From owner-p4-projects@FreeBSD.ORG Sun Sep 28 21:24:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D40716A4C0; Sun, 28 Sep 2003 21:24: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 3286616A4B3 for ; Sun, 28 Sep 2003 21:24:36 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B231C43FD7 for ; Sun, 28 Sep 2003 21:24:35 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8T4OZXJ024962 for ; Sun, 28 Sep 2003 21:24:35 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8T4OZsD024959 for perforce@freebsd.org; Sun, 28 Sep 2003 21:24:35 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Sun, 28 Sep 2003 21:24:35 -0700 (PDT) Message-Id: <200309290424.h8T4OZsD024959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 38769 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, 29 Sep 2003 04:24:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=38769 Change 38769 by sam@sam_ebb on 2003/09/28 21:24:02 One more time: rtrequest(RTM_DELETE...) locks the route so we cannot be holding it when we call it. Affected files ... .. //depot/projects/netperf/sys/netinet/if_ether.c#9 edit Differences ... ==== //depot/projects/netperf/sys/netinet/if_ether.c#9 (text+ko) ==== @@ -936,13 +936,14 @@ * If this is the only references to a protocol * cloned route, remove it. */ + RT_UNLOCK(rt); if (rt->rt_refcnt == 1 && (rt->rt_flags & RTF_WASCLONED)) { rtrequest(RTM_DELETE, (struct sockaddr *)rt_key(rt), rt->rt_gateway, rt_mask(rt), rt->rt_flags, 0); } - RTFREE_LOCKED(rt); + RTFREE(rt); return (0); } else { rt->rt_refcnt--; From owner-p4-projects@FreeBSD.ORG Sun Sep 28 21:25:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64D4F16A4C0; Sun, 28 Sep 2003 21:25:38 -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 3FD7916A4B3 for ; Sun, 28 Sep 2003 21:25:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B015C4401E for ; Sun, 28 Sep 2003 21:25:37 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8T4PbXJ025066 for ; Sun, 28 Sep 2003 21:25:37 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8T4PbCh025063 for perforce@freebsd.org; Sun, 28 Sep 2003 21:25:37 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Sun, 28 Sep 2003 21:25:37 -0700 (PDT) Message-Id: <200309290425.h8T4PbCh025063@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 38770 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, 29 Sep 2003 04:25:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=38770 Change 38770 by sam@sam_ebb on 2003/09/28 21:24:35 eliminate recursion on the SAHTREE lock Affected files ... .. //depot/projects/netperf/sys/netipsec/key.c#9 edit Differences ... ==== //depot/projects/netperf/sys/netipsec/key.c#9 (text+ko) ==== @@ -2903,7 +2903,7 @@ u_int stateidx, state; sav = NULL; - SAHTREE_LOCK(); + SAHTREE_LOCK_ASSERT(); /* search all status */ for (stateidx = 0; stateidx < _ARRAYLEN(saorder_state_alive); @@ -2924,7 +2924,6 @@ break; } } - SAHTREE_UNLOCK(); return sav; } @@ -4688,7 +4687,10 @@ return key_senderror(so, m, ENOENT); } #else - if ((sav = key_getsavbyspi(sah, sa0->sadb_sa_spi)) == NULL) { + SAHTREE_LOCK(); + sav = key_getsavbyspi(sah, sa0->sadb_sa_spi); + SAHTREE_UNLOCK(); + if (sav == NULL) { ipseclog((LOG_DEBUG, "%s: no such a SA found (spi:%u)\n", __func__, (u_int32_t)ntohl(sa0->sadb_sa_spi))); return key_senderror(so, m, EINVAL); @@ -4880,7 +4882,10 @@ /* create new SA entry. */ /* We can create new SA only if SPI is differenct. */ - if (key_getsavbyspi(newsah, sa0->sadb_sa_spi)) { + SAHTREE_LOCK(); + newsav = key_getsavbyspi(newsah, sa0->sadb_sa_spi); + SAHTREE_UNLOCK(); + if (newsav != NULL) { ipseclog((LOG_DEBUG, "%s: SA already exists.\n", __func__)); return key_senderror(so, m, EEXIST); } From owner-p4-projects@FreeBSD.ORG Mon Sep 29 13:55:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1212416A4C0; Mon, 29 Sep 2003 13:55:32 -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 D7B2416A4B3 for ; Mon, 29 Sep 2003 13:55:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57BC243FCB for ; Mon, 29 Sep 2003 13:55:31 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8TKtUXJ003931 for ; Mon, 29 Sep 2003 13:55:30 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8TKtTa1003928 for perforce@freebsd.org; Mon, 29 Sep 2003 13:55:29 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Mon, 29 Sep 2003 13:55:29 -0700 (PDT) Message-Id: <200309292055.h8TKtTa1003928@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 38798 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, 29 Sep 2003 20:55:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=38798 Change 38798 by sam@sam_ebb on 2003/09/29 13:54:32 add netbsd copyright from jonathon stone Affected files ... .. //depot/projects/netperf/sys/netipsec/ipsec_osdep.h#2 edit Differences ... ==== //depot/projects/netperf/sys/netipsec/ipsec_osdep.h#2 (text+ko) ==== @@ -1,5 +1,30 @@ /* $NetBSD: ipsec_osdep.h,v 1.1 2003/08/13 20:06:51 jonathan Exp $ */ +/* + * Copyright (c) 2003 Jonathan Stone (jonathan@cs.stanford.edu) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + #ifndef NETIPSEC_OSDEP_H #define NETIPSEC_OSDEP_H From owner-p4-projects@FreeBSD.ORG Mon Sep 29 13:56:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FCE916A4C0; Mon, 29 Sep 2003 13:56:34 -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 2BC0D16A4B3 for ; Mon, 29 Sep 2003 13:56:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A14B443FCB for ; Mon, 29 Sep 2003 13:56:33 -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.9/8.12.9) with ESMTP id h8TKuXXJ004029 for ; Mon, 29 Sep 2003 13:56:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8TKuWKl004026 for perforce@freebsd.org; Mon, 29 Sep 2003 13:56:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 29 Sep 2003 13:56:32 -0700 (PDT) Message-Id: <200309292056.h8TKuWKl004026@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 38799 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, 29 Sep 2003 20:56:34 -0000 X-List-Received-Date: Mon, 29 Sep 2003 20:56:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=38799 Change 38799 by rwatson@rwatson_tislabs on 2003/09/29 13:55:36 Make sure to unlock the pipe mutex when a MAC check fails on an ioctl, or we might return to userspace still holding the pipe mutex. Tripped over by: areisse Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#42 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#42 (text+ko) ==== @@ -1233,8 +1233,10 @@ #ifdef MAC error = mac_check_pipe_ioctl(active_cred, mpipe, cmd, data); - if (error) + if (error) { + PIPE_UNLOCK(mpipe); return (error); + } #endif switch (cmd) { From owner-p4-projects@FreeBSD.ORG Mon Sep 29 13:56:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2521E16A4C0; Mon, 29 Sep 2003 13:56: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 F31C716A4B3 for ; Mon, 29 Sep 2003 13:56:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 72D1B43FBD for ; Mon, 29 Sep 2003 13:56:35 -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.9/8.12.9) with ESMTP id h8TKuYXJ004035 for ; Mon, 29 Sep 2003 13:56:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8TKuX49004032 for perforce@freebsd.org; Mon, 29 Sep 2003 13:56:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 29 Sep 2003 13:56:33 -0700 (PDT) Message-Id: <200309292056.h8TKuX49004032@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 38800 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, 29 Sep 2003 20:56:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=38800 Change 38800 by rwatson@rwatson_tislabs on 2003/09/29 13:56:24 Integrate pipe locking fix from trustedbsd_mac: make sure to unlock the pipe lock on a MAC failure. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/sys_pipe.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/sys_pipe.c#5 (text+ko) ==== @@ -1233,8 +1233,10 @@ #ifdef MAC error = mac_check_pipe_ioctl(active_cred, mpipe, cmd, data); - if (error) + if (error) { + PIPE_UNLOCK(mpipe); return (error); + } #endif switch (cmd) { From owner-p4-projects@FreeBSD.ORG Mon Sep 29 14:54:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A519716A4C0; Mon, 29 Sep 2003 14:54: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 7895716A4B3 for ; Mon, 29 Sep 2003 14:54:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F085444017 for ; Mon, 29 Sep 2003 14:54:46 -0700 (PDT) (envelope-from Hrishikesh_Dandekar@NAI.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8TLskXJ007501 for ; Mon, 29 Sep 2003 14:54:46 -0700 (PDT) (envelope-from Hrishikesh_Dandekar@NAI.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8TLskX3007498 for perforce@freebsd.org; Mon, 29 Sep 2003 14:54:46 -0700 (PDT) (envelope-from Hrishikesh_Dandekar@NAI.com) Date: Mon, 29 Sep 2003 14:54:46 -0700 (PDT) Message-Id: <200309292154.h8TLskX3007498@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to Hrishikesh_Dandekar@NAI.com using -f From: Hrishikesh Dandekar To: Perforce Change Reviews Subject: PERFORCE change 38802 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, 29 Sep 2003 21:54:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=38802 Change 38802 by hdandeka@hdandeka_yash on 2003/09/29 14:54:37 Bug fix for SEM_CHECK_VALIDITY. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libc/sys/sem.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/sys/sem.c#7 (text+ko) ==== @@ -290,7 +290,7 @@ (*sem)->count--; _pthread_mutex_unlock(&(*sem)->lock); - +RETURN: return retval; } @@ -320,7 +320,7 @@ } _pthread_mutex_unlock(&(*sem)->lock); - +RETURN: return retval; } @@ -347,7 +347,7 @@ _pthread_cond_signal(&(*sem)->gtzero); _pthread_mutex_unlock(&(*sem)->lock); - +RETURN: return retval; } @@ -370,6 +370,6 @@ _pthread_mutex_lock(&(*sem)->lock); *sval = (int)(*sem)->count; _pthread_mutex_unlock(&(*sem)->lock); - +RETURN: return retval; } From owner-p4-projects@FreeBSD.ORG Mon Sep 29 15:02:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 067EC16A4C0; Mon, 29 Sep 2003 15:02:59 -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 D1ADC16A4B3 for ; Mon, 29 Sep 2003 15:02:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A3F044039 for ; Mon, 29 Sep 2003 15:02:58 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8TM2wXJ008073 for ; Mon, 29 Sep 2003 15:02:58 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8TM2vBI008070 for perforce@freebsd.org; Mon, 29 Sep 2003 15:02:57 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Mon, 29 Sep 2003 15:02:57 -0700 (PDT) Message-Id: <200309292202.h8TM2vBI008070@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 38804 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, 29 Sep 2003 22:02:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=38804 Change 38804 by sam@sam_ebb on 2003/09/29 15:02:19 o cleanup some types: long -> time_t o remove refrence to dead #define Affected files ... .. //depot/projects/netperf/sys/netipsec/keydb.h#5 edit Differences ... ==== //depot/projects/netperf/sys/netipsec/keydb.h#5 (text+ko) ==== @@ -102,7 +102,7 @@ size_t schedlen; struct secreplay *replay; /* replay prevention */ - long created; /* for lifetime */ + time_t created; /* for lifetime */ struct sadb_lifetime *lft_c; /* CURRENT lifetime, it's constant. */ struct sadb_lifetime *lft_h; /* HARD lifetime */ @@ -149,7 +149,6 @@ struct socket *so; }; -#ifndef IPSEC_NONBLOCK_ACQUIRE /* acquiring list table. */ struct secacq { LIST_ENTRY(secacq) chain; @@ -157,10 +156,9 @@ struct secasindex saidx; u_int32_t seq; /* sequence number */ - long created; /* for lifetime */ + time_t created; /* for lifetime */ int count; /* for lifetime */ }; -#endif /* Sensitivity Level Specification */ /* nothing */ From owner-p4-projects@FreeBSD.ORG Mon Sep 29 15:04:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB2D616A4C0; Mon, 29 Sep 2003 15:04:00 -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 C513116A4B3 for ; Mon, 29 Sep 2003 15:04:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 497124401E for ; Mon, 29 Sep 2003 15:04:00 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8TM40XJ009053 for ; Mon, 29 Sep 2003 15:04:00 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8TM3xUW009050 for perforce@freebsd.org; Mon, 29 Sep 2003 15:03:59 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Mon, 29 Sep 2003 15:03:59 -0700 (PDT) Message-Id: <200309292203.h8TM3xUW009050@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 38805 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, 29 Sep 2003 22:04:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=38805 Change 38805 by sam@sam_ebb on 2003/09/29 15:03:29 o correct some types: long -> time_t o add scan generation # to secpolicy to deal with locking issues Affected files ... .. //depot/projects/netperf/sys/netipsec/ipsec.h#6 edit Differences ... ==== //depot/projects/netperf/sys/netipsec/ipsec.h#6 (text+ko) ==== @@ -80,8 +80,8 @@ u_int state; /* 0: dead, others: alive */ #define IPSEC_SPSTATE_DEAD 0 #define IPSEC_SPSTATE_ALIVE 1 - - u_int policy; /* DISCARD, NONE or IPSEC, see keyv2.h */ + u_int16_t policy; /* policy_type per pfkeyv2.h */ + u_int16_t scangen; /* scan generation # */ struct ipsecrequest *req; /* pointer to the ipsec request tree, */ /* if policy == IPSEC else this value == NULL.*/ @@ -93,8 +93,8 @@ * "lifetime" is passed by sadb_lifetime.sadb_lifetime_addtime. * "validtime" is passed by sadb_lifetime.sadb_lifetime_usetime. */ - long created; /* time created the policy */ - long lastused; /* updated every when kernel sends a packet */ + time_t created; /* time created the policy */ + time_t lastused; /* updated every when kernel sends a packet */ long lifetime; /* duration of the lifetime of this policy */ long validtime; /* duration this policy is valid without use */ }; @@ -145,7 +145,7 @@ struct secpolicyindex spidx; - long created; /* for lifetime */ + time_t created; /* for lifetime */ int count; /* for lifetime */ /* XXX: here is mbuf place holder to be sent ? */ }; From owner-p4-projects@FreeBSD.ORG Mon Sep 29 15:08:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2175616A4C0; Mon, 29 Sep 2003 15:08:07 -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 DA3FE16A4B3 for ; Mon, 29 Sep 2003 15:08:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3170C44033 for ; Mon, 29 Sep 2003 15:08:06 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8TM85XJ009222 for ; Mon, 29 Sep 2003 15:08:05 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8TM859f009219 for perforce@freebsd.org; Mon, 29 Sep 2003 15:08:05 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Mon, 29 Sep 2003 15:08:05 -0700 (PDT) Message-Id: <200309292208.h8TM859f009219@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 38806 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, 29 Sep 2003 22:08:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=38806 Change 38806 by sam@sam_ebb on 2003/09/29 15:07:09 general cleanups and reorg to deal with recursive locking problems: o use LIST_FOREACH_SAFE instead of handrolled code o change key_flush_spd to drop the sptree lock before purging an entry to avoid lock recursion and to avoid holding the lock over a long-running operation o misc cleanups of tangled and twisty code There is still much to do here but for now things look to be working again. Affected files ... .. //depot/projects/netperf/sys/netipsec/key.c#10 edit Differences ... ==== //depot/projects/netperf/sys/netipsec/key.c#10 (text+ko) ==== @@ -289,10 +289,6 @@ SYSCTL_INT(_net_key, KEYCTL_PREFERED_OLDSA, prefered_oldsa, CTLFLAG_RW,\ &key_prefered_oldsa, 0, ""); -#ifndef LIST_FOREACH -#define LIST_FOREACH(elm, head, field) \ - for (elm = LIST_FIRST(head); elm; elm = LIST_NEXT(elm, field)) -#endif #define __LIST_CHAINED(elm) \ (!((elm)->chain.le_next == NULL && (elm)->chain.le_prev == NULL)) #define LIST_INSERT_TAIL(head, elm, type, field) \ @@ -1168,6 +1164,7 @@ IPSEC_ASSERT(sav != NULL, ("null sav")); + /* XXX unguarded? */ SA_DELREF(sav); KEYDEBUG(KEYDEBUG_IPSEC_STAMP, @@ -2298,9 +2295,10 @@ return key_senderror(so, m, EINVAL); for (dir = 0; dir < IPSEC_DIR_MAX; dir++) { - LIST_FOREACH(sp, &sptree[dir], chain) { + SPTREE_LOCK(); + LIST_FOREACH(sp, &sptree[dir], chain) sp->state = IPSEC_SPSTATE_DEAD; - } + SPTREE_UNLOCK(); } if (sizeof(struct sadb_msg) > m->m_len + M_TRAILINGSPACE(m)) { @@ -2610,7 +2608,7 @@ struct secashead *sah; { struct secasvar *sav, *nextsav; - u_int stateidx, state; + u_int stateidx; int zombie = 0; IPSEC_ASSERT(sah != NULL, ("NULL sah")); @@ -2620,14 +2618,8 @@ for (stateidx = 0; stateidx < _ARRAYLEN(saorder_state_any); stateidx++) { - - state = saorder_state_any[stateidx]; - for (sav = (struct secasvar *)LIST_FIRST(&sah->savtree[state]); - sav != NULL; - sav = nextsav) { - - nextsav = LIST_NEXT(sav, chain); - + u_int state = saorder_state_any[stateidx]; + LIST_FOREACH_SAFE(sav, &sah->savtree[state], chain, nextsav) { if (sav->refcnt == 0) { /* sanity check */ KEY_CHKSASTATE(state, sav->state, __func__); @@ -2638,20 +2630,16 @@ } } } - /* remove from tree of SA index */ - if (!zombie && __LIST_CHAINED(sah)) - LIST_REMOVE(sah, chain); - - /* don't delete sah only if there are savs. */ - if (zombie) - return; - - if (sah->sa_route.ro_rt) { - RTFREE(sah->sa_route.ro_rt); - sah->sa_route.ro_rt = (struct rtentry *)NULL; + if (!zombie) { /* delete only if there are savs */ + /* remove from tree of SA index */ + if (__LIST_CHAINED(sah)) + LIST_REMOVE(sah, chain); + if (sah->sa_route.ro_rt) { + RTFREE(sah->sa_route.ro_rt); + sah->sa_route.ro_rt = (struct rtentry *)NULL; + } + free(sah, M_IPSEC_SAH); } - - free(sah, M_IPSEC_SAH); } /* @@ -3973,32 +3961,34 @@ static void key_flush_spd(time_t now) { - struct secpolicy *sp, *nextsp; + static u_int16_t sptree_scangen = 0; + u_int16_t gen = sptree_scangen++; + struct secpolicy *sp; u_int dir; /* SPD */ for (dir = 0; dir < IPSEC_DIR_MAX; dir++) { +restart: SPTREE_LOCK(); - for (sp = LIST_FIRST(&sptree[dir]); - sp != NULL; - sp = nextsp) { - - nextsp = LIST_NEXT(sp, chain); - + LIST_FOREACH(sp, &sptree[dir], chain) { + if (sp->scangen == gen) /* previously handled */ + continue; + sp->scangen = gen; if (sp->state == IPSEC_SPSTATE_DEAD) { + /* NB: clean entries created by key_spdflush */ + SPTREE_UNLOCK(); KEY_FREESP(&sp); - continue; + goto restart; } - if (sp->lifetime == 0 && sp->validtime == 0) continue; - - /* the deletion will occur next time */ if ((sp->lifetime && now - sp->created > sp->lifetime) || (sp->validtime && now - sp->lastused > sp->validtime)) { sp->state = IPSEC_SPSTATE_DEAD; + SPTREE_UNLOCK(); key_spdexpire(sp); - continue; + KEY_FREESP(&sp); + goto restart; } } SPTREE_UNLOCK(); @@ -4013,12 +4003,7 @@ /* SAD */ SAHTREE_LOCK(); - for (sah = LIST_FIRST(&sahtree); - sah != NULL; - sah = nextsah) { - - nextsah = LIST_NEXT(sah, chain); - + LIST_FOREACH_SAFE(sah, &sahtree, chain, nextsah) { /* if sah has been dead, then delete it and process next sah. */ if (sah->state == SADB_SASTATE_DEAD) { key_delsah(sah); @@ -4026,27 +4011,16 @@ } /* if LARVAL entry doesn't become MATURE, delete it. */ - for (sav = LIST_FIRST(&sah->savtree[SADB_SASTATE_LARVAL]); - sav != NULL; - sav = nextsav) { - - nextsav = LIST_NEXT(sav, chain); - - if (now - sav->created > key_larval_lifetime) { + LIST_FOREACH_SAFE(sav, &sah->savtree[SADB_SASTATE_LARVAL], chain, nextsav) { + if (now - sav->created > key_larval_lifetime) KEY_FREESAV(&sav); - } } /* * check MATURE entry to start to send expire message * whether or not. */ - for (sav = LIST_FIRST(&sah->savtree[SADB_SASTATE_MATURE]); - sav != NULL; - sav = nextsav) { - - nextsav = LIST_NEXT(sav, chain); - + LIST_FOREACH_SAFE(sav, &sah->savtree[SADB_SASTATE_MATURE], chain, nextsav) { /* we don't need to check. */ if (sav->lft_s == NULL) continue; @@ -4059,8 +4033,8 @@ } /* check SOFT lifetime */ - if (sav->lft_s->sadb_lifetime_addtime != 0 - && now - sav->created > sav->lft_s->sadb_lifetime_addtime) { + if (sav->lft_s->sadb_lifetime_addtime != 0 && + now - sav->created > sav->lft_s->sadb_lifetime_addtime) { /* * check SA to be used whether or not. * when SA hasn't been used, delete it. @@ -4084,8 +4058,8 @@ * when new SA is installed. Caution when it's * installed too big lifetime by time. */ - else if (sav->lft_s->sadb_lifetime_bytes != 0 - && sav->lft_s->sadb_lifetime_bytes < sav->lft_c->sadb_lifetime_bytes) { + else if (sav->lft_s->sadb_lifetime_bytes != 0 && + sav->lft_s->sadb_lifetime_bytes < sav->lft_c->sadb_lifetime_bytes) { key_sa_chgstate(sav, SADB_SASTATE_DYING); /* @@ -4098,12 +4072,7 @@ } /* check DYING entry to change status to DEAD. */ - for (sav = LIST_FIRST(&sah->savtree[SADB_SASTATE_DYING]); - sav != NULL; - sav = nextsav) { - - nextsav = LIST_NEXT(sav, chain); - + LIST_FOREACH_SAFE(sav, &sah->savtree[SADB_SASTATE_DYING], chain, nextsav) { /* we don't need to check. */ if (sav->lft_h == NULL) continue; @@ -4115,8 +4084,8 @@ continue; } - if (sav->lft_h->sadb_lifetime_addtime != 0 - && now - sav->created > sav->lft_h->sadb_lifetime_addtime) { + if (sav->lft_h->sadb_lifetime_addtime != 0 && + now - sav->created > sav->lft_h->sadb_lifetime_addtime) { key_sa_chgstate(sav, SADB_SASTATE_DEAD); KEY_FREESAV(&sav); } @@ -4137,20 +4106,15 @@ } #endif /* check HARD lifetime by bytes */ - else if (sav->lft_h->sadb_lifetime_bytes != 0 - && sav->lft_h->sadb_lifetime_bytes < sav->lft_c->sadb_lifetime_bytes) { + else if (sav->lft_h->sadb_lifetime_bytes != 0 && + sav->lft_h->sadb_lifetime_bytes < sav->lft_c->sadb_lifetime_bytes) { key_sa_chgstate(sav, SADB_SASTATE_DEAD); KEY_FREESAV(&sav); } } /* delete entry in DEAD */ - for (sav = LIST_FIRST(&sah->savtree[SADB_SASTATE_DEAD]); - sav != NULL; - sav = nextsav) { - - nextsav = LIST_NEXT(sav, chain); - + LIST_FOREACH_SAFE(sav, &sah->savtree[SADB_SASTATE_DEAD], chain, nextsav) { /* sanity check */ if (sav->state != SADB_SASTATE_DEAD) { ipseclog((LOG_DEBUG, "%s: invalid sav->state " @@ -4158,7 +4122,6 @@ __func__, SADB_SASTATE_DEAD, sav->state)); } - /* * do not call key_freesav() here. * sav should already be freed, and sav->refcnt From owner-p4-projects@FreeBSD.ORG Mon Sep 29 15:45:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16DF816A4C0; Mon, 29 Sep 2003 15:45: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 B9DD016A4B3 for ; Mon, 29 Sep 2003 15:45:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 474F74400E for ; Mon, 29 Sep 2003 15:45:52 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8TMjqXJ010721 for ; Mon, 29 Sep 2003 15:45:52 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8TMjpxx010718 for perforce@freebsd.org; Mon, 29 Sep 2003 15:45:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Mon, 29 Sep 2003 15:45:51 -0700 (PDT) Message-Id: <200309292245.h8TMjpxx010718@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 38807 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, 29 Sep 2003 22:45:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=38807 Change 38807 by marcel@marcel_nfs on 2003/09/29 15:45:18 IFC @38801 Affected files ... .. //depot/projects/ia64/UPDATING#55 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_write.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#38 integrate .. //depot/projects/ia64/libexec/talkd/talkd.c#4 integrate .. //depot/projects/ia64/share/man/man9/VOP_GETPAGES.9#3 integrate .. //depot/projects/ia64/share/skel/dot.mail_aliases#2 integrate .. //depot/projects/ia64/sys/conf/majors#26 integrate .. //depot/projects/ia64/sys/ddb/db_elf.c#5 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#32 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdSchedule.c#10 integrate .. //depot/projects/ia64/sys/dev/mii/brgphy.c#18 integrate .. //depot/projects/ia64/sys/dev/nmdm/nmdm.c#9 integrate .. //depot/projects/ia64/sys/dev/ofw/ofw_console.c#12 integrate .. //depot/projects/ia64/sys/dev/raidframe/rf_decluster.c#3 integrate .. //depot/projects/ia64/sys/dev/raidframe/rf_freebsdkintf.c#15 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#55 integrate .. //depot/projects/ia64/sys/dev/uart/uart_cpu_sparc64.c#6 integrate .. //depot/projects/ia64/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/ia64/sys/dev/usb/ugen.c#18 integrate .. //depot/projects/ia64/sys/dev/usb/uhid.c#16 integrate .. //depot/projects/ia64/sys/dev/usb/ulpt.c#15 integrate .. //depot/projects/ia64/sys/dev/usb/ums.c#13 integrate .. //depot/projects/ia64/sys/dev/usb/uscanner.c#15 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumconfig.c#15 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumrevive.c#10 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumvar.h#4 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_map.c#6 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#39 integrate .. //depot/projects/ia64/sys/ia64/include/varargs.h#5 integrate .. //depot/projects/ia64/sys/kern/kern_conf.c#24 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#32 integrate .. //depot/projects/ia64/sys/net/if.c#25 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#8 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#41 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#47 integrate .. //depot/projects/ia64/sys/sys/conf.h#24 integrate .. //depot/projects/ia64/sys/sys/cons.h#6 integrate .. //depot/projects/ia64/sys/sys/param.h#45 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#55 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.holiday#8 integrate .. //depot/projects/ia64/usr.bin/rlogin/rlogin.1#5 integrate .. //depot/projects/ia64/usr.bin/rlogin/rlogin.c#9 integrate .. //depot/projects/ia64/usr.bin/su/su.1#7 integrate .. //depot/projects/ia64/usr.bin/talk/ctl.c#3 integrate .. //depot/projects/ia64/usr.bin/talk/io.c#3 integrate .. //depot/projects/ia64/usr.bin/talk/look_up.c#3 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/config.c#17 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#35 integrate .. //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.8#15 integrate .. //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.c#14 integrate Differences ... ==== //depot/projects/ia64/UPDATING#55 (text+ko) ==== @@ -17,6 +17,11 @@ developers choose to disable these features on build machines to maximize performance. +20030928: + Changes to the cdevsw default functions have been made to remove + the need to specify nullopen() and nullclose() explicitly. + __FreeBSD_version bumpted to 501110. + 20030926: kiconv(3) has been added. mount_msdosfs(8), mount_ntfs(8) and mount_cd9660(8) need to be in sync with kernel. @@ -1379,4 +1384,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.269 2003/09/27 14:12:39 fjoe Exp $ +$FreeBSD: src/UPDATING,v 1.270 2003/09/28 16:25:35 phk Exp $ ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_write.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_write.c,v 1.21 2002/11/05 00:59:18 archie Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_write.c,v 1.22 2003/09/29 13:41:26 deischen Exp $ * */ #include @@ -95,7 +95,7 @@ * write: */ if (blocking && ((n < 0 && (errno == EWOULDBLOCK || - errno == EAGAIN)) || (n >= 0 && num < nbytes))) { + errno == EAGAIN)) || (n > 0 && num < nbytes))) { curthread->data.fd.fd = fd; _thread_kern_set_timeout(NULL); @@ -133,7 +133,7 @@ * If there was an error, return partial success * (if any bytes were written) or else the error: */ - } else if (n < 0) { + } else if (n <= 0) { if (num > 0) ret = num; else ==== //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#38 (text+ko) ==== @@ -33,7 +33,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.97 2003/09/23 04:02:23 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.99 2003/09/29 06:25:04 davidxu Exp $"); #include #include @@ -1805,6 +1805,7 @@ { /* struct kse_group *free_kseg = NULL; */ struct timespec ts; + struct pthread *td; /* * Check to see if this is one of the main kses. @@ -1844,10 +1845,22 @@ KSE_SCHED_LOCK(kse, kse->k_kseg); TAILQ_REMOVE(&kse->k_kseg->kg_kseq, kse, k_kgqe); kse->k_kseg->kg_ksecount--; + /* + * Migrate thread to _kse_initial if its lastest + * kse it ran on is the kse. + */ + td = TAILQ_FIRST(&kse->k_kseg->kg_threadq); + while (td != NULL) { + if (td->kse == kse) + td->kse = _kse_initial; + td = TAILQ_NEXT(td, kle); + } KSE_SCHED_UNLOCK(kse, kse->k_kseg); KSE_LOCK_ACQUIRE(kse, &kse_lock); kse_free_unlocked(kse); KSE_LOCK_RELEASE(kse, &kse_lock); + /* Make sure there is always at least one is awake */ + KSE_WAKEUP(_kse_initial); kse_exit(); /* Never returns. */ PANIC("kse_exit() failed for initial kseg"); @@ -2394,11 +2407,9 @@ { kse_critical_t crit; struct kse *curkse; - struct pthread *curthread; crit = _kse_critical_enter(); curkse = _get_curkse(); - curthread = _get_curthread(); KSE_LOCK_ACQUIRE(curkse, &_thread_list_lock); /* * Initialize the unique id (which GDB uses to track ==== //depot/projects/ia64/libexec/talkd/talkd.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)talkd.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/talkd/talkd.c,v 1.14 2003/04/03 05:13:27 jmallett Exp $"; + "$FreeBSD: src/libexec/talkd/talkd.c,v 1.15 2003/09/28 09:16:09 tjr Exp $"; #endif /* not lint */ /* @@ -86,6 +86,7 @@ { register CTL_MSG *mp = &request; int cc; + struct sockaddr ctl_addr; #ifdef NOTDEF /* @@ -116,12 +117,13 @@ continue; } lastmsgtime = time(0); + (void)memcpy(&ctl_addr, &mp->ctl_addr, sizeof(ctl_addr)); + ctl_addr.sa_family = ntohs(mp->ctl_addr.sa_family); + ctl_addr.sa_len = sizeof(ctl_addr); process_request(mp, &response); /* can block here, is this what I want? */ - mp->ctl_addr.sa_family = htons(mp->ctl_addr.sa_family); - cc = sendto(sockt, (char *)&response, - sizeof (response), 0, (struct sockaddr *)&mp->ctl_addr, - sizeof (mp->ctl_addr)); + cc = sendto(sockt, (char *)&response, sizeof (response), 0, + &ctl_addr, sizeof (ctl_addr)); if (cc != sizeof (response)) syslog(LOG_WARNING, "sendto: %m"); } ==== //depot/projects/ia64/share/man/man9/VOP_GETPAGES.9#3 (text+ko) ==== @@ -1,6 +1,7 @@ .\" -*- nroff -*- .\" .\" Copyright (c) 1996 Doug Rabson +.\" Copyright 2003, Garrett A. Wollman .\" .\" All rights reserved. .\" @@ -26,9 +27,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_GETPAGES.9,v 1.7 2003/05/31 14:07:25 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_GETPAGES.9,v 1.8 2003/09/28 03:15:21 wollman Exp $ .\" -.Dd July 24, 1996 +.Dd September 27, 2003 .Os .Dt VOP_GETPAGES 9 .Sh NAME @@ -44,29 +45,118 @@ .Ft int .Fn VOP_PUTPAGES "struct vnode *vp" "vm_page_t *m" "int count" "int sync" "int *rtvals" "vm_ooffset_t offset" .Sh DESCRIPTION +The +.Fn VOP_GETPAGES +method is called to read in pages of virtual memory which are backed by +ordinary files. +If other adjacent pages are backed by adjacent regions of the same file, +.Fn VOP_GETPAGES +is requested to read those pages as well, although it is not required to +do so. +The +.Fn VOP_PUTPAGES +method does the converse; that is to say, it writes out adjacent dirty +pages of virtual memory. +.Pp +On entry, the vnode lock is held but neither the page queue nor VM object +locks are held. Both methods return in the same state on both success and +error returns. +.Pp The arguments are: .Bl -tag -width reqpage .It Fa vp The file to access. .It Fa m -A page ??? +Pointer to the first element of an array of contiguous pages representing a +contiguous region of the file to be read or written. .It Fa count -How many pages to access. +The number of pages in the array. .It Fa sync -Nonzero if the write should be synchronous. +.Dv VM_PAGER_PUT_SYNC +if the write should be synchronous. .It Fa rtvals -??? +An array of VM system result codes indicating the status of each +page written by +.Fn VOP_PUTPAGES . .It Fa reqpage -??? +The index in the page array of the requested page; i.e., the one page which +the implementation of this method must handle. .It Fa offset -Offset in the file to start accessing. +Offset in the file at which the mapped pages begin. +.El +.Pp +The status of the +.Fn VOP_PUTPAGES +method is returned on a page-by-page basis in the array +.Fa rtvals[] . +The possible status values are as follows: +.Bl -tag -width VM_PAGER_ERROR +.It Dv VM_PAGER_OK +The page was successfully written. +The implementation must call +.Xr vm_pager_undirty 9 +to mark the page as clean. +.It Dv VM_PAGER_PEND +The page was scheduled to be written asynchronously. +When the write completes, the completion callback should +call +.Xr vm_object_pip_wakeup 9 +and +.Xr vm_page_io_finish 9 +to clear the busy flag and awaken any other threads waiting for this page, +in addition to calling +.Xr vm_page_undirty 9 . +.It Dv VM_PAGER_BAD +The page was entirely beyond the end of the backing file. +This condition should not be possible if the vnode's filesystem +is correctly implemented. +.It Dv VM_PAGER_ERROR +The page could not be written because of an error on the underlying storage +medium or protocol. +.It Dv VM_PAGER_FAIL +Treated identically to +.Dv VM_PAGER_ERROR +.It Dv VM_PAGER_AGAIN +The page was not handled by this request. .El .Pp -Not quite sure about this one. +The +.Fn VOP_GETPAGES +method is expected to release any pages in +.Fa m +that it does not successfully handle, by calling +.Xr vm_page_free 9 . +When it succeeds, +.Fn VOP_GETPAGES +must set the valid bits appropriately, clear the dirty bit +(using +.Xr vm_page_undirty 9 ) , +either activate the page (if its wanted bit is set) +or deactivate it (otherwise), and finally call +.Xr vm_page_wakeup 9 +to arouse any threads currently waiting for the page to be faulted in, +for each page read. .Sh RETURN VALUES -Zero is returned on success, otherwise an error is returned. +If it successfully reads +.Fa m[reqpage] , +.Fn VOP_GETPAGES +returns +.Dv VM_PAGER_OK ; +otherwise, +.Dv VM_PAGER_ERROR . +By convention, the return value of +.Fn VOP_PUTPAGES +is +.Fa rtvals[0] . .Sh SEE ALSO +.Xr vm_object_pip_wakeup 9 , +.Xr vm_page_free 9 , +.Xr vm_page_io_finish 9 , +.Xr vm_page_undirty 9 , +.Xr vm_page_wakeup 9 , .Xr vnode 9 .Sh AUTHORS -This man page was written by -.An Doug Rabson . +This manual page was written by +.An Doug Rabson +and then substantially rewritten by +.An Garrett Wollman . ==== //depot/projects/ia64/share/skel/dot.mail_aliases#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/skel/dot.mail_aliases,v 1.2 1999/08/28 00:21:53 peter Exp $ +# $FreeBSD: src/share/skel/dot.mail_aliases,v 1.3 2003/09/28 16:17:30 rwatson Exp $ # # .mail_aliases - private mail aliases # @@ -6,8 +6,8 @@ # # FreeBSD Mailing lists aliases -# alias freebsd-bugs freebsd-bugs@freebsd.org -# alias freebsd-questions freebsd-questions@freebsd.org +# alias freebsd-bugs freebsd-bugs@FreeBSD.org +# alias freebsd-questions freebsd-questions@FreeBSD.org # an alias for your good friends # alias bicycle christoph gerhardt velophil zentralrad ==== //depot/projects/ia64/sys/conf/majors#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/majors,v 1.177 2003/08/27 07:35:12 simokawa Exp $ +# $FreeBSD: src/sys/conf/majors,v 1.179 2003/09/29 14:15:57 scottl Exp $ # # This list is semi-obsoleted by DEVFS, but for now it still contains # the current allocation of device major numbers. @@ -148,7 +148,6 @@ 146 *twe 3ware Escalade ATA RAID (controller) 148 *agp AGP 149 *tap Ethernet tunneling device -150 *aac Adaptec FSA RAID (controller) 152 *acpi ACPI bios support (Takanori Watanabe takawata@shidahara1.planet.sci.kobe-u.ac.jp) 153 *ti Tigon Gigabit Ethernet driver (ken@FreeBSD.ORG) 154 *asr Adaptec SCSI RAID @@ -169,8 +168,6 @@ 173 *devctl Devd control device 174 pciwd Berkshire Watchdog PCI 175 ips IBM/Adaptec ServeRAID (control device) -178 raidctl RAIDframe (control device) -179 raid RAIDframe (disk device) 180 nvidia NVIDIA (nvidiaN/nvidiactl) 181 casm HP/Compaq ProLiant Advanced Server Management 183 *smapi SMAPI BIOS interface ==== //depot/projects/ia64/sys/ddb/db_elf.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_elf.c,v 1.16 2003/06/10 22:09:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_elf.c,v 1.17 2003/09/28 06:02:33 bde Exp $"); #include "opt_ddb.h" @@ -266,6 +266,11 @@ for (symp = symtab_start; symp < symtab_end; symp++) { if (symp->st_name == 0) continue; + if (ELF_ST_TYPE(symp->st_info) != STT_OBJECT && + ELF_ST_TYPE(symp->st_info) != STT_FUNC && + ELF_ST_TYPE(symp->st_info) != STT_NOTYPE) + continue; + if (off >= symp->st_value) { if ((off - symp->st_value) < diff) { diff = off - symp->st_value; ==== //depot/projects/ia64/sys/dev/aac/aac.c#32 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.78 2003/09/16 16:07:15 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.79 2003/09/29 14:10:04 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -180,15 +180,12 @@ static int aac_return_aif(struct aac_softc *sc, caddr_t uptr); static int aac_query_disk(struct aac_softc *sc, caddr_t uptr); -#define AAC_CDEV_MAJOR 150 - static struct cdevsw aac_cdevsw = { .d_open = aac_open, .d_close = aac_close, .d_ioctl = aac_ioctl, .d_poll = aac_poll, .d_name = "aac", - .d_maj = AAC_CDEV_MAJOR, }; MALLOC_DEFINE(M_AACBUF, "aacbuf", "Buffers for the AAC driver"); ==== //depot/projects/ia64/sys/dev/acpica/Osd/OsdSchedule.c#10 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.23 2002/10/31 17:58:39 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.24 2003/09/29 07:29:26 njl Exp $ */ /* @@ -262,7 +262,15 @@ { ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - DELAY(Microseconds); + /* + * Maximum length for stall is 100 us. If longer, assume caller + * really meant "sleep". + */ + if (Microseconds <= 100) + DELAY(Microseconds); + else + AcpiOsSleep(Microseconds / 1000, Microseconds % 1000); + return_VOID; } ==== //depot/projects/ia64/sys/dev/mii/brgphy.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.26 2003/08/24 17:54:10 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.27 2003/09/28 04:16:16 ps Exp $"); /* * Driver for the Broadcom BCR5400 1000baseTX PHY. Speed is always @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.26 2003/08/24 17:54:10 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.27 2003/09/28 04:16:16 ps Exp $"); #include #include @@ -622,7 +622,7 @@ /* Enable Ethernet@WireSpeed. */ PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x7007); val = PHY_READ(sc, BRGPHY_MII_AUXCTL); - PHY_WRITE(sc, BRGPHY_MII_AUXCTL, val | (1 << 15) || (1 << 4)); + PHY_WRITE(sc, BRGPHY_MII_AUXCTL, val | (1 << 15) | (1 << 4)); /* Enable Link LED on Dell boxes */ if (bge_sc->bge_no_3_led) { ==== //depot/projects/ia64/sys/dev/nmdm/nmdm.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.15 2003/08/24 17:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.16 2003/09/28 20:48:12 phk Exp $"); /* * Pseudo-nulmodem driver @@ -604,8 +604,8 @@ nextdev2 = makedev(CDEV_MAJOR, (i+i) + 1); ptr1 = nextdev1->si_drv1; if (ptr1) { - revoke_and_destroy_dev(nextdev1); - revoke_and_destroy_dev(nextdev2); + destroy_dev(nextdev1); + destroy_dev(nextdev2); free(ptr1, M_NLMDM); } else { freedev(nextdev1); ==== //depot/projects/ia64/sys/dev/ofw/ofw_console.c#12 (text+ko) ==== @@ -24,10 +24,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.15 2003/09/26 19:35:49 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.17 2003/09/28 06:51:47 jake Exp $"); #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.15 2003/09/26 19:35:49 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.17 2003/09/28 06:51:47 jake Exp $"); #include "opt_ddb.h" #include "opt_comconsole.h" @@ -94,7 +94,8 @@ char output[32]; dev_t dev; - if (ofw_consdev.cn_pri != CN_DEAD) { + if (ofw_consdev.cn_pri != CN_DEAD && + ofw_consdev.cn_name[0] != '\0') { if ((options = OF_finddevice("/options")) == -1 || OF_getprop(options, "output-device", output, sizeof(output)) == -1) @@ -276,7 +277,7 @@ return; } - cp->cn_pri = CN_INTERNAL; + cp->cn_pri = CN_LOW; } static void ==== //depot/projects/ia64/sys/dev/raidframe/rf_decluster.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: rf_decluster.c,v 1.6 2001/01/26 04:40:03 oster Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/raidframe/rf_decluster.c,v 1.2 2003/08/24 17:54:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/raidframe/rf_decluster.c,v 1.4 2003/09/29 14:23:59 scottl Exp $"); /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -66,7 +66,7 @@ extern int rf_copyback_in_progress; /* debug only */ /* found in rf_kintf.c */ -int rf_GetSpareTableFromDaemon(RF_SparetWait_t * req); +extern int rf_GetSpareTableFromDaemon(RF_SparetWait_t * req); #if (RF_INCLUDE_PARITY_DECLUSTERING > 0) || (RF_INCLUDE_PARITY_DECLUSTERING_PQ > 0) ==== //depot/projects/ia64/sys/dev/raidframe/rf_freebsdkintf.c#15 (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/raidframe/rf_freebsdkintf.c,v 1.20 2003/07/27 17:04:54 phk Exp $ + * $FreeBSD: src/sys/dev/raidframe/rf_freebsdkintf.c,v 1.21 2003/09/29 14:14:35 scottl Exp $ */ /* $NetBSD: rf_netbsdkintf.c,v 1.105 2001/04/05 02:48:51 oster Exp $ */ @@ -219,7 +219,6 @@ .d_close = raidctlclose, .d_ioctl = raidctlioctl, .d_name = "raidctl", - .d_maj = 201, }; /* ==== //depot/projects/ia64/sys/dev/sio/sio.c#55 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.413 2003/09/27 11:13:59 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.414 2003/09/28 13:12:26 bde Exp $"); #include "opt_comconsole.h" #include "opt_compat.h" @@ -2302,8 +2302,6 @@ if (sio_getreg(com, com_dlbh) != dlbh) sio_setreg(com, com_dlbh, dlbh); - if (!(tp->t_state & TS_TTSTOP)) - com->state |= CS_TTGO; efr_flowbits = 0; if (cflag & CRTS_IFLOW) { @@ -2348,13 +2346,6 @@ /* XXX shouldn't call functions while intrs are disabled. */ disc_optim(tp, t, com); - /* - * Recover from fiddling with CS_TTGO. We used to call siointr1() - * unconditionally, but that defeated the careful discarding of - * stale input in sioopen(). - */ - if (com->state >= (CS_BUSY | CS_TTGO)) - siointr1(com); mtx_unlock_spin(&sio_lock); splx(s); ==== //depot/projects/ia64/sys/dev/uart/uart_cpu_sparc64.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.5 2003/09/26 05:14:56 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.6 2003/09/28 07:06:34 jake Exp $"); #include #include @@ -142,7 +142,10 @@ di->bas.bsh = sparc64_fake_bustag(space, addr, di->bas.bst); /* Get the line settings. */ - di->baudrate = 9600; + if (devtype == UART_DEV_KEYBOARD) + di->baudrate = 1200; + else + di->baudrate = 9600; di->databits = 8; di->stopbits = 1; di->parity = UART_PARITY_NONE; ==== //depot/projects/ia64/sys/dev/uart/uart_tty.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.3 2003/09/26 18:10:30 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.4 2003/09/28 18:20:42 marcel Exp $"); #include #include @@ -74,7 +74,6 @@ .d_ioctl = uart_tty_ioctl, .d_poll = ttypoll, .d_name = uart_driver_name, - .d_maj = MAJOR_AUTO, .d_flags = D_TTY, .d_kqfilter = ttykqfilter, }; ==== //depot/projects/ia64/sys/dev/usb/ugen.c#18 (text+ko) ==== @@ -7,7 +7,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.76 2003/08/25 22:01:05 joe Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.77 2003/09/28 20:48:12 phk Exp $"); /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -273,7 +273,6 @@ { int endptno; dev_t dev; - struct vnode *vp; /* destroy all devices for the other (existing) endpoints as well */ for (endptno = 1; endptno < USB_MAX_ENDPOINTS; endptno++) { @@ -289,9 +288,6 @@ */ dev = makedev(UGEN_CDEV_MAJOR, UGENMINOR(USBDEVUNIT(sc->sc_dev), endptno)); - vp = SLIST_FIRST(&dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); destroy_dev(dev); } @@ -860,7 +856,6 @@ int maj, mn; #elif defined(__FreeBSD__) dev_t dev; - struct vnode *vp; #endif #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -901,9 +896,6 @@ #elif defined(__FreeBSD__) /* destroy the device for the control endpoint */ dev = makedev(UGEN_CDEV_MAJOR, UGENMINOR(USBDEVUNIT(sc->sc_dev), 0)); - vp = SLIST_FIRST(&dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); destroy_dev(dev); ugen_destroy_devnodes(sc); #endif ==== //depot/projects/ia64/sys/dev/usb/uhid.c#16 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.62 2003/08/25 22:01:06 joe Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.63 2003/09/28 20:48:13 phk Exp $"); /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -304,8 +304,6 @@ int s; #if defined(__NetBSD__) || defined(__OpenBSD__) int maj, mn; -#elif defined(__FreeBSD__) - struct vnode *vp; #endif #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -339,10 +337,6 @@ mn = self->dv_unit; vdevgone(maj, mn, mn, VCHR); #elif defined(__FreeBSD__) - vp = SLIST_FIRST(&sc->dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); - destroy_dev(sc->dev); #endif ==== //depot/projects/ia64/sys/dev/usb/ulpt.c#15 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.58 2003/08/25 22:01:06 joe Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.59 2003/09/28 20:48:13 phk Exp $"); /* * Printer Class spec: http://www.usb.org/developers/data/devclass/usbprint109.PDF @@ -58,7 +58,6 @@ #endif #include #include -#include #include #include @@ -376,8 +375,6 @@ int s; #if defined(__NetBSD__) || defined(__OpenBSD__) int maj, mn; -#elif defined(__FreeBSD__) - struct vnode *vp; #endif #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -414,13 +411,6 @@ mn = self->dv_unit; vdevgone(maj, mn, mn, VCHR); #elif defined(__FreeBSD__) - vp = SLIST_FIRST(&sc->dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); - vp = SLIST_FIRST(&sc->dev_noprime->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); - destroy_dev(sc->dev); destroy_dev(sc->dev_noprime); #endif ==== //depot/projects/ia64/sys/dev/usb/ums.c#13 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.61 2003/08/25 22:10:52 joe Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.62 2003/09/28 20:48:13 phk Exp $"); /* * HID spec: http://www.usb.org/developers/data/devclass/hid1_1.pdf @@ -367,7 +367,6 @@ ums_detach(device_t self) { struct ums_softc *sc = device_get_softc(self); - struct vnode *vp; if (sc->sc_enabled) ums_disable(sc); @@ -377,10 +376,6 @@ free(sc->sc_loc_btn, M_USB); free(sc->sc_ibuf, M_USB); - vp = SLIST_FIRST(&sc->dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); - /* someone waiting for data */ /* * XXX If we wakeup the process here, the device will be gone by ==== //depot/projects/ia64/sys/dev/usb/uscanner.c#15 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.44 2003/08/25 22:01:06 joe Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.45 2003/09/28 20:48:13 phk Exp $"); /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -620,7 +620,6 @@ int maj, mn; #elif defined(__FreeBSD__) dev_t dev; - struct vnode *vp; #endif #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -657,9 +656,6 @@ #elif defined(__FreeBSD__) /* destroy the device for the control endpoint */ dev = makedev(USCANNER_CDEV_MAJOR, USBDEVUNIT(sc->sc_dev)); - vp = SLIST_FIRST(&dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); destroy_dev(dev); #endif ==== //depot/projects/ia64/sys/dev/vinum/vinumconfig.c#15 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.61 2003/08/24 17:55:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.62 2003/09/29 08:50:03 grog Exp $"); #define STATIC static @@ -254,12 +254,14 @@ } else /* first subdisk */ sd->plexoffset = 0; /* start at the beginning */ } - if (plex->subdisks == MAXSD) /* we already have our maximum */ + if (plex->subdisks == MAXSD) { /* we already have our maximum */ + if (sd->state == sd_unallocated) /* haven't finished allocating the sd, */ + free_sd(sdno); /* free it to return drive space */ throw_rude_remark(ENOSPC, /* crap out */ "Can't add %s to %s: plex full", sd->name, plex->name); - + } plex->subdisks++; /* another entry */ if (plex->subdisks >= plex->subdisks_allocated) /* need more space */ EXPAND(plex->sdnos, int, plex->subdisks_allocated, INITIAL_SUBDISKS_IN_PLEX); @@ -737,7 +739,13 @@ sd->sectors); if (sd->plexno >= 0) PLEX[sd->plexno].subdisks--; /* one less subdisk */ - destroy_dev(sd->dev); + /* + * If we come here as the result of a + * configuration error, we may not yet have + * created a device entry for the subdisk. + */ + if (sd->dev) + destroy_dev(sd->dev); bzero(sd, sizeof(struct sd)); /* and clear it out */ sd->state = sd_unallocated; vinum_conf.subdisks_used--; /* one less sd */ @@ -1199,11 +1207,6 @@ if (DRIVE[sd->driveno].state != drive_up) sd->state = sd_crashed; - /* - * This is tacky. If something goes wrong - * with the checks, we may end up losing drive - * space. FIXME. - */ if (autosize != 0) /* need to find a size, */ give_sd_to_drive(sdno); /* do it before the plex */ @@ -1226,8 +1229,11 @@ strlcpy(sd->name, /* take it from there */ PLEX[sd->plexno].name, sizeof(sd->name)); - else /* no way */ + else { /* no way */ + if (sd->state == sd_unallocated) /* haven't finished allocating the sd, */ + free_sd(sdno); /* free it to return drive space */ throw_rude_remark(EINVAL, "Unnamed sd is not associated with a plex"); + } sprintf(sdsuffix, ".s%d", sdindex); /* form the suffix */ strlcat(sd->name, sdsuffix, sizeof(sd->name)); /* and add it to the name */ } ==== //depot/projects/ia64/sys/dev/vinum/vinumrevive.c#10 (text+ko) ==== @@ -37,12 +37,12 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumrevive.c,v 1.18 2003/04/28 02:54:43 grog Exp $ + * $Id: vinumrevive.c,v 1.19 2003/05/08 04:34:47 grog Exp grog $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumrevive.c,v 1.43 2003/08/24 17:55:57 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumrevive.c,v 1.44 2003/09/29 03:16:20 grog Exp $"); #include #include @@ -161,9 +161,9 @@ * First, read the data from the volume. We * don't care which plex, that's bre's job. */ - bp->b_dev = VINUM_VOL(plex->volno); /* create the device number */ + bp->b_dev = VOL[plex->volno].dev; /* create the device number */ else /* it's an unattached plex */ - bp->b_dev = VINUM_PLEX(sd->plexno); /* create the device number */ + bp->b_dev = PLEX[sd->plexno].dev; /* create the device number */ bp->b_iocmd = BIO_READ; /* either way, read it */ bp->b_flags = 0; @@ -178,7 +178,7 @@ } else /* Now write to the subdisk */ { - bp->b_dev = VINUM_SD(sdno); /* create the device number */ + bp->b_dev = SD[sdno].dev; /* create the device number */ bp->b_flags &= ~B_DONE; /* no longer done */ bp->b_ioflags = 0; bp->b_iocmd = BIO_WRITE; @@ -212,7 +212,7 @@ rq->bp->b_iocmd == BIO_READ ? "Read" : "Write", major(rq->bp->b_dev), minor(rq->bp->b_dev), - (intmax_t)rq->bp->b_blkno, + (intmax_t) rq->bp->b_blkno, rq->bp->b_bcount); #endif launch_requests(sd->waitlist, 1); /* do them now */ @@ -309,7 +309,7 @@ reply->error = EIO; sprintf(reply->msg, "Parity incorrect at offset 0x%jx\n", - (intmax_t)errorloc); + (intmax_t) errorloc); } if (reply->error == EAGAIN) { /* still OK, */ plex->checkblock = pstripe + (pbp->b_bcount >> DEV_BSHIFT); /* moved this much further down */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 29 15:47:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40EFB16A4C1; Mon, 29 Sep 2003 15:47:57 -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 15EFE16A4BF for ; Mon, 29 Sep 2003 15:47:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABE3843FBD for ; Mon, 29 Sep 2003 15: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.9/8.12.9) with ESMTP id h8TMltXJ011489 for ; Mon, 29 Sep 2003 15:47:55 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8TMls92011486 for perforce@freebsd.org; Mon, 29 Sep 2003 15:47:54 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Mon, 29 Sep 2003 15:47:54 -0700 (PDT) Message-Id: <200309292247.h8TMls92011486@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 38808 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, 29 Sep 2003 22:47:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=38808 Change 38808 by marcel@marcel_nfs on 2003/09/29 15:47:32 IFC @38801 Affected files ... .. //depot/projects/uart/conf/majors#4 integrate .. //depot/projects/uart/ddb/db_elf.c#2 integrate .. //depot/projects/uart/dev/aac/aac.c#8 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/uart/dev/mii/brgphy.c#7 integrate .. //depot/projects/uart/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/uart/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/uart/dev/raidframe/rf_decluster.c#3 integrate .. //depot/projects/uart/dev/raidframe/rf_freebsdkintf.c#4 integrate .. //depot/projects/uart/dev/sio/sio.c#10 integrate .. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#18 integrate .. //depot/projects/uart/dev/uart/uart_tty.c#18 integrate .. //depot/projects/uart/dev/usb/ugen.c#6 integrate .. //depot/projects/uart/dev/usb/uhid.c#6 integrate .. //depot/projects/uart/dev/usb/ulpt.c#4 integrate .. //depot/projects/uart/dev/usb/ums.c#5 integrate .. //depot/projects/uart/dev/usb/uscanner.c#7 integrate .. //depot/projects/uart/dev/vinum/vinumconfig.c#4 integrate .. //depot/projects/uart/dev/vinum/vinumrevive.c#3 integrate .. //depot/projects/uart/dev/vinum/vinumvar.h#2 integrate .. //depot/projects/uart/fs/procfs/procfs_map.c#3 integrate .. //depot/projects/uart/geom/geom_disk.c#4 integrate .. //depot/projects/uart/ia64/include/varargs.h#2 integrate .. //depot/projects/uart/kern/kern_conf.c#3 integrate .. //depot/projects/uart/kern/kern_mac.c#5 integrate .. //depot/projects/uart/net/if.c#3 integrate .. //depot/projects/uart/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/uart/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/uart/pci/if_xl.c#9 integrate .. //depot/projects/uart/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/uart/sys/conf.h#3 integrate .. //depot/projects/uart/sys/cons.h#3 integrate .. //depot/projects/uart/sys/param.h#11 integrate .. //depot/projects/uart/vm/vm_page.c#7 integrate Differences ... ==== //depot/projects/uart/conf/majors#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/majors,v 1.177 2003/08/27 07:35:12 simokawa Exp $ +# $FreeBSD: src/sys/conf/majors,v 1.179 2003/09/29 14:15:57 scottl Exp $ # # This list is semi-obsoleted by DEVFS, but for now it still contains # the current allocation of device major numbers. @@ -148,7 +148,6 @@ 146 *twe 3ware Escalade ATA RAID (controller) 148 *agp AGP 149 *tap Ethernet tunneling device -150 *aac Adaptec FSA RAID (controller) 152 *acpi ACPI bios support (Takanori Watanabe takawata@shidahara1.planet.sci.kobe-u.ac.jp) 153 *ti Tigon Gigabit Ethernet driver (ken@FreeBSD.ORG) 154 *asr Adaptec SCSI RAID @@ -169,8 +168,6 @@ 173 *devctl Devd control device 174 pciwd Berkshire Watchdog PCI 175 ips IBM/Adaptec ServeRAID (control device) -178 raidctl RAIDframe (control device) -179 raid RAIDframe (disk device) 180 nvidia NVIDIA (nvidiaN/nvidiactl) 181 casm HP/Compaq ProLiant Advanced Server Management 183 *smapi SMAPI BIOS interface ==== //depot/projects/uart/ddb/db_elf.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_elf.c,v 1.16 2003/06/10 22:09:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_elf.c,v 1.17 2003/09/28 06:02:33 bde Exp $"); #include "opt_ddb.h" @@ -266,6 +266,11 @@ for (symp = symtab_start; symp < symtab_end; symp++) { if (symp->st_name == 0) continue; + if (ELF_ST_TYPE(symp->st_info) != STT_OBJECT && + ELF_ST_TYPE(symp->st_info) != STT_FUNC && + ELF_ST_TYPE(symp->st_info) != STT_NOTYPE) + continue; + if (off >= symp->st_value) { if ((off - symp->st_value) < diff) { diff = off - symp->st_value; ==== //depot/projects/uart/dev/aac/aac.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.78 2003/09/16 16:07:15 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.79 2003/09/29 14:10:04 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -180,15 +180,12 @@ static int aac_return_aif(struct aac_softc *sc, caddr_t uptr); static int aac_query_disk(struct aac_softc *sc, caddr_t uptr); -#define AAC_CDEV_MAJOR 150 - static struct cdevsw aac_cdevsw = { .d_open = aac_open, .d_close = aac_close, .d_ioctl = aac_ioctl, .d_poll = aac_poll, .d_name = "aac", - .d_maj = AAC_CDEV_MAJOR, }; MALLOC_DEFINE(M_AACBUF, "aacbuf", "Buffers for the AAC driver"); ==== //depot/projects/uart/dev/acpica/Osd/OsdSchedule.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.23 2002/10/31 17:58:39 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.24 2003/09/29 07:29:26 njl Exp $ */ /* @@ -262,7 +262,15 @@ { ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - DELAY(Microseconds); + /* + * Maximum length for stall is 100 us. If longer, assume caller + * really meant "sleep". + */ + if (Microseconds <= 100) + DELAY(Microseconds); + else + AcpiOsSleep(Microseconds / 1000, Microseconds % 1000); + return_VOID; } ==== //depot/projects/uart/dev/mii/brgphy.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.26 2003/08/24 17:54:10 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.27 2003/09/28 04:16:16 ps Exp $"); /* * Driver for the Broadcom BCR5400 1000baseTX PHY. Speed is always @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.26 2003/08/24 17:54:10 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.27 2003/09/28 04:16:16 ps Exp $"); #include #include @@ -622,7 +622,7 @@ /* Enable Ethernet@WireSpeed. */ PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x7007); val = PHY_READ(sc, BRGPHY_MII_AUXCTL); - PHY_WRITE(sc, BRGPHY_MII_AUXCTL, val | (1 << 15) || (1 << 4)); + PHY_WRITE(sc, BRGPHY_MII_AUXCTL, val | (1 << 15) | (1 << 4)); /* Enable Link LED on Dell boxes */ if (bge_sc->bge_no_3_led) { ==== //depot/projects/uart/dev/nmdm/nmdm.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.15 2003/08/24 17:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.16 2003/09/28 20:48:12 phk Exp $"); /* * Pseudo-nulmodem driver @@ -604,8 +604,8 @@ nextdev2 = makedev(CDEV_MAJOR, (i+i) + 1); ptr1 = nextdev1->si_drv1; if (ptr1) { - revoke_and_destroy_dev(nextdev1); - revoke_and_destroy_dev(nextdev2); + destroy_dev(nextdev1); + destroy_dev(nextdev2); free(ptr1, M_NLMDM); } else { freedev(nextdev1); ==== //depot/projects/uart/dev/ofw/ofw_console.c#4 (text+ko) ==== @@ -24,10 +24,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.15 2003/09/26 19:35:49 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.17 2003/09/28 06:51:47 jake Exp $"); #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.15 2003/09/26 19:35:49 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.17 2003/09/28 06:51:47 jake Exp $"); #include "opt_ddb.h" #include "opt_comconsole.h" @@ -94,7 +94,8 @@ char output[32]; dev_t dev; - if (ofw_consdev.cn_pri != CN_DEAD) { + if (ofw_consdev.cn_pri != CN_DEAD && + ofw_consdev.cn_name[0] != '\0') { if ((options = OF_finddevice("/options")) == -1 || OF_getprop(options, "output-device", output, sizeof(output)) == -1) @@ -276,7 +277,7 @@ return; } - cp->cn_pri = CN_INTERNAL; + cp->cn_pri = CN_LOW; } static void ==== //depot/projects/uart/dev/raidframe/rf_decluster.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: rf_decluster.c,v 1.6 2001/01/26 04:40:03 oster Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/raidframe/rf_decluster.c,v 1.2 2003/08/24 17:54:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/raidframe/rf_decluster.c,v 1.4 2003/09/29 14:23:59 scottl Exp $"); /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -66,7 +66,7 @@ extern int rf_copyback_in_progress; /* debug only */ /* found in rf_kintf.c */ -int rf_GetSpareTableFromDaemon(RF_SparetWait_t * req); +extern int rf_GetSpareTableFromDaemon(RF_SparetWait_t * req); #if (RF_INCLUDE_PARITY_DECLUSTERING > 0) || (RF_INCLUDE_PARITY_DECLUSTERING_PQ > 0) ==== //depot/projects/uart/dev/raidframe/rf_freebsdkintf.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/raidframe/rf_freebsdkintf.c,v 1.20 2003/07/27 17:04:54 phk Exp $ + * $FreeBSD: src/sys/dev/raidframe/rf_freebsdkintf.c,v 1.21 2003/09/29 14:14:35 scottl Exp $ */ /* $NetBSD: rf_netbsdkintf.c,v 1.105 2001/04/05 02:48:51 oster Exp $ */ @@ -219,7 +219,6 @@ .d_close = raidctlclose, .d_ioctl = raidctlioctl, .d_name = "raidctl", - .d_maj = 201, }; /* ==== //depot/projects/uart/dev/sio/sio.c#10 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.413 2003/09/27 11:13:59 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.414 2003/09/28 13:12:26 bde Exp $"); #include "opt_comconsole.h" #include "opt_compat.h" @@ -2302,8 +2302,6 @@ if (sio_getreg(com, com_dlbh) != dlbh) sio_setreg(com, com_dlbh, dlbh); - if (!(tp->t_state & TS_TTSTOP)) - com->state |= CS_TTGO; efr_flowbits = 0; if (cflag & CRTS_IFLOW) { @@ -2348,13 +2346,6 @@ /* XXX shouldn't call functions while intrs are disabled. */ disc_optim(tp, t, com); - /* - * Recover from fiddling with CS_TTGO. We used to call siointr1() - * unconditionally, but that defeated the careful discarding of - * stale input in sioopen(). - */ - if (com->state >= (CS_BUSY | CS_TTGO)) - siointr1(com); mtx_unlock_spin(&sio_lock); splx(s); ==== //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.5 2003/09/26 05:14:56 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.6 2003/09/28 07:06:34 jake Exp $"); #include #include @@ -142,7 +142,10 @@ di->bas.bsh = sparc64_fake_bustag(space, addr, di->bas.bst); /* Get the line settings. */ - di->baudrate = 9600; + if (devtype == UART_DEV_KEYBOARD) + di->baudrate = 1200; + else + di->baudrate = 9600; di->databits = 8; di->stopbits = 1; di->parity = UART_PARITY_NONE; ==== //depot/projects/uart/dev/uart/uart_tty.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.3 2003/09/26 18:10:30 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.4 2003/09/28 18:20:42 marcel Exp $"); #include #include @@ -74,7 +74,6 @@ .d_ioctl = uart_tty_ioctl, .d_poll = ttypoll, .d_name = uart_driver_name, - .d_maj = MAJOR_AUTO, .d_flags = D_TTY, .d_kqfilter = ttykqfilter, }; ==== //depot/projects/uart/dev/usb/ugen.c#6 (text+ko) ==== @@ -7,7 +7,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.76 2003/08/25 22:01:05 joe Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.77 2003/09/28 20:48:12 phk Exp $"); /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -273,7 +273,6 @@ { int endptno; dev_t dev; - struct vnode *vp; /* destroy all devices for the other (existing) endpoints as well */ for (endptno = 1; endptno < USB_MAX_ENDPOINTS; endptno++) { @@ -289,9 +288,6 @@ */ dev = makedev(UGEN_CDEV_MAJOR, UGENMINOR(USBDEVUNIT(sc->sc_dev), endptno)); - vp = SLIST_FIRST(&dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); destroy_dev(dev); } @@ -860,7 +856,6 @@ int maj, mn; #elif defined(__FreeBSD__) dev_t dev; - struct vnode *vp; #endif #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -901,9 +896,6 @@ #elif defined(__FreeBSD__) /* destroy the device for the control endpoint */ dev = makedev(UGEN_CDEV_MAJOR, UGENMINOR(USBDEVUNIT(sc->sc_dev), 0)); - vp = SLIST_FIRST(&dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); destroy_dev(dev); ugen_destroy_devnodes(sc); #endif ==== //depot/projects/uart/dev/usb/uhid.c#6 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.62 2003/08/25 22:01:06 joe Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.63 2003/09/28 20:48:13 phk Exp $"); /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -304,8 +304,6 @@ int s; #if defined(__NetBSD__) || defined(__OpenBSD__) int maj, mn; -#elif defined(__FreeBSD__) - struct vnode *vp; #endif #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -339,10 +337,6 @@ mn = self->dv_unit; vdevgone(maj, mn, mn, VCHR); #elif defined(__FreeBSD__) - vp = SLIST_FIRST(&sc->dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); - destroy_dev(sc->dev); #endif ==== //depot/projects/uart/dev/usb/ulpt.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.58 2003/08/25 22:01:06 joe Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.59 2003/09/28 20:48:13 phk Exp $"); /* * Printer Class spec: http://www.usb.org/developers/data/devclass/usbprint109.PDF @@ -58,7 +58,6 @@ #endif #include #include -#include #include #include @@ -376,8 +375,6 @@ int s; #if defined(__NetBSD__) || defined(__OpenBSD__) int maj, mn; -#elif defined(__FreeBSD__) - struct vnode *vp; #endif #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -414,13 +411,6 @@ mn = self->dv_unit; vdevgone(maj, mn, mn, VCHR); #elif defined(__FreeBSD__) - vp = SLIST_FIRST(&sc->dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); - vp = SLIST_FIRST(&sc->dev_noprime->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); - destroy_dev(sc->dev); destroy_dev(sc->dev_noprime); #endif ==== //depot/projects/uart/dev/usb/ums.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.61 2003/08/25 22:10:52 joe Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.62 2003/09/28 20:48:13 phk Exp $"); /* * HID spec: http://www.usb.org/developers/data/devclass/hid1_1.pdf @@ -367,7 +367,6 @@ ums_detach(device_t self) { struct ums_softc *sc = device_get_softc(self); - struct vnode *vp; if (sc->sc_enabled) ums_disable(sc); @@ -377,10 +376,6 @@ free(sc->sc_loc_btn, M_USB); free(sc->sc_ibuf, M_USB); - vp = SLIST_FIRST(&sc->dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); - /* someone waiting for data */ /* * XXX If we wakeup the process here, the device will be gone by ==== //depot/projects/uart/dev/usb/uscanner.c#7 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.44 2003/08/25 22:01:06 joe Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.45 2003/09/28 20:48:13 phk Exp $"); /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -620,7 +620,6 @@ int maj, mn; #elif defined(__FreeBSD__) dev_t dev; - struct vnode *vp; #endif #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -657,9 +656,6 @@ #elif defined(__FreeBSD__) /* destroy the device for the control endpoint */ dev = makedev(USCANNER_CDEV_MAJOR, USBDEVUNIT(sc->sc_dev)); - vp = SLIST_FIRST(&dev->si_hlist); - if (vp) - VOP_REVOKE(vp, REVOKEALL); destroy_dev(dev); #endif ==== //depot/projects/uart/dev/vinum/vinumconfig.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.61 2003/08/24 17:55:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.62 2003/09/29 08:50:03 grog Exp $"); #define STATIC static @@ -254,12 +254,14 @@ } else /* first subdisk */ sd->plexoffset = 0; /* start at the beginning */ } - if (plex->subdisks == MAXSD) /* we already have our maximum */ + if (plex->subdisks == MAXSD) { /* we already have our maximum */ + if (sd->state == sd_unallocated) /* haven't finished allocating the sd, */ + free_sd(sdno); /* free it to return drive space */ throw_rude_remark(ENOSPC, /* crap out */ "Can't add %s to %s: plex full", sd->name, plex->name); - + } plex->subdisks++; /* another entry */ if (plex->subdisks >= plex->subdisks_allocated) /* need more space */ EXPAND(plex->sdnos, int, plex->subdisks_allocated, INITIAL_SUBDISKS_IN_PLEX); @@ -737,7 +739,13 @@ sd->sectors); if (sd->plexno >= 0) PLEX[sd->plexno].subdisks--; /* one less subdisk */ - destroy_dev(sd->dev); + /* + * If we come here as the result of a + * configuration error, we may not yet have + * created a device entry for the subdisk. + */ + if (sd->dev) + destroy_dev(sd->dev); bzero(sd, sizeof(struct sd)); /* and clear it out */ sd->state = sd_unallocated; vinum_conf.subdisks_used--; /* one less sd */ @@ -1199,11 +1207,6 @@ if (DRIVE[sd->driveno].state != drive_up) sd->state = sd_crashed; - /* - * This is tacky. If something goes wrong - * with the checks, we may end up losing drive - * space. FIXME. - */ if (autosize != 0) /* need to find a size, */ give_sd_to_drive(sdno); /* do it before the plex */ @@ -1226,8 +1229,11 @@ strlcpy(sd->name, /* take it from there */ PLEX[sd->plexno].name, sizeof(sd->name)); - else /* no way */ + else { /* no way */ + if (sd->state == sd_unallocated) /* haven't finished allocating the sd, */ + free_sd(sdno); /* free it to return drive space */ throw_rude_remark(EINVAL, "Unnamed sd is not associated with a plex"); + } sprintf(sdsuffix, ".s%d", sdindex); /* form the suffix */ strlcat(sd->name, sdsuffix, sizeof(sd->name)); /* and add it to the name */ } ==== //depot/projects/uart/dev/vinum/vinumrevive.c#3 (text+ko) ==== @@ -37,12 +37,12 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumrevive.c,v 1.18 2003/04/28 02:54:43 grog Exp $ + * $Id: vinumrevive.c,v 1.19 2003/05/08 04:34:47 grog Exp grog $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumrevive.c,v 1.43 2003/08/24 17:55:57 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumrevive.c,v 1.44 2003/09/29 03:16:20 grog Exp $"); #include #include @@ -161,9 +161,9 @@ * First, read the data from the volume. We * don't care which plex, that's bre's job. */ - bp->b_dev = VINUM_VOL(plex->volno); /* create the device number */ + bp->b_dev = VOL[plex->volno].dev; /* create the device number */ else /* it's an unattached plex */ - bp->b_dev = VINUM_PLEX(sd->plexno); /* create the device number */ + bp->b_dev = PLEX[sd->plexno].dev; /* create the device number */ bp->b_iocmd = BIO_READ; /* either way, read it */ bp->b_flags = 0; @@ -178,7 +178,7 @@ } else /* Now write to the subdisk */ { - bp->b_dev = VINUM_SD(sdno); /* create the device number */ + bp->b_dev = SD[sdno].dev; /* create the device number */ bp->b_flags &= ~B_DONE; /* no longer done */ bp->b_ioflags = 0; bp->b_iocmd = BIO_WRITE; @@ -212,7 +212,7 @@ rq->bp->b_iocmd == BIO_READ ? "Read" : "Write", major(rq->bp->b_dev), minor(rq->bp->b_dev), - (intmax_t)rq->bp->b_blkno, + (intmax_t) rq->bp->b_blkno, rq->bp->b_bcount); #endif launch_requests(sd->waitlist, 1); /* do them now */ @@ -309,7 +309,7 @@ reply->error = EIO; sprintf(reply->msg, "Parity incorrect at offset 0x%jx\n", - (intmax_t)errorloc); + (intmax_t) errorloc); } if (reply->error == EAGAIN) { /* still OK, */ plex->checkblock = pstripe + (pbp->b_bcount >> DEV_BSHIFT); /* moved this much further down */ @@ -413,9 +413,9 @@ if (sdno == psd) parity_buf = (int *) bpp[sdno]->b_data; if (sdno == newpsd) /* the new one? */ - bpp[sdno]->b_dev = VINUM_SD(plex->sdnos[psd]); /* write back to the parity SD */ + bpp[sdno]->b_dev = SD[plex->sdnos[psd]].dev; /* write back to the parity SD */ else - bpp[sdno]->b_dev = VINUM_SD(plex->sdnos[sdno]); /* device number */ + bpp[sdno]->b_dev = SD[plex->sdnos[sdno]].dev; /* device number */ bpp[sdno]->b_iocmd = BIO_READ; /* either way, read it */ bpp[sdno]->b_flags = 0; bpp[sdno]->b_bcount = mysize; @@ -557,7 +557,7 @@ bp->b_resid = bp->b_bcount; bp->b_blkno = sd->initialized; /* write it to here */ bzero(bp->b_data, bp->b_bcount); - bp->b_dev = VINUM_SD(sdno); /* create the device number */ + bp->b_dev = SD[sdno].dev; /* create the device number */ bp->b_iocmd = BIO_WRITE; sdio(bp); /* perform the I/O */ bufwait(bp); @@ -578,7 +578,7 @@ bp->b_bcount = size; bp->b_resid = bp->b_bcount; bp->b_blkno = sd->initialized; /* read from here */ - bp->b_dev = VINUM_SD(sdno); /* create the device number */ + bp->b_dev = SD[sdno].dev; /* create the device number */ bp->b_iocmd = BIO_READ; /* read it back */ splx(s); sdio(bp); ==== //depot/projects/uart/dev/vinum/vinumvar.h#2 (text+ko) ==== @@ -37,8 +37,8 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumvar.h,v 1.33 2003/05/23 01:09:23 grog Exp $ - * $FreeBSD: src/sys/dev/vinum/vinumvar.h,v 1.44 2003/05/23 01:15:55 grog Exp $ + * $Id: vinumvar.h,v 1.33 2003/05/23 01:09:23 grog Exp grog $ + * $FreeBSD: src/sys/dev/vinum/vinumvar.h,v 1.46 2003/09/29 08:19:06 grog Exp $ */ #include ==== //depot/projects/uart/fs/procfs/procfs_map.c#3 (text+ko) ==== @@ -36,15 +36,18 @@ * * @(#)procfs_status.c 8.3 (Berkeley) 2/17/94 * - * $FreeBSD: src/sys/fs/procfs/procfs_map.c,v 1.32 2003/08/14 15:26:44 rwatson Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_map.c,v 1.33 2003/09/29 20:53:19 rwatson Exp $ */ #include #include #include +#include +#include #include #include #include +#include #include #include @@ -77,6 +80,7 @@ pmap_t pmap = vmspace_pmap(p->p_vmspace); vm_map_entry_t entry; char mebuffer[MEBUFFERSIZE]; + char *fullpath, *freepath; GIANT_REQUIRED; @@ -124,6 +128,8 @@ for (lobj = tobj = obj; tobj; tobj = tobj->backing_object) lobj = tobj; + freepath = NULL; + fullpath = "-"; if (lobj) { switch(lobj->type) { default: @@ -132,6 +138,11 @@ break; case OBJT_VNODE: type = "vnode"; + vn_fullpath(td, + (struct vnode *)lobj->handle, + &fullpath, + &freepath); + printf("string: %s\n", fullpath); break; case OBJT_SWAP: type = "swap"; @@ -156,7 +167,7 @@ * start, end, resident, private resident, cow, access, type. */ snprintf(mebuffer, sizeof mebuffer, - "0x%lx 0x%lx %d %d %p %s%s%s %d %d 0x%x %s %s %s\n", + "0x%lx 0x%lx %d %d %p %s%s%s %d %d 0x%x %s %s %s %s\n", (u_long)entry->start, (u_long)entry->end, resident, privateresident, obj, (entry->protection & VM_PROT_READ)?"r":"-", @@ -165,7 +176,10 @@ ref_count, shadow_count, flags, (entry->eflags & MAP_ENTRY_COW)?"COW":"NCOW", (entry->eflags & MAP_ENTRY_NEEDS_COPY)?"NC":"NNC", - type); + type, fullpath); + + if (freepath != NULL) + free(freepath, M_TEMP); len = strlen(mebuffer); if (len > uio->uio_resid) { ==== //depot/projects/uart/geom/geom_disk.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_disk.c,v 1.78 2003/09/23 07:53:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_disk.c,v 1.79 2003/09/29 07:44:23 phk Exp $"); #include "opt_geom.h" @@ -159,6 +159,10 @@ gp = bp->bio_to->geom; g_trace(G_T_TOPOLOGY, "g_disk_kernedump(%s, %jd, %jd)", gp->name, (intmax_t)gkd->offset, (intmax_t)gkd->length); + if (dp->d_dump == NULL) { + g_io_deliver(bp, ENODEV); + return; + } di.dumper = dp->d_dump; di.priv = dp; di.blocksize = dp->d_sectorsize; ==== //depot/projects/uart/ia64/include/varargs.h#2 (text+ko) ==== @@ -37,25 +37,12 @@ * SUCH DAMAGE. * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 - * $FreeBSD: src/sys/ia64/include/varargs.h,v 1.4 2002/10/06 22:02:06 mike Exp $ + * $FreeBSD: src/sys/ia64/include/varargs.h,v 1.5 2003/09/28 05:34:07 marcel Exp $ */ #ifndef _MACHINE_VARARGS_H_ #define _MACHINE_VARARGS_H_ -#include - -#ifndef _VA_LIST_DECLARED -#define _VA_LIST_DECLARED -typedef __va_list va_list; -#endif - -typedef int __builtin_va_alist_t __attribute__((__mode__(__word__))); - -#define va_alist __builtin_va_alist -#define va_dcl __builtin_va_alist_t __builtin_va_alist; ... -#define va_start(ap) __builtin_varargs_start(ap) -#define va_arg(ap, type) __builtin_va_arg((ap), type) -#define va_end(ap) __builtin_va_end(ap) +#error " is obsolete on ia64. Use instead." #endif /* !_MACHINE_VARARGS_H_ */ ==== //depot/projects/uart/kern/kern_conf.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.137 2003/09/27 21:50:00 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.138 2003/09/28 20:50:36 phk Exp $"); #include #include @@ -452,19 +452,6 @@ } void -revoke_and_destroy_dev(dev_t dev) -{ - struct vnode *vp; - - GIANT_REQUIRED; - - vp = SLIST_FIRST(&dev->si_hlist); - if (vp != NULL) - VOP_REVOKE(vp, REVOKEALL); - destroy_dev(dev); -} - -void destroy_dev(dev_t dev) { ==== //depot/projects/uart/kern/kern_mac.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.98 2003/08/26 17:29:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.99 2003/09/29 18:35:17 rwatson Exp $"); #include "opt_mac.h" #include "opt_devfs.h" @@ -1176,7 +1176,8 @@ mac_check_structmac_consistent(struct mac *mac) { - if (mac->m_buflen > MAC_MAX_LABEL_BUF_LEN) + if (mac->m_buflen < 0 || + mac->m_buflen > MAC_MAX_LABEL_BUF_LEN) return (EINVAL); return (0); ==== //depot/projects/uart/net/if.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.164 2003/07/19 16:47:16 ume Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.165 2003/09/28 20:48:12 phk Exp $ */ #include "opt_compat.h" @@ -470,7 +470,7 @@ * Clean up all addresses. */ ifaddr_byindex(ifp->if_index) = NULL; - revoke_and_destroy_dev(ifdev_byindex(ifp->if_index)); + destroy_dev(ifdev_byindex(ifp->if_index)); ifdev_byindex(ifp->if_index) = NULL; while (if_index > 0 && ifaddr_byindex(if_index) == NULL) ==== //depot/projects/uart/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_ubt.c,v 1.14 2003/04/14 23:00:50 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.7 2003/07/16 03:43:14 jmg Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.8 2003/09/28 20:48:13 phk Exp $ */ #include @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include @@ -2704,7 +2704,6 @@ Static void ubt_destroy_device_nodes(ubt_softc_p sc) { - struct vnode *vp = NULL; /* * Wait for processes to go away. This should be safe as we will not @@ -2721,28 +2720,16 @@ /* Destroy device nodes */ if (sc->sc_bulk_dev != NODEV) { - vp = SLIST_FIRST(&sc->sc_bulk_dev->si_hlist); - if (vp != NULL) - VOP_REVOKE(vp, REVOKEALL); - destroy_dev(sc->sc_bulk_dev); sc->sc_bulk_dev = NODEV; } if (sc->sc_intr_dev != NODEV) { - vp = SLIST_FIRST(&sc->sc_intr_dev->si_hlist); - if (vp != NULL) - VOP_REVOKE(vp, REVOKEALL); - destroy_dev(sc->sc_intr_dev); sc->sc_intr_dev = NODEV; } if (sc->sc_ctrl_dev != NODEV) { - vp = SLIST_FIRST(&sc->sc_ctrl_dev->si_hlist); - if (vp != NULL) - VOP_REVOKE(vp, REVOKEALL); - destroy_dev(sc->sc_ctrl_dev); sc->sc_ctrl_dev = NODEV; } ==== //depot/projects/uart/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ubtbcmfw.c,v 1.1 2003/04/27 00:20:15 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.1 2003/05/10 21:44:40 julian Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.2 2003/09/28 20:48:13 phk Exp $ */ #include @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include @@ -220,8 +220,6 @@ { USB_DETACH_START(ubtbcmfw, sc); - struct vnode *vp = NULL; - sc->sc_dying = 1; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 29 17:03:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CD9A16A4C0; Mon, 29 Sep 2003 17:03:35 -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 D466D16A4B3 for ; Mon, 29 Sep 2003 17:03:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F3E444008 for ; Mon, 29 Sep 2003 17:03:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U03WXJ022550 for ; Mon, 29 Sep 2003 17:03:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U03TtY022546 for perforce@freebsd.org; Mon, 29 Sep 2003 17:03:30 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 17:03:30 -0700 (PDT) Message-Id: <200309300003.h8U03TtY022546@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 38813 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, 30 Sep 2003 00:03:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=38813 Change 38813 by peter@peter_daintree on 2003/09/29 17:03:15 IFC @38810 Affected files ... .. //depot/projects/hammer/UPDATING#18 integrate .. //depot/projects/hammer/etc/Makefile#17 integrate .. //depot/projects/hammer/etc/defaults/devfs.rules#2 integrate .. //depot/projects/hammer/etc/rc.d/ipfilter#10 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#10 integrate .. //depot/projects/hammer/lib/Makefile#25 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/fabs.S#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#9 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_write.c#4 integrate .. //depot/projects/hammer/lib/libdisk/libdisk.h#10 integrate .. //depot/projects/hammer/lib/libkiconv/Makefile#1 branch .. //depot/projects/hammer/lib/libkiconv/kiconv.3#1 branch .. //depot/projects/hammer/lib/libkiconv/quirks.c#1 branch .. //depot/projects/hammer/lib/libkiconv/quirks.h#1 branch .. //depot/projects/hammer/lib/libkiconv/xlat16_iconv.c#1 branch .. //depot/projects/hammer/lib/libkiconv/xlat16_sysctl.c#1 branch .. //depot/projects/hammer/lib/libkvm/kvm_getprocs.3#4 integrate .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#14 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#13 integrate .. //depot/projects/hammer/lib/libpthread/arch/alpha/include/atomic_ops.h#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/alpha/include/pthread_md.h#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#22 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigaction.c#7 integrate .. //depot/projects/hammer/lib/libthr/Makefile#5 integrate .. //depot/projects/hammer/libexec/talkd/talkd.c#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#29 integrate .. //depot/projects/hammer/release/i386/fixit_crunch.conf#5 integrate .. //depot/projects/hammer/release/ia64/boot_crunch.conf#5 integrate .. //depot/projects/hammer/release/pc98/fixit-small_crunch.conf#4 integrate .. //depot/projects/hammer/release/pc98/fixit_crunch.conf#5 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#7 integrate .. //depot/projects/hammer/sbin/devd/devd.8#7 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#13 integrate .. //depot/projects/hammer/sbin/mount_cd9660/Makefile#2 integrate .. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.8#3 integrate .. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.c#3 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/Makefile#2 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/iso22dos#2 delete .. //depot/projects/hammer/sbin/mount_msdosfs/iso72dos#2 delete .. //depot/projects/hammer/sbin/mount_msdosfs/koi2dos#2 delete .. //depot/projects/hammer/sbin/mount_msdosfs/koi8u2dos#2 delete .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.8#4 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate .. //depot/projects/hammer/sbin/mount_ntfs/Makefile#2 integrate .. //depot/projects/hammer/sbin/mount_ntfs/mount_ntfs.8#3 integrate .. //depot/projects/hammer/sbin/mount_ntfs/mount_ntfs.c#2 integrate .. //depot/projects/hammer/sbin/rcorder/rcorder.c#3 integrate .. //depot/projects/hammer/sbin/route/route.8#2 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_cmds.c#2 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_target.c#3 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#11 integrate .. //depot/projects/hammer/share/man/man4/amr.4#5 integrate .. //depot/projects/hammer/share/man/man4/iir.4#4 integrate .. //depot/projects/hammer/share/man/man4/wlan.4#3 integrate .. //depot/projects/hammer/share/man/man9/Makefile#17 integrate .. //depot/projects/hammer/share/man/man9/VOP_GETPAGES.9#3 integrate .. //depot/projects/hammer/share/man/man9/disk.9#1 branch .. //depot/projects/hammer/share/man/man9/pfil.9#3 integrate .. //depot/projects/hammer/share/man/man9/pmap.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_activate.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_addr_hint.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_change_wiring.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_clear_modify.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_copy.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_enter.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_extract.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_growkernel.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_init.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_is_modified.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_map.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_mincore.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_object_init_pt.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_page_exists_quick.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_page_protect.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_pinit.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_prefault.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_qenter.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_release.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_remove.9#1 branch .. //depot/projects/hammer/share/man/man9/pmap_zero_page.9#1 branch .. //depot/projects/hammer/share/man/man9/style.9#10 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#15 integrate .. //depot/projects/hammer/share/mk/sys.mk#8 integrate .. //depot/projects/hammer/share/skel/dot.mail_aliases#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/elf_machdep.c#7 integrate .. //depot/projects/hammer/sys/alpha/alpha/promcons.c#5 integrate .. //depot/projects/hammer/sys/alpha/include/elf.h#2 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysvec.c#6 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_sysvec.c#5 integrate .. //depot/projects/hammer/sys/alpha/tlsb/zs_tlsb.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#36 integrate .. //depot/projects/hammer/sys/amd64/include/elf.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#20 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#15 integrate .. //depot/projects/hammer/sys/arm/include/elf.h#2 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_targ_bh.c#6 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_util.h#2 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#7 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#7 integrate .. //depot/projects/hammer/sys/conf/NOTES#26 integrate .. //depot/projects/hammer/sys/conf/files#28 integrate .. //depot/projects/hammer/sys/conf/majors#13 integrate .. //depot/projects/hammer/sys/conf/options#24 integrate .. //depot/projects/hammer/sys/ddb/db_elf.c#4 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#15 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSynch.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#12 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#6 integrate .. //depot/projects/hammer/sys/dev/adlink/adlink.c#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/asr/asr.c#7 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#13 integrate .. //depot/projects/hammer/sys/dev/digi/digi.c#5 integrate .. //depot/projects/hammer/sys/dev/exca/exca.c#7 integrate .. //depot/projects/hammer/sys/dev/fb/fb.c#5 integrate .. //depot/projects/hammer/sys/dev/fb/fbreg.h#10 integrate .. //depot/projects/hammer/sys/dev/firewire/fwphyreg.h#1 branch .. //depot/projects/hammer/sys/dev/gfb/gfb_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/iir/iir.c#7 integrate .. //depot/projects/hammer/sys/dev/iir/iir.h#3 integrate .. //depot/projects/hammer/sys/dev/iir/iir_ctrl.c#6 integrate .. //depot/projects/hammer/sys/dev/iir/iir_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#9 integrate .. //depot/projects/hammer/sys/dev/kbd/kbd.c#4 integrate .. //depot/projects/hammer/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/hammer/sys/dev/md/md.c#16 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#11 integrate .. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#4 integrate .. //depot/projects/hammer/sys/dev/null/null.c#6 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#6 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirmio.c#5 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#8 integrate .. //depot/projects/hammer/sys/dev/puc/pucvar.h#7 integrate .. //depot/projects/hammer/sys/dev/raidframe/rf_decluster.c#3 integrate .. //depot/projects/hammer/sys/dev/raidframe/rf_freebsdkintf.c#5 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#7 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#21 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#10 integrate .. //depot/projects/hammer/sys/dev/uart/uart.h#3 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus.h#3 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_acpi.c#2 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_ebus.c#2 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_isa.c#2 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_pccard.c#3 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_puc.c#2 integrate .. //depot/projects/hammer/sys/dev/uart/uart_core.c#4 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_alpha.c#3 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_amd64.c#3 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_i386.c#3 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_ia64.c#3 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_pc98.c#3 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#4 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_sab82532.c#4 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.c#4 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/uhid.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/ulpt.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/ums.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#8 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#10 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrevive.c#7 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumvar.h#4 integrate .. //depot/projects/hammer/sys/dev/zs/zs.c#4 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#7 integrate .. //depot/projects/hammer/sys/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_conv.c#4 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_iconv.c#1 branch .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfsmount.h#3 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs.h#2 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_iconv.c#1 branch .. //depot/projects/hammer/sys/fs/ntfs/ntfs_subr.c#6 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_subr.h#2 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#9 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#6 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfsmount.h#2 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_map.c#3 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#7 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#9 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.c#14 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#18 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#15 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#12 integrate .. //depot/projects/hammer/sys/i386/bios/smapi.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/elf_machdep.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#18 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysvec.c#4 integrate .. //depot/projects/hammer/sys/i386/include/elf.h#5 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#7 integrate .. //depot/projects/hammer/sys/i386/isa/cy.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_drv.c#6 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#12 integrate .. //depot/projects/hammer/sys/ia64/ia32/ia32_sysvec.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#8 integrate .. //depot/projects/hammer/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/hammer/sys/ia64/include/elf.h#3 integrate .. //depot/projects/hammer/sys/ia64/include/varargs.h#4 integrate .. //depot/projects/hammer/sys/isa/vga_isa.c#8 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_iconv.c#1 branch .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_lookup.c#5 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_mount.h#2 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_rrip.c#4 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_util.c#3 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#10 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vnops.c#7 integrate .. //depot/projects/hammer/sys/isofs/cd9660/iso.h#2 integrate .. //depot/projects/hammer/sys/kern/imgact_aout.c#7 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#10 integrate .. //depot/projects/hammer/sys/kern/init_main.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#25 integrate .. //depot/projects/hammer/sys/kern/subr_devstat.c#8 integrate .. //depot/projects/hammer/sys/kern/subr_xxx.c#5 delete .. //depot/projects/hammer/sys/kern/sys_generic.c#9 integrate .. //depot/projects/hammer/sys/kern/tty_cons.c#9 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#7 integrate .. //depot/projects/hammer/sys/kern/tty_tty.c#5 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#14 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#14 integrate .. //depot/projects/hammer/sys/libkern/iconv.c#5 integrate .. //depot/projects/hammer/sys/libkern/iconv_converter_if.m#2 integrate .. //depot/projects/hammer/sys/libkern/iconv_xlat.c#4 integrate .. //depot/projects/hammer/sys/libkern/iconv_xlat16.c#1 branch .. //depot/projects/hammer/sys/modules/Makefile#26 integrate .. //depot/projects/hammer/sys/modules/cd9660/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/cd9660_iconv/Makefile#1 branch .. //depot/projects/hammer/sys/modules/libiconv/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/msdosfs/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/msdosfs_iconv/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ntfs/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ntfs_iconv/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.c#9 integrate .. //depot/projects/hammer/sys/net/if_tun.c#6 integrate .. //depot/projects/hammer/sys/net/if_tunvar.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#6 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#5 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/hammer/sys/netinet/icmp6.h#3 integrate .. //depot/projects/hammer/sys/netinet/ip6.h#3 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_input.c#6 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_mbuf.c#4 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_osdep.h#1 branch .. //depot/projects/hammer/sys/netipsec/ipsec_output.c#6 integrate .. //depot/projects/hammer/sys/netipsec/key.c#5 integrate .. //depot/projects/hammer/sys/netipsec/key_debug.c#2 integrate .. //depot/projects/hammer/sys/netipsec/keydb.h#3 integrate .. //depot/projects/hammer/sys/netipsec/keysock.c#4 integrate .. //depot/projects/hammer/sys/netipsec/xform_ah.c#5 integrate .. //depot/projects/hammer/sys/netipsec/xform_esp.c#5 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipcomp.c#5 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipip.c#3 integrate .. //depot/projects/hammer/sys/netkey/key.c#4 integrate .. //depot/projects/hammer/sys/netkey/key_debug.c#3 integrate .. //depot/projects/hammer/sys/netkey/key_debug.h#2 integrate .. //depot/projects/hammer/sys/netkey/keysock.c#5 integrate .. //depot/projects/hammer/sys/netncp/ncp_mod.c#4 integrate .. //depot/projects/hammer/sys/netsmb/smb_dev.c#4 integrate .. //depot/projects/hammer/sys/opencrypto/cryptodev.c#7 integrate .. //depot/projects/hammer/sys/pc98/pc98/pc98gdc.c#6 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#11 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#20 integrate .. //depot/projects/hammer/sys/powerpc/include/cpu.h#6 integrate .. //depot/projects/hammer/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/clock.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/elf_machdep.c#6 integrate .. //depot/projects/hammer/sys/sparc64/include/elf.h#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/elf_machdep.c#7 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#19 integrate .. //depot/projects/hammer/sys/sys/conf.h#6 integrate .. //depot/projects/hammer/sys/sys/cons.h#3 integrate .. //depot/projects/hammer/sys/sys/iconv.h#2 integrate .. //depot/projects/hammer/sys/sys/param.h#20 integrate .. //depot/projects/hammer/sys/sys/signalvar.h#9 integrate .. //depot/projects/hammer/sys/sys/sysent.h#4 integrate .. //depot/projects/hammer/sys/sys/systm.h#10 integrate .. //depot/projects/hammer/sys/vm/uma_dbg.c#6 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#20 integrate .. //depot/projects/hammer/sys/vm/vm_map.h#7 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#10 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#15 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.holiday#5 integrate .. //depot/projects/hammer/usr.bin/killall/killall.c#6 integrate .. //depot/projects/hammer/usr.bin/rlogin/rlogin.1#3 integrate .. //depot/projects/hammer/usr.bin/rlogin/rlogin.c#3 integrate .. //depot/projects/hammer/usr.bin/su/su.1#5 integrate .. //depot/projects/hammer/usr.bin/talk/ctl.c#2 integrate .. //depot/projects/hammer/usr.bin/talk/io.c#2 integrate .. //depot/projects/hammer/usr.bin/talk/look_up.c#2 integrate .. //depot/projects/hammer/usr.sbin/asf/asf.8#2 integrate .. //depot/projects/hammer/usr.sbin/asf/asf.c#2 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#6 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.c#7 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#8 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#15 integrate .. //depot/projects/hammer/usr.sbin/wicontrol/wicontrol.8#8 integrate .. //depot/projects/hammer/usr.sbin/wicontrol/wicontrol.c#7 integrate Differences ... ==== //depot/projects/hammer/UPDATING#18 (text+ko) ==== @@ -17,6 +17,22 @@ developers choose to disable these features on build machines to maximize performance. +20030928: + Changes to the cdevsw default functions have been made to remove + the need to specify nullopen() and nullclose() explicitly. + __FreeBSD_version bumpted to 501110. + +20030926: + kiconv(3) has been added. mount_msdosfs(8), mount_ntfs(8) and + mount_cd9660(8) need to be in sync with kernel. + +20030925: + Configuring a system to use IPFILTER now requires that PFIL_HOOKS + also be explicitly configured. Previously this dependency was + magically handled through some cruft in net/pfil.h; but that has + been removed. Building a kernel with IPFILTER but not PFIL_HOOKS + will fail with obtuse errors in ip_fil.c. + 20030923: Fix a bug in arplookup(), whereby a hostile party on a locally attached network could exhaust kernel memory, and cause a system @@ -1368,4 +1384,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.267 2003/09/23 16:39:30 bms Exp $ +$FreeBSD: src/UPDATING,v 1.270 2003/09/28 16:25:35 phk Exp $ ==== //depot/projects/hammer/etc/Makefile#17 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.318 2003/09/18 16:35:43 markm Exp $ +# $FreeBSD: src/etc/Makefile,v 1.319 2003/09/27 17:33:03 markm Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -11,7 +11,7 @@ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ - phones printcap profile protocols \ + phones profile protocols \ rc rc.firewall rc.firewall6 rc.sendmail rc.shutdown \ rc.subr remote rpc services \ shells sysctl.conf syslog.conf usbd.conf \ @@ -79,6 +79,11 @@ .if !defined(NO_I4B) cd ${.CURDIR}/isdn; ${MAKE} install .endif +.if !defined(NO_LPR) + cd ${.CURDIR}; \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ + printcap ${DESTDIR}/etc +.endif .if !defined(NO_SENDMAIL) cd ${.CURDIR}/sendmail; ${MAKE} distribution .endif ==== //depot/projects/hammer/etc/defaults/devfs.rules#2 (text+ko) ==== @@ -13,7 +13,7 @@ # references must include a dollar sign '$' in-front of the # name to be expanded properly. # -# $FreeBSD: src/etc/defaults/devfs.rules,v 1.1 2003/08/20 06:15:18 mtm Exp $ +# $FreeBSD: src/etc/defaults/devfs.rules,v 1.2 2003/09/26 10:32:21 phk Exp $ # # Very basic and secure ruleset: Hide everything. @@ -28,6 +28,7 @@ [devfsrules_unhide_basic=2] add path null unhide add path zero unhide +add path crypto unhide add path random unhide add path urandom unhide ==== //depot/projects/hammer/etc/rc.d/ipfilter#10 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.11 2003/07/30 18:53:59 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.12 2003/09/27 13:50:47 mux Exp $ # # PROVIDE: ipfilter @@ -40,7 +40,7 @@ case ${OSTYPE} in FreeBSD) # load ipfilter kernel module if needed - if ! sysctl net.inet.ipf.fr_pass > /dev/null 2>&1; then + if ! kldstat -v | grep "IP Filter" > /dev/null 2>&1; then if kldload ipl; then info 'IP-filter module loaded.' else @@ -79,12 +79,15 @@ echo "Enabling ipfilter." case ${OSTYPE} in FreeBSD) - ${ipfilter_program:-/sbin/ipf} -EFa + if [ `sysctl -n net.inet.ipf.fr_running` -eq 0 ]; then + ${ipfilter_program:-/sbin/ipf} -E + fi + ${ipfilter_program:-/sbin/ipf} -Fa if [ -r "${ipfilter_rules}" ]; then ${ipfilter_program:-/sbin/ipf} \ -f "${ipfilter_rules}" ${ipfilter_flags} fi - ${ipfilter_program:-/sbin/ipf} -6 -EFa + ${ipfilter_program:-/sbin/ipf} -6 -Fa if [ -r "${ipv6_ipfilter_rules}" ]; then ${ipfilter_program:-/sbin/ipf} -6 \ -f "${ipv6_ipfilter_rules}" ${ipfilter_flags} @@ -104,17 +107,21 @@ ipfilter_stop() { - case ${OSTYPE} in - FreeBSD) - echo "Saving firewall state tables" - ${ipfs_program:-/sbin/ipfs} -W ${ipfs_flags} - ;; - NetBSD) - ;; - esac - # XXX - The following command is not effective for 'lkm's - echo "Disabling ipfilter." - /sbin/ipf -D + # XXX - The ipf -D command is not effective for 'lkm's + if [ `sysctl -n net.inet.ipf.fr_running` -eq 1 ]; then + case ${OSTYPE} in + FreeBSD) + echo "Saving firewall state tables" + ${ipfs_program:-/sbin/ipfs} -W ${ipfs_flags} + echo "Disabling ipfilter." + ${ipfilter_program:-/sbin/ipf} -D + ;; + NetBSD) + echo "Disabling ipfilter." + /sbin/ipf -D + ;; + esac + fi } ipfilter_reload() @@ -157,7 +164,7 @@ case ${OSTYPE} in FreeBSD) # Don't resync if ipfilter is not loaded - [ sysctl net.inet.ipf.fr_pass > /dev/null 2>&1 ] && return + [ kldstat -v | grep "IP Filter" > /dev/null 2>&1 ] && return ;; esac ${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} ==== //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#10 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.30 2003/09/20 21:32:26 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.31 2003/09/26 20:26:20 fjoe Exp $ .\" .\" %beginstrip% . @@ -43,6 +43,7 @@ .ds doc-str-Lb-libfetch File Transfer Library (libfetch, \-lfetch) .ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom) .ds doc-str-Lb-libipx IPX Address Conversion Support Library (libipx, \-lipx) +.ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv) .ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd) .ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph) .ds doc-str-Lb-libpam PAM Library (libpam, \-lpam) ==== //depot/projects/hammer/lib/Makefile#25 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.171 2003/08/29 10:35:00 phk Exp $ +# $FreeBSD: src/lib/Makefile,v 1.172 2003/09/26 20:26:20 fjoe Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -26,7 +26,7 @@ ${_compat} libalias ${_libatm} ${_libbind} libbz2 libc ${_libc_r} \ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \ - libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ + libipx libisc libkiconv libmenu ${_libmilter} ${_libmp} ${_libncp} \ libnetgraph libopie libpam libpanel libpcap ${_libpthread} \ ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ libstand libtelnet ${_libthr} libufs libugidfw ${_libusbhid} \ ==== //depot/projects/hammer/lib/libc/amd64/gen/fabs.S#5 (text+ko) ==== @@ -2,7 +2,7 @@ #if defined(LIBC_SCCS) RCSID("$NetBSD: fabs.S,v 1.4 1997/07/16 14:37:16 christos Exp $") #endif -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/fabs.S,v 1.1 2003/04/30 16:21:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/fabs.S,v 1.2 2003/09/26 01:49:48 peter Exp $"); /* * Ok, this sucks. Is there really no way to push an xmm register onto @@ -13,6 +13,6 @@ movsd %xmm0, -8(%rsp) fldl -8(%rsp) fabs - fstp -8(%rsp) + fstpl -8(%rsp) movsd -8(%rsp),%xmm0 ret ==== //depot/projects/hammer/lib/libc/stdlib/malloc.c#9 (text+ko) ==== @@ -9,17 +9,17 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.77 2003/07/29 11:16:14 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.79 2003/09/27 18:58:26 phk Exp $"); /* - * Defining EXTRA_SANITY will enable extra checks which are related + * Defining MALLOC_EXTRA_SANITY will enable extra checks which are related * to internal conditions and consistency in malloc.c. This has a * noticeable runtime performance hit, and generally will not do you * any good unless you fiddle with the internals of malloc or want * to catch random pointer corruption as early as possible. */ -#ifndef MALLOC_EXTRA_SANITY -#undef MALLOC_EXTRA_SANITY +#ifndef MALLOC_MALLOC_EXTRA_SANITY +#undef MALLOC_MALLOC_EXTRA_SANITY #endif /* @@ -76,8 +76,8 @@ # include "libc_private.h" # include "spinlock.h" static spinlock_t thread_lock = _SPINLOCK_INITIALIZER; -# define THREAD_LOCK() if (__isthreaded) _SPINLOCK(&thread_lock); -# define THREAD_UNLOCK() if (__isthreaded) _SPINUNLOCK(&thread_lock); +# define _MALLOC_LOCK() if (__isthreaded) _SPINLOCK(&thread_lock); +# define _MALLOC_UNLOCK() if (__isthreaded) _SPINUNLOCK(&thread_lock); #endif /* __FreeBSD__ */ #if defined(__sparc__) && defined(sun) @@ -184,12 +184,12 @@ #define pageround(foo) (((foo) + (malloc_pagemask))&(~(malloc_pagemask))) #define ptr2index(foo) (((u_long)(foo) >> malloc_pageshift)-malloc_origo) -#ifndef THREAD_LOCK -#define THREAD_LOCK() +#ifndef _MALLOC_LOCK +#define _MALLOC_LOCK() #endif -#ifndef THREAD_UNLOCK -#define THREAD_UNLOCK() +#ifndef _MALLOC_UNLOCK +#define _MALLOC_UNLOCK() #endif #ifndef MMAP_FD @@ -331,22 +331,22 @@ result = (caddr_t)pageround((u_long)sbrk(0)); tail = result + (pages << malloc_pageshift); if (tail < result) - return 0; + return (NULL); if (brk(tail)) { -#ifdef EXTRA_SANITY - wrterror("(ES): map_pages fails\n"); -#endif /* EXTRA_SANITY */ - return 0; +#ifdef MALLOC_EXTRA_SANITY + wrterror("(ES): map_pages fails.\n"); +#endif /* MALLOC_EXTRA_SANITY */ + return (NULL); } last_index = ptr2index(tail) - 1; malloc_brk = tail; if ((last_index+1) >= malloc_ninfo && !extend_pgdir(last_index)) - return 0;; + return (NULL); - return result; + return (result); } /* @@ -383,8 +383,8 @@ /* Get new pages */ new = (struct pginfo**) MMAP(i * malloc_pagesize); - if (new == (struct pginfo **)-1) - return 0; + if (new == MAP_FAILED) + return (0); /* Copy the old stuff */ memcpy(new, page_dir, @@ -399,7 +399,7 @@ /* Now free the old stuff */ munmap(old, oldlen); - return 1; + return (1); } /* @@ -421,9 +421,9 @@ malloc_pageshift++; #endif -#ifdef EXTRA_SANITY +#ifdef MALLOC_EXTRA_SANITY malloc_junk = 1; -#endif /* EXTRA_SANITY */ +#endif /* MALLOC_EXTRA_SANITY */ for (i = 0; i < 3; i++) { if (i == 0) { @@ -439,7 +439,7 @@ } else { p = _malloc_options; } - for (; p && *p; p++) { + for (; p != NULL && *p != '\0'; p++) { switch (*p) { case '>': malloc_cache <<= 1; break; case '<': malloc_cache >>= 1; break; @@ -464,7 +464,7 @@ default: j = malloc_abort; malloc_abort = 0; - wrtwarning("unknown char in MALLOC_OPTIONS\n"); + wrtwarning("unknown char in MALLOC_OPTIONS.\n"); malloc_abort = j; break; } @@ -498,7 +498,7 @@ page_dir = (struct pginfo **) MMAP(malloc_pagesize); if (page_dir == (struct pginfo **) -1) - wrterror("mmap(2) failed, check limits\n"); + wrterror("mmap(2) failed, check limits.\n"); /* * We need a maximum of malloc_pageshift buckets, steal these from the @@ -509,6 +509,9 @@ malloc_ninfo = malloc_pagesize / sizeof *page_dir; + /* Been here, done that */ + malloc_started++; + /* Recalculate the cache size in bytes, and make sure it's nonzero */ if (!malloc_cache) @@ -521,9 +524,6 @@ * We can sbrk(2) further back when we keep this on a low address. */ px = (struct pgfree *) imalloc (sizeof *px); - - /* Been here, done that */ - malloc_started++; } /* @@ -532,41 +532,41 @@ static void * malloc_pages(size_t size) { - void *p, *delay_free = 0; + void *p, *delay_free = NULL; size_t i; struct pgfree *pf; u_long index; size = pageround(size); - p = 0; + p = NULL; /* Look for free pages before asking for more */ for(pf = free_list.next; pf; pf = pf->next) { -#ifdef EXTRA_SANITY +#ifdef MALLOC_EXTRA_SANITY if (pf->size & malloc_pagemask) - wrterror("(ES): junk length entry on free_list\n"); + wrterror("(ES): junk length entry on free_list.\n"); if (!pf->size) - wrterror("(ES): zero length entry on free_list\n"); + wrterror("(ES): zero length entry on free_list.\n"); if (pf->page == pf->end) - wrterror("(ES): zero entry on free_list\n"); + wrterror("(ES): zero entry on free_list.\n"); if (pf->page > pf->end) - wrterror("(ES): sick entry on free_list\n"); + wrterror("(ES): sick entry on free_list.\n"); if ((void*)pf->page >= (void*)sbrk(0)) - wrterror("(ES): entry on free_list past brk\n"); + wrterror("(ES): entry on free_list past brk.\n"); if (page_dir[ptr2index(pf->page)] != MALLOC_FREE) - wrterror("(ES): non-free first page on free-list\n"); + wrterror("(ES): non-free first page on free-list.\n"); if (page_dir[ptr2index(pf->end)-1] != MALLOC_FREE) - wrterror("(ES): non-free last page on free-list\n"); -#endif /* EXTRA_SANITY */ + wrterror("(ES): non-free last page on free-list.\n"); +#endif /* MALLOC_EXTRA_SANITY */ if (pf->size < size) continue; if (pf->size == size) { p = pf->page; - if (pf->next) + if (pf->next != NULL) pf->next->prev = pf->prev; pf->prev->next = pf->next; delay_free = pf; @@ -579,18 +579,18 @@ break; } -#ifdef EXTRA_SANITY - if (p && page_dir[ptr2index(p)] != MALLOC_FREE) - wrterror("(ES): allocated non-free page on free-list\n"); -#endif /* EXTRA_SANITY */ +#ifdef MALLOC_EXTRA_SANITY + if (p != NULL && page_dir[ptr2index(p)] != MALLOC_FREE) + wrterror("(ES): allocated non-free page on free-list.\n"); +#endif /* MALLOC_EXTRA_SANITY */ size >>= malloc_pageshift; /* Map new pages */ - if (!p) + if (p == NULL) p = map_pages(size); - if (p) { + if (p != NULL) { index = ptr2index(p); page_dir[index] = MALLOC_FIRST; @@ -602,13 +602,13 @@ } if (delay_free) { - if (!px) + if (px == NULL) px = delay_free; else ifree(delay_free); } - return p; + return (p); } /* @@ -624,8 +624,8 @@ /* Allocate a new bucket */ pp = malloc_pages(malloc_pagesize); - if (!pp) - return 0; + if (pp == NULL) + return (0); /* Find length of admin structure */ l = offsetof(struct pginfo, bits[0]); @@ -637,9 +637,9 @@ bp = (struct pginfo *)pp; } else { bp = (struct pginfo *)imalloc(l); - if (!bp) { + if (bp == NULL) { ifree(pp); - return 0; + return (0); } } @@ -678,7 +678,7 @@ /* MALLOC_UNLOCK */ - return 1; + return (1); } /* @@ -704,8 +704,8 @@ j++; /* If it's empty, make a page more of that size chunks */ - if (!page_dir[j] && !malloc_make_chunks(j)) - return 0; + if (page_dir[j] == NULL && !malloc_make_chunks(j)) + return (NULL); bp = page_dir[j]; @@ -725,7 +725,7 @@ /* If there are no more free, remove from free-list */ if (!--bp->free) { page_dir[j] = bp->next; - bp->next = 0; + bp->next = NULL; } /* Adjust to the real offset of that chunk */ @@ -735,7 +735,7 @@ if (malloc_junk) memset((u_char*)bp->page + k, SOME_JUNK, bp->size); - return (u_char *)bp->page + k; + return ((u_char *)bp->page + k); } /* @@ -746,22 +746,28 @@ { void *result; + if (!malloc_started) + malloc_init(); + if (suicide) abort(); if ((size + malloc_pagesize) < size) /* Check for overflow */ - result = 0; + result = NULL; else if ((size + malloc_pagesize) >= (uintptr_t)page_dir) - result = 0; + result = NULL; else if (size <= malloc_maxsize) - result = malloc_bytes(size); + result = malloc_bytes(size); else - result = malloc_pages(size); + result = malloc_pages(size); + + if (malloc_abort && result == NULL) + wrterror("allocation failed.\n"); - if (malloc_zero && result) + if (malloc_zero && result != NULL) memset(result, 0, size); - return result; + return (result); } /* @@ -778,16 +784,21 @@ if (suicide) abort(); + if (!malloc_started) { + wrtwarning("malloc() has never been called.\n"); + return (NULL); + } + index = ptr2index(ptr); if (index < malloc_pageshift) { - wrtwarning("junk pointer, too low to make sense\n"); - return 0; + wrtwarning("junk pointer, too low to make sense.\n"); + return (NULL); } if (index > last_index) { - wrtwarning("junk pointer, too high to make sense\n"); - return 0; + wrtwarning("junk pointer, too high to make sense.\n"); + return (NULL); } mp = &page_dir[index]; @@ -796,26 +807,28 @@ /* Check the pointer */ if ((u_long)ptr & malloc_pagemask) { - wrtwarning("modified (page-) pointer\n"); - return 0; + wrtwarning("modified (page-) pointer.\n"); + return (NULL); } /* Find the size in bytes */ - for (osize = malloc_pagesize; *++mp == MALLOC_FOLLOW;) + for (osize = malloc_pagesize; *(++mp) == MALLOC_FOLLOW;) osize += malloc_pagesize; - if (!malloc_realloc && /* unless we have to, */ + if (!malloc_realloc && /* Unless we have to, */ size <= osize && /* .. or are too small, */ size > (osize - malloc_pagesize)) { /* .. or can free a page, */ - return ptr; /* don't do anything. */ + if (malloc_junk) + memset((char *)ptr + size, SOME_JUNK, osize-size); + return (ptr); /* ..don't do anything else. */ } } else if (*mp >= MALLOC_MAGIC) { /* Chunk allocation */ /* Check the pointer for sane values */ if (((u_long)ptr & ((*mp)->size-1))) { - wrtwarning("modified (chunk-) pointer\n"); - return 0; + wrtwarning("modified (chunk-) pointer.\n"); + return (NULL); } /* Find the chunk index in the page */ @@ -823,27 +836,29 @@ /* Verify that it isn't a free chunk already */ if ((*mp)->bits[i/MALLOC_BITS] & (1<<(i%MALLOC_BITS))) { - wrtwarning("chunk is already free\n"); - return 0; + wrtwarning("chunk is already free.\n"); + return (NULL); } osize = (*mp)->size; if (!malloc_realloc && /* Unless we have to, */ - size < osize && /* ..or are too small, */ + size <= osize && /* ..or are too small, */ (size > osize/2 || /* ..or could use a smaller size, */ osize == malloc_minsize)) { /* ..(if there is one) */ - return ptr; /* ..Don't do anything */ + if (malloc_junk) + memset((char *)ptr + size, SOME_JUNK, osize-size); + return (ptr); /* ..don't do anything else. */ } } else { - wrtwarning("pointer to wrong page\n"); - return 0; + wrtwarning("pointer to wrong page.\n"); + return (NULL); } p = imalloc(size); - if (p) { + if (p != NULL) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 29 17:06:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBA8916A4EC; Mon, 29 Sep 2003 17:06: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 8FB5D16A4E6 for ; Mon, 29 Sep 2003 17:06:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7E6843FD7 for ; Mon, 29 Sep 2003 17:06:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U06cXJ022867 for ; Mon, 29 Sep 2003 17:06:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U06cRP022864 for perforce@freebsd.org; Mon, 29 Sep 2003 17:06:38 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 17:06:38 -0700 (PDT) Message-Id: <200309300006.h8U06cRP022864@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 38816 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, 30 Sep 2003 00:06:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=38816 Change 38816 by peter@peter_daintree on 2003/09/29 17:05:51 cross-branch integrate from jhb_acpipci (p4 integ -I smp_hammer) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#4 integrate .. //depot/projects/hammer/sys/jhb_notes#4 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#6 (text+ko) ==== @@ -73,7 +73,6 @@ #define DEST_NONE -1 #define DEST_EXTINT -2 -#define DEST_EXTINT_ENABLED -3 #define TODO printf("%s: not implemented!\n", __func__) @@ -130,7 +129,7 @@ static void ioapic_resume(struct intsrc *isrc); static void ioapic_program_destination(struct ioapic_intsrc *intpin); #ifdef MIXED_MODE -static struct intsrc *mixedpic_create_source(struct ioapic_intsrc *intpin); +static void ioapic_setup_mixed_mode(struct ioapic_intsrc *intpin); #endif struct pic ioapic_template = { ioapic_enable_source, ioapic_disable_source, @@ -214,8 +213,7 @@ KASSERT(intpin->io_dest != DEST_NONE, ("intpin not assigned to a cluster")); - KASSERT(intpin->io_dest != DEST_EXTINT && - intpin->io_dest != DEST_EXTINT_ENABLED, + KASSERT(intpin->io_dest != DEST_EXTINT, ("intpin routed via ExtINT")); /* XXXTEST */ printf("ioapic%u: routing intpin %u (", io->io_id, intpin->io_intpin); @@ -261,33 +259,18 @@ ioapic_enable_intr(struct intsrc *isrc) { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; - struct ioapic_intsrc *extint; - struct ioapic *io; if (intpin->io_vector == IDT_TO_IRQ(IDT_SYSCALL)) { printf("WARNING: IRQ %d is not routed!\n", IDT_TO_IRQ(IDT_SYSCALL)); return; } - switch (intpin->io_dest) { - case DEST_NONE: + KASSERT(intpin->io_dest != DEST_EXTINT, + ("ExtINT pin trying to use ioapic enable_intr method")); + if (intpin->io_dest == DEST_NONE) { ioapic_assign_cluster(intpin); - break; - case DEST_EXTINT: - io = (struct ioapic *)isrc->is_pic; - extint = &io->io_pins[0]; - if (extint->io_vector != VECTOR_EXTINT) - panic("Can't find ExtINT pin to route through!"); - if (extint->io_dest == DEST_NONE) { - ioapic_assign_cluster(extint); - ioapic_enable_source(&extint->io_intsrc); - } - intpin->io_dest = DEST_EXTINT_ENABLED; - break; - default: - return; + lapic_enable_intr(intpin->io_vector); } - lapic_enable_intr(intpin->io_vector); } static int @@ -419,9 +402,13 @@ */ intpin->io_masked = 1; intpin->io_dest = -1; - if (bootverbose) - printf("ioapic%u: intpin %d -> irq %d\n", io->io_id, - i, intpin->io_vector); + if (bootverbose) { + printf("ioapic%u: intpin %d -> ", io->io_id, i); + if (intpin->io_vector == VECTOR_EXTINT) + printf("ExtINT\n"); + else + printf("irq %d\n", intpin->io_vector); + } value = ioapic_read(apic, IOAPIC_REDTBL_LO(i)); ioapic_write(apic, IOAPIC_REDTBL_LO(i), value | IOART_INTMSET); } @@ -490,6 +477,8 @@ return (EINVAL); io->io_pins[pin].io_vector = VECTOR_NMI; io->io_pins[pin].io_masked = 0; + io->io_pins[pin].io_edgetrigger = 1; + io->io_pins[pin].io_activehi = 1; #if 0 if (bootverbose) #endif @@ -510,6 +499,8 @@ return (EINVAL); io->io_pins[pin].io_vector = VECTOR_SMI; io->io_pins[pin].io_masked = 0; + io->io_pins[pin].io_edgetrigger = 1; + io->io_pins[pin].io_activehi = 1; #if 0 if (bootverbose) #endif @@ -530,6 +521,7 @@ return (EINVAL); io->io_pins[pin].io_vector = VECTOR_EXTINT; io->io_pins[pin].io_edgetrigger = 1; + io->io_pins[pin].io_activehi = 1; #if 0 if (bootverbose) #endif @@ -645,16 +637,15 @@ ioapic_write(apic, IOAPIC_REDTBL_HI(i), flags); mtx_unlock_spin(&icu_lock); if (pin->io_vector >= 0) { - struct intsrc *isrc; #ifdef MIXED_MODE /* Route IRQ0 via the 8259A using mixed mode. */ if (pin->io_vector == 0) - isrc = mixedpic_create_source(pin); + ioapic_setup_mixed_mode(pin); else #endif - isrc = &pin->io_intsrc; - intr_register_source(isrc); + intr_register_source(&pin->io_intsrc); } + } } @@ -671,7 +662,8 @@ program_logical_dest = 1; STAILQ_FOREACH(io, &ioapic_list, io_next) for (i = 0; i < io->io_numintr; i++) - if (io->io_pins[i].io_dest != DEST_NONE) + if (io->io_pins[i].io_dest != DEST_NONE && + io->io_pins[i].io_dest != DEST_EXTINT) ioapic_program_destination(&io->io_pins[i]); } SYSINIT(ioapic_destinations, SI_SUB_SMP, SI_ORDER_SECOND, @@ -685,140 +677,26 @@ * functionality to build these interrupt sources. */ -struct mixedpic_intsrc { - struct intsrc mp_intsrc; - struct intsrc *mp_atpicsrc; - struct intsrc *mp_apicpin; -}; - -static void mixedpic_enable_source(struct intsrc *isrc); -static void mixedpic_disable_source(struct intsrc *isrc); -static void mixedpic_eoi_source(struct intsrc *isrc); -static void mixedpic_enable_intr(struct intsrc *isrc); -static int mixedpic_vector(struct intsrc *isrc); -static int mixedpic_source_pending(struct intsrc *isrc); -static void mixedpic_suspend(struct intsrc *isrc); -static void mixedpic_resume(struct intsrc *isrc); - -struct pic mixedpic = { mixedpic_enable_source, mixedpic_disable_source, - mixedpic_eoi_source, mixedpic_enable_intr, - mixedpic_vector, mixedpic_source_pending, - mixedpic_suspend, mixedpic_resume }; - -static void -mixedpic_enable_source(struct intsrc *isrc) +void +ioapic_setup_mixed_mode(struct ioapic_intsrc *intpin) { - struct mixedpic_intsrc *mpsrc; - - mpsrc = (struct mixedpic_intsrc *)isrc; - isrc = mpsrc->mp_atpicsrc; - isrc->is_pic->pic_enable_source(isrc); -} - -static void -mixedpic_disable_source(struct intsrc *isrc) -{ - struct mixedpic_intsrc *mpsrc; -#if 0 - struct intsrc *intpin; -#endif - - mpsrc = (struct mixedpic_intsrc *)isrc; -#if 0 - intpin = mpsrc->mp_apicpin; -#endif - isrc = mpsrc->mp_atpicsrc; - isrc->is_pic->pic_disable_source(isrc); + struct ioapic_intsrc *extint; + struct ioapic *io; -#if 0 /* - * If the interrupt is pending in the local APIC, assume that - * we have been called just before the local APIC gets its - * EOI and send an EOI out to the 8259As. + * Mark the associated I/O APIC intpin as being delivered via + * ExtINT and enable the ExtINT pin on the I/O APIC if needed. */ - if (intpin->is_pic->pic_source_pending(intpin)) - isrc->is_pic->pic_eoi_source(isrc); -#endif -} - -static void -mixedpic_eoi_source(struct intsrc *isrc) -{ - struct mixedpic_intsrc *mpsrc; -#if 0 - struct intsrc *intpin; -#endif - - mpsrc = (struct mixedpic_intsrc *)isrc; -#if 0 - intpin = mpsrc->mp_apicpin; -#endif - isrc = mpsrc->mp_atpicsrc; - isrc->is_pic->pic_eoi_source(isrc); -#if 0 - intpin->is_pic->pic_eoi_source(intpin); -#endif -} - -static void -mixedpic_enable_intr(struct intsrc *isrc) -{ - struct mixedpic_intsrc *mpsrc; - - mpsrc = (struct mixedpic_intsrc *)isrc; - isrc = mpsrc->mp_atpicsrc; - isrc->is_pic->pic_enable_intr(isrc); -} + intpin->io_dest = DEST_EXTINT; + io = (struct ioapic *)intpin->io_intsrc.is_pic; + extint = &io->io_pins[0]; + if (extint->io_vector != VECTOR_EXTINT) + panic("Can't find ExtINT pin to route through!"); + if (extint->io_dest == DEST_NONE) { + ioapic_assign_cluster(extint); + ioapic_enable_source(&extint->io_intsrc); + } -static int -mixedpic_vector(struct intsrc *isrc) -{ - struct mixedpic_intsrc *mpsrc; - - mpsrc = (struct mixedpic_intsrc *)isrc; - isrc = mpsrc->mp_atpicsrc; - return (isrc->is_pic->pic_vector(isrc)); -} - -static int -mixedpic_source_pending(struct intsrc *isrc) -{ - struct mixedpic_intsrc *mpsrc; - - mpsrc = (struct mixedpic_intsrc *)isrc; - isrc = mpsrc->mp_atpicsrc; - return (isrc->is_pic->pic_source_pending(isrc)); -} - -static void -mixedpic_suspend(struct intsrc *isrc) -{ - - TODO; -} - -static void -mixedpic_resume(struct intsrc *isrc) -{ - - TODO; -} - -static struct intsrc * -mixedpic_create_source(struct ioapic_intsrc *intpin) -{ - struct mixedpic_intsrc *mpsrc; - int vector; - - KASSERT(intpin->io_dest == DEST_NONE, ("%s: intpin already enabled", - __func__)); - mpsrc = malloc(sizeof(struct mixedpic_intsrc), M_IOAPIC, M_WAITOK); - mpsrc->mp_intsrc.is_pic = &mixedpic; - mpsrc->mp_apicpin = (struct intsrc *)intpin; - vector = intpin->io_intsrc.is_pic->pic_vector(&intpin->io_intsrc); - mpsrc->mp_atpicsrc = atpic_lookup_source(vector); - intpin->io_dest = DEST_EXTINT; /* XXX */ - return (&mpsrc->mp_intsrc); } #endif /* MIXED_MODE */ ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#4 (text+ko) ==== @@ -139,18 +139,13 @@ value |= lvt->lvt_mode; switch (lvt->lvt_mode) { case APIC_LVT_DM_NMI: - /* XXX: do the same for SMI? */ - /* Enable NMI's on the BSP. */ - if (PCPU_GET(cpuid) == 0) - value &= ~APIC_LVT_M; - /* FALLTHROUGH */ case APIC_LVT_DM_SMI: case APIC_LVT_DM_INIT: + case APIC_LVT_DM_EXTINT: KASSERT(lvt->lvt_edgetrigger == 1, ("LVT with mode %#x must be edge triggered", lvt->lvt_mode)); /* FALLTHROUGH */ - case APIC_LVT_DM_EXTINT: /* Use a vector of 0. */ break; case APIC_LVT_DM_FIXED: @@ -361,17 +356,35 @@ int lapic_set_lvt_mode(u_int apic_id, u_int lvt, u_int32_t mode) { + struct lvt *lv; if (lvt > LVT_MAX) return (EINVAL); if (apic_id == APIC_ID_ALL) - lvts[lvt].lvt_mode = mode; + lv = &lvts[lvt]; else { KASSERT(lapics[apic_id].la_present, ("%s: missing APIC %u", __func__, apic_id)); - lapics[apic_id].la_lvts[lvt].lvt_mode = mode; - lapics[apic_id].la_lvts[lvt].lvt_active = 1; + lv = &lapics[apic_id].la_lvts[lvt]; + lv->lvt_active = 1; + } + lv->lvt_mode = mode; + switch (mode) { + case APIC_LVT_DM_NMI: + case APIC_LVT_DM_SMI: + case APIC_LVT_DM_INIT: + case APIC_LVT_DM_EXTINT: + lv->lvt_edgetrigger = 1; + lv->lvt_activehi = 1; + if (mode == APIC_LVT_DM_EXTINT) + lvt->lvt_masked = 1; + else + lvt->lvt_masked = 0; + break; + default: + panic("Unsupported delivery mode: 0x%x\n", mode); + } return (0); } ==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#3 (text+ko) ==== @@ -77,8 +77,8 @@ extern struct mtx icu_lock; +/* XXX: Does this belong in icu.h? */ void atpic_startup(void); -struct intsrc *atpic_lookup_source(int vector); int intr_add_handler(const char *name, int vector, driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep); ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#4 (text+ko) ==== @@ -106,6 +106,7 @@ int at_irq; /* Relative to PIC base. */ inthand_t *at_fastintr; inthand_t *at_intr; + struct intsrc *at_extsrc; }; /* @@ -346,20 +347,17 @@ void atpic_sched_ithd(struct intrframe iframe) { + struct atpic_intsrc *asrc; + struct intsrc *isrc; KASSERT((uint)iframe.if_vec < ICU_LEN, ("unknown int %d\n", iframe.if_vec)); - intr_execute_handlers(&atintrs[iframe.if_vec].at_intsrc, &iframe); -} - -struct intsrc * -atpic_lookup_source(int vector) -{ - - KASSERT(vector >= 0 && vector != ICU_SLAVEID && - vector < sizeof(atintrs) / sizeof(struct atpic_intsrc), - ("%s: invalid vector %d", __func__, vector)); - return (&atintrs[vector].at_intsrc); + asrc = &atintrs[iframe.if_vec]; + if (asrc->at_extsrc != NULL) + isrc = asrc->at_extsrc; + else + isrc = &asrc->at_intsrc; + intr_execute_handlers(isrc, &iframe); } /* ==== //depot/projects/hammer/sys/jhb_notes#4 (text+ko) ==== @@ -27,8 +27,17 @@ - isa/vector.s Todo: -- Set PCPU(apic_id) for UP case in lapic_init(). -- Use apic id of BSP (current CPU) when programming temporary physical +- DDB + + Add APIC ID to show pcpu + + Add 'show intrcnt' + + Add 'show idt' + - Add 'show ithread' + + Add 'show irqs' + - print out PIC driver name for each IRQ? + - Add 'show irq' +- Add nmi.c ++ Set PCPU(apic_id) for UP case in lapic_init(). ++ Use apic id of BSP (current CPU) when programming temporary physical destinations into I/O APIC RDT entries. - Fix IDT_SYSCALL mapping in APIC case - Test mixed mode From owner-p4-projects@FreeBSD.ORG Mon Sep 29 17:10:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A84016A4C1; Mon, 29 Sep 2003 17:10: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 F04E416A4B3 for ; Mon, 29 Sep 2003 17:10:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2130843F3F for ; Mon, 29 Sep 2003 17:10:45 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U0AiXJ023099 for ; Mon, 29 Sep 2003 17:10:44 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U0AiQb023096 for perforce@freebsd.org; Mon, 29 Sep 2003 17:10:44 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 17:10:44 -0700 (PDT) Message-Id: <200309300010.h8U0AiQb023096@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 38818 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, 30 Sep 2003 00:10:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=38818 Change 38818 by peter@peter_hammer on 2003/09/29 17:10:22 dedup the basemem declaration. oops. Affected files ... .. //depot/projects/hammer/sys/amd64/include/md_var.h#15 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/md_var.h#15 (text+ko) ==== @@ -51,7 +51,6 @@ extern char kstack[]; extern char sigcode[]; extern int szsigcode; -extern u_int basemem; typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); struct thread; From owner-p4-projects@FreeBSD.ORG Mon Sep 29 17:31:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7614016A4C3; Mon, 29 Sep 2003 17:31:11 -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 4998316A4C0 for ; Mon, 29 Sep 2003 17:31:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 683394400F for ; Mon, 29 Sep 2003 17:31:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U0VAXJ023824 for ; Mon, 29 Sep 2003 17:31:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U0V9hY023821 for perforce@freebsd.org; Mon, 29 Sep 2003 17:31:09 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 17:31:09 -0700 (PDT) Message-Id: <200309300031.h8U0V9hY023821@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 38819 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, 30 Sep 2003 00:31:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=38819 Change 38819 by peter@peter_hammer on 2003/09/29 17:30:33 lazy_switch is very premature here Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#37 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#37 (text+ko) ==== @@ -168,9 +168,11 @@ LIST_HEAD(pmaplist, pmap); static struct pmaplist allpmaps; static struct mtx allpmaps_lock; +#ifdef LAZY_SWITCH #ifdef SMP static struct mtx lazypmap_lock; #endif +#endif vm_paddr_t avail_start; /* PA of first available physical page */ vm_paddr_t avail_end; /* PA of last available physical page */ @@ -485,9 +487,11 @@ kernel_pmap->pm_active = -1; /* don't allow deactivation */ TAILQ_INIT(&kernel_pmap->pm_pvlist); LIST_INIT(&allpmaps); +#ifdef LAZY_SWITCH #ifdef SMP mtx_init(&lazypmap_lock, "lazypmap", NULL, MTX_SPIN); #endif +#endif mtx_init(&allpmaps_lock, "allpmaps", NULL, MTX_SPIN); mtx_lock_spin(&allpmaps_lock); LIST_INSERT_HEAD(&allpmaps, kernel_pmap, pm_list); @@ -1381,6 +1385,7 @@ * Pmap allocation/deallocation routines. ***************************************************/ +#ifdef LAZY_SWITCH #ifdef SMP /* * Deal with a SMP shootdown of other users of the pmap that we are @@ -1465,6 +1470,7 @@ } } #endif /* SMP */ +#endif /* * Release any resources held by the given physical map. @@ -1480,7 +1486,9 @@ ("pmap_release: pmap resident count %ld != 0", pmap->pm_stats.resident_count)); +#ifdef LAZY_SWITCH pmap_lazyfix(pmap); +#endif mtx_lock_spin(&allpmaps_lock); LIST_REMOVE(pmap, pm_list); mtx_unlock_spin(&allpmaps_lock); From owner-p4-projects@FreeBSD.ORG Mon Sep 29 17:35:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75A8316A4C1; Mon, 29 Sep 2003 17:35: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 4ABF516A4B3 for ; Mon, 29 Sep 2003 17:35:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 385B24403B for ; Mon, 29 Sep 2003 17:35:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U0ZFXJ024096 for ; Mon, 29 Sep 2003 17:35:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U0ZFic024093 for perforce@freebsd.org; Mon, 29 Sep 2003 17:35:15 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 17:35:15 -0700 (PDT) Message-Id: <200309300035.h8U0ZFic024093@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 38820 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, 30 Sep 2003 00:35:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=38820 Change 38820 by peter@peter_hammer on 2003/09/29 17:34:54 sync up with jhb Affected files ... .. //depot/projects/hammer/sys/amd64/include/segments.h#11 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/segments.h#11 (text+ko) ==== @@ -191,8 +191,12 @@ #define IDT_AC 17 /* #AC: Alignment Check */ #define IDT_MC 18 /* #MC: Machine Check */ #define IDT_XF 19 /* #XF: SIMD Floating-Point Exception */ +#define IDT_IO_INTS NRSVIDT /* Base of IDT entries for I/O interrupts. */ #define IDT_SYSCALL 0x80 /* System Call Interrupt Vector */ +#define IDT_TO_IRQ(idt) ((idt) - IDT_IO_INTS) +#define IRQ_TO_IDT(irq) ((irq) + IDT_IO_INTS) + /* * Entries in the Global Descriptor Table (GDT) */ From owner-p4-projects@FreeBSD.ORG Mon Sep 29 17:39:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A013A16A4B3; Mon, 29 Sep 2003 17:39:22 -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 5A29A16A4B3 for ; Mon, 29 Sep 2003 17:39:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DCF843FBF for ; Mon, 29 Sep 2003 17:39:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U0dLXJ024237 for ; Mon, 29 Sep 2003 17:39:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U0dLBX024234 for perforce@freebsd.org; Mon, 29 Sep 2003 17:39:21 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 17:39:21 -0700 (PDT) Message-Id: <200309300039.h8U0dLBX024234@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 38821 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, 30 Sep 2003 00:39:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=38821 Change 38821 by peter@peter_hammer on 2003/09/29 17:39:01 search and replace on renamed segments and setidt() usage Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#5 edit .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#5 (text+ko) ==== @@ -173,8 +173,7 @@ KASSERT(trunc_page(addr) == addr, ("local APIC not aligned on a page boundary")); lapic = (lapic_t *)pmap_mapdev(addr, sizeof(lapic_t)); - setidt(APIC_SPURIOUS_INT, IDTVEC(spuriousint), SDT_SYS386IGT, SEL_KPL, - GSEL(GCODE_SEL, SEL_KPL)); + setidt(APIC_SPURIOUS_INT, IDTVEC(spuriousint), SDT_SYSIGT, SEL_KPL, 0); /* Perform basic initialization of the BSP's local APIC. */ value = lapic->svr; @@ -243,8 +242,7 @@ KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry")); KASSERT(ioint_handlers[vector / 32] != NULL, ("No ISR handler for IRQ %d", IDT_TO_IRQ(vector))); - setidt(vector, ioint_handlers[vector / 32], SDT_SYS386IGT, SEL_KPL, - GSEL(GCODE_SEL, SEL_KPL)); + setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, 0); } void ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#6 (text+ko) ==== @@ -246,36 +246,27 @@ { /* Install an inter-CPU IPI for TLB invalidation */ - setidt(IPI_INVLTLB, IDTVEC(invltlb), - SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(IPI_INVLPG, IDTVEC(invlpg), - SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(IPI_INVLRNG, IDTVEC(invlrng), - SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); + setidt(IPI_INVLTLB, IDTVEC(invltlb), SDT_SYSIGT, SEL_KPL, 0); + setidt(IPI_INVLPG, IDTVEC(invlpg), SDT_SYSIGT, SEL_KPL, 0); + setidt(IPI_INVLRNG, IDTVEC(invlrng), SDT_SYSIGT, SEL_KPL, 0); /* Install an inter-CPU IPI for forwarding hardclock() */ - setidt(IPI_HARDCLOCK, IDTVEC(hardclock), - SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); + setidt(IPI_HARDCLOCK, IDTVEC(hardclock), SDT_SYSIGT, 0); /* Install an inter-CPU IPI for forwarding statclock() */ - setidt(IPI_STATCLOCK, IDTVEC(statclock), - SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); + setidt(IPI_STATCLOCK, IDTVEC(statclock), SDT_SYSIGT, 0); /* Install an inter-CPU IPI for lazy pmap release */ - setidt(IPI_LAZYPMAP, IDTVEC(lazypmap), - SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); + setidt(IPI_LAZYPMAP, IDTVEC(lazypmap), SDT_SYSIGT, SEL_KPL, 0); /* Install an inter-CPU IPI for all-CPU rendezvous */ - setidt(IPI_RENDEZVOUS, IDTVEC(rendezvous), - SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); + setidt(IPI_RENDEZVOUS, IDTVEC(rendezvous), SDT_SYSIGT, SEL_KPL, 0); /* Install an inter-CPU IPI for forcing an additional software trap */ - setidt(IPI_AST, IDTVEC(cpuast), - SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); + setidt(IPI_AST, IDTVEC(cpuast), SDT_SYSIGT, SEL_KPL, 0); /* Install an inter-CPU IPI for CPU stop/restart */ - setidt(IPI_STOP, IDTVEC(cpustop), - SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); + setidt(IPI_STOP, IDTVEC(cpustop), SDT_SYSIGT, SEL_KPL, 0); mtx_init(&smp_tlb_mtx, "tlb", NULL, MTX_SPIN); @@ -351,7 +342,7 @@ PCPU_SET(currentldt, _default_ldt); gsel_tss = GSEL(GPROC0_SEL, SEL_KPL); - gdt[myid * NGDT + GPROC0_SEL].sd.sd_type = SDT_SYS386TSS; + gdt[myid * NGDT + GPROC0_SEL].sd.sd_type = SDT_SYSTSS; PCPU_SET(common_tss.tss_esp0, 0); /* not used until after switch */ PCPU_SET(common_tss.tss_ss0, GSEL(GDATA_SEL, SEL_KPL)); PCPU_SET(common_tss.tss_ioopt, (sizeof (struct i386tss)) << 16); From owner-p4-projects@FreeBSD.ORG Mon Sep 29 18:16:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C47116A4C0; Mon, 29 Sep 2003 18:16: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 0709D16A4B3 for ; Mon, 29 Sep 2003 18:16:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCC2F43FFD for ; Mon, 29 Sep 2003 18:16:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U1G6XJ026755 for ; Mon, 29 Sep 2003 18:16:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U1G5xH026752 for perforce@freebsd.org; Mon, 29 Sep 2003 18:16:05 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 18:16:05 -0700 (PDT) Message-Id: <200309300116.h8U1G5xH026752@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 38822 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, 30 Sep 2003 01:16:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=38822 Change 38822 by peter@peter_hammer on 2003/09/29 18:15:57 make this compile Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#4 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#4 (text+ko) ==== @@ -49,19 +49,65 @@ * Macros to create and destroy a trap frame. */ #define PUSH_FRAME \ - pushl $0 ; /* dummy error code */ \ - pushl $0 ; /* dummy trap type */ \ - pushal ; /* 8 ints */ \ - pushl %ds ; /* save data and extra segments ... */ \ - pushl %es ; \ - pushl %fs + subq $TF_RIP,%rsp ; /* skip dummy tf_err and tf_trapno */ \ + testb $SEL_RPL_MASK,TF_CS(%rsp) ; /* come from kernel? */ \ + jz 1f ; /* Yes, dont swapgs again */ \ + swapgs ; \ +1: movq %rdi,TF_RDI(%rsp) ; \ + movq %rsi,TF_RSI(%rsp) ; \ + movq %rdx,TF_RDX(%rsp) ; \ + movq %rcx,TF_RCX(%rsp) ; \ + movq %r8,TF_R8(%rsp) ; \ + movq %r9,TF_R9(%rsp) ; \ + movq %rax,TF_RAX(%rsp) ; \ + movq %rbx,TF_RBX(%rsp) ; \ + movq %rbp,TF_RBP(%rsp) ; \ + movq %r10,TF_R10(%rsp) ; \ + movq %r11,TF_R11(%rsp) ; \ + movq %r12,TF_R12(%rsp) ; \ + movq %r13,TF_R13(%rsp) ; \ + movq %r14,TF_R14(%rsp) ; \ + movq %r15,TF_R15(%rsp) \ + +#if 0 + maybe_extra_ipending ; \ + movb imen + IRQ_BYTE(irq_num),%al ; \ + orb $IRQ_BIT(irq_num),%al ; \ + movb %al,imen + IRQ_BYTE(irq_num) ; \ + outb %al,$icu+ICU_IMR_OFFSET ; \ + enable_icus ; \ + movq PCPU(CURTHREAD),%rbx ; \ + incl TD_INTR_NESTING_LEVEL(%rbx) ; \ + FAKE_MCOUNT(13*4(%rsp)) ; /* XXX late to avoid double count */ \ + movq $irq_num, %rdi; /* pass the IRQ */ \ + call sched_ithd ; \ + decl TD_INTR_NESTING_LEVEL(%rbx) ; \ + MEXITCOUNT ; \ + jmp doreti +#endif #define POP_FRAME \ - popl %fs ; \ - popl %es ; \ - popl %ds ; \ - popal ; \ - addl $4+4,%esp + movq TF_RDI(%rsp),%rdi ; \ + movq TF_RSI(%rsp),%rsi ; \ + movq TF_RDX(%rsp),%rdx ; \ + movq TF_RCX(%rsp),%rcx ; \ + movq TF_R8(%rsp),%r8 ; \ + movq TF_R9(%rsp),%r9 ; \ + movq TF_RAX(%rsp),%rax ; \ + movq TF_RBX(%rsp),%rbx ; \ + movq TF_RBP(%rsp),%rbp ; \ + movq TF_R10(%rsp),%r10 ; \ + movq TF_R11(%rsp),%r11 ; \ + movq TF_R12(%rsp),%r12 ; \ + movq TF_R13(%rsp),%r13 ; \ + movq TF_R14(%rsp),%r14 ; \ + movq TF_R15(%rsp),%r15 ; \ + testb $SEL_RPL_MASK,TF_CS(%rsp) ; /* come from kernel? */ \ + jz 1f ; /* keep kernel GS.base */ \ + cli ; \ + swapgs ; \ +1: addq $TF_RIP,%rsp /* skip over tf_err, tf_trapno */ + /* * I/O Interrupt Entry Point. Rather than having one entry point for @@ -75,24 +121,18 @@ SUPERALIGN_TEXT ; \ IDTVEC(vec_name) ; \ PUSH_FRAME ; \ - movl $KDSEL, %eax ; /* reload with kernel's data segment */ \ - mov %ax, %ds ; \ - mov %ax, %es ; \ - movl $KPSEL, %eax ; /* reload with per-CPU data segment */ \ - mov %ax, %fs ; \ - movl lapic, %edx ; /* pointer to local APIC */ \ - movl PCPU(CURTHREAD), %ebx ; \ - movl LA_ISR + 16 * (index)(%edx), %eax ; /* load ISR */ \ - incl TD_INTR_NESTING_LEVEL(%ebx) ; \ + movq lapic, %rdx ; /* pointer to local APIC */ \ + movq PCPU(CURTHREAD), %rbx ; \ + movl LA_ISR + 16 * (index)(%rdx), %eax ; /* load ISR */ \ + incl TD_INTR_NESTING_LEVEL(%rbx) ; \ bsrl %eax, %eax ; /* index of highset set bit in ISR */ \ jz 2f ; \ addl $(32 * (index - 1)),%eax ; \ 1: ; \ FAKE_MCOUNT(13*4(%esp)) ; /* XXX avoid double count */ \ - pushl %eax ; /* pass the IRQ */ \ + movq %rax, %rdi ; /* pass the IRQ */ \ call lapic_handle_intr ; \ - addl $4, %esp ; /* discard parameter */ \ - decl TD_INTR_NESTING_LEVEL(%ebx) ; \ + decl TD_INTR_NESTING_LEVEL(%rbx) ; \ MEXITCOUNT ; \ jmp doreti ; \ 2: movl $-1, %eax ; /* send a vector of -1 */ \ @@ -111,7 +151,7 @@ /* No EOI cycle used here */ - iret + iretq MCOUNT_LABEL(bintr) ISR_VEC(1,apic_isr1) @@ -128,23 +168,19 @@ .text SUPERALIGN_TEXT IDTVEC(invltlb) - pushl %eax - pushl %ds - movl $KDSEL, %eax /* Kernel data selector */ - mov %ax, %ds + pushq %rax - movl %cr3, %eax /* invalidate the TLB */ - movl %eax, %cr3 + movq %cr3, %rax /* invalidate the TLB */ + movq %rax, %cr3 - movl lapic, %eax - movl $0, LA_EOI(%eax) /* End Of Interrupt to APIC */ + movq lapic, %rax + movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ lock incl smp_tlb_wait - popl %ds - popl %eax - iret + popq %rax + iretq /* * Single page TLB shootdown @@ -152,23 +188,19 @@ .text SUPERALIGN_TEXT IDTVEC(invlpg) - pushl %eax - pushl %ds - movl $KDSEL, %eax /* Kernel data selector */ - mov %ax, %ds + pushq %rax - movl smp_tlb_addr1, %eax - invlpg (%eax) /* invalidate single page */ + movq smp_tlb_addr1, %rax + invlpg (%rax) /* invalidate single page */ - movl lapic, %eax - movl $0, LA_EOI(%eax) /* End Of Interrupt to APIC */ + movq lapic, %rax + movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ lock incl smp_tlb_wait - popl %ds - popl %eax - iret + popq %rax + iretq /* * Page range TLB shootdown. @@ -176,29 +208,25 @@ .text SUPERALIGN_TEXT IDTVEC(invlrng) - pushl %eax - pushl %edx - pushl %ds - movl $KDSEL, %eax /* Kernel data selector */ - mov %ax, %ds + pushq %rax + pushq %rdx - movl smp_tlb_addr1, %edx - movl smp_tlb_addr2, %eax -1: invlpg (%edx) /* invalidate single page */ - addl $PAGE_SIZE, %edx - cmpl %eax, %edx + movq smp_tlb_addr1, %rdx + movq smp_tlb_addr2, %rax +1: invlpg (%rdx) /* invalidate single page */ + addq $PAGE_SIZE, %rdx + cmpq %rax, %rdx jb 1b - movl lapic, %eax - movl $0, LA_EOI(%eax) /* End Of Interrupt to APIC */ + movq lapic, %rax + movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ lock incl smp_tlb_wait - popl %ds - popl %edx - popl %eax - iret + popq %rdx + popq %rax + iretq /* * Forward hardclock to another CPU. Pushes a clockframe and calls @@ -208,21 +236,16 @@ SUPERALIGN_TEXT IDTVEC(hardclock) PUSH_FRAME - movl $KDSEL, %eax /* reload with kernel's data segment */ - mov %ax, %ds - mov %ax, %es - movl $KPSEL, %eax - mov %ax, %fs - movl lapic, %edx - movl $0, LA_EOI(%edx) /* End Of Interrupt to APIC */ + movq lapic, %rdx + movl $0, LA_EOI(%rdx) /* End Of Interrupt to APIC */ - movl PCPU(CURTHREAD),%ebx - incl TD_INTR_NESTING_LEVEL(%ebx) - pushl $0 /* XXX convert trapframe to clockframe */ + movq PCPU(CURTHREAD),%rbx + incl TD_INTR_NESTING_LEVEL(%rbx) + pushq $0 /* XXX convert trapframe to clockframe */ call forwarded_hardclock - addl $4, %esp /* XXX convert clockframe to trapframe */ - decl TD_INTR_NESTING_LEVEL(%ebx) + addq $8, %rsp /* XXX convert clockframe to trapframe */ + decl TD_INTR_NESTING_LEVEL(%rbx) MEXITCOUNT jmp doreti @@ -234,23 +257,18 @@ SUPERALIGN_TEXT IDTVEC(statclock) PUSH_FRAME - movl $KDSEL, %eax /* reload with kernel's data segment */ - mov %ax, %ds - mov %ax, %es - movl $KPSEL, %eax - mov %ax, %fs - movl lapic, %edx - movl $0, LA_EOI(%edx) /* End Of Interrupt to APIC */ + movq lapic, %rdx + movl $0, LA_EOI(%rdx) /* End Of Interrupt to APIC */ FAKE_MCOUNT(13*4(%esp)) - movl PCPU(CURTHREAD),%ebx - incl TD_INTR_NESTING_LEVEL(%ebx) - pushl $0 /* XXX convert trapframe to clockframe */ + movq PCPU(CURTHREAD),%rbx + incl TD_INTR_NESTING_LEVEL(%rbx) + pushq $0 /* XXX convert trapframe to clockframe */ call forwarded_statclock - addl $4, %esp /* XXX convert clockframe to trapframe */ - decl TD_INTR_NESTING_LEVEL(%ebx) + addq $8, %rsp /* XXX convert clockframe to trapframe */ + decl TD_INTR_NESTING_LEVEL(%rbx) MEXITCOUNT jmp doreti @@ -266,14 +284,9 @@ SUPERALIGN_TEXT IDTVEC(cpuast) PUSH_FRAME - movl $KDSEL, %eax - mov %ax, %ds /* use KERNEL data segment */ - mov %ax, %es - movl $KPSEL, %eax - mov %ax, %fs - movl lapic, %edx - movl $0, LA_EOI(%edx) /* End Of Interrupt to APIC */ + movq lapic, %rdx + movl $0, LA_EOI(%rdx) /* End Of Interrupt to APIC */ FAKE_MCOUNT(13*4(%esp)) @@ -290,60 +303,41 @@ .text SUPERALIGN_TEXT IDTVEC(cpustop) - pushl %ebp - movl %esp, %ebp - pushl %eax - pushl %ecx - pushl %edx - pushl %ds /* save current data segment */ - pushl %fs + PUSH_FRAME - movl $KDSEL, %eax - mov %ax, %ds /* use KERNEL data segment */ - movl $KPSEL, %eax - mov %ax, %fs + movq lapic, %rax + movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ - movl lapic, %eax - movl $0, LA_EOI(%eax) /* End Of Interrupt to APIC */ - movl PCPU(CPUID), %eax imull $PCB_SIZE, %eax - leal CNAME(stoppcbs)(%eax), %eax - pushl %eax - call CNAME(savectx) /* Save process context */ - addl $4, %esp + leaq stoppcbs(%rax), %rdi + call savectx /* Save process context */ movl PCPU(CPUID), %eax lock - btsl %eax, CNAME(stopped_cpus) /* stopped_cpus |= (1< Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADDA116A4C0; Mon, 29 Sep 2003 18:18:10 -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 6631716A4B3 for ; Mon, 29 Sep 2003 18:18:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD61743FE3 for ; Mon, 29 Sep 2003 18:18:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U1I9XJ026802 for ; Mon, 29 Sep 2003 18:18:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U1I9AR026799 for perforce@freebsd.org; Mon, 29 Sep 2003 18:18:09 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 18:18:09 -0700 (PDT) Message-Id: <200309300118.h8U1I9AR026799@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 38823 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, 30 Sep 2003 01:18:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=38823 Change 38823 by peter@peter_hammer on 2003/09/29 18:17:31 remove 686 B0 workaround fix setidt call Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#6 (text+ko) ==== @@ -242,7 +242,7 @@ KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry")); KASSERT(ioint_handlers[vector / 32] != NULL, ("No ISR handler for IRQ %d", IDT_TO_IRQ(vector))); - setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, 0); + setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, SEL_KPL,SEL_KPL, 0); } void @@ -517,17 +517,6 @@ if (best_enum == NULL) return; - /* - * To work around an errata, we disable the local APIC on some - * CPUs during early startup. We need to turn the local APIC back - * on on such CPUs now. - */ - if (cpu == CPU_686 && strcmp(cpu_vendor, "GenuineIntel") == 0 && - (cpu_id & 0xff0) == 0x610) { - apic_base = rdmsr(MSR_APICBASE); - apic_base |= APICBASE_ENABLED; - wrmsr(MSR_APICBASE, apic_base); - } retval = best_enum->apic_setup_local(); if (retval != 0) printf("%s: Failed to setup the local APIC: returned %d\n", From owner-p4-projects@FreeBSD.ORG Mon Sep 29 18:20:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B004F16A4C0; Mon, 29 Sep 2003 18:20: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 80B0716A4B3 for ; Mon, 29 Sep 2003 18:20:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 059F84400B for ; Mon, 29 Sep 2003 18:20:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U1KCXJ026864 for ; Mon, 29 Sep 2003 18:20:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U1KCW9026861 for perforce@freebsd.org; Mon, 29 Sep 2003 18:20:12 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 18:20:12 -0700 (PDT) Message-Id: <200309300120.h8U1KCW9026861@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 38824 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, 30 Sep 2003 01:20:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=38824 Change 38824 by peter@peter_hammer on 2003/09/29 18:19:48 fix another setidt() botch fix a jhb-typo finish removing 686 workaround Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#7 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#7 (text+ko) ==== @@ -242,7 +242,7 @@ KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry")); KASSERT(ioint_handlers[vector / 32] != NULL, ("No ISR handler for IRQ %d", IDT_TO_IRQ(vector))); - setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, SEL_KPL,SEL_KPL, 0); + setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, SEL_KPL, 0); } void @@ -376,9 +376,9 @@ lv->lvt_edgetrigger = 1; lv->lvt_activehi = 1; if (mode == APIC_LVT_DM_EXTINT) - lvt->lvt_masked = 1; + lv->lvt_masked = 1; else - lvt->lvt_masked = 0; + lv->lvt_masked = 0; break; default: panic("Unsupported delivery mode: 0x%x\n", mode); @@ -513,7 +513,6 @@ apic_setup_local(void *dummy __unused) { int retval; - uint64_t apic_base; if (best_enum == NULL) return; From owner-p4-projects@FreeBSD.ORG Mon Sep 29 18:36:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D97616A4C0; Mon, 29 Sep 2003 18:36:35 -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 450EA16A4B3 for ; Mon, 29 Sep 2003 18:36:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A1CBA4400F for ; Mon, 29 Sep 2003 18:36:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U1aYXJ027493 for ; Mon, 29 Sep 2003 18:36:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U1aXux027490 for perforce@freebsd.org; Mon, 29 Sep 2003 18:36:33 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 18:36:33 -0700 (PDT) Message-Id: <200309300136.h8U1aXux027490@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 38826 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, 30 Sep 2003 01:36:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=38826 Change 38826 by peter@peter_hammer on 2003/09/29 18:36:22 make this compile. jhb still has the unused 'icu' arg to FAST_INTR(), I didn't add it back. Affected files ... .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.s#4 edit Differences ... ==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.s#4 (text+ko) ==== @@ -46,65 +46,39 @@ #include "assym.s" -#define FAST_INTR_HANDLER_USES_ES 1 -#ifdef FAST_INTR_HANDLER_USES_ES -#define ACTUALLY_PUSHED 1 -#define MAYBE_MOVW_AX_ES movw %ax,%es -#define MAYBE_POPL_ES popl %es -#define MAYBE_PUSHL_ES pushl %es -#else -/* - * We can usually skip loading %es for fastintr handlers. %es should - * only be used for string instructions, and fastintr handlers shouldn't - * do anything slow enough to justify using a string instruction. - */ -#define ACTUALLY_PUSHED 0 -#define MAYBE_MOVW_AX_ES -#define MAYBE_POPL_ES -#define MAYBE_PUSHL_ES -#endif - #define IRQ_BIT(irq_num) (1 << ((irq_num) % 8)) #define IRQ_BYTE(irq_num) ((irq_num) >> 3) -#ifdef AUTO_EOI_1 - -#define ENABLE_ICU1 /* use auto-EOI to reduce i/o */ -#define OUTB_ICU1 - -#else - #define ENABLE_ICU1 \ movb $ICU_EOI,%al ; /* as soon as possible send EOI ... */ \ - OUTB_ICU1 /* ... to clear in service bit */ - -#define OUTB_ICU1 \ - outb %al,$IO_ICU1 - -#endif - -#ifdef AUTO_EOI_2 -/* - * The data sheet says no auto-EOI on slave, but it sometimes works. - */ -#define ENABLE_ICU1_AND_2 ENABLE_ICU1 + outb %al,$IO_ICU1 /* ... to clear in service bit */ -#else - #define ENABLE_ICU1_AND_2 \ movb $ICU_EOI,%al ; /* as above */ \ outb %al,$IO_ICU2 ; /* but do second icu first ... */ \ - OUTB_ICU1 /* ... then first icu (if !AUTO_EOI_1) */ + outb %al,$IO_ICU1 /* ... then first icu (if !AUTO_EOI_1) */ -#endif #define PUSH_FRAME \ - pushl $0 ; /* dummy error code */ \ - pushl $0 ; /* dummy trap type */ \ - pushal ; /* 8 ints */ \ - pushl %ds ; /* save data and extra segments ... */ \ - pushl %es ; \ - pushl %fs + subq $TF_RIP,%rsp ; /* skip dummy tf_err and tf_trapno */ \ + testb $SEL_RPL_MASK,TF_CS(%rsp) ; /* come from kernel? */ \ + jz 1f ; /* Yes, dont swapgs again */ \ + swapgs ; \ +1: movq %rdi,TF_RDI(%rsp) ; \ + movq %rsi,TF_RSI(%rsp) ; \ + movq %rdx,TF_RDX(%rsp) ; \ + movq %rcx,TF_RCX(%rsp) ; \ + movq %r8,TF_R8(%rsp) ; \ + movq %r9,TF_R9(%rsp) ; \ + movq %rax,TF_RAX(%rsp) ; \ + movq %rbx,TF_RBX(%rsp) ; \ + movq %rbp,TF_RBP(%rsp) ; \ + movq %r10,TF_R10(%rsp) ; \ + movq %r11,TF_R11(%rsp) ; \ + movq %r12,TF_R12(%rsp) ; \ + movq %r13,TF_R13(%rsp) ; \ + movq %r14,TF_R14(%rsp) ; \ + movq %r15,TF_R15(%rsp) ; \ #define MASK_IRQ(icu, irq_num) \ movb imen + IRQ_BYTE(irq_num),%al ; \ @@ -116,28 +90,23 @@ * Macros for interrupt interrupt entry, call to handler, and exit. */ -#define FAST_INTR(irq_num, vec_name, icu, enable_icus) \ +#define FAST_INTR(irq_num, vec_name, enable_icus) \ .text ; \ SUPERALIGN_TEXT ; \ IDTVEC(vec_name) ; \ PUSH_FRAME ; \ - mov $KDSEL,%ax ; \ - mov %ax,%ds ; \ - mov %ax,%es ; \ - mov $KPSEL,%ax ; \ - mov %ax,%fs ; \ - FAKE_MCOUNT((12+ACTUALLY_PUSHED)*4(%esp)) ; \ + FAKE_MCOUNT((12)*4(%esp)) ; \ call critical_enter ; \ - movl PCPU(CURTHREAD),%ebx ; \ - incl TD_INTR_NESTING_LEVEL(%ebx) ; \ - pushl atpic_intr_arg + (irq_num) * 4 ; \ - call *atpic_intr_handler + (irq_num) * 4 ; \ - addl $4,%esp ; \ + movq PCPU(CURTHREAD),%rbx ; \ + incl TD_INTR_NESTING_LEVEL(%rbx) ; \ + pushq atpic_intr_arg + (irq_num) * 8 ; \ + call *atpic_intr_handler + (irq_num) * 8 ; \ + addq $8,%rsp ; \ enable_icus ; \ incl cnt+V_INTR ; /* book-keeping can wait */ \ - movl atpic_intr_countp + (irq_num) * 4,%eax ; \ - incl (%eax) ; \ - decl TD_INTR_NESTING_LEVEL(%ebx) ; \ + movq atpic_intr_countp + (irq_num) * 8,%rax ; \ + incq (%rax) ; \ + decl TD_INTR_NESTING_LEVEL(%rbx) ; \ call critical_exit ; \ MEXITCOUNT ; \ jmp doreti @@ -156,46 +125,37 @@ SUPERALIGN_TEXT ; \ IDTVEC(vec_name) ; \ PUSH_FRAME ; \ - mov $KDSEL,%ax ; /* load kernel ds, es and fs */ \ - mov %ax,%ds ; \ - mov %ax,%es ; \ - mov $KPSEL,%ax ; \ - mov %ax,%fs ; \ -; \ maybe_extra_ipending ; \ MASK_IRQ(icu, irq_num) ; \ enable_icus ; \ -; \ - movl PCPU(CURTHREAD),%ebx ; \ - incl TD_INTR_NESTING_LEVEL(%ebx) ; \ -; \ + movq PCPU(CURTHREAD),%rbx ; \ + incl TD_INTR_NESTING_LEVEL(%rbx) ; \ FAKE_MCOUNT(13*4(%esp)) ; /* XXX late to avoid double count */ \ - pushl $irq_num; /* pass the IRQ */ \ + pushq $irq_num; /* pass the IRQ */ \ call atpic_sched_ithd ; \ - addl $4, %esp ; /* discard the parameter */ \ -; \ - decl TD_INTR_NESTING_LEVEL(%ebx) ; \ + addq $8, %rsp ; /* discard the parameter */ \ + decl TD_INTR_NESTING_LEVEL(%rbx) ; \ MEXITCOUNT ; \ jmp doreti MCOUNT_LABEL(bintr) /* XXX: no longer used */ - FAST_INTR(0,atpic_fastintr0, IO_ICU1, ENABLE_ICU1) - FAST_INTR(1,atpic_fastintr1, IO_ICU1, ENABLE_ICU1) - FAST_INTR(2,atpic_fastintr2, IO_ICU1, ENABLE_ICU1) - FAST_INTR(3,atpic_fastintr3, IO_ICU1, ENABLE_ICU1) - FAST_INTR(4,atpic_fastintr4, IO_ICU1, ENABLE_ICU1) - FAST_INTR(5,atpic_fastintr5, IO_ICU1, ENABLE_ICU1) - FAST_INTR(6,atpic_fastintr6, IO_ICU1, ENABLE_ICU1) - FAST_INTR(7,atpic_fastintr7, IO_ICU1, ENABLE_ICU1) - FAST_INTR(8,atpic_fastintr8, IO_ICU2, ENABLE_ICU1_AND_2) - FAST_INTR(9,atpic_fastintr9, IO_ICU2, ENABLE_ICU1_AND_2) - FAST_INTR(10,atpic_fastintr10, IO_ICU2, ENABLE_ICU1_AND_2) - FAST_INTR(11,atpic_fastintr11, IO_ICU2, ENABLE_ICU1_AND_2) - FAST_INTR(12,atpic_fastintr12, IO_ICU2, ENABLE_ICU1_AND_2) - FAST_INTR(13,atpic_fastintr13, IO_ICU2, ENABLE_ICU1_AND_2) - FAST_INTR(14,atpic_fastintr14, IO_ICU2, ENABLE_ICU1_AND_2) - FAST_INTR(15,atpic_fastintr15, IO_ICU2, ENABLE_ICU1_AND_2) + FAST_INTR(0,atpic_fastintr0, ENABLE_ICU1) + FAST_INTR(1,atpic_fastintr1, ENABLE_ICU1) + FAST_INTR(2,atpic_fastintr2, ENABLE_ICU1) + FAST_INTR(3,atpic_fastintr3, ENABLE_ICU1) + FAST_INTR(4,atpic_fastintr4, ENABLE_ICU1) + FAST_INTR(5,atpic_fastintr5, ENABLE_ICU1) + FAST_INTR(6,atpic_fastintr6, ENABLE_ICU1) + FAST_INTR(7,atpic_fastintr7, ENABLE_ICU1) + FAST_INTR(8,atpic_fastintr8, ENABLE_ICU1_AND_2) + FAST_INTR(9,atpic_fastintr9, ENABLE_ICU1_AND_2) + FAST_INTR(10,atpic_fastintr10, ENABLE_ICU1_AND_2) + FAST_INTR(11,atpic_fastintr11, ENABLE_ICU1_AND_2) + FAST_INTR(12,atpic_fastintr12, ENABLE_ICU1_AND_2) + FAST_INTR(13,atpic_fastintr13, ENABLE_ICU1_AND_2) + FAST_INTR(14,atpic_fastintr14, ENABLE_ICU1_AND_2) + FAST_INTR(15,atpic_fastintr15, ENABLE_ICU1_AND_2) #define CLKINTR_PENDING movl $1,CNAME(clkintr_pending) /* Threaded interrupts */ From owner-p4-projects@FreeBSD.ORG Mon Sep 29 18:36:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5048A16A4C2; Mon, 29 Sep 2003 18:36:38 -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 04FE516A4C0 for ; Mon, 29 Sep 2003 18:36:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8C3843FDF for ; Mon, 29 Sep 2003 18:36:33 -0700 (PDT) (envelope-from njl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U1aXXJ027487 for ; Mon, 29 Sep 2003 18:36:33 -0700 (PDT) (envelope-from njl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U1aW2M027484 for perforce@freebsd.org; Mon, 29 Sep 2003 18:36:32 -0700 (PDT) (envelope-from njl@freebsd.org) Date: Mon, 29 Sep 2003 18:36:32 -0700 (PDT) Message-Id: <200309300136.h8U1aW2M027484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to njl@freebsd.org using -f From: Nate Lawson To: Perforce Change Reviews Subject: PERFORCE change 38825 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, 30 Sep 2003 01:36:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=38825 Change 38825 by njl@njl_laptop on 2003/09/29 18:36:13 Kick cam-ng branch to the trashcan due to lack of support. I'm Clark Kent, not Superman. Affected files ... .. //depot/projects/camng/src/lib/libcam/Makefile#2 delete .. //depot/projects/camng/src/lib/libcam/cam.3#2 delete .. //depot/projects/camng/src/lib/libcam/cam_cdbparse.3#2 delete .. //depot/projects/camng/src/lib/libcam/camlib.c#2 delete .. //depot/projects/camng/src/lib/libcam/camlib.h#2 delete .. //depot/projects/camng/src/lib/libcam/scsi_cmdparse.c#2 delete .. //depot/projects/camng/src/sbin/camcontrol/Makefile#2 delete .. //depot/projects/camng/src/sbin/camcontrol/camcontrol.8#2 delete .. //depot/projects/camng/src/sbin/camcontrol/camcontrol.c#2 delete .. //depot/projects/camng/src/sbin/camcontrol/camcontrol.h#2 delete .. //depot/projects/camng/src/sbin/camcontrol/modeedit.c#2 delete .. //depot/projects/camng/src/sbin/camcontrol/util.c#2 delete .. //depot/projects/camng/src/sys/Makefile#2 delete .. //depot/projects/camng/src/sys/alpha/Makefile#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/alpha-gdbstub.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/api_up1000.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/atomic.s#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/autoconf.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/busdma_machdep.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/busspace.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/clock.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/clock_if.m#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/cpuconf.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/critical.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/db_disasm.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/db_instruction.h#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/db_interface.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/db_trace.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/dec_1000a.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/dec_2100_a50.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/dec_2100_a500.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/dec_3000_300.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/dec_3000_500.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/dec_axppci_33.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/dec_eb164.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/dec_eb64plus.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/dec_kn20aa.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/dec_kn300.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/dec_kn8ae.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/dec_st550.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/dec_st6600.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/divrem.m4#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/dump_machdep.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/elf_machdep.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/exception.s#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/fp_emulate.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/genassym.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/ieee_float.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/ieee_float.h#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/in_cksum.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/interrupt.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/locore.s#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/machdep.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/mem.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/mp_machdep.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/pal.s#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/pmap.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/prom.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/prom_disp.s#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/promcons.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/sgmap.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/support.s#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/swtch.s#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/sys_machdep.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/timerreg.h#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/trap.c#2 delete .. //depot/projects/camng/src/sys/alpha/alpha/vm_machdep.c#2 delete .. //depot/projects/camng/src/sys/alpha/compile/.cvsignore#2 delete .. //depot/projects/camng/src/sys/alpha/conf/GENERIC#2 delete .. //depot/projects/camng/src/sys/alpha/conf/GENERIC.hints#2 delete .. //depot/projects/camng/src/sys/alpha/conf/Makefile#2 delete .. //depot/projects/camng/src/sys/alpha/conf/NOTES#2 delete .. //depot/projects/camng/src/sys/alpha/conf/SIMOS#2 delete .. //depot/projects/camng/src/sys/alpha/conf/gethints.awk#2 delete .. //depot/projects/camng/src/sys/alpha/include/_inttypes.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/_stdint.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/_types.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/alpha_cpu.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/asm.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/atomic.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/bootinfo.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/bus.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/bus_memio.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/bus_pio.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/bwx.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/chipset.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/clock.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/clockvar.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/cpu.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/cpuconf.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/cpufunc.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/critical.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/db_machdep.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/elf.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/endian.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/exec.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/float.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/floatingpoint.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/fpu.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/frame.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/ieee.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/ieeefp.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/in_cksum.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/inst.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/intr.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/intrcnt.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/ioctl_bt848.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/ioctl_meteor.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/kse.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/limits.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/md_var.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/mutex.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/pal.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/param.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/pc/bios.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/pc/display.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/pc/msdos.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/pc/vesa.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/pcb.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/pcpu.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/pmap.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/proc.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/profile.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/prom.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/pte.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/ptrace.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/reg.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/reloc.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/resource.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/rpb.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/runq.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/setjmp.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/sgmap.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/sigframe.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/signal.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/smp.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/stdarg.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/swiz.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/sysarch.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/ucontext.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/varargs.h#2 delete .. //depot/projects/camng/src/sys/alpha/include/vmparam.h#2 delete .. //depot/projects/camng/src/sys/alpha/isa/isa.c#2 delete .. //depot/projects/camng/src/sys/alpha/isa/isa_dma.c#2 delete .. //depot/projects/camng/src/sys/alpha/isa/isavar.h#2 delete .. //depot/projects/camng/src/sys/alpha/isa/mcclock_isa.c#2 delete .. //depot/projects/camng/src/sys/alpha/linux/Makefile#2 delete .. //depot/projects/camng/src/sys/alpha/linux/linux.h#2 delete .. //depot/projects/camng/src/sys/alpha/linux/linux_dummy.c#2 delete .. //depot/projects/camng/src/sys/alpha/linux/linux_genassym.c#2 delete .. //depot/projects/camng/src/sys/alpha/linux/linux_ipc64.h#2 delete .. //depot/projects/camng/src/sys/alpha/linux/linux_locore.s#2 delete .. //depot/projects/camng/src/sys/alpha/linux/linux_machdep.c#2 delete .. //depot/projects/camng/src/sys/alpha/linux/linux_proto.h#2 delete .. //depot/projects/camng/src/sys/alpha/linux/linux_syscall.h#2 delete .. //depot/projects/camng/src/sys/alpha/linux/linux_sysent.c#2 delete .. //depot/projects/camng/src/sys/alpha/linux/linux_sysvec.c#2 delete .. //depot/projects/camng/src/sys/alpha/linux/syscalls.conf#2 delete .. //depot/projects/camng/src/sys/alpha/linux/syscalls.master#2 delete .. //depot/projects/camng/src/sys/alpha/mcbus/mcbus.c#2 delete .. //depot/projects/camng/src/sys/alpha/mcbus/mcbusreg.h#2 delete .. //depot/projects/camng/src/sys/alpha/mcbus/mcbusvar.h#2 delete .. //depot/projects/camng/src/sys/alpha/mcbus/mcmem.c#2 delete .. //depot/projects/camng/src/sys/alpha/mcbus/mcpcia.c#2 delete .. //depot/projects/camng/src/sys/alpha/mcbus/mcpciareg.h#2 delete .. //depot/projects/camng/src/sys/alpha/mcbus/mcpciavar.h#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/Makefile#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/README.mach-traps#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/exec_ecoff.h#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/imgact_osf1.c#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/osf1.h#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/osf1_ioctl.c#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/osf1_misc.c#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/osf1_mount.c#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/osf1_proto.h#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/osf1_signal.c#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/osf1_signal.h#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/osf1_syscall.h#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/osf1_sysent.c#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/osf1_sysvec.c#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/osf1_util.h#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/syscalls.conf#2 delete .. //depot/projects/camng/src/sys/alpha/osf1/syscalls.master#2 delete .. //depot/projects/camng/src/sys/alpha/pci/alphapci_if.m#2 delete .. //depot/projects/camng/src/sys/alpha/pci/apecs.c#2 delete .. //depot/projects/camng/src/sys/alpha/pci/apecs_pci.c#2 delete .. //depot/projects/camng/src/sys/alpha/pci/apecsreg.h#2 delete .. //depot/projects/camng/src/sys/alpha/pci/apecsvar.h#2 delete .. //depot/projects/camng/src/sys/alpha/pci/bwx.c#2 delete .. //depot/projects/camng/src/sys/alpha/pci/cia.c#2 delete .. //depot/projects/camng/src/sys/alpha/pci/cia_pci.c#2 delete .. //depot/projects/camng/src/sys/alpha/pci/ciareg.h#2 delete .. //depot/projects/camng/src/sys/alpha/pci/ciavar.h#2 delete .. //depot/projects/camng/src/sys/alpha/pci/irongate.c#2 delete .. //depot/projects/camng/src/sys/alpha/pci/irongate_pci.c#2 delete .. //depot/projects/camng/src/sys/alpha/pci/irongatereg.h#2 delete .. //depot/projects/camng/src/sys/alpha/pci/irongatevar.h#2 delete .. //depot/projects/camng/src/sys/alpha/pci/lca.c#2 delete .. //depot/projects/camng/src/sys/alpha/pci/lca_pci.c#2 delete .. //depot/projects/camng/src/sys/alpha/pci/lcareg.h#2 delete .. //depot/projects/camng/src/sys/alpha/pci/lcavar.h#2 delete .. //depot/projects/camng/src/sys/alpha/pci/pci_eb164_intr.s#2 delete .. //depot/projects/camng/src/sys/alpha/pci/pci_eb64plus_intr.s#2 delete .. //depot/projects/camng/src/sys/alpha/pci/pcibus.c#2 delete .. //depot/projects/camng/src/sys/alpha/pci/pcibus.h#2 delete .. //depot/projects/camng/src/sys/alpha/pci/swiz.c#2 delete .. //depot/projects/camng/src/sys/alpha/pci/t2.c#2 delete .. //depot/projects/camng/src/sys/alpha/pci/t2_pci.c#2 delete .. //depot/projects/camng/src/sys/alpha/pci/t2reg.h#2 delete .. //depot/projects/camng/src/sys/alpha/pci/t2var.h#2 delete .. //depot/projects/camng/src/sys/alpha/pci/tsunami.c#2 delete .. //depot/projects/camng/src/sys/alpha/pci/tsunami_pci.c#2 delete .. //depot/projects/camng/src/sys/alpha/pci/tsunamireg.h#2 delete .. //depot/projects/camng/src/sys/alpha/pci/tsunamivar.h#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/dwlpx.c#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/dwlpxreg.h#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/dwlpxvar.h#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/gbus.c#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/gbusreg.h#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/gbusvar.h#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/kftxx.c#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/kftxxreg.h#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/kftxxvar.h#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/mcclock_tlsb.c#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/tlsb.c#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/tlsbcpu.c#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/tlsbmem.c#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/tlsbreg.h#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/tlsbvar.h#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/zs_tlsb.c#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/zsreg.h#2 delete .. //depot/projects/camng/src/sys/alpha/tlsb/zsvar.h#2 delete .. //depot/projects/camng/src/sys/arm/compile/.cvsignore#2 delete .. //depot/projects/camng/src/sys/arm/include/_stdint.h#2 delete .. //depot/projects/camng/src/sys/arm/include/_types.h#2 delete .. //depot/projects/camng/src/sys/arm/include/elf.h#2 delete .. //depot/projects/camng/src/sys/arm/include/endian.h#2 delete .. //depot/projects/camng/src/sys/arm/include/exec.h#2 delete .. //depot/projects/camng/src/sys/arm/include/limits.h#2 delete .. //depot/projects/camng/src/sys/arm/include/param.h#2 delete .. //depot/projects/camng/src/sys/arm/include/signal.h#2 delete .. //depot/projects/camng/src/sys/arm/include/ucontext.h#2 delete .. //depot/projects/camng/src/sys/boot/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/README#2 delete .. //depot/projects/camng/src/sys/boot/alpha/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/alpha/Makefile.inc#2 delete .. //depot/projects/camng/src/sys/boot/alpha/boot1/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/alpha/boot1/boot1.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/cdboot/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/alpha/cdboot/version#2 delete .. //depot/projects/camng/src/sys/boot/alpha/common/Makefile.common#2 delete .. //depot/projects/camng/src/sys/boot/alpha/common/conf.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/common/help.alpha#2 delete .. //depot/projects/camng/src/sys/boot/alpha/common/main.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/OSFpal.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/alpha_copy.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/alpha_module.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/bbinfo.h#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/bootinfo.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/common.h#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/delay.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/devicename.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/elf_freebsd.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/getsecs.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/libalpha.h#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/pal.S#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/prom.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/prom_disp.S#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/prom_swpal.S#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/reboot.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/srmdisk.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/srmnet.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/start.S#2 delete .. //depot/projects/camng/src/sys/boot/alpha/libalpha/time.c#2 delete .. //depot/projects/camng/src/sys/boot/alpha/loader/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/alpha/loader/version#2 delete .. //depot/projects/camng/src/sys/boot/alpha/netboot/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/alpha/netboot/version#2 delete .. //depot/projects/camng/src/sys/boot/arc/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/arc/Makefile.inc#2 delete .. //depot/projects/camng/src/sys/boot/arc/include/arcfuncs.h#2 delete .. //depot/projects/camng/src/sys/boot/arc/include/arctypes.h#2 delete .. //depot/projects/camng/src/sys/boot/arc/include/libarc.h#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/abort.c#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/arcconsole.c#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/arcdisk.c#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/arch/alpha/copy.c#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/arch/alpha/rpb.c#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/arch/alpha/setjmp.S#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/arch/alpha/start.S#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/bootinfo.c#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/delay.c#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/devicename.c#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/elf_freebsd.c#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/module.c#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/prom.c#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/setjmperr.c#2 delete .. //depot/projects/camng/src/sys/boot/arc/lib/time.c#2 delete .. //depot/projects/camng/src/sys/boot/arc/loader/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/arc/loader/conf.c#2 delete .. //depot/projects/camng/src/sys/boot/arc/loader/help.alpha#2 delete .. //depot/projects/camng/src/sys/boot/arc/loader/main.c#2 delete .. //depot/projects/camng/src/sys/boot/arc/loader/version#2 delete .. //depot/projects/camng/src/sys/boot/common/Makefile.inc#2 delete .. //depot/projects/camng/src/sys/boot/common/bcache.c#2 delete .. //depot/projects/camng/src/sys/boot/common/boot.c#2 delete .. //depot/projects/camng/src/sys/boot/common/bootstrap.h#2 delete .. //depot/projects/camng/src/sys/boot/common/commands.c#2 delete .. //depot/projects/camng/src/sys/boot/common/console.c#2 delete .. //depot/projects/camng/src/sys/boot/common/dev_net.c#2 delete .. //depot/projects/camng/src/sys/boot/common/dev_net.h#2 delete .. //depot/projects/camng/src/sys/boot/common/devopen.c#2 delete .. //depot/projects/camng/src/sys/boot/common/help.common#2 delete .. //depot/projects/camng/src/sys/boot/common/interp.c#2 delete .. //depot/projects/camng/src/sys/boot/common/interp_backslash.c#2 delete .. //depot/projects/camng/src/sys/boot/common/interp_forth.c#2 delete .. //depot/projects/camng/src/sys/boot/common/interp_parse.c#2 delete .. //depot/projects/camng/src/sys/boot/common/isapnp.c#2 delete .. //depot/projects/camng/src/sys/boot/common/isapnp.h#2 delete .. //depot/projects/camng/src/sys/boot/common/load.c#2 delete .. //depot/projects/camng/src/sys/boot/common/load_elf.c#2 delete .. //depot/projects/camng/src/sys/boot/common/loader.8#2 delete .. //depot/projects/camng/src/sys/boot/common/ls.c#2 delete .. //depot/projects/camng/src/sys/boot/common/merge_help.awk#2 delete .. //depot/projects/camng/src/sys/boot/common/misc.c#2 delete .. //depot/projects/camng/src/sys/boot/common/module.c#2 delete .. //depot/projects/camng/src/sys/boot/common/newvers.sh#2 delete .. //depot/projects/camng/src/sys/boot/common/panic.c#2 delete .. //depot/projects/camng/src/sys/boot/common/pnp.c#2 delete .. //depot/projects/camng/src/sys/boot/common/pnpdata#2 delete .. //depot/projects/camng/src/sys/boot/common/ufsread.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/efi/Makefile.inc#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/README#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efi.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efi_nii.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efiapi.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/eficon.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efidebug.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efidef.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efidevp.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efierr.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efifpswa.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efifs.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efilib.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efinet.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efipart.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efiprot.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efipxebc.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efiser.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/efistdarg.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/i386/efibind.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/i386/pe.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/ia64/efibind.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/include/ia64/pe.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/arch/ia64/start.S#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/bootinfo.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/copy.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/delay.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/devicename.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/efi_console.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/efiboot.h#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/efifpswa.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/efifs.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/efinet.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/elf_freebsd.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/exit.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/libefi.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/module.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/libefi/time.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/loader/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/efi/loader/conf.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/loader/main.c#2 delete .. //depot/projects/camng/src/sys/boot/efi/loader/version#2 delete .. //depot/projects/camng/src/sys/boot/ficl/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/ficl/alpha/sysdep.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/alpha/sysdep.h#2 delete .. //depot/projects/camng/src/sys/boot/ficl/dict.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/ficl.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/ficl.h#2 delete .. //depot/projects/camng/src/sys/boot/ficl/fileaccess.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/float.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/i386/sysdep.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/i386/sysdep.h#2 delete .. //depot/projects/camng/src/sys/boot/ficl/ia64/sysdep.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/ia64/sysdep.h#2 delete .. //depot/projects/camng/src/sys/boot/ficl/loader.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/math64.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/math64.h#2 delete .. //depot/projects/camng/src/sys/boot/ficl/prefix.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/search.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/softwords/classes.fr#2 delete .. //depot/projects/camng/src/sys/boot/ficl/softwords/ficlclass.fr#2 delete .. //depot/projects/camng/src/sys/boot/ficl/softwords/ficllocal.fr#2 delete .. //depot/projects/camng/src/sys/boot/ficl/softwords/fileaccess.fr#2 delete .. //depot/projects/camng/src/sys/boot/ficl/softwords/forml.fr#2 delete .. //depot/projects/camng/src/sys/boot/ficl/softwords/freebsd.fr#2 delete .. //depot/projects/camng/src/sys/boot/ficl/softwords/ifbrack.fr#2 delete .. //depot/projects/camng/src/sys/boot/ficl/softwords/jhlocal.fr#2 delete .. //depot/projects/camng/src/sys/boot/ficl/softwords/marker.fr#2 delete .. //depot/projects/camng/src/sys/boot/ficl/softwords/oo.fr#2 delete .. //depot/projects/camng/src/sys/boot/ficl/softwords/prefix.fr#2 delete .. //depot/projects/camng/src/sys/boot/ficl/softwords/softcore.awk#2 delete .. //depot/projects/camng/src/sys/boot/ficl/softwords/softcore.fr#2 delete .. //depot/projects/camng/src/sys/boot/ficl/softwords/string.fr#2 delete .. //depot/projects/camng/src/sys/boot/ficl/sparc64/sysdep.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/sparc64/sysdep.h#2 delete .. //depot/projects/camng/src/sys/boot/ficl/stack.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/testmain.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/tools.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/unix.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/vm.c#2 delete .. //depot/projects/camng/src/sys/boot/ficl/words.c#2 delete .. //depot/projects/camng/src/sys/boot/forth/loader.4th#2 delete .. //depot/projects/camng/src/sys/boot/forth/loader.4th.8#2 delete .. //depot/projects/camng/src/sys/boot/forth/loader.conf#2 delete .. //depot/projects/camng/src/sys/boot/forth/loader.conf.5#2 delete .. //depot/projects/camng/src/sys/boot/forth/loader.rc#2 delete .. //depot/projects/camng/src/sys/boot/forth/pnp.4th#2 delete .. //depot/projects/camng/src/sys/boot/forth/support.4th#2 delete .. //depot/projects/camng/src/sys/boot/i386/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/i386/Makefile.inc#2 delete .. //depot/projects/camng/src/sys/boot/i386/boot0/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/i386/boot0/boot0.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/boot2/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/i386/boot2/boot1.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/boot2/boot2.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/boot2/lib.h#2 delete .. //depot/projects/camng/src/sys/boot/i386/boot2/sio.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/btx/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/i386/btx/btx/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/i386/btx/btx/btx.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/btx/btxldr/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/i386/btx/btxldr/btxldr.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/btx/lib/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/i386/btx/lib/btxcsu.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/btx/lib/btxsys.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/btx/lib/btxv86.h#2 delete .. //depot/projects/camng/src/sys/boot/i386/btx/lib/btxv86.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/cdboot/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/i386/cdboot/cdboot.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/kgzldr/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/i386/kgzldr/boot.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/kgzldr/crt.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/kgzldr/kgzldr.h#2 delete .. //depot/projects/camng/src/sys/boot/i386/kgzldr/lib.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/kgzldr/sio.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/kgzldr/start.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/biosacpi.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/bioscd.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/biosdisk.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/biosmem.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/biospci.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/biospnp.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/bootinfo.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/comconsole.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/devicename.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/elf_freebsd.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/gatea20.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/i386_copy.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/i386_module.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/libi386.h#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/nullconsole.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/pread.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/pxe.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/pxe.h#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/pxetramp.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/time.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/libi386/vidconsole.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/liloldr/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/i386/liloldr/lilobsect.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/liloldr/liloldr.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/loader/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/i386/loader/conf.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/loader/help.i386#2 delete .. //depot/projects/camng/src/sys/boot/i386/loader/main.c#2 delete .. //depot/projects/camng/src/sys/boot/i386/loader/version#2 delete .. //depot/projects/camng/src/sys/boot/i386/mbr/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/i386/mbr/mbr.s#2 delete .. //depot/projects/camng/src/sys/boot/i386/pxeldr/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/i386/pxeldr/pxeboot.8#2 delete .. //depot/projects/camng/src/sys/boot/i386/pxeldr/pxeldr.s#2 delete .. //depot/projects/camng/src/sys/boot/ia64/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/ia64/Makefile.inc#2 delete .. //depot/projects/camng/src/sys/boot/ia64/libski/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/ia64/libski/bootinfo.c#2 delete .. //depot/projects/camng/src/sys/boot/ia64/libski/copy.c#2 delete .. //depot/projects/camng/src/sys/boot/ia64/libski/delay.c#2 delete .. //depot/projects/camng/src/sys/boot/ia64/libski/devicename.c#2 delete .. //depot/projects/camng/src/sys/boot/ia64/libski/elf_freebsd.c#2 delete .. //depot/projects/camng/src/sys/boot/ia64/libski/exit.c#2 delete .. //depot/projects/camng/src/sys/boot/ia64/libski/libski.h#2 delete .. //depot/projects/camng/src/sys/boot/ia64/libski/module.c#2 delete .. //depot/projects/camng/src/sys/boot/ia64/libski/skiconsole.c#2 delete .. //depot/projects/camng/src/sys/boot/ia64/libski/skifs.c#2 delete .. //depot/projects/camng/src/sys/boot/ia64/libski/ssc.c#2 delete .. //depot/projects/camng/src/sys/boot/ia64/libski/time.c#2 delete .. //depot/projects/camng/src/sys/boot/ia64/skiload/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/ia64/skiload/conf.c#2 delete .. //depot/projects/camng/src/sys/boot/ia64/skiload/ldscript.ia64#2 delete .. //depot/projects/camng/src/sys/boot/ia64/skiload/main.c#2 delete .. //depot/projects/camng/src/sys/boot/ia64/skiload/skiload.cmd#2 delete .. //depot/projects/camng/src/sys/boot/ia64/skiload/version#2 delete .. //depot/projects/camng/src/sys/boot/libstand/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/libstand/__main.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/alpha/_setjmp.S#2 delete .. //depot/projects/camng/src/sys/boot/libstand/arp.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/assert.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/bcd.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/bootp.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/bootp.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/bootparam.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/bootparam.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/bswap.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/bzipfs.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/bzlib.c.diff#2 delete .. //depot/projects/camng/src/sys/boot/libstand/bzlib.h.diff#2 delete .. //depot/projects/camng/src/sys/boot/libstand/bzlib_private.h.diff#2 delete .. //depot/projects/camng/src/sys/boot/libstand/cd9660.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/close.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/closeall.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/dev.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/dosfs.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/dosfs.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/environment.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/ether.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/ext2fs.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/fstat.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/getopt.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/gets.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/globals.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/i386/_setjmp.S#2 delete .. //depot/projects/camng/src/sys/boot/libstand/if_ether.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/in_cksum.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/inet_ntoa.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/ioctl.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/iodesc.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/libstand.3#2 delete .. //depot/projects/camng/src/sys/boot/libstand/lseek.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/net.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/net.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/netif.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/netif.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/nfs.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/nfsv2.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/nullfs.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/open.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/pager.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/powerpc/_setjmp.S#2 delete .. //depot/projects/camng/src/sys/boot/libstand/printf.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/qdivrem.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/quad.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/random.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/rarp.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/read.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/readdir.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/rpc.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/rpc.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/rpcv2.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/saioctl.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/sbrk.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/sparc64/_setjmp.S#2 delete .. //depot/projects/camng/src/sys/boot/libstand/splitfs.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/stand.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/stat.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/strcasecmp.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/strdup.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/strerror.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/strtol.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/tftp.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/tftp.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/twiddle.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/udp.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/ufs.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/write.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/zalloc.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/zalloc_defs.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/zalloc_malloc.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/zalloc_mem.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/zalloc_protos.h#2 delete .. //depot/projects/camng/src/sys/boot/libstand/zipfs.c#2 delete .. //depot/projects/camng/src/sys/boot/libstand/zutil.h.diff#2 delete .. //depot/projects/camng/src/sys/boot/ofw/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/ofw/common/Makefile.inc#2 delete .. //depot/projects/camng/src/sys/boot/ofw/common/main.c#2 delete .. //depot/projects/camng/src/sys/boot/ofw/libofw/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/ofw/libofw/devicename.c#2 delete .. //depot/projects/camng/src/sys/boot/ofw/libofw/elf_freebsd.c#2 delete .. //depot/projects/camng/src/sys/boot/ofw/libofw/libofw.h#2 delete .. //depot/projects/camng/src/sys/boot/ofw/libofw/ofw_console.c#2 delete .. //depot/projects/camng/src/sys/boot/ofw/libofw/ofw_copy.c#2 delete .. //depot/projects/camng/src/sys/boot/ofw/libofw/ofw_disk.c#2 delete .. //depot/projects/camng/src/sys/boot/ofw/libofw/ofw_memory.c#2 delete .. //depot/projects/camng/src/sys/boot/ofw/libofw/ofw_module.c#2 delete .. //depot/projects/camng/src/sys/boot/ofw/libofw/ofw_net.c#2 delete .. //depot/projects/camng/src/sys/boot/ofw/libofw/ofw_reboot.c#2 delete .. //depot/projects/camng/src/sys/boot/ofw/libofw/ofw_time.c#2 delete .. //depot/projects/camng/src/sys/boot/ofw/libofw/openfirm.c#2 delete .. //depot/projects/camng/src/sys/boot/ofw/libofw/openfirm.h#2 delete .. //depot/projects/camng/src/sys/boot/pc98/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/pc98/Makefile.inc#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot0.5/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot0.5/boot.s#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot0.5/boot0.5.s#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot0.5/disk.s#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot0.5/selector.s#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot0.5/start.s#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot0.5/support.s#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot0.5/syscons.s#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot0/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot0/boot0.s#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/README.serial.98#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/asm.S#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/asm.h#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/bios.S#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/boot.c#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/boot.h#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/boot2.S#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/dinode.h#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/disk.c#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/fs.h#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/inode.h#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/io.c#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/probe_keyboard.c#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/quota.h#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/serial.S#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/serial_16550.S#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/serial_8251.S#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/start.S#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/sys.c#2 delete .. //depot/projects/camng/src/sys/boot/pc98/boot2/table.c#2 delete .. //depot/projects/camng/src/sys/boot/pc98/btx/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/pc98/btx/btx/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/pc98/btx/btx/btx.s#2 delete .. //depot/projects/camng/src/sys/boot/pc98/btx/btxldr/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/pc98/btx/btxldr/btxldr.s#2 delete .. //depot/projects/camng/src/sys/boot/pc98/btx/lib/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/pc98/btx/lib/btxcsu.s#2 delete .. //depot/projects/camng/src/sys/boot/pc98/btx/lib/btxsys.s#2 delete .. //depot/projects/camng/src/sys/boot/pc98/btx/lib/btxv86.h#2 delete .. //depot/projects/camng/src/sys/boot/pc98/btx/lib/btxv86.s#2 delete .. //depot/projects/camng/src/sys/boot/pc98/kgzldr/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/pc98/kgzldr/crt.s#2 delete .. //depot/projects/camng/src/sys/boot/pc98/libpc98/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/pc98/libpc98/biosdisk.c#2 delete .. //depot/projects/camng/src/sys/boot/pc98/libpc98/biosmem.c#2 delete .. //depot/projects/camng/src/sys/boot/pc98/libpc98/comconsole.c#2 delete .. //depot/projects/camng/src/sys/boot/pc98/libpc98/gatea20.c#2 delete .. //depot/projects/camng/src/sys/boot/pc98/libpc98/time.c#2 delete .. //depot/projects/camng/src/sys/boot/pc98/libpc98/vidconsole.c#2 delete .. //depot/projects/camng/src/sys/boot/pc98/loader/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/pc98/loader/main.c#2 delete .. //depot/projects/camng/src/sys/boot/powerpc/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/powerpc/loader/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/powerpc/loader/conf.c#2 delete .. //depot/projects/camng/src/sys/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/camng/src/sys/boot/powerpc/loader/metadata.c#2 delete .. //depot/projects/camng/src/sys/boot/powerpc/loader/start.c#2 delete .. //depot/projects/camng/src/sys/boot/powerpc/loader/version#2 delete .. //depot/projects/camng/src/sys/boot/sparc64/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/sparc64/boot1/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/sparc64/boot1/_start.S#2 delete .. //depot/projects/camng/src/sys/boot/sparc64/boot1/boot1.c#2 delete .. //depot/projects/camng/src/sys/boot/sparc64/loader/Makefile#2 delete .. //depot/projects/camng/src/sys/boot/sparc64/loader/help.sparc64#2 delete .. //depot/projects/camng/src/sys/boot/sparc64/loader/locore.S#2 delete .. //depot/projects/camng/src/sys/boot/sparc64/loader/main.c#2 delete .. //depot/projects/camng/src/sys/boot/sparc64/loader/metadata.c#2 delete .. //depot/projects/camng/src/sys/boot/sparc64/loader/version#2 delete .. //depot/projects/camng/src/sys/cam/cam.c#2 delete .. //depot/projects/camng/src/sys/cam/cam.h#2 delete .. //depot/projects/camng/src/sys/cam/cam_ccb.h#2 delete .. //depot/projects/camng/src/sys/cam/cam_debug.h#2 delete .. //depot/projects/camng/src/sys/cam/cam_periph.c#2 delete .. //depot/projects/camng/src/sys/cam/cam_periph.h#2 delete .. //depot/projects/camng/src/sys/cam/cam_queue.c#2 delete .. //depot/projects/camng/src/sys/cam/cam_queue.h#2 delete .. //depot/projects/camng/src/sys/cam/cam_sim.c#2 delete .. //depot/projects/camng/src/sys/cam/cam_sim.h#2 delete .. //depot/projects/camng/src/sys/cam/cam_xpt.c#2 delete .. //depot/projects/camng/src/sys/cam/cam_xpt.h#2 delete .. //depot/projects/camng/src/sys/cam/cam_xpt_periph.h#2 delete .. //depot/projects/camng/src/sys/cam/cam_xpt_sim.h#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_all.c#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_all.h#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_cd.c#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_cd.h#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_ch.c#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_ch.h#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_da.c#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_da.h#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_dvcfg.h#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_iu.h#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_low.c#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_low.h#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_low_pisa.c#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_low_pisa.h#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_message.h#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_pass.c#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_pass.h#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_pt.c#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_pt.h#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_sa.c#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_sa.h#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_ses.c#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_ses.h#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_targ_bh.c#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_target.c#2 delete .. //depot/projects/camng/src/sys/cam/scsi/scsi_targetio.h#2 delete .. //depot/projects/camng/src/sys/coda/00READ#2 delete .. //depot/projects/camng/src/sys/coda/README#2 delete .. //depot/projects/camng/src/sys/coda/TODO#2 delete .. //depot/projects/camng/src/sys/coda/cnode.h#2 delete .. //depot/projects/camng/src/sys/coda/coda.h#2 delete .. //depot/projects/camng/src/sys/coda/coda_fbsd.c#2 delete .. //depot/projects/camng/src/sys/coda/coda_io.h#2 delete .. //depot/projects/camng/src/sys/coda/coda_kernel.h#2 delete .. //depot/projects/camng/src/sys/coda/coda_namecache.c#2 delete .. //depot/projects/camng/src/sys/coda/coda_namecache.h#2 delete .. //depot/projects/camng/src/sys/coda/coda_opstats.h#2 delete .. //depot/projects/camng/src/sys/coda/coda_pioctl.h#2 delete .. //depot/projects/camng/src/sys/coda/coda_psdev.c#2 delete .. //depot/projects/camng/src/sys/coda/coda_psdev.h#2 delete .. //depot/projects/camng/src/sys/coda/coda_subr.c#2 delete .. //depot/projects/camng/src/sys/coda/coda_subr.h#2 delete .. //depot/projects/camng/src/sys/coda/coda_venus.c#2 delete .. //depot/projects/camng/src/sys/coda/coda_venus.h#2 delete .. //depot/projects/camng/src/sys/coda/coda_vfsops.c#2 delete .. //depot/projects/camng/src/sys/coda/coda_vfsops.h#2 delete .. //depot/projects/camng/src/sys/coda/coda_vnops.c#2 delete .. //depot/projects/camng/src/sys/coda/coda_vnops.h#2 delete .. //depot/projects/camng/src/sys/compat/linprocfs/linprocfs.c#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_file.c#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_getcwd.c#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_ioctl.c#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_ioctl.h#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_ipc.c#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_ipc.h#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_mib.c#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_mib.h#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_misc.c#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_signal.c#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_signal.h#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_socket.c#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_socket.h#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_stats.c#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_sysctl.c#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_uid16.c#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_util.c#2 delete .. //depot/projects/camng/src/sys/compat/linux/linux_util.h#2 delete .. //depot/projects/camng/src/sys/compat/pecoff/imgact_pecoff.c#2 delete .. //depot/projects/camng/src/sys/compat/pecoff/imgact_pecoff.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/Makefile#2 delete .. //depot/projects/camng/src/sys/compat/svr4/imgact_svr4.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_acl.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_dirent.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_errno.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_exec.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_fcntl.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_fcntl.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_filio.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_filio.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_fuser.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_hrt.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_ioctl.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_ioctl.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_ipc.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_ipc.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_misc.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_mman.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_proto.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_resource.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_resource.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_siginfo.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_signal.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_signal.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_socket.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_socket.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_sockio.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_sockio.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_sockmod.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_stat.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_stat.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_statvfs.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_stream.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_stropts.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_syscall.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_syscallnames.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_sysconfig.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_sysent.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_systeminfo.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_sysvec.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_termios.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_termios.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_time.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_timod.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_ttold.c#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_ttold.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_types.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_ucontext.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_ulimit.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_ustat.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_util.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_utsname.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/svr4_wait.h#2 delete .. //depot/projects/camng/src/sys/compat/svr4/syscalls.conf#2 delete .. //depot/projects/camng/src/sys/compat/svr4/syscalls.master#2 delete .. //depot/projects/camng/src/sys/conf/Makefile.alpha#2 delete .. //depot/projects/camng/src/sys/conf/Makefile.i386#2 delete .. //depot/projects/camng/src/sys/conf/Makefile.ia64#2 delete .. //depot/projects/camng/src/sys/conf/Makefile.pc98#2 delete .. //depot/projects/camng/src/sys/conf/Makefile.powerpc#2 delete .. //depot/projects/camng/src/sys/conf/Makefile.sparc64#2 delete .. //depot/projects/camng/src/sys/conf/Makefile.x86_64#2 delete .. //depot/projects/camng/src/sys/conf/NOTES#2 delete .. //depot/projects/camng/src/sys/conf/defines#2 delete .. //depot/projects/camng/src/sys/conf/files#2 delete .. //depot/projects/camng/src/sys/conf/files.alpha#2 delete .. //depot/projects/camng/src/sys/conf/files.i386#2 delete .. //depot/projects/camng/src/sys/conf/files.ia64#2 delete .. //depot/projects/camng/src/sys/conf/files.pc98#2 delete .. //depot/projects/camng/src/sys/conf/files.powerpc#2 delete .. //depot/projects/camng/src/sys/conf/files.sparc64#2 delete .. //depot/projects/camng/src/sys/conf/files.x86_64#2 delete .. //depot/projects/camng/src/sys/conf/kern.mk#2 delete .. //depot/projects/camng/src/sys/conf/kern.post.mk#2 delete .. //depot/projects/camng/src/sys/conf/kern.pre.mk#2 delete .. //depot/projects/camng/src/sys/conf/kmod.mk#2 delete .. //depot/projects/camng/src/sys/conf/kmod_syms.awk#2 delete .. //depot/projects/camng/src/sys/conf/ldscript.alpha#2 delete .. //depot/projects/camng/src/sys/conf/ldscript.i386#2 delete .. //depot/projects/camng/src/sys/conf/ldscript.ia64#2 delete .. //depot/projects/camng/src/sys/conf/ldscript.powerpc#2 delete .. //depot/projects/camng/src/sys/conf/ldscript.sparc64#2 delete .. //depot/projects/camng/src/sys/conf/majors#2 delete .. //depot/projects/camng/src/sys/conf/makeLINT.sed#2 delete .. //depot/projects/camng/src/sys/conf/newvers.sh#2 delete .. //depot/projects/camng/src/sys/conf/options#2 delete .. //depot/projects/camng/src/sys/conf/options.alpha#2 delete .. //depot/projects/camng/src/sys/conf/options.i386#2 delete .. //depot/projects/camng/src/sys/conf/options.ia64#2 delete .. //depot/projects/camng/src/sys/conf/options.pc98#2 delete .. //depot/projects/camng/src/sys/conf/options.powerpc#2 delete .. //depot/projects/camng/src/sys/conf/options.sparc64#2 delete .. //depot/projects/camng/src/sys/conf/options.x86_64#2 delete .. //depot/projects/camng/src/sys/conf/systags.sh#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/CHANGES.txt#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acapps.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acconfig.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acdebug.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acdisasm.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acdispat.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acdos16.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acefi.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acenv.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acevents.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acexcep.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acfreebsd.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acgcc.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acglobal.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/achware.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acinterp.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/aclocal.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acmacros.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acnamesp.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acobject.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acoutput.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acparser.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acpi.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acpica_prep.sh#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acpiosxf.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acpixf.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acresrc.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acstruct.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/actables.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/actbl.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/actbl1.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/actbl2.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/actbl71.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/actypes.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/acutils.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/amlcode.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/amlresrc.h#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dbcmds.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dbdisply.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dbexec.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dbfileio.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dbhistry.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dbinput.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dbstats.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dbutils.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dbxface.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dmbuffer.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dmnames.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dmopcode.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dmresrc.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dmresrcl.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dmresrcs.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dmutils.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dmwalk.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dsfield.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dsmethod.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dsmthdat.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dsobject.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dsopcode.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dsutils.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dswexec.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dswload.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dswscope.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/dswstate.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/evevent.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/evmisc.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/evregion.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/evrgnini.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/evsci.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/evxface.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/evxfevnt.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/evxfregn.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exconfig.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exconvrt.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/excreate.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exdump.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exfield.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exfldio.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exmisc.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exmutex.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exnames.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exoparg1.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exoparg2.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exoparg3.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exoparg6.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exprep.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exregion.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exresnte.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exresolv.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exresop.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exstore.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exstoren.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exstorob.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exsystem.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/exutils.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/hwacpi.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/hwgpe.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/hwregs.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/hwsleep.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/hwtimer.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/nsaccess.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/nsalloc.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/nsdump.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/nsdumpdv.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/nseval.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/nsinit.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/nsload.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/nsnames.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/nsobject.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/nssearch.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/nsutils.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/nswalk.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/nsxfeval.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/nsxfname.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/nsxfobj.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/psargs.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/psfind.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/psopcode.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/psparse.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/psscope.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/pstree.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/psutils.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/pswalk.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/psxface.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/rsaddr.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/rscalc.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/rscreate.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/rsdump.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/rsio.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/rsirq.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/rslist.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/rsmemory.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/rsmisc.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/rsutils.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/rsxface.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/tbconvrt.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/tbget.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/tbgetall.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/tbinstal.c#2 delete .. //depot/projects/camng/src/sys/contrib/dev/acpica/tbrsdt.c#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 29 18:44:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4B3216A4C1; Mon, 29 Sep 2003 18:44:53 -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 7D3E116A4B3 for ; Mon, 29 Sep 2003 18:44:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BC544402A for ; Mon, 29 Sep 2003 18:44:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U1iqXJ027971 for ; Mon, 29 Sep 2003 18:44:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U1iqoU027968 for perforce@freebsd.org; Mon, 29 Sep 2003 18:44:52 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 18:44:52 -0700 (PDT) Message-Id: <200309300144.h8U1iqoU027968@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 38828 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, 30 Sep 2003 01:44:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=38828 Change 38828 by peter@peter_hammer on 2003/09/29 18:43:50 suck this in from jhb_acpipci Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/hammer/sys/conf/files.amd64#24 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.amd64#24 (text+ko) ==== @@ -65,6 +65,7 @@ amd64/amd64/exception.S standard amd64/amd64/identcpu.c standard amd64/amd64/initcpu.c standard +amd64/amd64/intr_machdep.c standard amd64/amd64/io_apic.c standard amd64/amd64/legacy.c standard amd64/amd64/local_apic.c standard From owner-p4-projects@FreeBSD.ORG Mon Sep 29 18:44:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0240316A4E3; Mon, 29 Sep 2003 18:44:53 -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 A034F16A4BF for ; Mon, 29 Sep 2003 18:44:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B4ED44031 for ; Mon, 29 Sep 2003 18:44:53 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U1iqXJ027977 for ; Mon, 29 Sep 2003 18:44:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U1iq8g027974 for perforce@freebsd.org; Mon, 29 Sep 2003 18:44:52 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 18:44:52 -0700 (PDT) Message-Id: <200309300144.h8U1iq8g027974@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 38829 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, 30 Sep 2003 01:44:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=38829 Change 38829 by peter@peter_hammer on 2003/09/29 18:44:20 oh the horror that this file is! I don't know where to start. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#7 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#7 (text+ko) ==== @@ -251,10 +251,10 @@ setidt(IPI_INVLRNG, IDTVEC(invlrng), SDT_SYSIGT, SEL_KPL, 0); /* Install an inter-CPU IPI for forwarding hardclock() */ - setidt(IPI_HARDCLOCK, IDTVEC(hardclock), SDT_SYSIGT, 0); + setidt(IPI_HARDCLOCK, IDTVEC(hardclock), SDT_SYSIGT, SEL_KPL, 0); /* Install an inter-CPU IPI for forwarding statclock() */ - setidt(IPI_STATCLOCK, IDTVEC(statclock), SDT_SYSIGT, 0); + setidt(IPI_STATCLOCK, IDTVEC(statclock), SDT_SYSIGT, SEL_KPL, 0); /* Install an inter-CPU IPI for lazy pmap release */ setidt(IPI_LAZYPMAP, IDTVEC(lazypmap), SDT_SYSIGT, SEL_KPL, 0); @@ -322,9 +322,9 @@ int x, myid = bootAP; u_int cr0; - gdt_segs[GPRIV_SEL].ssd_base = (int) &SMP_prvspace[myid]; + gdt_segs[GPRIV_SEL].ssd_base = (long) &SMP_prvspace[myid]; gdt_segs[GPROC0_SEL].ssd_base = - (int) &SMP_prvspace[myid].pcpu.pc_common_tss; + (long) &SMP_prvspace[myid].pcpu.pc_common_tss; SMP_prvspace[myid].pcpu.pc_prvspace = &SMP_prvspace[myid].pcpu; @@ -333,7 +333,7 @@ } r_gdt.rd_limit = NGDT * sizeof(gdt[0]) - 1; - r_gdt.rd_base = (int) &gdt[myid * NGDT]; + r_gdt.rd_base = (long) &gdt[myid * NGDT]; lgdt(&r_gdt); /* does magic intra-segment return */ lidt(&r_idt); @@ -434,7 +434,7 @@ cpu++; /* first page of AP's private space */ - pg = cpu * i386_btop(sizeof(struct privatespace)); + pg = cpu * amd64_btop(sizeof(struct privatespace)); /* allocate a new private data page */ pc = (struct pcpu *)kmem_alloc(kernel_map, PAGE_SIZE); From owner-p4-projects@FreeBSD.ORG Mon Sep 29 18:51:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF39D16A4C0; Mon, 29 Sep 2003 18:51: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 B700B16A4B3 for ; Mon, 29 Sep 2003 18:51:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABA8744042 for ; Mon, 29 Sep 2003 18:51:01 -0700 (PDT) (envelope-from Hrishikesh_Dandekar@NAI.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U1p1XJ028396 for ; Mon, 29 Sep 2003 18:51:01 -0700 (PDT) (envelope-from Hrishikesh_Dandekar@NAI.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U1p0YG028380 for perforce@freebsd.org; Mon, 29 Sep 2003 18:51:00 -0700 (PDT) (envelope-from Hrishikesh_Dandekar@NAI.com) Date: Mon, 29 Sep 2003 18:51:00 -0700 (PDT) Message-Id: <200309300151.h8U1p0YG028380@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to Hrishikesh_Dandekar@NAI.com using -f From: Hrishikesh Dandekar To: Perforce Change Reviews Subject: PERFORCE change 38830 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, 30 Sep 2003 01:51:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=38830 Change 38830 by hdandeka@hdandeka_yash on 2003/09/29 18:50:05 Integrate the System V IPC and Posix semaphores related changes from the trustedbsd_mac parent branch. Affected files ... .. //depot/projects/trustedbsd/sebsd/include/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/sys/sem.c#4 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/sysv_ipc.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/sysv_msg.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/sysv_sem.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/sysv_shm.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/uipc_sem.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/mac_stub/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/sysvipc/sysvmsg/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/sysvipc/sysvsem/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/sysvipc/sysvshm/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/posix4/ksem.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/mac_biba/mac_biba.h#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#6 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/mac_policy.h#6 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/msg.h#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/msg_msg.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/sys/sem.h#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/shm.h#5 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/ipcs/ipcs.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/include/Makefile#6 (text+ko) ==== @@ -22,7 +22,7 @@ MHDRS= float.h floatingpoint.h stdarg.h varargs.h # posix4/mqueue.h is useless without an implementation and isn't installed: -PHDRS= sched.h semaphore.h _semaphore.h # mqueue.h +PHDRS= sched.h semaphore.h _semaphore.h ksem.h# mqueue.h LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \ termios.h ucontext.h ==== //depot/projects/trustedbsd/sebsd/lib/libc/sys/sem.c#4 (text+ko) ==== @@ -115,21 +115,20 @@ * Range check the arguments. */ if (pshared != 0) { - retval = ksem_init(&semid, value); - if (retval == -1) - goto RETURN; + if ((retval = ksem_init(&semid, value))) { + errno = retval; + return (-1); + } got_system_sem = 1; } (*sem) = sem_alloc(value, semid, got_system_sem); - if ((*sem) == NULL) - retval = -1; - else - retval = 0; - RETURN: - if (retval != 0 && got_system_sem) + if ((*sem) == NULL) { + errno = ENOSPC; ksem_destroy(semid); - return retval; + return (-1); + } + return (0); } int @@ -145,8 +144,9 @@ * make sure there are no waiters. */ if ((*sem)->syssem != 0) { - retval = ksem_destroy((*sem)->semid); - if (retval == -1) { + if ((retval = ksem_destroy((*sem)->semid))) { + errno = retval; + retval = -1; _pthread_mutex_unlock(&(*sem)->lock); goto RETURN; } @@ -173,6 +173,7 @@ semid_t semid; mode_t mode; unsigned int value; + int retval; mode = 0; value = 0; @@ -189,8 +190,10 @@ * we can be lazy and let the kernel handle the "oflag", * we'll just merge duplicate IDs into our list. */ - if (ksem_open(&semid, name, oflag, mode, value) == -1) + if ((retval = ksem_open(&semid, name, oflag, mode, value))) { + errno = retval; return (SEM_FAILED); + } /* * search for a duplicate ID, we must return the same sem_t * * if we locate one. @@ -230,13 +233,15 @@ int sem_close(sem_t *sem) { + int retval; if ((*sem)->syssem == 0) { errno = EINVAL; return (-1); } _pthread_mutex_lock(&named_sems_mtx); - if (ksem_close((*sem)->semid) == -1) { + if ((retval = ksem_close((*sem)->semid))) { + errno = retval; _pthread_mutex_unlock(&named_sems_mtx); return (-1); } @@ -250,8 +255,13 @@ int sem_unlink(const char *name) { + int retval; - return (ksem_unlink(name)); + if ((retval = ksem_unlink(name))) { + errno = retval; + return (-1); + } + return (0); } int @@ -262,9 +272,13 @@ _SEM_CHECK_VALIDITY(sem); if ((*sem)->syssem != 0) { - retval = ksem_wait((*sem)->semid); - goto RETURN; + if ((retval = ksem_wait((*sem)->semid))) { + errno = retval; + return (-1); + } + return (0); } + retval = 0; _pthread_mutex_lock(&(*sem)->lock); @@ -276,9 +290,7 @@ (*sem)->count--; _pthread_mutex_unlock(&(*sem)->lock); - - retval = 0; - RETURN: +RETURN: return retval; } @@ -290,8 +302,11 @@ _SEM_CHECK_VALIDITY(sem); if ((*sem)->syssem != 0) { - retval = ksem_trywait((*sem)->semid); - goto RETURN; + if ((retval = ksem_trywait((*sem)->semid))) { + errno = retval; + return (-1); + } + return (0); } _pthread_mutex_lock(&(*sem)->lock); @@ -305,8 +320,7 @@ } _pthread_mutex_unlock(&(*sem)->lock); - - RETURN: +RETURN: return retval; } @@ -318,10 +332,14 @@ _SEM_CHECK_VALIDITY(sem); if ((*sem)->syssem != 0) { - retval = ksem_post((*sem)->semid); - goto RETURN; + if ((retval = ksem_post((*sem)->semid))) { + errno = retval; + return (-1); + } + return (0); } + retval = 0; _pthread_mutex_lock(&(*sem)->lock); (*sem)->count++; @@ -329,9 +347,7 @@ _pthread_cond_signal(&(*sem)->gtzero); _pthread_mutex_unlock(&(*sem)->lock); - - retval = 0; - RETURN: +RETURN: return retval; } @@ -343,15 +359,17 @@ _SEM_CHECK_VALIDITY(sem); if ((*sem)->syssem != 0) { - retval = ksem_getvalue((*sem)->semid, sval); - goto RETURN; + if ((retval = ksem_getvalue((*sem)->semid, sval))) { + errno = retval; + return (-1); + } + return (0); } + retval = 0; _pthread_mutex_lock(&(*sem)->lock); *sval = (int)(*sem)->count; _pthread_mutex_unlock(&(*sem)->lock); - - retval = 0; - RETURN: +RETURN: return retval; } ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#9 (text+ko) ==== @@ -40,10 +40,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.94 2003/08/01 15:45:14 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.97 2003/08/21 18:21:22 rwatson Exp $"); #include "opt_mac.h" #include "opt_devfs.h" +#include "opt_posix.h" #include #include @@ -68,6 +69,12 @@ #include #include #include +#include +#include +#include +#include + +#include #include #include @@ -161,6 +168,11 @@ &mac_enforce_pipe, 0, "Enforce MAC policy on pipe operations"); TUNABLE_INT("security.mac.enforce_pipe", &mac_enforce_pipe); +static int mac_enforce_posix_sem = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_posix_sem, CTLFLAG_RW, + &mac_enforce_posix_sem, 0, "Enforce MAC policy on global POSIX semaphores"); +TUNABLE_INT("security.mac.enforce_posix_sem", &mac_enforce_posix_sem); + static int mac_enforce_process = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_process, CTLFLAG_RW, &mac_enforce_process, 0, "Enforce MAC policy on inter-process operations"); @@ -176,6 +188,11 @@ &mac_enforce_system, 0, "Enforce MAC policy on system operations"); TUNABLE_INT("security.mac.enforce_system", &mac_enforce_system); +static int mac_enforce_sysv = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv, CTLFLAG_RW, + &mac_enforce_sysv, 0, "Enforce MAC policy on System V IPC objects"); +TUNABLE_INT("security.mac.enforce_sysv", &mac_enforce_sysv); + static int mac_enforce_vm = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); @@ -185,6 +202,7 @@ SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation, CTLFLAG_RW, &mac_mmap_revocation, 0, "Revoke mmap access to files on subject " "relabel"); + static int mac_mmap_revocation_via_cow = 1; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation_via_cow, CTLFLAG_RW, &mac_mmap_revocation_via_cow, 0, "Revoke mmap access to files via " @@ -206,7 +224,8 @@ static unsigned int nmacmbufs, nmaccreds, nmacfiles, nmacifnets, nmacbpfdescs, nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, - nmacipqs, nmacpipes, nmacprocs; + nmacipqs, nmacpipes, nmacprocs, nmacipcmsgs, nmacipcmsqs, + nmacipcsemas, nmacipcshms, nmacposixksems; #define MAC_DEBUG_COUNTER_INC(x) atomic_add_int(x, 1); #define MAC_DEBUG_COUNTER_DEC(x) atomic_subtract_int(x, 1); @@ -237,6 +256,16 @@ &nmacvnodes, 0, "number of vnodes in use"); SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, devfsdirents, CTLFLAG_RD, &nmacdevfsdirents, 0, "number of devfs dirents inuse"); +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipc_msgs, CTLFLAG_RD, + &nmacipcmsgs, 0, "number of sysv ipc messages inuse"); +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipc_msqs, CTLFLAG_RD, + &nmacipcmsqs, 0, "number of sysv ipc message queue identifiers inuse"); +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipc_semas, CTLFLAG_RD, + &nmacipcsemas, 0, "number of sysv ipc semaphore identifiers inuse"); +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipc_shms, CTLFLAG_RD, + &nmacipcshms, 0, "number of sysv ipc shm identifiers inuse"); +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, posix_ksems, CTLFLAG_RD, + &nmacposixksems, 0, "number of posix global semaphores inuse"); #else #define MAC_DEBUG_COUNTER_INC(x) #define MAC_DEBUG_COUNTER_DEC(x) @@ -277,9 +306,11 @@ * exclusive consumers that they should try to acquire the lock if a * first attempt at exclusive access fails. */ +#ifndef MAC_STATIC static struct mtx mac_policy_mtx; static struct cv mac_policy_cv; static int mac_policy_count; +#endif static LIST_HEAD(, mac_policy_conf) mac_policy_list; static LIST_HEAD(, mac_policy_conf) mac_static_policy_list; @@ -295,42 +326,54 @@ static __inline void mac_policy_grab_exclusive(void) { + +#ifndef MAC_STATIC WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_policy_grab_exclusive() at %s:%d", __FILE__, __LINE__); mtx_lock(&mac_policy_mtx); while (mac_policy_count != 0) cv_wait(&mac_policy_cv, &mac_policy_mtx); +#endif } static __inline void mac_policy_assert_exclusive(void) { + +#ifndef MAC_STATIC mtx_assert(&mac_policy_mtx, MA_OWNED); KASSERT(mac_policy_count == 0, ("mac_policy_assert_exclusive(): not exclusive")); +#endif } static __inline void mac_policy_release_exclusive(void) { +#ifndef MAC_STATIC KASSERT(mac_policy_count == 0, ("mac_policy_release_exclusive(): not exclusive")); mtx_unlock(&mac_policy_mtx); cv_signal(&mac_policy_cv); +#endif } static __inline void mac_policy_list_busy(void) { + +#ifndef MAC_STATIC mtx_lock(&mac_policy_mtx); mac_policy_count++; mtx_unlock(&mac_policy_mtx); +#endif } static __inline int mac_policy_list_conditional_busy(void) { +#ifndef MAC_STATIC int ret; mtx_lock(&mac_policy_mtx); @@ -341,17 +384,23 @@ ret = 0; mtx_unlock(&mac_policy_mtx); return (ret); +#else + return (0); +#endif } static __inline void mac_policy_list_unbusy(void) { + +#ifndef MAC_STATIC mtx_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); +#endif } /* @@ -510,8 +559,10 @@ LIST_INIT(&mac_static_policy_list); LIST_INIT(&mac_policy_list); +#ifndef MAC_STATIC mtx_init(&mac_policy_mtx, "mac_policy_mtx", NULL, MTX_DEF); cv_init(&mac_policy_cv, "mac_policy_cv"); +#endif } /* @@ -566,6 +617,13 @@ error = 0; mpc = (struct mac_policy_conf *) data; +#ifdef MAC_STATIC + if (mac_late) { + printf("mac_policy_modevent: MAC_STATIC and late\n"); + return (EBUSY); + } +#endif + switch (type) { case MOD_LOAD: if (mpc->mpc_loadtime_flags & MPC_LOADTIME_FLAG_NOTLATE && @@ -840,6 +898,42 @@ mac_init_ifnet_label(&ifp->if_label); } +void +mac_init_ipc_msgmsg(struct msg *msgptr) +{ + + mac_init_label(&msgptr->label); + MAC_PERFORM(init_ipc_msgmsg_label, &msgptr->label); + MAC_DEBUG_COUNTER_INC(&nmacipcmsgs); +} + +void +mac_init_ipc_msgqueue(struct msqid_kernel *msqkptr) +{ + + mac_init_label(&msqkptr->label); + MAC_PERFORM(init_ipc_msgqueue_label, &msqkptr->label); + MAC_DEBUG_COUNTER_INC(&nmacipcmsqs); +} + +void +mac_init_ipc_sema(struct semid_kernel *semakptr) +{ + + mac_init_label(&semakptr->label); + MAC_PERFORM(init_ipc_sema_label, &semakptr->label); + MAC_DEBUG_COUNTER_INC(&nmacipcsemas); +} + +void +mac_init_ipc_shm(struct shmid_kernel *shmsegptr) +{ + + mac_init_label(&shmsegptr->label); + MAC_PERFORM(init_ipc_shm_label, &shmsegptr->label); + MAC_DEBUG_COUNTER_INC(&nmacipcshms); +} + int mac_init_ipq(struct ipq *ipq, int flag) { @@ -936,6 +1030,15 @@ mac_init_pipe_label(label); } +void +mac_init_posix_ksem(struct ksem *ksemptr) +{ + + mac_init_label(&ksemptr->ks_label); + MAC_PERFORM(init_posix_ksem_label, &ksemptr->ks_label); + MAC_DEBUG_COUNTER_INC(&nmacposixksems); +} + void mac_init_proc(struct proc *p) { @@ -1071,6 +1174,42 @@ } void +mac_destroy_ipc_msgmsg(struct msg *msgptr) +{ + + MAC_PERFORM(destroy_ipc_msgmsg_label, &msgptr->label); + mac_destroy_label(&msgptr->label); + MAC_DEBUG_COUNTER_DEC(&nmacipcmsgs); +} + +void +mac_destroy_ipc_msgqueue(struct msqid_kernel *msqkptr) +{ + + MAC_PERFORM(destroy_ipc_msgqueue_label, &msqkptr->label); + mac_destroy_label(&msqkptr->label); + MAC_DEBUG_COUNTER_DEC(&nmacipcmsqs); +} + +void +mac_destroy_ipc_sema(struct semid_kernel *semakptr) +{ + + MAC_PERFORM(destroy_ipc_sema_label, &semakptr->label); + mac_destroy_label(&semakptr->label); + MAC_DEBUG_COUNTER_DEC(&nmacipcsemas); +} + +void +mac_destroy_ipc_shm(struct shmid_kernel *shmsegptr) +{ + + MAC_PERFORM(destroy_ipc_shm_label, &shmsegptr->label); + mac_destroy_label(&shmsegptr->label); + MAC_DEBUG_COUNTER_DEC(&nmacipcshms); +} + +void mac_destroy_ipq(struct ipq *ipq) { @@ -1120,6 +1259,15 @@ } void +mac_destroy_posix_ksem(struct ksem *ksemptr) +{ + + MAC_PERFORM(destroy_posix_ksem_label, &ksemptr->ks_label); + mac_destroy_label(&ksemptr->ks_label); + MAC_DEBUG_COUNTER_DEC(&nmacposixksems); +} + +void mac_destroy_proc(struct proc *p) { @@ -2373,6 +2521,41 @@ } void +mac_create_ipc_msgmsg(struct ucred *cred, struct msg *msgptr) +{ + + MAC_PERFORM(create_ipc_msgmsg, cred, msgptr, &msgptr->label); +} + +void +mac_create_ipc_msgqueue(struct ucred *cred, struct msqid_kernel *msqkptr) +{ + + MAC_PERFORM(create_ipc_msgqueue, cred, msqkptr, &msqkptr->label); +} + +void +mac_create_ipc_sema(struct ucred *cred, struct semid_kernel *semakptr) +{ + + MAC_PERFORM(create_ipc_sema, cred, semakptr, &semakptr->label); +} + +void +mac_create_ipc_shm(struct ucred *cred, struct shmid_kernel *shmsegptr) +{ + + MAC_PERFORM(create_ipc_shm, cred, shmsegptr, &shmsegptr->label); +} + +void +mac_create_posix_ksem(struct ucred *cred, struct ksem *ksemptr) +{ + + MAC_PERFORM(create_posix_ksem, cred, ksemptr, &ksemptr->ks_label); +} + +void mac_create_file(struct ucred *cred, struct file *fp) { @@ -2630,6 +2813,34 @@ &mp->mnt_fslabel); } +void +mac_cleanup_ipc_msgmsg(struct msg *msgptr) +{ + + MAC_PERFORM(cleanup_ipc_msgmsg, &msgptr->label); +} + +void +mac_cleanup_ipc_msgqueue(struct msqid_kernel *msqkptr) +{ + + MAC_PERFORM(cleanup_ipc_msgqueue, &msqkptr->label); +} + +void +mac_cleanup_ipc_sema(struct semid_kernel *semakptr) +{ + + MAC_PERFORM(cleanup_ipc_sema, &semakptr->label); +} + +void +mac_cleanup_ipc_shm(struct shmid_kernel *shmsegptr) +{ + + MAC_PERFORM(cleanup_ipc_shm, &shmsegptr->label); +} + int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet) { @@ -2697,6 +2908,209 @@ } int +mac_check_ipc_msgmsq(struct ucred *cred, struct msg *msgptr, + struct msqid_kernel *msqkptr) +{ + int error; + + if (!mac_enforce_sysv) + return (0); + + //XXX: Should we also pass &msqkptr->label ?? + MAC_CHECK(check_ipc_msgmsq, cred, msgptr, msqkptr); + + return(error); +} + +int +mac_check_ipc_msgrcv(struct ucred *cred, struct msg *msgptr) +{ + int error; + + if (!mac_enforce_sysv) + return (0); + + //XXX: Should we also pass &msqkptr->label ?? + MAC_CHECK(check_ipc_msgrcv, cred, msgptr); + + return(error); +} + +int +mac_check_ipc_msgrmid(struct ucred *cred, struct msg *msgptr) +{ + int error; + + if (!mac_enforce_sysv) + return (0); + + //XXX: Should we also pass &msqkptr->label ?? + MAC_CHECK(check_ipc_msgrmid, cred, msgptr); + + return(error); +} + +int +mac_check_ipc_msqget(struct ucred *cred, struct msqid_kernel *msqkptr) +{ + int error; + + if (!mac_enforce_sysv) + return (0); + + //XXX: Should we also pass &msqkptr->label ?? + MAC_CHECK(check_ipc_msqget, cred, msqkptr); + + return(error); +} + +int +mac_check_ipc_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr) +{ + int error; + + if (!mac_enforce_sysv) + return (0); + + //XXX: Should we also pass &msqkptr->label ?? + MAC_CHECK(check_ipc_msqsnd, cred, msqkptr); + + return(error); +} + +int +mac_check_ipc_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr) +{ + int error; + + if (!mac_enforce_sysv) + return (0); + + //XXX: Should we also pass &msqkptr->label ?? + MAC_CHECK(check_ipc_msqrcv, cred, msqkptr); + + return(error); +} + +int +mac_check_ipc_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr, + int cmd) +{ + int error; + + if (!mac_enforce_sysv) + return (0); + + //XXX: Should we also pass &msqkptr->label ?? + MAC_CHECK(check_ipc_msqctl, cred, msqkptr, cmd); + + return(error); +} + +int +mac_check_ipc_semctl(struct ucred *cred, struct semid_kernel *semakptr, + int cmd) +{ + int error; + + if (!mac_enforce_sysv) + return (0); + + //XXX: Should we also pass &semakptr->label ?? + MAC_CHECK(check_ipc_semctl, cred, semakptr, cmd); + + return(error); +} + +int +mac_check_ipc_semget(struct ucred *cred, struct semid_kernel *semakptr) +{ + int error; + + if (!mac_enforce_sysv) + return (0); + + //XXX: Should we also pass &semakptr->label ?? + MAC_CHECK(check_ipc_semget, cred, semakptr); + + return(error); +} + +int +mac_check_ipc_semop(struct ucred *cred, struct semid_kernel *semakptr, + size_t accesstype) +{ + int error; + + if (!mac_enforce_sysv) + return (0); + + //XXX: Should we also pass &semakptr->label ?? + MAC_CHECK(check_ipc_semop, cred, semakptr, accesstype); + + return(error); +} + +int +mac_check_ipc_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, + int shmflg) +{ + int error; + + if (!mac_enforce_sysv) + return (0); + + //XXX: Should we also pass &shmsegptr->label ?? + MAC_CHECK(check_ipc_shmat, cred, shmsegptr, shmflg); + + return(error); +} + +int +mac_check_ipc_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr, + int cmd) +{ + int error; + + if (!mac_enforce_sysv) + return (0); + + //XXX: Should we also pass &shmsegptr->label ?? + MAC_CHECK(check_ipc_shmctl, cred, shmsegptr, cmd); + + return(error); +} + +int +mac_check_ipc_shmdt(struct ucred *cred, struct shmid_kernel *shmsegptr) +{ + int error; + + if (!mac_enforce_sysv) + return (0); + + //XXX: Should we also pass &shmsegptr->label ?? + MAC_CHECK(check_ipc_shmdt, cred, shmsegptr); + + return(error); +} + +int +mac_check_ipc_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, + int shmflg) +{ + int error; + + if (!mac_enforce_sysv) + return (0); + + //XXX: Should we also pass &shmsegptr->label ?? + MAC_CHECK(check_ipc_shmget, cred, shmsegptr, shmflg); + + return(error); +} + +int mac_check_kenv_dump(struct ucred *cred) { int error; @@ -2895,6 +3309,105 @@ } int +mac_check_posix_sem_close(struct ucred *cred, struct ksem *ksemptr) +{ + int error; + + if (!mac_enforce_posix_sem) + return (0); + + //XXX: Should we also pass &ksemptr->ks_label ?? + MAC_CHECK(check_posix_sem_close, cred, ksemptr); + + return(error); +} + +int +mac_check_posix_sem_destroy(struct ucred *cred, struct ksem *ksemptr) +{ + int error; + + if (!mac_enforce_posix_sem) + return (0); + + //XXX: Should we also pass &ksemptr->ks_label ?? + MAC_CHECK(check_posix_sem_destroy, cred, ksemptr); + + return(error); +} + +int +mac_check_posix_sem_openexisting(struct ucred *cred, struct ksem *ksemptr) +{ + int error; + + if (!mac_enforce_posix_sem) + return (0); + + //XXX: Should we also pass &ksemptr->ks_label ?? + MAC_CHECK(check_posix_sem_openexisting, cred, ksemptr); + + return(error); +} + +int +mac_check_posix_sem_getvalue(struct ucred *cred, struct ksem *ksemptr) +{ + int error; + + if (!mac_enforce_posix_sem) + return (0); + + //XXX: Should we also pass &ksemptr->ks_label ?? + MAC_CHECK(check_posix_sem_getvalue, cred, ksemptr); + + return(error); +} + +int +mac_check_posix_sem_post(struct ucred *cred, struct ksem *ksemptr) +{ + int error; + + if (!mac_enforce_posix_sem) + return (0); + + //XXX: Should we also pass &ksemptr->ks_label ?? + MAC_CHECK(check_posix_sem_post, cred, ksemptr); + + return(error); +} + +int +mac_check_posix_sem_unlink(struct ucred *cred, struct ksem *ksemptr) +{ + int error; + + if (!mac_enforce_posix_sem) + return (0); + + //XXX: Should we also pass &ksemptr->ks_label ?? + MAC_CHECK(check_posix_sem_unlink, cred, ksemptr); + + return(error); +} + +int +mac_check_posix_sem_wait(struct ucred *cred, struct ksem *ksemptr) +{ + int error; + + if (!mac_enforce_posix_sem) + return (0); + + //XXX: Should we also pass &ksemptr->ks_label ?? + MAC_CHECK(check_posix_sem_wait, cred, ksemptr); + + return(error); +} + + +int mac_check_proc_debug(struct ucred *cred, struct proc *proc) { int error; ==== //depot/projects/trustedbsd/sebsd/sys/kern/sysv_ipc.c#5 (text+ko) ==== @@ -71,6 +71,13 @@ * Check for ipc permission */ + +/* + * Note: The MAC Framework doesnt add any hook to the ipcperm function as + * fine-grained hooks are inserted throughout the ipc primitives. These hooks + * compliment the ipcperm check. + */ + int ipcperm(td, perm, mode) struct thread *td; ==== //depot/projects/trustedbsd/sebsd/sys/kern/sysv_msg.c#5 (text+ko) ==== @@ -21,6 +21,7 @@ __FBSDID("$FreeBSD: src/sys/kern/sysv_msg.c,v 1.49 2003/06/11 00:56:57 obrien Exp $"); #include "opt_sysvipc.h" +#include "opt_mac.h" #include #include @@ -36,6 +37,11 @@ #include #include #include +#ifdef MAC +#include +#include +#include +#endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 29 18:52:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C77616A4C0; Mon, 29 Sep 2003 18:52:04 -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 54E6616A4B3 for ; Mon, 29 Sep 2003 18:52:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D42B343FBD for ; Mon, 29 Sep 2003 18:52:03 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U1q3XJ028602 for ; Mon, 29 Sep 2003 18:52:03 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U1q31g028599 for perforce@freebsd.org; Mon, 29 Sep 2003 18:52:03 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 18:52:03 -0700 (PDT) Message-Id: <200309300152.h8U1q31g028599@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 38831 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, 30 Sep 2003 01:52:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=38831 Change 38831 by peter@peter_hammer on 2003/09/29 18:51:26 ugh. get this code off my make -k output. I have something better, based on the long mode entry examples in the amd64 manual. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mpboot.s#5 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mpboot.s#5 (text+ko) ==== @@ -45,6 +45,7 @@ */ .p2align 4 + .code32 NON_GPROF_ENTRY(MPentry) /* * Enable features on this processor. We don't support SMP on @@ -60,7 +61,7 @@ movl %eax,%cr4 /* Now enable paging mode */ - movl R(IdlePDPT), %eax + movl IdlePDT, %eax movl %eax, %cr3 movl %cr0,%eax orl $CR0_PE|CR0_PG,%eax /* enable paging */ From owner-p4-projects@FreeBSD.ORG Mon Sep 29 19:21:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0FE816A4C0; Mon, 29 Sep 2003 19:21: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 844DD16A4B3 for ; Mon, 29 Sep 2003 19:21:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD8CD43FE5 for ; Mon, 29 Sep 2003 19:21:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U2LeXJ030620 for ; Mon, 29 Sep 2003 19:21:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U2LeSb030617 for perforce@freebsd.org; Mon, 29 Sep 2003 19:21:40 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 19:21:40 -0700 (PDT) Message-Id: <200309300221.h8U2LeSb030617@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 38833 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, 30 Sep 2003 02:21:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=38833 Change 38833 by peter@peter_hammer on 2003/09/29 19:20:53 no, I won't go back to pretending the vector is part of the frame. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#8 edit .. //depot/projects/hammer/sys/amd64/include/apicvar.h#4 edit .. //depot/projects/hammer/sys/amd64/isa/atpic.c#5 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#8 (text+ko) ==== @@ -421,13 +421,14 @@ } void -lapic_handle_intr(struct intrframe frame) +lapic_handle_intr(void *cookie, struct intrframe frame) { struct intsrc *isrc; + int vec = (uintptr_t)cookie; - if (frame.if_vec == -1) + if (vec == -1) panic("Couldn't get vector from ISR!"); - isrc = intr_lookup_source(frame.if_vec); + isrc = intr_lookup_source(vec); isrc->is_pic->pic_disable_source(isrc); lapic->eoi = 0; intr_execute_handlers(isrc, &frame); ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#4 (text+ko) ==== @@ -152,7 +152,7 @@ void lapic_ipi_raw(register_t icrlo, u_int dest); void lapic_ipi_vectored(u_int vector, int dest); int lapic_ipi_wait(int delay); -void lapic_handle_intr(struct intrframe frame); +void lapic_handle_intr(void *cookie, struct intrframe frame); void lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id); int lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked); int lapic_set_lvt_mode(u_int apic_id, u_int lvt, u_int32_t mode); ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#5 (text+ko) ==== @@ -342,17 +342,17 @@ SYSINIT(atpic_init, SI_SUB_INTR, SI_ORDER_SECOND + 1, atpic_init, NULL) /* XXX */ -void atpic_sched_ithd(struct intrframe iframe); +void atpic_sched_ithd(void *cookie, struct intrframe iframe); void -atpic_sched_ithd(struct intrframe iframe) +atpic_sched_ithd(void *cookie, struct intrframe iframe) { struct atpic_intsrc *asrc; struct intsrc *isrc; + int vec = (uintptr_t)cookie; - KASSERT((uint)iframe.if_vec < ICU_LEN, - ("unknown int %d\n", iframe.if_vec)); - asrc = &atintrs[iframe.if_vec]; + KASSERT(vec < ICU_LEN, ("unknown int %d\n", vec)); + asrc = &atintrs[vec]; if (asrc->at_extsrc != NULL) isrc = asrc->at_extsrc; else From owner-p4-projects@FreeBSD.ORG Mon Sep 29 19:30:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AE7816A4C0; Mon, 29 Sep 2003 19:30:53 -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 16C7D16A4B3 for ; Mon, 29 Sep 2003 19:30:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E15F44029 for ; Mon, 29 Sep 2003 19:30:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U2UqXJ030964 for ; Mon, 29 Sep 2003 19:30:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U2Uq0U030961 for perforce@freebsd.org; Mon, 29 Sep 2003 19:30:52 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 19:30:52 -0700 (PDT) Message-Id: <200309300230.h8U2Uq0U030961@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 38834 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, 30 Sep 2003 02:30:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=38834 Change 38834 by peter@peter_hammer on 2003/09/29 19:30:26 hack! hack! Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#8 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#8 (text+ko) ==== @@ -157,7 +157,9 @@ static void set_logical_apic_ids(void); static int start_all_aps(u_int boot_addr); +#ifdef SMP_ME_HARDER static void install_ap_tramp(u_int boot_addr); +#endif static int start_ap(int apic_id, u_int boot_addr); void ap_init(void); static void release_aps(void *dummy); @@ -312,6 +314,7 @@ /* XXX: List I/O APICs? They are done differently now. */ } +#ifdef SMP_ME_HARDER /* * AP cpu's call this to sync up protected mode. */ @@ -359,6 +362,7 @@ cr0 &= ~(CR0_CD | CR0_NW | CR0_EM); load_cr0(cr0); } +#endif /******************************************************************* * local functions and data @@ -401,6 +405,7 @@ static int start_all_aps(u_int boot_addr) { +#ifdef SMP_ME_HARDER u_char mpbiosreason; u_long mpbioswarmvec; struct pcpu *pc; @@ -500,6 +505,7 @@ PTD[i] = 0; invltlb(); +#endif /* number of APs actually started */ return mp_naps; } @@ -508,6 +514,7 @@ * load the 1st level AP boot code into base memory. */ +#ifdef SMP_ME_HARDER /* targets for relocation */ extern void bigJump(void); extern void bootCodeSeg(void); @@ -560,6 +567,14 @@ *dst16 = (u_int) boot_addr & 0xffff; *dst8 = ((u_int) boot_addr >> 16) & 0xff; } +#endif + +void compile_hack(void); +void +compile_hack() +{ + start_ap(0, bootAP); +} /* * This function starts the AP (application processor) identified From owner-p4-projects@FreeBSD.ORG Mon Sep 29 19:36:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4849816A4C0; Mon, 29 Sep 2003 19:36:00 -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 21CEA16A4B3 for ; Mon, 29 Sep 2003 19:36:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99C4F4402B for ; Mon, 29 Sep 2003 19:35:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U2ZxXJ031127 for ; Mon, 29 Sep 2003 19:35:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U2Zw49031124 for perforce@freebsd.org; Mon, 29 Sep 2003 19:35:58 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 19:35:58 -0700 (PDT) Message-Id: <200309300235.h8U2Zw49031124@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 38835 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, 30 Sep 2003 02:36:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=38835 Change 38835 by peter@peter_hammer on 2003/09/29 19:35:12 collect SEL_RPL_MASK in one place and export it to assym.s It is used in every PUSH_FRAME Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/exception.S#19 edit .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#22 edit .. //depot/projects/hammer/sys/amd64/include/segments.h#12 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#19 (text+ko) ==== @@ -40,8 +40,6 @@ #include "assym.s" -#define SEL_RPL_MASK 0x0003 - .text /*****************************************************************************/ ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#22 (text+ko) ==== @@ -74,6 +74,7 @@ #include #include #include +#include ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace)); ASSYM(VM_PMAP, offsetof(struct vmspace, vm_pmap)); @@ -207,6 +208,7 @@ ASSYM(KUCSEL, GSEL(GUCODE_SEL, SEL_UPL)); ASSYM(KUDSEL, GSEL(GUDATA_SEL, SEL_UPL)); ASSYM(KUC32SEL, GSEL(GUCODE32_SEL, SEL_UPL)); +ASSYM(SEL_RPL_MASK, SEL_RPL_MASK); ASSYM(MSR_FSBASE, MSR_FSBASE); ASSYM(MSR_GSBASE, MSR_GSBASE); ==== //depot/projects/hammer/sys/amd64/include/segments.h#12 (text+ko) ==== @@ -49,6 +49,7 @@ * Selectors */ +#define SEL_RPL_MASK 3 /* requester priv level */ #define ISPL(s) ((s)&3) /* what is the priority level of a selector */ #define SEL_KPL 0 /* kernel priority level */ #define SEL_UPL 3 /* user priority level */ From owner-p4-projects@FreeBSD.ORG Mon Sep 29 19:37:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A3DB16A4C0; Mon, 29 Sep 2003 19:37: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 3625516A4B3 for ; Mon, 29 Sep 2003 19:37:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B178143F93 for ; Mon, 29 Sep 2003 19:37:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U2b1XJ031163 for ; Mon, 29 Sep 2003 19:37:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U2b1tj031160 for perforce@freebsd.org; Mon, 29 Sep 2003 19:37:01 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 19:37:01 -0700 (PDT) Message-Id: <200309300237.h8U2b1tj031160@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 38836 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, 30 Sep 2003 02:37:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=38836 Change 38836 by peter@peter_hammer on 2003/09/29 19:36:47 encapsulate some more lazy switch stuff Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#5 edit .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#9 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#5 (text+ko) ==== @@ -354,6 +354,7 @@ POP_FRAME /* Why not doreti? */ iretq +#ifdef LAZY_SWITCH /* * Clean up when we lose out on the lazy context switch optimization. * ie: when we are about to release a PTD but a cpu is still borrowing it. @@ -366,4 +367,5 @@ movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ POP_FRAME /* Why not doreti? */ iretq +#endif #endif /* SMP */ ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#9 (text+ko) ==== @@ -258,8 +258,10 @@ /* Install an inter-CPU IPI for forwarding statclock() */ setidt(IPI_STATCLOCK, IDTVEC(statclock), SDT_SYSIGT, SEL_KPL, 0); +#ifdef LAZY_SWITCH /* Install an inter-CPU IPI for lazy pmap release */ setidt(IPI_LAZYPMAP, IDTVEC(lazypmap), SDT_SYSIGT, SEL_KPL, 0); +#endif /* Install an inter-CPU IPI for all-CPU rendezvous */ setidt(IPI_RENDEZVOUS, IDTVEC(rendezvous), SDT_SYSIGT, SEL_KPL, 0); From owner-p4-projects@FreeBSD.ORG Mon Sep 29 19:53:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55D0616A4C0; Mon, 29 Sep 2003 19:53:23 -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 2B9E016A4BF for ; Mon, 29 Sep 2003 19:53:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E5844400F for ; Mon, 29 Sep 2003 19:53:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U2rMXJ031890 for ; Mon, 29 Sep 2003 19:53:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U2rLh2031887 for perforce@freebsd.org; Mon, 29 Sep 2003 19:53:21 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 19:53:21 -0700 (PDT) Message-Id: <200309300253.h8U2rLh2031887@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 38837 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, 30 Sep 2003 02:53:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=38837 Change 38837 by peter@peter_hammer on 2003/09/29 19:53:08 get out the BIG hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mpboot.s#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mpboot.s#6 (text+ko) ==== @@ -45,6 +45,7 @@ */ .p2align 4 + .section .data32 .code32 NON_GPROF_ENTRY(MPentry) /* @@ -61,12 +62,12 @@ movl %eax,%cr4 /* Now enable paging mode */ - movl IdlePDT, %eax + movl IdlePTD32, %eax movl %eax, %cr3 movl %cr0,%eax orl $CR0_PE|CR0_PG,%eax /* enable paging */ movl %eax,%cr0 /* let the games begin! */ - movl bootSTK,%esp /* boot stack end loc. */ + movl bootSTK32,%esp /* boot stack end loc. */ pushl $mp_begin /* jump to high mem */ ret @@ -75,13 +76,16 @@ * Wait for the booting CPU to signal startup */ mp_begin: /* now running relocated at KERNBASE */ + .code64 +#ifdef SMP_ME_HARDER call init_secondary /* load i386 tables */ +#endif /* disable the APIC, just to be SURE */ - movl lapic, %edx - movl LA_SVR(%edx), %eax /* get spurious vector reg. */ + movq lapic, %rdx + movl LA_SVR(%rdx), %eax /* get spurious vector reg. */ andl $~APIC_SVR_SWEN, %eax /* clear software enable bit */ - movl %eax, LA_SVR(%edx) + movl %eax, LA_SVR(%rdx) /* signal our startup to the BSP */ incl mp_naps /* signal BSP */ @@ -98,8 +102,7 @@ * 1Meg. -jackv */ - .data - ALIGN_DATA /* just to be sure */ + .p2align 4 BOOTMP1: @@ -236,6 +239,13 @@ .space 0x100 /* space for boot_stk - 1st temporary stack */ boot_stk: + .globl bootSTK32 +bootSTK32: + .long 0 + .globl IdlePTD32 +IdlePTD32: + .long 0 + BOOTMP2: .globl bootMP_size bootMP_size: From owner-p4-projects@FreeBSD.ORG Mon Sep 29 21:30:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3ECAC16A4C0; Mon, 29 Sep 2003 21:30: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 1A68216A4B3 for ; Mon, 29 Sep 2003 21:30:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5810444013 for ; Mon, 29 Sep 2003 21:30:20 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U4UKXJ042905 for ; Mon, 29 Sep 2003 21:30:20 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U4UJbh042900 for perforce@freebsd.org; Mon, 29 Sep 2003 21:30:19 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Mon, 29 Sep 2003 21:30:19 -0700 (PDT) Message-Id: <200309300430.h8U4UJbh042900@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 38839 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, 30 Sep 2003 04:30:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=38839 Change 38839 by sam@sam_ebb on 2003/09/29 21:30:00 correct pfil_run_hooks handling Affected files ... .. //depot/projects/netperf/sys/net/bridge.c#11 edit Differences ... ==== //depot/projects/netperf/sys/net/bridge.c#11 (text+ko) ==== @@ -1020,13 +1020,11 @@ ip->ip_off = ntohs(ip->ip_off); if (pfil_run_hooks(&inet_pfil_hook, &m0, src, PFIL_IN) != 0) { - EH_RESTORE(m0); /* restore Ethernet header */ - return m0; - } - if (m0 == NULL) { - bdg_dropped++; + /* NB: hook should consume packet */ return NULL; } + if (m0 == NULL) /* consumed by filter */ + return m0; /* * If we get here, the firewall has passed the pkt, but the mbuf * pointer might have changed. Restore ip and the fields ntohs()'d. From owner-p4-projects@FreeBSD.ORG Mon Sep 29 21:31:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5C3C16A4C0; Mon, 29 Sep 2003 21:31:22 -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 BFEB916A4B3 for ; Mon, 29 Sep 2003 21:31:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 471C243FEC for ; Mon, 29 Sep 2003 21:31:22 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U4VMXJ042985 for ; Mon, 29 Sep 2003 21:31:22 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U4VLMa042982 for perforce@freebsd.org; Mon, 29 Sep 2003 21:31:21 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Mon, 29 Sep 2003 21:31:21 -0700 (PDT) Message-Id: <200309300431.h8U4VLMa042982@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 38840 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, 30 Sep 2003 04:31:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=38840 Change 38840 by sam@sam_ebb on 2003/09/29 21:30:26 correct pfil_run_hooks handling Affected files ... .. //depot/projects/netperf/sys/netinet6/ip6_forward.c#4 edit .. //depot/projects/netperf/sys/netinet6/ip6_output.c#6 edit Differences ... ==== //depot/projects/netperf/sys/netinet6/ip6_forward.c#4 (text+ko) ==== @@ -522,10 +522,9 @@ /* * Run through list of hooks for output packets. */ - if (pfil_run_hooks(&inet6_pfil_hook, &m, rt->rt_ifp, PFIL_OUT) != 0) { - error = EHOSTUNREACH; - goto freecopy; - } + error = pfil_run_hooks(&inet6_pfil_hook, &m, rt->rt_ifp, PFIL_OUT); + if (error != 0) + goto senderr; if (m == NULL) goto freecopy; ip6 = mtod(m, struct ip6_hdr *); @@ -545,6 +544,9 @@ goto freecopy; } } +#ifdef PFIL_HOOKS +senderr: +#endif if (mcopy == NULL) return; switch (error) { ==== //depot/projects/netperf/sys/netinet6/ip6_output.c#6 (text+ko) ==== @@ -927,11 +927,8 @@ /* * Run through list of hooks for output packets. */ - if (pfil_run_hooks(&inet6_pfil_hook, &m, ifp, PFIL_OUT) != 0) { - error = EHOSTUNREACH; - goto done; - } - if (m == NULL) + error = pfil_run_hooks(&inet6_pfil_hook, &m, ifp, PFIL_OUT); + if (error != 0 || m == NULL) goto done; ip6 = mtod(m, struct ip6_hdr *); #endif /* PFIL_HOOKS */ From owner-p4-projects@FreeBSD.ORG Mon Sep 29 23:47:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09ADE16A4C0; Mon, 29 Sep 2003 23:47:11 -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 DA1EB16A4B3 for ; Mon, 29 Sep 2003 23:47:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6319D43F3F for ; Mon, 29 Sep 2003 23:47:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U6lAXJ050195 for ; Mon, 29 Sep 2003 23:47:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U6l976050192 for perforce@freebsd.org; Mon, 29 Sep 2003 23:47:09 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 23:47:09 -0700 (PDT) Message-Id: <200309300647.h8U6l976050192@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 38847 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, 30 Sep 2003 06:47:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=38847 Change 38847 by peter@peter_hammer on 2003/09/29 23:46:48 add SMP hooks into clock.c Affected files ... .. //depot/projects/hammer/sys/amd64/isa/clock.c#10 edit Differences ... ==== //depot/projects/hammer/sys/amd64/isa/clock.c#10 (text+ko) ==== @@ -180,6 +180,10 @@ mtx_unlock_spin(&clock_lock); } timer_func(frame); +#ifdef SMP + if (timer_func == hardclock) + forward_hardclock(); +#endif switch (timer0_state) { case RELEASED: @@ -190,6 +194,9 @@ >= hardclock_max_count) { timer0_prescaler_count -= hardclock_max_count; hardclock(frame); +#ifdef SMP + forward_hardclock(); +#endif } break; @@ -222,6 +229,9 @@ timer_func = hardclock; timer0_state = RELEASED; hardclock(frame); +#ifdef SMP + forward_hardclock(); +#endif } break; } @@ -346,6 +356,9 @@ } if (pscnt == psdiv) statclock(frame); +#ifdef SMP + forward_statclock(); +#endif } } From owner-p4-projects@FreeBSD.ORG Mon Sep 29 23:48:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D9CE16A4C0; Mon, 29 Sep 2003 23:48: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 C628416A4B3 for ; Mon, 29 Sep 2003 23:48:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C6FE43FCB for ; Mon, 29 Sep 2003 23:48:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U6mCXJ050222 for ; Mon, 29 Sep 2003 23:48:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U6mBOc050219 for perforce@freebsd.org; Mon, 29 Sep 2003 23:48:11 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 23:48:11 -0700 (PDT) Message-Id: <200309300648.h8U6mBOc050219@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 38848 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, 30 Sep 2003 06:48:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=38848 Change 38848 by peter@peter_hammer on 2003/09/29 23:48:11 do not pad the stack to make a different clockframe. Unlike the i386, the clockframe isn't different. The vector (when needed) is passed in integer argument in a register. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#6 (text+ko) ==== @@ -242,9 +242,7 @@ movq PCPU(CURTHREAD),%rbx incl TD_INTR_NESTING_LEVEL(%rbx) - pushq $0 /* XXX convert trapframe to clockframe */ call forwarded_hardclock - addq $8, %rsp /* XXX convert clockframe to trapframe */ decl TD_INTR_NESTING_LEVEL(%rbx) MEXITCOUNT jmp doreti @@ -265,9 +263,7 @@ movq PCPU(CURTHREAD),%rbx incl TD_INTR_NESTING_LEVEL(%rbx) - pushq $0 /* XXX convert trapframe to clockframe */ call forwarded_statclock - addq $8, %rsp /* XXX convert clockframe to trapframe */ decl TD_INTR_NESTING_LEVEL(%rbx) MEXITCOUNT jmp doreti From owner-p4-projects@FreeBSD.ORG Tue Sep 30 00:08:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9862C16A4C0; Tue, 30 Sep 2003 00:08: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 528BB16A4B3 for ; Tue, 30 Sep 2003 00:08:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EACB044017 for ; Tue, 30 Sep 2003 00:08:37 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U78bXJ052421 for ; Tue, 30 Sep 2003 00:08:37 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U78bPP052418 for perforce@freebsd.org; Tue, 30 Sep 2003 00:08:37 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Sep 2003 00:08:37 -0700 (PDT) Message-Id: <200309300708.h8U78bPP052418@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 38849 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, 30 Sep 2003 07:08:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=38849 Change 38849 by peter@peter_daintree on 2003/09/30 00:07:41 IFC @38846 Affected files ... .. //depot/projects/hammer/share/man/man9/Makefile#18 integrate .. //depot/projects/hammer/share/man/man9/vm_map.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_check_protection.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_clean.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_create.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_delete.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_find.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_findspace.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_inherit.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_init.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_insert.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_lock.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_lookup.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_madvise.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_max.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_protect.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_remove.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_simplify_entry.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_stack.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_submap.9#1 branch .. //depot/projects/hammer/share/man/man9/vm_map_wire.9#1 branch .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#23 integrate .. //depot/projects/hammer/sys/amd64/include/clock.h#8 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#11 integrate .. //depot/projects/hammer/sys/conf/Makefile.amd64#13 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#20 integrate .. //depot/projects/hammer/sys/net/bridge.c#8 integrate .. //depot/projects/hammer/sys/netinet6/ip6_forward.c#4 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#7 integrate .. //depot/projects/hammer/usr.sbin/Makefile#29 integrate .. //depot/projects/hammer/usr.sbin/mptable/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/mptable/mptable.c#3 integrate Differences ... ==== //depot/projects/hammer/share/man/man9/Makefile#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.203 2003/09/26 21:43:25 rwatson Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.205 2003/09/30 00:56:17 bms Exp $ MAN= BUF_LOCK.9 BUF_LOCKFREE.9 BUF_LOCKINIT.9 BUF_REFCNT.9 \ BUF_TIMELOCK.9 BUF_UNLOCK.9 BUS_CONFIG_INTR.9 BUS_PRINT_CHILD.9 \ @@ -81,6 +81,12 @@ vfsconf.9 \ vget.9 vgone.9 vhold.9 vinvalbuf.9 \ vflush.9 \ + vm_map.9 \ + vm_map_check_protection.9 vm_map_clean.9 vm_map_create.9 \ + vm_map_delete.9 vm_map_find.9 vm_map_findspace.9 vm_map_inherit.9 \ + vm_map_init.9 vm_map_insert.9 vm_map_lock.9 vm_map_lookup.9 \ + vm_map_madvise.9 vm_map_max.9 vm_map_protect.9 vm_map_remove.9 \ + vm_map_simplify_entry.9 vm_map_stack.9 vm_map_submap.9 vm_map_wire.9 \ vm_page_alloc.9 vm_page_bits.9 vm_page_cache.9 \ vm_page_copy.9 vm_page_deactivate.9 vm_page_dontneed.9 \ vm_page_flag.9 vm_page_free.9 vm_page_grab.9 vm_page_hold.9 \ @@ -289,6 +295,18 @@ MLINKS+=vfsconf.9 vfs_unregister.9 MLINKS+=vgone.9 vgonel.9 MLINKS+=vhold.9 vdrop.9 +MLINKS+=vm_map_lock.9 vm_map_unlock.9 +MLINKS+=vm_map_lock.9 vm_map_lock_read.9 +MLINKS+=vm_map_lock.9 vm_map_unlock_read.9 +MLINKS+=vm_map_lock.9 vm_map_trylock.9 +MLINKS+=vm_map_lock.9 vm_map_trylock_read.9 +MLINKS+=vm_map_lock.9 vm_map_lock_upgrade.9 +MLINKS+=vm_map_lock.9 vm_map_lock_downgrade.9 +MLINKS+=vm_map_lookup.9 vm_map_lookup_done.9 +MLINKS+=vm_map_max.9 vm_map_min.9 +MLINKS+=vm_map_max.9 vm_map_pmap.9 +MLINKS+=vm_map_stack.9 vm_map_growstack.9 +MLINKS+=vm_map_wire.9 vm_map_unwire.9 MLINKS+=vm_page_bits.9 vm_page_set_validclean.9 MLINKS+=vm_page_bits.9 vm_page_clear_dirty.9 MLINKS+=vm_page_bits.9 vm_page_set_invalid.9 ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#23 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.148 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.149 2003/09/30 04:52:24 jeff Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -87,7 +87,6 @@ ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_INTR_NESTING_LEVEL, offsetof(struct thread, td_intr_nesting_level)); ASSYM(TD_CRITNEST, offsetof(struct thread, td_critnest)); -ASSYM(TD_SWITCHIN, offsetof(struct thread, td_switchin)); ASSYM(TD_MD, offsetof(struct thread, td_md)); ASSYM(P_MD, offsetof(struct proc, p_md)); ==== //depot/projects/hammer/sys/amd64/include/clock.h#8 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.46 2003/09/22 23:02:24 peter Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.47 2003/09/30 06:38:11 peter Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -30,9 +30,11 @@ */ struct clockframe; +#ifndef BURN_BRIDGES int acquire_timer0(int rate, void (*function)(struct clockframe *frame)); +int release_timer0(void); +#endif int acquire_timer2(int mode); -int release_timer0(void); int release_timer2(void); int rtcin(int val); int sysbeep(int pitch, int period); ==== //depot/projects/hammer/sys/amd64/isa/clock.c#11 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.202 2003/09/22 23:02:24 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.204 2003/09/30 06:42:47 peter Exp $"); /* * Routines to handle clock hardware. @@ -89,11 +89,12 @@ * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we * can use a simple formula for leap years. */ -#define LEAPYEAR(y) ((u_int)(y) % 4 == 0) +#define LEAPYEAR(y) (((u_int)(y) % 4 == 0) ? 1 : 0) #define DAYSPERYEAR (31+28+31+30+31+30+31+31+30+31+30+31) #define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x)) +#ifndef BURN_BRIDGES /* * Time in timer cycles that it takes for microtime() to disable interrupts * and latch the count. microtime() currently uses "cli; outb ..." so it @@ -109,6 +110,7 @@ * before the next timer interrupt. */ #define TIMER0_MAX_FREQ 20000 +#endif int adjkerntz; /* local offset from GMT in seconds */ int clkintr_pending; @@ -131,6 +133,7 @@ static u_int32_t i8254_offset; static int i8254_ticked; static struct intsrc *i8254_intsrc; +#ifndef BURN_BRIDGES /* * XXX new_function and timer_func should not handle clockframes, but * timer_func currently needs to hold hardclock to handle the @@ -139,9 +142,11 @@ */ static void (*new_function)(struct clockframe *frame); static u_int new_rate; +static u_int timer0_prescaler_count; +static u_char timer0_state; +#endif static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR | RTCSB_PINTR; -static u_int timer0_prescaler_count; /* Values for timerX_state: */ #define RELEASED 0 @@ -149,7 +154,6 @@ #define ACQUIRED 2 #define ACQUIRE_PENDING 3 -static u_char timer0_state; static u_char timer2_state; static void (*timer_func)(struct clockframe *frame) = hardclock; @@ -161,7 +165,8 @@ 0, /* no poll_pps */ ~0u, /* counter_mask */ 0, /* frequency */ - "i8254" /* name */ + "i8254", /* name */ + 0 /* quality */ }; static void @@ -179,11 +184,12 @@ clkintr_pending = 0; mtx_unlock_spin(&clock_lock); } - timer_func(frame); + timer_func(&frame); #ifdef SMP if (timer_func == hardclock) forward_hardclock(); #endif +#ifndef BURN_BRIDGES switch (timer0_state) { case RELEASED: @@ -228,15 +234,17 @@ timer0_prescaler_count = 0; timer_func = hardclock; timer0_state = RELEASED; - hardclock(frame); + hardclock(&frame); #ifdef SMP forward_hardclock(); #endif } break; } +#endif } +#ifndef BURN_BRIDGES /* * The acquire and release functions must be called at ipl >= splclock(). */ @@ -272,6 +280,7 @@ old_rate = new_rate = rate; return (0); } +#endif int acquire_timer2(int mode) @@ -293,6 +302,7 @@ return (0); } +#ifndef BURN_BRIDGES int release_timer0() { @@ -312,6 +322,7 @@ } return (0); } +#endif int release_timer2() @@ -357,7 +368,7 @@ if (pscnt == psdiv) statclock(frame); #ifdef SMP - forward_statclock(); + forward_statclock(); #endif } } @@ -931,8 +942,10 @@ freq = timer_freq; error = sysctl_handle_int(oidp, &freq, sizeof(freq), req); if (error == 0 && req->newptr != NULL) { +#ifndef BURN_BRIDGES if (timer0_state != RELEASED) return (EBUSY); /* too much trouble to handle */ +#endif set_timer_freq(freq, hz); i8254_timecounter.tc_frequency = freq; } ==== //depot/projects/hammer/sys/conf/Makefile.amd64#13 (text+ko) ==== @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.9 2003/05/30 01:03:43 peter Exp $ +# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.10 2003/09/30 03:49:09 peter Exp $ # # Makefile for FreeBSD # @@ -31,7 +31,7 @@ .endif .include "$S/conf/kern.pre.mk" -DDB_ENABLED!= grep DDB opt_ddb.h +DDB_ENABLED!= grep DDB opt_ddb.h || true .if ${DDB_ENABLED} != "" CFLAGS+= -fno-omit-frame-pointer .endif ==== //depot/projects/hammer/sys/i386/i386/machdep.c#20 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.571 2003/09/10 01:07:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.572 2003/09/30 04:51:12 jeff Exp $"); #include "opt_atalk.h" #include "opt_compat.h" @@ -1276,7 +1276,7 @@ /* GPROC0_SEL 4 Proc 0 Tss Descriptor */ { 0x0, /* segment base address */ - sizeof(struct i386tss)-1,/* length - all address space */ + sizeof(struct i386tss)-1,/* length */ SDT_SYS386TSS, /* segment type */ 0, /* segment descriptor priority level */ 1, /* segment descriptor present */ ==== //depot/projects/hammer/sys/net/bridge.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/bridge.c,v 1.70 2003/09/23 17:54:03 sam Exp $ + * $FreeBSD: src/sys/net/bridge.c,v 1.71 2003/09/30 04:46:08 sam Exp $ */ /* @@ -1020,13 +1020,11 @@ ip->ip_off = ntohs(ip->ip_off); if (pfil_run_hooks(&inet_pfil_hook, &m0, src, PFIL_IN) != 0) { - EH_RESTORE(m0); /* restore Ethernet header */ - return m0; - } - if (m0 == NULL) { - bdg_dropped++; + /* NB: hook should consume packet */ return NULL; } + if (m0 == NULL) /* consumed by filter */ + return m0; /* * If we get here, the firewall has passed the pkt, but the mbuf * pointer might have changed. Restore ip and the fields ntohs()'d. ==== //depot/projects/hammer/sys/netinet6/ip6_forward.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_forward.c,v 1.17 2003/09/23 17:54:03 sam Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_forward.c,v 1.18 2003/09/30 04:46:08 sam Exp $ */ /* $KAME: ip6_forward.c,v 1.69 2001/05/17 03:48:30 itojun Exp $ */ /* @@ -522,10 +522,9 @@ /* * Run through list of hooks for output packets. */ - if (pfil_run_hooks(&inet6_pfil_hook, &m, rt->rt_ifp, PFIL_OUT) != 0) { - error = EHOSTUNREACH; - goto freecopy; - } + error = pfil_run_hooks(&inet6_pfil_hook, &m, rt->rt_ifp, PFIL_OUT); + if (error != 0) + goto senderr; if (m == NULL) goto freecopy; ip6 = mtod(m, struct ip6_hdr *); @@ -545,6 +544,9 @@ goto freecopy; } } +#ifdef PFIL_HOOKS +senderr: +#endif if (mcopy == NULL) return; switch (error) { ==== //depot/projects/hammer/sys/netinet6/ip6_output.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_output.c,v 1.50 2003/09/23 17:54:03 sam Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_output.c,v 1.51 2003/09/30 04:46:08 sam Exp $ */ /* $KAME: ip6_output.c,v 1.279 2002/01/26 06:12:30 jinmei Exp $ */ /* @@ -926,11 +926,8 @@ /* * Run through list of hooks for output packets. */ - if (pfil_run_hooks(&inet6_pfil_hook, &m, ifp, PFIL_OUT) != 0) { - error = EHOSTUNREACH; - goto done; - } - if (m == NULL) + error = pfil_run_hooks(&inet6_pfil_hook, &m, ifp, PFIL_OUT); + if (error != 0 || m == NULL) goto done; ip6 = mtod(m, struct ip6_hdr *); #endif /* PFIL_HOOKS */ ==== //depot/projects/hammer/usr.sbin/Makefile#29 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.271 2003/09/16 21:25:42 marcel Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.273 2003/09/30 04:19:01 peter Exp $ .if ${MACHINE_ARCH} != "powerpc" _sysinstall=sysinstall @@ -221,11 +221,13 @@ # pnpinfo: crashes (not really useful anyway) .if ${MACHINE_ARCH} == "amd64" SUBDIR+=acpi \ + asf \ boot0cfg \ btxld \ lptcontrol \ mount_nwfs \ mount_smbfs \ + mptable \ sicontrol \ spkrtest \ zzz ==== //depot/projects/hammer/usr.sbin/mptable/Makefile#2 (text+ko) ==== @@ -1,5 +1,6 @@ -# $FreeBSD: src/usr.sbin/mptable/Makefile,v 1.6 2001/03/26 14:40:51 ru Exp $ +# $FreeBSD: src/usr.sbin/mptable/Makefile,v 1.7 2003/09/30 04:09:21 peter Exp $ PROG= mptable +WARNS?= 6 .include ==== //depot/projects/hammer/usr.sbin/mptable/mptable.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.sbin/mptable/mptable.c,v 1.17 2003/06/07 18:33:18 imp Exp $"; + "$FreeBSD: src/usr.sbin/mptable/mptable.c,v 1.18 2003/09/30 04:09:21 peter Exp $"; #endif /* not lint */ #define VMAJOR 2 @@ -123,7 +123,7 @@ { UNKNOWN_BUSTYPE, "---" } }; -char* whereStrings[] = { +const char* whereStrings[] = { "Extended BIOS Data Area", "BIOS top of memory", "Default top of memory", @@ -158,7 +158,7 @@ /* MP Floating Pointer Structure */ typedef struct MPFPS { char signature[ 4 ]; - void* pap; + u_int32_t pap; u_char length; u_char spec_rev; u_char checksum; @@ -177,10 +177,10 @@ u_char checksum; u_char oem_id[ 8 ]; u_char product_id[ 12 ]; - void* oem_table_pointer; + u_int32_t oem_table_pointer; u_short oem_table_size; u_short entry_count; - void* apic_address; + u_int32_t apic_address; u_short extended_table_length; u_char extended_table_checksum; u_char reserved; @@ -192,10 +192,10 @@ u_char apicID; u_char apicVersion; u_char cpuFlags; - u_long cpuSignature; - u_long featureFlags; - u_long reserved1; - u_long reserved2; + u_int32_t cpuSignature; + u_int32_t featureFlags; + u_int32_t reserved1; + u_int32_t reserved2; } ProcEntry; typedef struct BUSENTRY { @@ -209,7 +209,7 @@ u_char apicID; u_char apicVersion; u_char apicFlags; - void* apicAddress; + u_int32_t apicAddress; } IOApicEntry; typedef struct INTENTRY { @@ -234,7 +234,7 @@ u_char addressType; u_int64_t addressBase; u_int64_t addressLength; -} SasEntry; +} __attribute__((__packed__)) SasEntry; typedef struct BHDENTRY { @@ -257,15 +257,15 @@ -static void apic_probe( vm_offset_t* paddr, int* where ); +static void apic_probe( u_int32_t* paddr, int* where ); static void MPConfigDefault( int featureByte ); -static void MPFloatingPointer( vm_offset_t paddr, int where, mpfps_t* mpfps ); -static void MPConfigTableHeader( void* pap ); +static void MPFloatingPointer( u_int32_t paddr, int where, mpfps_t* mpfps ); +static void MPConfigTableHeader( u_int32_t pap ); static int readType( void ); -static void seekEntry( vm_offset_t addr ); +static void seekEntry( u_int32_t addr ); static void readEntry( void* entry, int size ); static void processorEntry( void ); @@ -308,7 +308,7 @@ int main( int argc, char *argv[] ) { - vm_offset_t paddr; + u_int32_t paddr; int where; mpfps_t mpfps; int defaultConfig; @@ -393,7 +393,7 @@ */ #define NEXT(X) ((X) += 4) static void -apic_probe( vm_offset_t* paddr, int* where ) +apic_probe( u_int32_t* paddr, int* where ) { /* * c rewrite of apic_probe() by Jack F. Vogel @@ -401,7 +401,7 @@ int x; u_short segment; - vm_offset_t target; + u_int32_t target; u_int buffer[ BIOS_SIZE / sizeof( int ) ]; if ( verbose ) @@ -410,16 +410,16 @@ /* search Extended Bios Data Area, if present */ if ( verbose ) printf( " looking for EBDA pointer @ 0x%04x, ", EBDA_POINTER ); - seekEntry( (vm_offset_t)EBDA_POINTER ); + seekEntry( (u_int32_t)EBDA_POINTER ); readEntry( &segment, 2 ); if ( segment ) { /* search EBDA */ - target = (vm_offset_t)segment << 4; + target = (u_int32_t)segment << 4; if ( verbose ) printf( "found, searching EBDA @ 0x%08x\n", target ); seekEntry( target ); readEntry( buffer, ONE_KBYTE ); - for ( x = 0; x < ONE_KBYTE / sizeof ( unsigned int ); NEXT(x) ) { + for ( x = 0; x < ONE_KBYTE / (int)sizeof ( unsigned int ); NEXT(x) ) { if ( buffer[ x ] == MP_SIG ) { *where = 1; *paddr = (x * sizeof( unsigned int )) + target; @@ -433,7 +433,7 @@ } /* read CMOS for real top of mem */ - seekEntry( (vm_offset_t)TOPOFMEM_POINTER ); + seekEntry( (u_int32_t)TOPOFMEM_POINTER ); readEntry( &segment, 2 ); --segment; /* less ONE_KBYTE */ target = segment * 1024; @@ -443,7 +443,7 @@ seekEntry( target ); readEntry( buffer, ONE_KBYTE ); - for ( x = 0; x < ONE_KBYTE / sizeof ( unsigned int ); NEXT(x) ) { + for ( x = 0; x < ONE_KBYTE / (int)sizeof ( unsigned int ); NEXT(x) ) { if ( buffer[ x ] == MP_SIG ) { *where = 2; *paddr = (x * sizeof( unsigned int )) + target; @@ -460,7 +460,7 @@ seekEntry( target ); readEntry( buffer, ONE_KBYTE ); - for ( x = 0; x < ONE_KBYTE / sizeof ( unsigned int ); NEXT(x) ) { + for ( x = 0; x < ONE_KBYTE / (int)sizeof ( unsigned int ); NEXT(x) ) { if ( buffer[ x ] == MP_SIG ) { *where = 3; *paddr = (x * sizeof( unsigned int )) + target; @@ -475,7 +475,7 @@ seekEntry( BIOS_BASE ); readEntry( buffer, BIOS_SIZE ); - for ( x = 0; x < BIOS_SIZE / sizeof( unsigned int ); NEXT(x) ) { + for ( x = 0; x < BIOS_SIZE / (int)sizeof( unsigned int ); NEXT(x) ) { if ( buffer[ x ] == MP_SIG ) { *where = 4; *paddr = (x * sizeof( unsigned int )) + BIOS_BASE; @@ -489,7 +489,7 @@ seekEntry( BIOS_BASE2 ); readEntry( buffer, BIOS_SIZE ); - for ( x = 0; x < BIOS_SIZE / sizeof( unsigned int ); NEXT(x) ) { + for ( x = 0; x < BIOS_SIZE / (int)sizeof( unsigned int ); NEXT(x) ) { if ( buffer[ x ] == MP_SIG ) { *where = 5; *paddr = (x * sizeof( unsigned int )) + BIOS_BASE2; @@ -505,7 +505,7 @@ seekEntry( target ); readEntry( buffer, GROPE_SIZE ); - for ( x = 0; x < GROPE_SIZE / sizeof( unsigned int ); NEXT(x) ) { + for ( x = 0; x < GROPE_SIZE / (int)sizeof( unsigned int ); NEXT(x) ) { if ( buffer[ x ] == MP_SIG ) { *where = 6; *paddr = (x * sizeof( unsigned int )) + GROPE_AREA1; @@ -519,7 +519,7 @@ seekEntry( target ); readEntry( buffer, GROPE_SIZE ); - for ( x = 0; x < GROPE_SIZE / sizeof( unsigned int ); NEXT(x) ) { + for ( x = 0; x < GROPE_SIZE / (int)sizeof( unsigned int ); NEXT(x) ) { if ( buffer[ x ] == MP_SIG ) { *where = 7; *paddr = (x * sizeof( unsigned int )) + GROPE_AREA2; @@ -529,7 +529,7 @@ } *where = 0; - *paddr = (vm_offset_t)0; + *paddr = (u_int32_t)0; } @@ -537,7 +537,7 @@ * */ static void -MPFloatingPointer( vm_offset_t paddr, int where, mpfps_t* mpfps ) +MPFloatingPointer( u_int32_t paddr, int where, mpfps_t* mpfps ) { /* read in mpfps structure*/ @@ -663,9 +663,9 @@ * */ static void -MPConfigTableHeader( void* pap ) +MPConfigTableHeader( u_int32_t pap ) { - vm_offset_t paddr; + u_int32_t paddr; mpcth_t cth; int x; int totalSize; @@ -679,7 +679,7 @@ } /* convert physical address to virtual address */ - paddr = (vm_offset_t)pap; + paddr = pap; /* read in cth structure */ seekEntry( paddr ); @@ -817,7 +817,7 @@ #if defined( OEM_PROCESSING_READY ) # error your on your own here! /* convert OEM table pointer to virtual address */ - poemtp = (vm_offset_t)cth.oem_table_pointer; + poemtp = (u_int32_t)cth.oem_table_pointer; /* read in oem table structure */ if ( (oemdata = (void*)malloc( cth.oem_table_size )) == NULL ) @@ -873,7 +873,7 @@ * */ static void -seekEntry( vm_offset_t addr ) +seekEntry( u_int32_t addr ) { if ( lseek( pfd, (off_t)addr, SEEK_SET ) < 0 ) err( 1, "%s seek", _PATH_MEM ); @@ -982,14 +982,14 @@ } -char* intTypes[] = { +const char* intTypes[] = { "INT", "NMI", "SMI", "ExtINT" }; -char* polarityMode[] = { +const char* polarityMode[] = { "conforms", "active-hi", "reserved", "active-lo" }; -char* triggerMode[] = { +const char* triggerMode[] = { "conforms", "edge", "reserved", "level" }; @@ -1048,8 +1048,8 @@ break; } - printf( " address base: 0x%qx\n", entry.addressBase ); - printf( " address range: 0x%qx\n", entry.addressLength ); + printf( " address base: 0x%llx\n", (long long)entry.addressBase ); + printf( " address range: 0x%llx\n", (long long)entry.addressLength ); } From owner-p4-projects@FreeBSD.ORG Tue Sep 30 00:13:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CCF116A4C0; Tue, 30 Sep 2003 00:13:45 -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 3819E16A4B3 for ; Tue, 30 Sep 2003 00:13:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B646843FA3 for ; Tue, 30 Sep 2003 00:13:44 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U7DiXJ052705 for ; Tue, 30 Sep 2003 00:13:44 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U7DiOs052702 for perforce@freebsd.org; Tue, 30 Sep 2003 00:13:44 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Sep 2003 00:13:44 -0700 (PDT) Message-Id: <200309300713.h8U7DiOs052702@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 38850 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, 30 Sep 2003 07:13:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=38850 Change 38850 by peter@peter_hammer on 2003/09/30 00:13:23 mismerge. clkintr takes a struct clockframe * already. Affected files ... .. //depot/projects/hammer/sys/amd64/isa/clock.c#12 edit Differences ... ==== //depot/projects/hammer/sys/amd64/isa/clock.c#12 (text+ko) ==== @@ -184,7 +184,7 @@ clkintr_pending = 0; mtx_unlock_spin(&clock_lock); } - timer_func(&frame); + timer_func(frame); #ifdef SMP if (timer_func == hardclock) forward_hardclock(); @@ -234,7 +234,7 @@ timer0_prescaler_count = 0; timer_func = hardclock; timer0_state = RELEASED; - hardclock(&frame); + hardclock(frame); #ifdef SMP forward_hardclock(); #endif From owner-p4-projects@FreeBSD.ORG Tue Sep 30 00:42:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FFD116A4C0; Tue, 30 Sep 2003 00:42: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 D8CF416A4B3 for ; Tue, 30 Sep 2003 00:42:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BD7F4402B for ; Tue, 30 Sep 2003 00:42:20 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U7gKXJ053714 for ; Tue, 30 Sep 2003 00:42:20 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U7gJD4053711 for perforce@freebsd.org; Tue, 30 Sep 2003 00:42:19 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Sep 2003 00:42:19 -0700 (PDT) Message-Id: <200309300742.h8U7gJD4053711@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 38852 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, 30 Sep 2003 07:42:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=38852 Change 38852 by peter@peter_hammer on 2003/09/30 00:42:16 add missing SMP hook Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#53 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#53 (text+ko) ==== @@ -903,6 +903,12 @@ /* * Now, physmap contains a map of physical memory. */ + +#ifdef SMP + /* make hole for AP bootstrap code */ + physmap[1] = mp_bootaddress(physmap[1] / 1024); +#endif + /* * Maxmem isn't the "maximum memory", it's one larger than the * highest page of the physical address space. It should be From owner-p4-projects@FreeBSD.ORG Tue Sep 30 01:01:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 239DE16A4BF; Tue, 30 Sep 2003 01:01: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 EBBB016A4BF for ; Tue, 30 Sep 2003 01:01:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 967A444014 for ; Tue, 30 Sep 2003 01:01:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U81kXJ060247 for ; Tue, 30 Sep 2003 01:01:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U81kHw060244 for perforce@freebsd.org; Tue, 30 Sep 2003 01:01:46 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Sep 2003 01:01:46 -0700 (PDT) Message-Id: <200309300801.h8U81kHw060244@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 38856 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, 30 Sep 2003 08:01:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=38856 Change 38856 by peter@peter_hammer on 2003/09/30 01:01:35 Add SMP reset hooks and includes Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#54 edit .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#14 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#54 (text+ko) ==== @@ -108,6 +108,9 @@ #include #endif #include +#ifdef SMP +#include +#endif #include #include ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#14 (text+ko) ==== @@ -59,6 +59,7 @@ #include #include #include +#include #include #include #include @@ -80,6 +81,11 @@ #include static void cpu_reset_real(void); +#ifdef SMP +static void cpu_reset_proxy(void); +static u_int cpu_reset_proxyid; +static volatile u_int cpu_reset_proxy_active; +#endif static void sf_buf_init(void *arg); SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) @@ -334,10 +340,69 @@ * Force reset the processor by invalidating the entire address space! */ +#ifdef SMP +static void +cpu_reset_proxy() +{ + + cpu_reset_proxy_active = 1; + while (cpu_reset_proxy_active == 1) + ; /* Wait for other cpu to see that we've started */ + stop_cpus((1< Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 514B716A4C4; Tue, 30 Sep 2003 08:32:09 -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 1457316A4F4 for ; Tue, 30 Sep 2003 08:32:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8771043FF3 for ; Tue, 30 Sep 2003 08:32:08 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8UFW8XJ092305 for ; Tue, 30 Sep 2003 08:32:08 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8UFW81Z092302 for perforce@freebsd.org; Tue, 30 Sep 2003 08:32:08 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Tue, 30 Sep 2003 08:32:08 -0700 (PDT) Message-Id: <200309301532.h8UFW81Z092302@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 38889 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, 30 Sep 2003 15:32:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=38889 Change 38889 by areisse@areisse_tislabs on 2003/09/30 08:32:04 properly initialize sidtab structures don't divide by zero when empty policy files are loaded Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.c#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/sidtab.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.c#5 (text+ko) ==== @@ -107,6 +107,9 @@ size_t fread(void *ptr, size_t size, size_t nmemb, FILE *fp) { + if (size == 0) + return 0; + struct thread *td = curthread; fp->FILE_uio.uio_iov->iov_base = ptr; ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/sidtab.c#7 (text+ko) ==== @@ -42,6 +42,7 @@ s->nel = 0; s->next_sid = 1; s->shutdown = 0; + memset (&s->lock, 0, sizeof (struct mtx)); INIT_SIDTAB_LOCK(s); return 0; } From owner-p4-projects@FreeBSD.ORG Tue Sep 30 08:35:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6ADB16A4C0; Tue, 30 Sep 2003 08:35:52 -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 98E4116A4B3; Tue, 30 Sep 2003 08:35:52 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7867643FE1; Tue, 30 Sep 2003 08:35:49 -0700 (PDT) (envelope-from arr@watson.org) Received: from fledge.watson.org (localhost [127.0.0.1]) by fledge.watson.org (8.12.9p2/8.12.9) with ESMTP id h8UFZF7R005194; Tue, 30 Sep 2003 11:35:15 -0400 (EDT) (envelope-from arr@watson.org) Received: from localhost (arr@localhost)h8UFZFDV005191; Tue, 30 Sep 2003 11:35:15 -0400 (EDT) (envelope-from arr@watson.org) X-Authentication-Warning: fledge.watson.org: arr owned process doing -bs Date: Tue, 30 Sep 2003 11:35:15 -0400 (EDT) From: "Andrew R. Reiter" To: Andrew Reisse In-Reply-To: <200309301532.h8UFW81Z092302@repoman.freebsd.org> Message-ID: <20030930113435.H4476@fledge.watson.org> References: <200309301532.h8UFW81Z092302@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Perforce Change Reviews Subject: Re: PERFORCE change 38889 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, 30 Sep 2003 15:35:53 -0000 On Tue, 30 Sep 2003, Andrew Reisse wrote: :http://perforce.freebsd.org/chv.cgi?CH=38889 : :Change 38889 by areisse@areisse_tislabs on 2003/09/30 08:32:04 : : properly initialize sidtab structures : don't divide by zero when empty policy files are loaded : :Affected files ... : :.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.c#5 edit :.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/sidtab.c#7 edit : :Differences ... : :==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.c#5 (text+ko) ==== : :@@ -107,6 +107,9 @@ : size_t : fread(void *ptr, size_t size, size_t nmemb, FILE *fp) : { :+ if (size == 0) :+ return 0; :+ : struct thread *td = curthread; Won't this generate a parse error? : : fp->FILE_uio.uio_iov->iov_base = ptr; : :==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/sidtab.c#7 (text+ko) ==== : :@@ -42,6 +42,7 @@ : s->nel = 0; : s->next_sid = 1; : s->shutdown = 0; :+ memset (&s->lock, 0, sizeof (struct mtx)); : INIT_SIDTAB_LOCK(s); : return 0; : } : -- Andrew R. Reiter arr@watson.org arr@FreeBSD.org From owner-p4-projects@FreeBSD.ORG Tue Sep 30 08:40:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55EAE16A4C0; Tue, 30 Sep 2003 08:40: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 1622B16A4B3 for ; Tue, 30 Sep 2003 08:40:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02B6E43FB1 for ; Tue, 30 Sep 2003 08:40:46 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8UFejXJ092832 for ; Tue, 30 Sep 2003 08:40:45 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8UFej3S092829 for perforce@freebsd.org; Tue, 30 Sep 2003 08:40:45 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Tue, 30 Sep 2003 08:40:45 -0700 (PDT) Message-Id: <200309301540.h8UFej3S092829@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 38890 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, 30 Sep 2003 15:40:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=38890 Change 38890 by areisse@areisse_tislabs on 2003/09/30 08:39:52 Allow limited remote command execution from sshd. Initial policy for cvs. To use the "secure" cvs, it must be accessed from ssh via a repository specification such as :ext:localhost:/cvs. Repositories must be labelled with user_cvsrep_t or similar. Affected files ... .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/ssh.te#5 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/cvs.te#1 add .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/cvs.fc#1 add .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/types.fc#3 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/global_macros.te#4 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/cvs_macros.te#1 add .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/ssh_macros.te#4 edit Differences ... ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/ssh.te#5 (text+ko) ==== @@ -204,3 +204,24 @@ # Everything else is in the ssh_domain macro in # macros/program/ssh_macros.te. +# Transitory domain to run cvs from sshd +ifdef(`cvs.te',` +type sshd_user_shell_t, domain; +domain_auto_trans(sshd_t, shell_exec_t, sshd_user_shell_t) +domain_auto_trans(sshd_user_shell_t, cvs_exec_t, user_cvs_rw_t) +role system_r types sshd_user_shell_t; +role system_r types user_cvs_rw_t; + +allow sshd_user_shell_t { self sshd_t }:fd { create use }; +allow sshd_user_shell_t { sbin_t bin_t home_root_t user_home_dir_t usr_t etc_t }:dir search; +allow sshd_user_shell_t etc_t:file r_file_perms; +allow sshd_user_shell_t { sbin_t bin_t }:file rx_file_perms; +allow sshd_user_shell_t { sbin_t bin_t }:file execute_no_trans; + +uses_shlib(sshd_user_shell_t) + +allow sshd_user_shell_t user_home_t:file r_file_perms; +allow sshd_user_shell_t { user_home_dir_t user_home_t }:dir r_dir_perms; + +allow user_cvs_rw_t sshd_t:fd use; +') ==== //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/types.fc#3 (text+ko) ==== @@ -84,8 +84,8 @@ /home/[^/]+ -d system_u:object_r:user_home_dir_t /home/[^/]+/.+ system_u:object_r:user_home_t /usr/home system_u:object_r:home_root_t -/home/[^/]+ -d system_u:object_r:user_home_dir_t -/home/[^/]+/.+ system_u:object_r:user_home_t +/usr/home/[^/]+ -d system_u:object_r:user_home_dir_t +/usr/home/[^/]+/.+ system_u:object_r:user_home_t # # Other staff home directories, replace "jadmin" with appropriate name ==== //depot/projects/trustedbsd/sebsd_policy/policy/macros/global_macros.te#4 (text+ko) ==== @@ -706,7 +706,7 @@ # Access file descriptions, pipes, and sockets # created by processes in the same domain. allow $1 self:fd *; -allow $1 self:fifo_file rw_file_perms; +allow $1 self:fifo_file { poll rw_file_perms }; allow $1 self:unix_dgram_socket create_socket_perms; allow $1 self:unix_stream_socket create_stream_socket_perms; ==== //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/ssh_macros.te#4 (text+ko) ==== @@ -128,6 +128,8 @@ allow $1_ssh_t $1_tty_device_t:chr_file { poll rw_file_perms }; allow $1_ssh_t $1_devpts_t:chr_file { poll rw_file_perms }; +allow $1_ssh_t $1_t:fifo_file poll; + # Allow the user shell to signal the ssh program. allow $1_t $1_ssh_t:process signal; # allow ps to show ssh From owner-p4-projects@FreeBSD.ORG Tue Sep 30 08:44:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E24F816A4C0; Tue, 30 Sep 2003 08:44:03 -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 BB2EE16A4B3; Tue, 30 Sep 2003 08:44:03 -0700 (PDT) Received: from mailhub.fokus.fraunhofer.de (mailhub.fokus.fraunhofer.de [193.174.154.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2705A43FAF; Tue, 30 Sep 2003 08:44:02 -0700 (PDT) (envelope-from brandt@fokus.fraunhofer.de) Received: from beagle (beagle [193.175.132.100])h8UFhw612090; Tue, 30 Sep 2003 17:43:58 +0200 (MEST) Date: Tue, 30 Sep 2003 17:43:58 +0200 (CEST) From: Harti Brandt To: "Andrew R. Reiter" In-Reply-To: <20030930113435.H4476@fledge.watson.org> Message-ID: <20030930174127.W96881@beagle.fokus.fraunhofer.de> References: <200309301532.h8UFW81Z092302@repoman.freebsd.org> <20030930113435.H4476@fledge.watson.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Andrew Reisse cc: Perforce Change Reviews Subject: Re: PERFORCE change 38889 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, 30 Sep 2003 15:44:04 -0000 On Tue, 30 Sep 2003, Andrew R. Reiter wrote: ARR>On Tue, 30 Sep 2003, Andrew Reisse wrote: ARR> ARR>:http://perforce.freebsd.org/chv.cgi?CH=38889 ARR>: ARR>:Change 38889 by areisse@areisse_tislabs on 2003/09/30 08:32:04 ARR>: ARR>: properly initialize sidtab structures ARR>: don't divide by zero when empty policy files are loaded ARR>: ARR>:Affected files ... ARR>: ARR>:.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.c#5 edit ARR>:.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/sidtab.c#7 edit ARR>: ARR>:Differences ... ARR>: ARR>:==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.c#5 (text+ko) ==== ARR>: ARR>:@@ -107,6 +107,9 @@ ARR>: size_t ARR>: fread(void *ptr, size_t size, size_t nmemb, FILE *fp) ARR>: { ARR>:+ if (size == 0) ARR>:+ return 0; ARR>:+ ARR>: struct thread *td = curthread; ARR> ARR>Won't this generate a parse error? This is allowed in C99. See 6.8.2 of the standard. It should probably be disallowed by style(9). harti ARR> ARR>: ARR>: fp->FILE_uio.uio_iov->iov_base = ptr; ARR>: ARR>:==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/sidtab.c#7 (text+ko) ==== ARR>: ARR>:@@ -42,6 +42,7 @@ ARR>: s->nel = 0; ARR>: s->next_sid = 1; ARR>: s->shutdown = 0; ARR>:+ memset (&s->lock, 0, sizeof (struct mtx)); ARR>: INIT_SIDTAB_LOCK(s); ARR>: return 0; ARR>: } ARR>: ARR> ARR>-- ARR>Andrew R. Reiter ARR>arr@watson.org ARR>arr@FreeBSD.org ARR> -- harti brandt, http://www.fokus.fraunhofer.de/research/cc/cats/employees/hartmut.brandt/private brandt@fokus.fraunhofer.de, harti@freebsd.org From owner-p4-projects@FreeBSD.ORG Tue Sep 30 08:44:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CD0916A4C0; Tue, 30 Sep 2003 08:44:57 -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 DBB9916A4B3; Tue, 30 Sep 2003 08:44:56 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id A81AD43F93; Tue, 30 Sep 2003 08:44:55 -0700 (PDT) (envelope-from arr@watson.org) Received: from fledge.watson.org (localhost [127.0.0.1]) by fledge.watson.org (8.12.9p2/8.12.9) with ESMTP id h8UFiI7R005292; Tue, 30 Sep 2003 11:44:18 -0400 (EDT) (envelope-from arr@watson.org) Received: from localhost (arr@localhost)h8UFiIn2005289; Tue, 30 Sep 2003 11:44:18 -0400 (EDT) (envelope-from arr@watson.org) X-Authentication-Warning: fledge.watson.org: arr owned process doing -bs Date: Tue, 30 Sep 2003 11:44:18 -0400 (EDT) From: "Andrew R. Reiter" To: Harti Brandt In-Reply-To: <20030930174127.W96881@beagle.fokus.fraunhofer.de> Message-ID: <20030930114409.V4476@fledge.watson.org> References: <200309301532.h8UFW81Z092302@repoman.freebsd.org> <20030930174127.W96881@beagle.fokus.fraunhofer.de> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Andrew Reisse cc: Perforce Change Reviews Subject: Re: PERFORCE change 38889 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, 30 Sep 2003 15:44:57 -0000 On Tue, 30 Sep 2003, Harti Brandt wrote: :On Tue, 30 Sep 2003, Andrew R. Reiter wrote: : :ARR>On Tue, 30 Sep 2003, Andrew Reisse wrote: :ARR> :ARR>:http://perforce.freebsd.org/chv.cgi?CH=38889 :ARR>: :ARR>:Change 38889 by areisse@areisse_tislabs on 2003/09/30 08:32:04 :ARR>: :ARR>: properly initialize sidtab structures :ARR>: don't divide by zero when empty policy files are loaded :ARR>: :ARR>:Affected files ... :ARR>: :ARR>:.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.c#5 edit :ARR>:.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/sidtab.c#7 edit :ARR>: :ARR>:Differences ... :ARR>: :ARR>:==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.c#5 (text+ko) ==== :ARR>: :ARR>:@@ -107,6 +107,9 @@ :ARR>: size_t :ARR>: fread(void *ptr, size_t size, size_t nmemb, FILE *fp) :ARR>: { :ARR>:+ if (size == 0) :ARR>:+ return 0; :ARR>:+ :ARR>: struct thread *td = curthread; :ARR> :ARR>Won't this generate a parse error? : :This is allowed in C99. See 6.8.2 of the standard. It should probably be :disallowed by style(9). Ah, thanks for the info. : :ARR> :ARR>: :ARR>: fp->FILE_uio.uio_iov->iov_base = ptr; :ARR>: :ARR>:==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/sidtab.c#7 (text+ko) ==== :ARR>: :ARR>:@@ -42,6 +42,7 @@ :ARR>: s->nel = 0; :ARR>: s->next_sid = 1; :ARR>: s->shutdown = 0; :ARR>:+ memset (&s->lock, 0, sizeof (struct mtx)); :ARR>: INIT_SIDTAB_LOCK(s); :ARR>: return 0; :ARR>: } :ARR>: :ARR> :ARR>-- :ARR>Andrew R. Reiter :ARR>arr@watson.org :ARR>arr@FreeBSD.org :ARR> : :-- :harti brandt, :http://www.fokus.fraunhofer.de/research/cc/cats/employees/hartmut.brandt/private :brandt@fokus.fraunhofer.de, harti@freebsd.org : -- Andrew R. Reiter arr@watson.org arr@FreeBSD.org From owner-p4-projects@FreeBSD.ORG Tue Sep 30 12:20:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA2C716A4C0; Tue, 30 Sep 2003 12:20: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 82FB716A4B3 for ; Tue, 30 Sep 2003 12:20:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD76144014 for ; Tue, 30 Sep 2003 12:20:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8UJKlXJ011825 for ; Tue, 30 Sep 2003 12:20:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8UJKlmS011822 for perforce@freebsd.org; Tue, 30 Sep 2003 12:20:47 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Sep 2003 12:20:47 -0700 (PDT) Message-Id: <200309301920.h8UJKlmS011822@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 38902 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, 30 Sep 2003 19:20:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=38902 Change 38902 by peter@peter_daintree on 2003/09/30 12:20:29 IFC @38900 Affected files ... .. //depot/projects/hammer/lib/libc/stdlib/qsort.3#4 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#13 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_targ_bh.c#7 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#14 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/genassym.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#19 integrate .. //depot/projects/hammer/sys/i386/i386/swtch.s#7 integrate .. //depot/projects/hammer/sys/i386/include/pcb.h#8 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#23 integrate .. //depot/projects/hammer/sys/netkey/key.c#5 integrate .. //depot/projects/hammer/sys/netkey/key_debug.h#3 integrate .. //depot/projects/hammer/sys/netkey/keysock.c#6 integrate .. //depot/projects/hammer/sys/sys/proc.h#31 integrate Differences ... ==== //depot/projects/hammer/lib/libc/stdlib/qsort.3#4 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)qsort.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/qsort.3,v 1.13 2002/12/18 12:45:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/qsort.3,v 1.14 2003/09/30 07:05:46 tjr Exp $ .\" -.Dd September 7, 2002 +.Dd September 30, 2003 .Dt QSORT 3 .Os .Sh NAME @@ -263,16 +263,19 @@ .%P pp. 114-123, 145-149 .Re .Rs -.%A Mcilroy, P.M. +.%A McIlroy, P.M. .%T "Optimistic Sorting and Information Theoretic Complexity" .%J "Fourth Annual ACM-SIAM Symposium on Discrete Algorithms" .%V January 1992 .Re .Rs .%A Bentley, J.L. +.%A McIlroy, M.D. .%T "Engineering a Sort Function" -.%J "bentley@research.att.com" -.%V January 1992 +.%J "Software--Practice and Experience" +.%V Vol. 23(11) +.%P pp. 1249-1265 +.%D November\ 1993 .Re .Sh STANDARDS The ==== //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#13 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.83 2003/09/11 19:27:24 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.84 2003/09/30 07:52:15 phk Exp $"); #include "opt_cd.h" @@ -63,6 +63,7 @@ #include #include #include +#include #include #include @@ -146,15 +147,10 @@ struct cd_params params; union ccb saved_ccb; cd_quirks quirks; - struct devstat *device_stats; STAILQ_ENTRY(cd_softc) changer_links; struct cdchanger *changer; int bufs_left; struct cam_periph *periph; - dev_t dev; -#ifdef GONE_IN_5 - eventhandler_tag clonetag; -#endif int minimum_command_size; int outstanding_cmds; struct task sysctl_task; @@ -162,6 +158,7 @@ struct sysctl_oid *sysctl_tree; STAILQ_HEAD(, cd_mode_params) mode_queue; struct cd_tocdata toc; + struct disk disk; }; struct cd_page_sizes { @@ -217,12 +214,10 @@ } }; -#define CD_CDEV_MAJOR 15 - -static d_open_t cdopen; -static d_close_t cdclose; -static d_ioctl_t cdioctl; -static d_strategy_t cdstrategy; +static disk_open_t cdopen; +static disk_close_t cdclose; +static disk_ioctl_t cdioctl; +static disk_strategy_t cdstrategy; static periph_init_t cdinit; static periph_ctor_t cdregister; @@ -294,17 +289,6 @@ PERIPHDRIVER_DECLARE(cd, cddriver); -static struct cdevsw cd_cdevsw = { - .d_open = cdopen, - .d_close = cdclose, - .d_read = physread, - .d_write = physwrite, - .d_ioctl = cdioctl, - .d_strategy = cdstrategy, - .d_name = "cd", - .d_maj = CD_CDEV_MAJOR, - .d_flags = D_DISK, -}; static int num_changers; @@ -343,27 +327,6 @@ static STAILQ_HEAD(changerlist, cdchanger) changerq; -#ifdef GONE_IN_5 -static void -cdclone(void *arg, char *name, int namelen, dev_t *dev) -{ - struct cd_softc *softc; - const char *p; - int l; - - softc = arg; - p = devtoname(softc->dev); - l = strlen(p); - if (bcmp(name, p, l)) - return; - if (name[l] != 'a' && name[l] != 'c') - return; - if (name[l + 1] != '\0') - return; - *dev = softc->dev; - return; -} -#endif static void cdinit(void) @@ -533,11 +496,6 @@ free(softc->changer, M_DEVBUF); num_changers--; } - devstat_remove_entry(softc->device_stats); - destroy_dev(softc->dev); -#ifdef GONE_IN_5 - EVENTHANDLER_DEREGISTER(dev_clone, softc->clonetag); -#endif free(softc, M_DEVBUF); splx(s); } @@ -774,18 +732,18 @@ * WORM peripheral driver. WORM drives will also have the WORM * driver attached to them. */ - softc->device_stats = devstat_new_entry("cd", + softc->disk.d_devstat = devstat_new_entry("cd", periph->unit_number, 0, DEVSTAT_BS_UNAVAILABLE, DEVSTAT_TYPE_CDROM | DEVSTAT_TYPE_IF_SCSI, DEVSTAT_PRIORITY_CD); - softc->dev = make_dev(&cd_cdevsw, periph->unit_number, - UID_ROOT, GID_OPERATOR, 0640, "cd%d", periph->unit_number); - softc->dev->si_drv1 = periph; -#ifdef GONE_IN_5 - softc->clonetag = - EVENTHANDLER_REGISTER(dev_clone, cdclone, softc, 1000); -#endif + softc->disk.d_open = cdopen; + softc->disk.d_close = cdclose; + softc->disk.d_strategy = cdstrategy; + softc->disk.d_ioctl = cdioctl; + softc->disk.d_name = "cd"; + disk_create(periph->unit_number, &softc->disk, 0, NULL, NULL); + softc->disk.d_drv1 = periph; /* * Add an async callback so that we get @@ -1028,14 +986,14 @@ } static int -cdopen(dev_t dev, int flags, int fmt, struct thread *td) +cdopen(struct disk *dp) { struct cam_periph *periph; struct cd_softc *softc; int error; int s; - periph = (struct cam_periph *)dev->si_drv1; + periph = (struct cam_periph *)dp->d_drv1; if (periph == NULL) return (ENXIO); @@ -1075,13 +1033,13 @@ } static int -cdclose(dev_t dev, int flag, int fmt, struct thread *td) +cdclose(struct disk *dp) { struct cam_periph *periph; struct cd_softc *softc; int error; - periph = (struct cam_periph *)dev->si_drv1; + periph = (struct cam_periph *)dp->d_drv1; if (periph == NULL) return (ENXIO); @@ -1097,7 +1055,7 @@ * Since we're closing this CD, mark the blocksize as unavailable. * It will be marked as available when the CD is opened again. */ - softc->device_stats->flags |= DEVSTAT_BS_UNAVAILABLE; + softc->disk.d_devstat->flags |= DEVSTAT_BS_UNAVAILABLE; /* * We'll check the media and toc again at the next open(). @@ -1391,7 +1349,7 @@ softc = (struct cd_softc *)periph->softc; error = cam_periph_runccb(ccb, error_routine, cam_flags, sense_flags, - softc->device_stats); + softc->disk.d_devstat); if (softc->flags & CD_FLAG_CHANGER) cdchangerschedule(softc); @@ -1453,7 +1411,7 @@ struct cd_softc *softc; int s; - periph = (struct cam_periph *)bp->bio_dev->si_drv1; + periph = (struct cam_periph *)bp->bio_disk->d_drv1; if (periph == NULL) { biofinish(bp, NULL, ENXIO); return; @@ -1547,7 +1505,7 @@ } else { bioq_remove(&softc->bio_queue, bp); - devstat_start_transaction_bio(softc->device_stats, bp); + devstat_start_transaction_bio(softc->disk.d_devstat, bp); scsi_read_write(&start_ccb->csio, /*retries*/4, @@ -1703,7 +1661,7 @@ if (softc->flags & CD_FLAG_CHANGER) cdchangerschedule(softc); - biofinish(bp, softc->device_stats, 0); + biofinish(bp, softc->disk.d_devstat, 0); break; } case CD_CCB_PROBE: @@ -1939,14 +1897,14 @@ } static int -cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) +cdioctl(struct disk *dp, u_long cmd, void *addr, int flag, struct thread *td) { struct cam_periph *periph; struct cd_softc *softc; int error; - periph = (struct cam_periph *)dev->si_drv1; + periph = (struct cam_periph *)dp->d_drv1; if (periph == NULL) return(ENXIO); @@ -1977,14 +1935,6 @@ switch (cmd) { - case DIOCGMEDIASIZE: - *(off_t *)addr = - (off_t)softc->params.blksize * softc->params.disksize; - break; - case DIOCGSECTORSIZE: - *(u_int *)addr = softc->params.blksize; - break; - case CDIOCPLAYTRACKS: { struct ioc_play_track *args @@ -2749,6 +2699,10 @@ } } +/* + * XXX: the disk media and sector size is only really able to change + * XXX: while the device is closed. + */ static int cdcheckmedia(struct cam_periph *periph) { @@ -2761,6 +2715,9 @@ softc = (struct cd_softc *)periph->softc; cdprevent(periph, PR_PREVENT); + softc->disk.d_maxsize = DFLTPHYS; + softc->disk.d_sectorsize = 0; + softc->disk.d_mediasize = 0; /* * Get the disc size and block size. If we can't get it, we don't @@ -2860,6 +2817,10 @@ } softc->flags |= CD_FLAG_VALID_TOC; + softc->disk.d_maxsize = DFLTPHYS; + softc->disk.d_sectorsize = softc->params.blksize; + softc->disk.d_mediasize = + (off_t)softc->params.blksize * softc->params.disksize; bailout: @@ -2870,9 +2831,9 @@ * XXX problems here if some slice or partition is still * open with the old size? */ - if ((softc->device_stats->flags & DEVSTAT_BS_UNAVAILABLE) != 0) - softc->device_stats->flags &= ~DEVSTAT_BS_UNAVAILABLE; - softc->device_stats->block_size = softc->params.blksize; + if ((softc->disk.d_devstat->flags & DEVSTAT_BS_UNAVAILABLE) != 0) + softc->disk.d_devstat->flags &= ~DEVSTAT_BS_UNAVAILABLE; + softc->disk.d_devstat->block_size = softc->params.blksize; return (error); } ==== //depot/projects/hammer/sys/cam/scsi/scsi_targ_bh.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.19 2003/09/25 05:02:19 simokawa Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.20 2003/09/30 08:03:52 simokawa Exp $"); #include #include @@ -186,14 +186,21 @@ struct cam_path *path, void *arg) { struct cam_path *new_path; + struct ccb_pathinq *cpi; + path_id_t bus_path_id; cam_status status; + cpi = (struct ccb_pathinq *)arg; + if (code == AC_PATH_REGISTERED) + bus_path_id = cpi->ccb_h.path_id; + else + bus_path_id = xpt_path_path_id(path); /* * Allocate a peripheral instance for * this target instance. */ status = xpt_create_path(&new_path, NULL, - xpt_path_path_id(path), + bus_path_id, CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); if (status != CAM_REQ_CMP) { printf("targbhasync: Unable to create path " @@ -204,10 +211,6 @@ switch (code) { case AC_PATH_REGISTERED: { - struct ccb_pathinq *cpi; - - cpi = (struct ccb_pathinq *)arg; - /* Only attach to controllers that support target mode */ if ((cpi->target_sprt & PIT_PROCESSOR) == 0) break; @@ -222,7 +225,10 @@ } case AC_PATH_DEREGISTERED: { - cam_periph_invalidate(cam_periph_find(new_path, "targbh")); + struct cam_periph *periph; + + if ((periph = cam_periph_find(new_path, "targbh")) != NULL) + cam_periph_invalidate(periph); break; } default: ==== //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#14 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.74 2003/09/22 16:05:11 des Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.75 2003/09/30 13:35:19 des Exp $"); #include #include @@ -413,7 +413,8 @@ static int linprocfs_dostat(PFS_FILL_ARGS) { - int name[2], olen, plen; + unsigned int olen, plen; + int name[2]; int i, ncpu; name[0] = CTL_HW; ==== //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.24 2003/09/29 07:29:26 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.25 2003/09/30 19:12:37 njl Exp $ */ /* @@ -262,15 +262,7 @@ { ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - /* - * Maximum length for stall is 100 us. If longer, assume caller - * really meant "sleep". - */ - if (Microseconds <= 100) - DELAY(Microseconds); - else - AcpiOsSleep(Microseconds / 1000, Microseconds % 1000); - + DELAY(Microseconds); return_VOID; } ==== //depot/projects/hammer/sys/i386/i386/genassym.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.142 2003/06/27 21:50:52 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.143 2003/09/30 08:11:35 jeff Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -89,7 +89,6 @@ ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_INTR_NESTING_LEVEL, offsetof(struct thread, td_intr_nesting_level)); ASSYM(TD_CRITNEST, offsetof(struct thread, td_critnest)); -ASSYM(TD_SWITCHIN, offsetof(struct thread, td_switchin)); ASSYM(TD_MD, offsetof(struct thread, td_md)); ASSYM(P_MD, offsetof(struct proc, p_md)); @@ -144,6 +143,7 @@ ASSYM(PCB_SAVEFPU, offsetof(struct pcb, pcb_save)); ASSYM(PCB_SAVEFPU_SIZE, sizeof(union savefpu)); ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); +ASSYM(PCB_SWITCHOUT, offsetof(struct pcb, pcb_switchout)); ASSYM(PCB_SIZE, sizeof(struct pcb)); ASSYM(PCB_VM86CALL, PCB_VM86CALL); ==== //depot/projects/hammer/sys/i386/i386/pmap.c#19 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.437 2003/09/27 05:44:53 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.438 2003/09/30 08:11:35 jeff Exp $"); /* * Manages physical address maps. @@ -2481,7 +2481,7 @@ #ifdef SMP /* - * pmap_zpi_switchin*() + * pmap_zpi_switchout*() * * These functions allow us to avoid doing IPIs alltogether in certain * temporary page-mapping situations (page zeroing). Instead to deal @@ -2490,20 +2490,20 @@ * very often so we remain relatively optimal with very little effort. */ static void -pmap_zpi_switchin12(void) +pmap_zpi_switchout12(void) { invlpg((u_int)CADDR1); invlpg((u_int)CADDR2); } static void -pmap_zpi_switchin2(void) +pmap_zpi_switchout2(void) { invlpg((u_int)CADDR2); } static void -pmap_zpi_switchin3(void) +pmap_zpi_switchout3(void) { invlpg((u_int)CADDR3); } @@ -2521,23 +2521,23 @@ mtx_lock(&CMAPCADDR12_lock); if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); - *CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; -#ifdef I386_CPU - invltlb(); -#else #ifdef SMP - curthread->td_switchin = pmap_zpi_switchin2; + curthread->td_pcb->pcb_switchout = pmap_zpi_switchout2; #endif - invlpg((u_int)CADDR2); -#endif + *CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; #if defined(I686_CPU) if (cpu_class == CPUCLASS_686) i686_pagezero(CADDR2); else #endif bzero(CADDR2, PAGE_SIZE); +#ifdef I386_CPU + invltlb(); +#else + invlpg((u_int)CADDR2); +#endif #ifdef SMP - curthread->td_switchin = NULL; + curthread->td_pcb->pcb_switchout = NULL; #endif *CMAP2 = 0; mtx_unlock(&CMAPCADDR12_lock); @@ -2556,23 +2556,23 @@ mtx_lock(&CMAPCADDR12_lock); if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); - *CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; -#ifdef I386_CPU - invltlb(); -#else #ifdef SMP - curthread->td_switchin = pmap_zpi_switchin2; + curthread->td_pcb->pcb_switchout = pmap_zpi_switchout2; #endif - invlpg((u_int)CADDR2); -#endif + *CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; #if defined(I686_CPU) if (cpu_class == CPUCLASS_686 && off == 0 && size == PAGE_SIZE) i686_pagezero(CADDR2); else #endif bzero((char *)CADDR2 + off, size); +#ifdef I386_CPU + invltlb(); +#else + invlpg((u_int)CADDR2); +#endif #ifdef SMP - curthread->td_switchin = NULL; + curthread->td_pcb->pcb_switchout = NULL; #endif *CMAP2 = 0; mtx_unlock(&CMAPCADDR12_lock); @@ -2590,23 +2590,23 @@ if (*CMAP3) panic("pmap_zero_page: CMAP3 busy"); - *CMAP3 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; -#ifdef I386_CPU - invltlb(); -#else #ifdef SMP - curthread->td_switchin = pmap_zpi_switchin3; + curthread->td_pcb->pcb_switchout = pmap_zpi_switchout3; #endif - invlpg((u_int)CADDR3); -#endif + *CMAP3 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M; #if defined(I686_CPU) if (cpu_class == CPUCLASS_686) i686_pagezero(CADDR3); else #endif bzero(CADDR3, PAGE_SIZE); +#ifdef I386_CPU + invltlb(); +#else + invlpg((u_int)CADDR3); +#endif #ifdef SMP - curthread->td_switchin = NULL; + curthread->td_pcb->pcb_switchout = NULL; #endif *CMAP3 = 0; } @@ -2626,20 +2626,20 @@ panic("pmap_copy_page: CMAP1 busy"); if (*CMAP2) panic("pmap_copy_page: CMAP2 busy"); +#ifdef SMP + curthread->td_pcb->pcb_switchout = pmap_zpi_switchout12; +#endif *CMAP1 = PG_V | VM_PAGE_TO_PHYS(src) | PG_A; *CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(dst) | PG_A | PG_M; + bcopy(CADDR1, CADDR2, PAGE_SIZE); #ifdef I386_CPU invltlb(); #else -#ifdef SMP - curthread->td_switchin = pmap_zpi_switchin12; -#endif invlpg((u_int)CADDR1); invlpg((u_int)CADDR2); #endif - bcopy(CADDR1, CADDR2, PAGE_SIZE); #ifdef SMP - curthread->td_switchin = NULL; + curthread->td_pcb->pcb_switchout = NULL; #endif *CMAP1 = 0; *CMAP2 = 0; ==== //depot/projects/hammer/sys/i386/i386/swtch.s#7 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.142 2003/07/10 01:02:59 peter Exp $ + * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.143 2003/09/30 08:11:35 jeff Exp $ */ #include "opt_npx.h" @@ -118,7 +118,12 @@ movl %gs,PCB_GS(%edx) pushfl /* PSL */ popl PCB_PSL(%edx) - + /* Check to see if we need to call a switchout function. */ + movl PCB_SWITCHOUT(%edx),%eax + cmpl $0, %eax + je 1f + call *%eax +1: /* Test if debug registers should be saved. */ testl $PCB_DBREGS,PCB_FLAGS(%edx) jz 1f /* no, skip over */ ==== //depot/projects/hammer/sys/i386/include/pcb.h#8 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pcb.h,v 1.49 2002/11/07 01:34:23 davidxu Exp $ + * $FreeBSD: src/sys/i386/include/pcb.h,v 1.50 2003/09/30 08:11:36 jeff Exp $ */ #ifndef _I386_PCB_H_ @@ -73,7 +73,8 @@ int pcb_gs; struct pcb_ext *pcb_ext; /* optional pcb extension */ int pcb_psl; /* process status long */ - u_long __pcb_spare[2]; /* adjust to avoid core dump size changes */ + void (*pcb_switchout)(void); /* Special switchout function. */ + u_long __pcb_spare[1]; /* adjust to avoid core dump size changes */ }; #ifdef _KERNEL ==== //depot/projects/hammer/sys/kern/kern_synch.c#23 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.233 2003/08/19 17:51:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.234 2003/09/30 08:11:34 jeff Exp $"); #include "opt_ddb.h" #include "opt_ktrace.h" @@ -531,14 +531,6 @@ if (PCPU_GET(switchtime.sec) == 0) binuptime(PCPU_PTR(switchtime)); PCPU_SET(switchticks, ticks); - - /* - * Call the switchin function while still holding the scheduler lock - * (used by the idlezero code and the general page-zeroing code) - */ - if (td->td_switchin) - td->td_switchin(); - /* * If the last thread was exiting, finish cleaning it up. */ ==== //depot/projects/hammer/sys/netkey/key.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netkey/key.c,v 1.50 2003/09/25 13:40:06 ume Exp $"); +__FBSDID("$FreeBSD: src/sys/netkey/key.c,v 1.52 2003/09/30 10:52:49 ume Exp $"); /* * This code is referd to RFC 2367 @@ -823,7 +823,7 @@ /*NOTREACHED*/ } - /* prefered new sa rather than old sa */ + /* preferred new sa rather than old sa */ if (candidate->lft_c->sadb_lifetime_addtime < sav->lft_c->sadb_lifetime_addtime) { d = candidate; @@ -1790,16 +1790,16 @@ /* check policy */ /* key_spdadd() accepts DISCARD, NONE and IPSEC. */ - if (xpl0->sadb_x_policy_type == IPSEC_POLICY_ENTRUST - || xpl0->sadb_x_policy_type == IPSEC_POLICY_BYPASS) { + if (xpl0->sadb_x_policy_type == IPSEC_POLICY_ENTRUST || + xpl0->sadb_x_policy_type == IPSEC_POLICY_BYPASS) { ipseclog((LOG_DEBUG, "key_spdadd: Invalid policy type.\n")); return key_senderror(so, m, EINVAL); } /* policy requests are mandatory when action is ipsec. */ - if (mhp->msg->sadb_msg_type != SADB_X_SPDSETIDX - && xpl0->sadb_x_policy_type == IPSEC_POLICY_IPSEC - && mhp->extlen[SADB_X_EXT_POLICY] <= sizeof(*xpl0)) { + if (mhp->msg->sadb_msg_type != SADB_X_SPDSETIDX && + xpl0->sadb_x_policy_type == IPSEC_POLICY_IPSEC && + mhp->extlen[SADB_X_EXT_POLICY] <= sizeof(*xpl0)) { ipseclog((LOG_DEBUG, "key_spdadd: some policy requests part required.\n")); return key_senderror(so, m, EINVAL); } @@ -1979,7 +1979,7 @@ * and send, * * to the ikmpd. - * policy(*) including direction of policy. + * policy(*) including the direction of the policy. * * m will always be freed. */ @@ -2041,7 +2041,7 @@ return key_senderror(so, m, EINVAL); } - /* save policy id to buffer to be returned. */ + /* save policy id to be returned. */ xpl0->sadb_x_policy_id = sp->id; sp->state = IPSEC_SPSTATE_DEAD; @@ -2102,7 +2102,8 @@ /* Is there SP in SPD ? */ if ((sp = key_getspbyid(id)) == NULL) { - ipseclog((LOG_DEBUG, "key_spddelete2: no SP found id:%u.\n", id)); + ipseclog((LOG_DEBUG, "key_spddelete2: no SP found id:%u.\n", + id)); key_senderror(so, m, EINVAL); } @@ -2241,7 +2242,7 @@ if (sp->policy != IPSEC_POLICY_IPSEC) panic("key_spdacquire: policy mismathed. IPsec is expected."); - /* Get an entry to check whether sent message or not. */ + /* get an entry to check whether sent message or not. */ if ((newspacq = key_getspacq(&sp->spidx)) != NULL) { if (key_blockacq_count < newspacq->count) { /* reset counter and do send message. */ @@ -2616,7 +2617,7 @@ newsah->state = SADB_SASTATE_MATURE; LIST_INSERT_HEAD(&sahtree, newsah, chain); - return(newsah); + return (newsah); } /* @@ -2666,7 +2667,7 @@ } } - /* don't delete sah only if there are savs. */ + /* delete sah only if there's no sav. */ if (zombie) { splx(s); return; @@ -3237,8 +3238,8 @@ switch (sav->sah->saidx.proto) { case IPPROTO_ESP: /* check flags */ - if ((sav->flags & SADB_X_EXT_OLD) - && (sav->flags & SADB_X_EXT_DERIV)) { + if ((sav->flags & SADB_X_EXT_OLD) && + (sav->flags & SADB_X_EXT_DERIV)) { ipseclog((LOG_DEBUG, "key_mature: " "invalid flag (derived) given to old-esp.\n")); return EINVAL; @@ -3259,7 +3260,7 @@ if (sav->alg_enc != SADB_EALG_NONE) { ipseclog((LOG_DEBUG, "key_mature: " "protocol and algorithm mismated.\n")); - return(EINVAL); + return (EINVAL); } checkmask = 2; mustmask = 2; @@ -3268,12 +3269,12 @@ if (sav->alg_auth != SADB_AALG_NONE) { ipseclog((LOG_DEBUG, "key_mature: " "protocol and algorithm mismated.\n")); - return(EINVAL); + return (EINVAL); } - if ((sav->flags & SADB_X_EXT_RAWCPI) == 0 - && ntohl(sav->spi) >= 0x10000) { + if ((sav->flags & SADB_X_EXT_RAWCPI) == 0 && + ntohl(sav->spi) >= 0x10000) { ipseclog((LOG_DEBUG, "key_mature: invalid cpi for IPComp.\n")); - return(EINVAL); + return (EINVAL); } checkmask = 4; mustmask = 4; @@ -3421,8 +3422,8 @@ case SADB_X_EXT_SA2: m = key_setsadbxsa2(sav->sah->saidx.mode, - sav->replay ? sav->replay->count : 0, - sav->sah->saidx.reqid); + sav->replay ? sav->replay->count : 0, + sav->sah->saidx.reqid); if (!m) goto fail; break; @@ -3812,8 +3813,7 @@ case AF_INET: sin = (struct sockaddr_in *)sa; for (ia = in_ifaddrhead.tqh_first; ia; - ia = ia->ia_link.tqe_next) - { + ia = ia->ia_link.tqe_next) { if (sin->sin_family == ia->ia_addr.sin_family && sin->sin_len == ia->ia_addr.sin_len && sin->sin_addr.s_addr == ia->ia_addr.sin_addr.s_addr) @@ -3911,8 +3911,7 @@ } else { /* CMP_MODE_REQID, CMP_REQID, CMP_HEAD */ - if (flag == CMP_MODE_REQID - ||flag == CMP_REQID) { + if (flag == CMP_MODE_REQID || flag == CMP_REQID) { /* * If reqid of SPD is non-zero, unique SA is required. * The result must be of same reqid in this case. @@ -3922,8 +3921,8 @@ } if (flag == CMP_MODE_REQID) { - if (saidx0->mode != IPSEC_MODE_ANY - && saidx0->mode != saidx1->mode) + if (saidx0->mode != IPSEC_MODE_ANY && + saidx0->mode != saidx1->mode) return 0; } @@ -3960,9 +3959,8 @@ if (spidx0 == NULL || spidx1 == NULL) return 0; - if (spidx0->prefs != spidx1->prefs - || spidx0->prefd != spidx1->prefd - || spidx0->ul_proto != spidx1->ul_proto) + if (spidx0->prefs != spidx1->prefs || spidx0->prefd != spidx1->prefd || + spidx0->ul_proto != spidx1->ul_proto) return 0; if (key_sockaddrcmp((struct sockaddr *)&spidx0->src, @@ -4004,14 +4002,14 @@ return 0; /* if spidx.ul_proto == IPSEC_ULPROTO_ANY, ignore. */ - if (spidx0->ul_proto != (u_int16_t)IPSEC_ULPROTO_ANY - && spidx0->ul_proto != spidx1->ul_proto) + if (spidx0->ul_proto != (u_int16_t)IPSEC_ULPROTO_ANY && + spidx0->ul_proto != spidx1->ul_proto) return 0; switch (spidx0->src.ss_family) { case AF_INET: - if (satosin(&spidx0->src)->sin_port != IPSEC_PORT_ANY - && satosin(&spidx0->src)->sin_port != + if (satosin(&spidx0->src)->sin_port != IPSEC_PORT_ANY && + satosin(&spidx0->src)->sin_port != satosin(&spidx1->src)->sin_port) return 0; if (!key_bbcmp((caddr_t)&satosin(&spidx0->src)->sin_addr, @@ -4019,8 +4017,8 @@ return 0; break; case AF_INET6: - if (satosin6(&spidx0->src)->sin6_port != IPSEC_PORT_ANY - && satosin6(&spidx0->src)->sin6_port != + if (satosin6(&spidx0->src)->sin6_port != IPSEC_PORT_ANY && + satosin6(&spidx0->src)->sin6_port != satosin6(&spidx1->src)->sin6_port) return 0; /* @@ -4045,8 +4043,8 @@ switch (spidx0->dst.ss_family) { case AF_INET: - if (satosin(&spidx0->dst)->sin_port != IPSEC_PORT_ANY - && satosin(&spidx0->dst)->sin_port != + if (satosin(&spidx0->dst)->sin_port != IPSEC_PORT_ANY && + satosin(&spidx0->dst)->sin_port != satosin(&spidx1->dst)->sin_port) return 0; if (!key_bbcmp((caddr_t)&satosin(&spidx0->dst)->sin_addr, @@ -4054,8 +4052,8 @@ return 0; break; case AF_INET6: - if (satosin6(&spidx0->dst)->sin6_port != IPSEC_PORT_ANY - && satosin6(&spidx0->dst)->sin6_port != + if (satosin6(&spidx0->dst)->sin6_port != IPSEC_PORT_ANY && + satosin6(&spidx0->dst)->sin6_port != satosin6(&spidx1->dst)->sin6_port) return 0; /* @@ -4191,7 +4189,6 @@ for (sp = LIST_FIRST(&sptree[dir]); sp != NULL; sp = nextsp) { - nextsp = LIST_NEXT(sp, chain); if (sp->state == IPSEC_SPSTATE_DEAD) { @@ -4203,10 +4200,10 @@ continue; /* the deletion will occur next time */ - if ((sp->lifetime - && tv.tv_sec - sp->created > sp->lifetime) - || (sp->validtime - && tv.tv_sec - sp->lastused > sp->validtime)) { + if ((sp->lifetime && + tv.tv_sec - sp->created > sp->lifetime) || + (sp->validtime && >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 30 12:21:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06A1916A4C1; Tue, 30 Sep 2003 12:21: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 B608316A4BF for ; Tue, 30 Sep 2003 12:21:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA6A743F85 for ; Tue, 30 Sep 2003 12:21:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8UJLnXJ011861 for ; Tue, 30 Sep 2003 12:21:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8UJLnaI011858 for perforce@freebsd.org; Tue, 30 Sep 2003 12:21:49 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Sep 2003 12:21:49 -0700 (PDT) Message-Id: <200309301921.h8UJLnaI011858@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 38903 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, 30 Sep 2003 19:21:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=38903 Change 38903 by peter@peter_daintree on 2003/09/30 12:21:16 import jhb's cleanups Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#9 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#2 (text+ko) ==== @@ -78,12 +78,8 @@ int error, vector; vector = isrc->is_pic->pic_vector(isrc); - mtx_lock_spin(&intr_table_lock); - if (interrupt_sources[vector] != NULL) { - mtx_unlock_spin(&intr_table_lock); + if (interrupt_sources[vector] != NULL) return (EEXIST); - } - mtx_unlock_spin(&intr_table_lock); /* * Ok, so this is kind of a nasty optimization that only works * because sizeof(int) == sizeof(void *) on i386. If we passed @@ -103,7 +99,6 @@ return (error); mtx_lock_spin(&intr_table_lock); if (interrupt_sources[vector] != NULL) { - /* XXX: This should never happen. */ mtx_unlock_spin(&intr_table_lock); ithread_destroy(isrc->is_ithread); return (EEXIST); @@ -117,12 +112,8 @@ struct intsrc * intr_lookup_source(int vector) { - struct intsrc *isrc; - mtx_lock_spin(&intr_table_lock); - isrc = interrupt_sources[vector]; - mtx_unlock_spin(&intr_table_lock); - return (isrc); + return (interrupt_sources[vector]); } int ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#7 (text+ko) ==== @@ -38,23 +38,14 @@ #include #include #include -#if 0 -#include -#endif #include #include #include -#if 0 -#include -#endif #include #include #include -#if 0 -#include -#endif #include #ifdef DEV_ISA ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#9 (text+ko) ==== @@ -35,29 +35,17 @@ #include #include #include -#if 0 -#include -#include -#include -#endif #include #include #include -#if 0 -#include -#endif #include #include #include #include #include #include -#if 0 -#include -#include -#endif #include /* From owner-p4-projects@FreeBSD.ORG Tue Sep 30 13:53:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7050B16A4C0; Tue, 30 Sep 2003 13:53: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 4A11E16A4B3 for ; Tue, 30 Sep 2003 13:53:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8484543FF9 for ; Tue, 30 Sep 2003 13:53:46 -0700 (PDT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8UKrkXJ022312 for ; Tue, 30 Sep 2003 13:53:46 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8UKrjed022309 for perforce@freebsd.org; Tue, 30 Sep 2003 13:53:45 -0700 (PDT) (envelope-from imp@freebsd.org) Date: Tue, 30 Sep 2003 13:53:45 -0700 (PDT) Message-Id: <200309302053.h8UKrjed022309@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 38911 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, 30 Sep 2003 20:53:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=38911 Change 38911 by imp@imp_koguchi on 2003/09/30 13:52:55 Strawman driver Affected files ... .. //depot/doc/strawman-driver.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Sep 30 14:11:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43ADF16A4C0; Tue, 30 Sep 2003 14:11: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 012B016A4B3 for ; Tue, 30 Sep 2003 14:11:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86ACA43FB1 for ; Tue, 30 Sep 2003 14:11:11 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8ULBBXJ024341 for ; Tue, 30 Sep 2003 14:11:11 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8ULBApm024338 for perforce@freebsd.org; Tue, 30 Sep 2003 14:11:10 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Tue, 30 Sep 2003 14:11:10 -0700 (PDT) Message-Id: <200309302111.h8ULBApm024338@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 38916 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, 30 Sep 2003 21:11:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=38916 Change 38916 by sam@sam_ebb on 2003/09/30 14:10:36 IFC Affected files ... .. //depot/projects/netperf/sys/alpha/tlsb/zs_tlsb.c#4 integrate .. //depot/projects/netperf/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/netperf/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/netperf/sys/conf/NOTES#11 integrate .. //depot/projects/netperf/sys/conf/files#9 integrate .. //depot/projects/netperf/sys/conf/majors#4 integrate .. //depot/projects/netperf/sys/conf/options#10 integrate .. //depot/projects/netperf/sys/ddb/db_elf.c#2 integrate .. //depot/projects/netperf/sys/dev/aac/aac.c#6 integrate .. //depot/projects/netperf/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/netperf/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi.c#9 integrate .. //depot/projects/netperf/sys/dev/adlink/adlink.c#5 integrate .. //depot/projects/netperf/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/netperf/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/netperf/sys/dev/kbd/kbd.c#3 integrate .. //depot/projects/netperf/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/netperf/sys/dev/md/md.c#5 integrate .. //depot/projects/netperf/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/netperf/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/netperf/sys/dev/null/null.c#3 integrate .. //depot/projects/netperf/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/netperf/sys/dev/ofw/openfirmio.c#3 integrate .. //depot/projects/netperf/sys/dev/raidframe/rf_decluster.c#3 integrate .. //depot/projects/netperf/sys/dev/raidframe/rf_freebsdkintf.c#3 integrate .. //depot/projects/netperf/sys/dev/sab/sab.c#3 integrate .. //depot/projects/netperf/sys/dev/sio/sio.c#8 integrate .. //depot/projects/netperf/sys/dev/uart/uart_cpu_sparc64.c#4 integrate .. //depot/projects/netperf/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/ugen.c#4 integrate .. //depot/projects/netperf/sys/dev/usb/uhid.c#4 integrate .. //depot/projects/netperf/sys/dev/usb/ulpt.c#4 integrate .. //depot/projects/netperf/sys/dev/usb/ums.c#4 integrate .. //depot/projects/netperf/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/netperf/sys/dev/vinum/vinumconfig.c#3 integrate .. //depot/projects/netperf/sys/dev/vinum/vinumrevive.c#3 integrate .. //depot/projects/netperf/sys/dev/vinum/vinumvar.h#2 integrate .. //depot/projects/netperf/sys/dev/zs/zs.c#3 integrate .. //depot/projects/netperf/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/netperf/sys/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_iconv.c#1 branch .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfsmount.h#3 integrate .. //depot/projects/netperf/sys/fs/ntfs/ntfs.h#2 integrate .. //depot/projects/netperf/sys/fs/ntfs/ntfs_iconv.c#1 branch .. //depot/projects/netperf/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/netperf/sys/fs/ntfs/ntfs_subr.h#2 integrate .. //depot/projects/netperf/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/netperf/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/netperf/sys/fs/ntfs/ntfsmount.h#2 integrate .. //depot/projects/netperf/sys/fs/procfs/procfs_map.c#3 integrate .. //depot/projects/netperf/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/netperf/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/netperf/sys/geom/geom_disk.c#4 integrate .. //depot/projects/netperf/sys/geom/geom_io.c#4 integrate .. //depot/projects/netperf/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/elan-mmcr.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/netperf/sys/i386/isa/cy.c#2 integrate .. //depot/projects/netperf/sys/ia64/include/varargs.h#2 integrate .. //depot/projects/netperf/sys/isofs/cd9660/cd9660_iconv.c#1 branch .. //depot/projects/netperf/sys/isofs/cd9660/cd9660_lookup.c#3 integrate .. //depot/projects/netperf/sys/isofs/cd9660/cd9660_mount.h#2 integrate .. //depot/projects/netperf/sys/isofs/cd9660/cd9660_rrip.c#2 integrate .. //depot/projects/netperf/sys/isofs/cd9660/cd9660_util.c#2 integrate .. //depot/projects/netperf/sys/isofs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/netperf/sys/isofs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/netperf/sys/isofs/cd9660/iso.h#2 integrate .. //depot/projects/netperf/sys/kern/kern_conf.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_exec.c#4 integrate .. //depot/projects/netperf/sys/kern/kern_mac.c#5 integrate .. //depot/projects/netperf/sys/kern/subr_devstat.c#3 integrate .. //depot/projects/netperf/sys/kern/subr_xxx.c#2 delete .. //depot/projects/netperf/sys/kern/sys_generic.c#3 integrate .. //depot/projects/netperf/sys/kern/tty_cons.c#4 integrate .. //depot/projects/netperf/sys/kern/tty_pty.c#2 integrate .. //depot/projects/netperf/sys/kern/tty_tty.c#2 integrate .. //depot/projects/netperf/sys/kern/vfs_default.c#2 integrate .. //depot/projects/netperf/sys/libkern/iconv.c#2 integrate .. //depot/projects/netperf/sys/libkern/iconv_converter_if.m#2 integrate .. //depot/projects/netperf/sys/libkern/iconv_xlat.c#2 integrate .. //depot/projects/netperf/sys/libkern/iconv_xlat16.c#1 branch .. //depot/projects/netperf/sys/modules/Makefile#6 integrate .. //depot/projects/netperf/sys/modules/cd9660/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/cd9660_iconv/Makefile#1 branch .. //depot/projects/netperf/sys/modules/libiconv/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/msdosfs/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/msdosfs_iconv/Makefile#1 branch .. //depot/projects/netperf/sys/modules/ntfs/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/ntfs_iconv/Makefile#1 branch .. //depot/projects/netperf/sys/net/if.c#4 integrate .. //depot/projects/netperf/sys/net/if_tun.c#2 integrate .. //depot/projects/netperf/sys/net/if_tunvar.h#2 integrate .. //depot/projects/netperf/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/netperf/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/netperf/sys/netipsec/ipsec.c#7 integrate .. //depot/projects/netperf/sys/netipsec/ipsec.h#7 integrate .. //depot/projects/netperf/sys/netipsec/ipsec_input.c#7 integrate .. //depot/projects/netperf/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/netperf/sys/netipsec/ipsec_output.c#7 integrate .. //depot/projects/netperf/sys/netipsec/key.c#11 integrate .. //depot/projects/netperf/sys/netipsec/key_debug.c#3 integrate .. //depot/projects/netperf/sys/netipsec/keydb.h#6 integrate .. //depot/projects/netperf/sys/netipsec/keysock.c#3 integrate .. //depot/projects/netperf/sys/netipsec/xform_ah.c#6 integrate .. //depot/projects/netperf/sys/netipsec/xform_esp.c#7 integrate .. //depot/projects/netperf/sys/netipsec/xform_ipcomp.c#6 integrate .. //depot/projects/netperf/sys/netipsec/xform_ipip.c#3 integrate .. //depot/projects/netperf/sys/netncp/ncp_mod.c#2 integrate .. //depot/projects/netperf/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/netperf/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/netperf/sys/pc98/pc98/sio.c#4 integrate .. //depot/projects/netperf/sys/pci/if_xl.c#6 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/netperf/sys/sys/conf.h#2 integrate .. //depot/projects/netperf/sys/sys/cons.h#3 integrate .. //depot/projects/netperf/sys/sys/iconv.h#2 integrate .. //depot/projects/netperf/sys/sys/param.h#8 integrate .. //depot/projects/netperf/sys/sys/systm.h#2 integrate .. //depot/projects/netperf/sys/vm/uma_dbg.c#3 integrate .. //depot/projects/netperf/sys/vm/vm_map.c#7 integrate .. //depot/projects/netperf/sys/vm/vm_map.h#5 integrate .. //depot/projects/netperf/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/netperf/sys/vm/vm_page.c#6 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/tlsb/zs_tlsb.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.38 2003/09/26 10:53:29 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.39 2003/09/26 19:35:49 phk Exp $"); #include "opt_ddb.h" @@ -228,6 +228,7 @@ zs_console_addr = (caddr_t) ALPHA_PHYS_TO_K0SEG(base + offset); sprintf(zs_consdev.cn_name, "zs0"); + zs_consdev.cn_unit = 0; zs_consdev.cn_pri = CN_NORMAL; make_dev(&zs_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "zs0"); cnadd(&zs_consdev); @@ -238,7 +239,7 @@ zs_cngetc(struct consdev *cp) { int s = spltty(); - int c = zs_getc(zs_console_addr, minor(cp->cn_dev)); + int c = zs_getc(zs_console_addr, cp->cn_unit); splx(s); return c; } @@ -247,7 +248,7 @@ zs_cncheckc(struct consdev *cp) { int s = spltty(); - int c = zs_maygetc(zs_console_addr, minor(cp->cn_dev)); + int c = zs_maygetc(zs_console_addr, cp->cn_unit); splx(s); return c; } @@ -256,7 +257,7 @@ zs_cnputc(struct consdev *cp, int c) { int s = spltty(); - zs_putc(zs_console_addr, minor(cp->cn_dev), c); + zs_putc(zs_console_addr, cp->cn_unit, c); splx(s); } ==== //depot/projects/netperf/sys/amd64/amd64/pmap.c#10 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.439 2003/09/26 04:12:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.440 2003/09/27 20:53:00 alc Exp $"); /* * Manages physical address maps. @@ -1015,12 +1015,6 @@ static vm_pindex_t color; /* - * allocate object for the ptes - */ - if (pmap->pm_pteobj == NULL) - pmap->pm_pteobj = vm_object_allocate(OBJT_DEFAULT, NUPDE + NUPDPE + NUPML4E + 1); - - /* * allocate the page directory page */ while ((pml4pg = vm_page_alloc(NULL, color++, VM_ALLOC_NOOBJ | @@ -1068,6 +1062,11 @@ /* * this routine is called if the page table page is not * mapped correctly. + * + * Note: If a page allocation fails at page table level two or three, + * one or two pages may be held during the wait, only to be released + * afterwards. This conservative approach is easily argued to avoid + * race conditions. */ static vm_page_t _pmap_allocpte(pmap, ptepindex) @@ -1075,15 +1074,19 @@ vm_pindex_t ptepindex; { vm_page_t m, pdppg, pdpg; - int is_object_locked; /* - * Find or fabricate a new pagetable page + * Allocate a page table page. */ - if (!(is_object_locked = VM_OBJECT_LOCKED(pmap->pm_pteobj))) - VM_OBJECT_LOCK(pmap->pm_pteobj); - m = vm_page_grab(pmap->pm_pteobj, ptepindex, - VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); + if ((m = vm_page_alloc(NULL, ptepindex, VM_ALLOC_NOOBJ | + VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) { + VM_WAIT; + /* + * Indicate the need to retry. While waiting, the page table + * page may have been allocated. + */ + return (NULL); + } if ((m->flags & PG_ZERO) == 0) pmap_zero_page(m); @@ -1125,7 +1128,13 @@ pml4 = &pmap->pm_pml4[pml4index]; if ((*pml4 & PG_V) == 0) { /* Have to allocate a new pdp, recurse */ - _pmap_allocpte(pmap, NUPDE + NUPDPE + pml4index); + if (_pmap_allocpte(pmap, NUPDE + NUPDPE + pml4index) == NULL) { + vm_page_lock_queues(); + vm_page_unhold(m); + vm_page_free(m); + vm_page_unlock_queues(); + return (NULL); + } } else { /* Add reference to pdp page */ pdppg = PHYS_TO_VM_PAGE(*pml4); @@ -1152,7 +1161,13 @@ pml4 = &pmap->pm_pml4[pml4index]; if ((*pml4 & PG_V) == 0) { /* Have to allocate a new pd, recurse */ - _pmap_allocpte(pmap, NUPDE + pdpindex); + if (_pmap_allocpte(pmap, NUPDE + pdpindex) == NULL) { + vm_page_lock_queues(); + vm_page_unhold(m); + vm_page_free(m); + vm_page_unlock_queues(); + return (NULL); + } pdp = (pdp_entry_t *)PHYS_TO_DMAP(*pml4 & PG_FRAME); pdp = &pdp[pdpindex & ((1ul << NPDPEPGSHIFT) - 1)]; } else { @@ -1160,7 +1175,13 @@ pdp = &pdp[pdpindex & ((1ul << NPDPEPGSHIFT) - 1)]; if ((*pdp & PG_V) == 0) { /* Have to allocate a new pd, recurse */ - _pmap_allocpte(pmap, NUPDE + pdpindex); + if (_pmap_allocpte(pmap, NUPDE + pdpindex) == NULL) { + vm_page_lock_queues(); + vm_page_unhold(m); + vm_page_free(m); + vm_page_unlock_queues(); + return (NULL); + } } else { /* Add reference to the pd page */ pdpg = PHYS_TO_VM_PAGE(*pdp); @@ -1179,8 +1200,6 @@ vm_page_flag_clear(m, PG_ZERO); vm_page_wakeup(m); vm_page_unlock_queues(); - if (!is_object_locked) - VM_OBJECT_UNLOCK(pmap->pm_pteobj); return m; } @@ -1196,7 +1215,7 @@ * Calculate pagetable page index */ ptepindex = pmap_pde_pindex(va); - +retry: /* * Get the page directory entry */ @@ -1219,13 +1238,16 @@ if (pd != 0 && (*pd & PG_V) != 0) { m = PHYS_TO_VM_PAGE(*pd); m->hold_count++; - return m; + } else { + /* + * Here if the pte page isn't mapped, or if it has been + * deallocated. + */ + m = _pmap_allocpte(pmap, ptepindex); + if (m == NULL) + goto retry; } - /* - * Here if the pte page isn't mapped, or if it has been deallocated. - */ - m = _pmap_allocpte(pmap, ptepindex); - return m; + return (m); } @@ -1258,8 +1280,6 @@ vm_page_busy(m); vm_page_free(m); vm_page_unlock_queues(); - KASSERT(TAILQ_EMPTY(&pmap->pm_pteobj->memq), - ("pmap_release: leaking page table pages")); } static int @@ -1955,6 +1975,7 @@ if (mpte && (mpte->pindex == ptepindex)) { mpte->hold_count++; } else { + retry: /* * Get the page directory entry */ @@ -1971,6 +1992,8 @@ mpte->hold_count++; } else { mpte = _pmap_allocpte(pmap, ptepindex); + if (mpte == NULL) + goto retry; } } } else { ==== //depot/projects/netperf/sys/amd64/include/pmap.h#2 (text+ko) ==== @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.105 2003/07/09 23:04:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.106 2003/09/27 20:53:01 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -219,7 +219,6 @@ struct pmap { pml4_entry_t *pm_pml4; /* KVA of level 4 page table */ - vm_object_t pm_pteobj; /* Container for pte's */ TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ u_long pm_active; /* active on cpus */ struct pmap_statistics pm_stats; /* pmap statistics */ ==== //depot/projects/netperf/sys/conf/NOTES#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1177 2003/09/25 16:06:17 sam Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1178 2003/09/26 20:26:22 fjoe Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -788,6 +788,12 @@ # Cryptographically secure random number generator; /dev/[u]random device random +# Optional character code conversion support with LIBICONV. +# Each option requires their base file system and LIBICONV. +options CD9660_ICONV +options MSDOSFS_ICONV +options NTFS_ICONV + ##################################################################### # POSIX P1003.1B ==== //depot/projects/netperf/sys/conf/files#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.825 2003/09/14 17:02:59 takawata Exp $ +# $FreeBSD: src/sys/conf/files,v 1.827 2003/09/27 12:53:32 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -893,11 +893,13 @@ fs/msdosfs/msdosfs_lookup.c optional msdosfs fs/msdosfs/msdosfs_vfsops.c optional msdosfs fs/msdosfs/msdosfs_vnops.c optional msdosfs +fs/msdosfs/msdosfs_iconv.c optional msdosfs_iconv fs/ntfs/ntfs_compr.c optional ntfs fs/ntfs/ntfs_ihash.c optional ntfs fs/ntfs/ntfs_subr.c optional ntfs fs/ntfs/ntfs_vfsops.c optional ntfs fs/ntfs/ntfs_vnops.c optional ntfs +fs/ntfs/ntfs_iconv.c optional ntfs_iconv fs/nullfs/null_subr.c optional nullfs fs/nullfs/null_vfsops.c optional nullfs fs/nullfs/null_vnops.c optional nullfs @@ -1056,6 +1058,7 @@ isofs/cd9660/cd9660_util.c optional cd9660 isofs/cd9660/cd9660_vfsops.c optional cd9660 isofs/cd9660/cd9660_vnops.c optional cd9660 +isofs/cd9660/cd9660_iconv.c optional cd9660_iconv kern/imgact_elf.c standard kern/imgact_shell.c standard kern/inflate.c optional gzip @@ -1144,7 +1147,6 @@ kern/subr_taskqueue.c standard kern/subr_trap.c standard kern/subr_witness.c optional witness -kern/subr_xxx.c standard kern/sys_generic.c standard kern/sys_pipe.c standard kern/sys_process.c standard @@ -1198,6 +1200,7 @@ libkern/iconv.c optional libiconv libkern/iconv_converter_if.m optional libiconv libkern/iconv_xlat.c optional libiconv +libkern/iconv_xlat16.c optional libiconv libkern/index.c standard libkern/inet_ntoa.c standard libkern/mcount.c optional profiling-routine ==== //depot/projects/netperf/sys/conf/majors#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/majors,v 1.177 2003/08/27 07:35:12 simokawa Exp $ +# $FreeBSD: src/sys/conf/majors,v 1.179 2003/09/29 14:15:57 scottl Exp $ # # This list is semi-obsoleted by DEVFS, but for now it still contains # the current allocation of device major numbers. @@ -148,7 +148,6 @@ 146 *twe 3ware Escalade ATA RAID (controller) 148 *agp AGP 149 *tap Ethernet tunneling device -150 *aac Adaptec FSA RAID (controller) 152 *acpi ACPI bios support (Takanori Watanabe takawata@shidahara1.planet.sci.kobe-u.ac.jp) 153 *ti Tigon Gigabit Ethernet driver (ken@FreeBSD.ORG) 154 *asr Adaptec SCSI RAID @@ -169,8 +168,6 @@ 173 *devctl Devd control device 174 pciwd Berkshire Watchdog PCI 175 ips IBM/Adaptec ServeRAID (control device) -178 raidctl RAIDframe (control device) -179 raid RAIDframe (disk device) 180 nvidia NVIDIA (nvidiaN/nvidiactl) 181 casm HP/Compaq ProLiant Advanced Server Management 183 *smapi SMAPI BIOS interface ==== //depot/projects/netperf/sys/conf/options#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.414 2003/09/11 23:06:41 marcel Exp $ +# $FreeBSD: src/sys/conf/options,v 1.415 2003/09/26 20:26:22 fjoe Exp $ # # On the handling of kernel options # @@ -198,6 +198,11 @@ NFSCLIENT opt_nfs.h NFSSERVER opt_nfs.h +# filesystems and libiconv bridge +CD9660_ICONV opt_dontuse.h +MSDOSFS_ICONV opt_dontuse.h +NTFS_ICONV opt_dontuse.h + # If you are following the conditions in the copyright, # you can enable soft-updates which will speed up a lot of thigs # and make the system safer from crashes at the same time. ==== //depot/projects/netperf/sys/ddb/db_elf.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_elf.c,v 1.16 2003/06/10 22:09:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_elf.c,v 1.17 2003/09/28 06:02:33 bde Exp $"); #include "opt_ddb.h" @@ -266,6 +266,11 @@ for (symp = symtab_start; symp < symtab_end; symp++) { if (symp->st_name == 0) continue; + if (ELF_ST_TYPE(symp->st_info) != STT_OBJECT && + ELF_ST_TYPE(symp->st_info) != STT_FUNC && + ELF_ST_TYPE(symp->st_info) != STT_NOTYPE) + continue; + if (off >= symp->st_value) { if ((off - symp->st_value) < diff) { diff = off - symp->st_value; ==== //depot/projects/netperf/sys/dev/aac/aac.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.78 2003/09/16 16:07:15 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.79 2003/09/29 14:10:04 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -180,15 +180,12 @@ static int aac_return_aif(struct aac_softc *sc, caddr_t uptr); static int aac_query_disk(struct aac_softc *sc, caddr_t uptr); -#define AAC_CDEV_MAJOR 150 - static struct cdevsw aac_cdevsw = { .d_open = aac_open, .d_close = aac_close, .d_ioctl = aac_ioctl, .d_poll = aac_poll, .d_name = "aac", - .d_maj = AAC_CDEV_MAJOR, }; MALLOC_DEFINE(M_AACBUF, "aacbuf", "Buffers for the AAC driver"); ==== //depot/projects/netperf/sys/dev/acpica/Osd/OsdSchedule.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.23 2002/10/31 17:58:39 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.24 2003/09/29 07:29:26 njl Exp $ */ /* @@ -262,7 +262,15 @@ { ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - DELAY(Microseconds); + /* + * Maximum length for stall is 100 us. If longer, assume caller + * really meant "sleep". + */ + if (Microseconds <= 100) + DELAY(Microseconds); + else + AcpiOsSleep(Microseconds / 1000, Microseconds % 1000); + return_VOID; } ==== //depot/projects/netperf/sys/dev/acpica/Osd/OsdSynch.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.17 2003/07/13 22:57:16 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.18 2003/09/26 21:22:10 njl Exp $ */ /* @@ -79,8 +79,9 @@ #endif static int acpi_semaphore_debug = 0; TUNABLE_INT("debug.acpi_semaphore_debug", &acpi_semaphore_debug); -SYSCTL_INT(_debug, OID_AUTO, acpi_semaphore_debug, CTLFLAG_RW, - &acpi_semaphore_debug, 0, ""); +SYSCTL_DECL(_debug_acpi); +SYSCTL_INT(_debug_acpi, OID_AUTO, semaphore_debug, CTLFLAG_RW, + &acpi_semaphore_debug, 0, "Enable ACPI semaphore debug messages"); #endif ACPI_STATUS ==== //depot/projects/netperf/sys/dev/acpica/acpi.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.103 2003/09/26 04:32:40 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.104 2003/09/26 21:22:10 njl Exp $ */ #include "opt_acpi.h" @@ -157,13 +157,10 @@ DRIVER_MODULE(acpi, nexus, acpi_driver, acpi_devclass, acpi_modevent, 0); MODULE_VERSION(acpi, 100); -SYSCTL_INT(_debug, OID_AUTO, acpi_debug_layer, CTLFLAG_RW, &AcpiDbgLayer, 0, - ""); -SYSCTL_INT(_debug, OID_AUTO, acpi_debug_level, CTLFLAG_RW, &AcpiDbgLevel, 0, - ""); -static int acpi_ca_version = ACPI_CA_VERSION; -SYSCTL_INT(_debug, OID_AUTO, acpi_ca_version, CTLFLAG_RD, &acpi_ca_version, 0, - ""); +SYSCTL_NODE(_debug, OID_AUTO, acpi, CTLFLAG_RW, NULL, "ACPI debugging"); +static char acpi_ca_version[12]; +SYSCTL_STRING(_debug_acpi, OID_AUTO, acpi_ca_version, CTLFLAG_RD, + acpi_ca_version, 0, "Version of Intel ACPI-CA"); /* * ACPI can only be loaded as a module by the loader; activating it after @@ -212,6 +209,9 @@ if (resource_disabled("acpi", 0)) return_VOID; + snprintf(acpi_ca_version, sizeof(acpi_ca_version), "0x%x", + ACPI_CA_VERSION); + /* Make sure we're not being doubly invoked. */ if (device_find_child(parent, "acpi", 0) != NULL) return_VOID; @@ -2187,11 +2187,11 @@ { char *cp; - if (!cold) - return; + if (cold) { + AcpiDbgLayer = 0; + AcpiDbgLevel = 0; + } - AcpiDbgLayer = 0; - AcpiDbgLevel = 0; if ((cp = getenv("debug.acpi.layer")) != NULL) { acpi_parse_debug(cp, &dbg_layer[0], &AcpiDbgLayer); freeenv(cp); @@ -2201,11 +2201,61 @@ freeenv(cp); } - printf("ACPI debug layer 0x%x debug level 0x%x\n", AcpiDbgLayer, - AcpiDbgLevel); + if (cold) { + printf("ACPI debug layer 0x%x debug level 0x%x\n", + AcpiDbgLayer, AcpiDbgLevel); + } } SYSINIT(acpi_debugging, SI_SUB_TUNABLES, SI_ORDER_ANY, acpi_set_debugging, NULL); + +static int +acpi_debug_sysctl(SYSCTL_HANDLER_ARGS) +{ + char *options; + int error, len, *dbg; + struct debugtag *tag; + + len = 512; + MALLOC(options, char *, len, M_TEMP, M_WAITOK); + options[0] = '\0'; + + if (strcmp(oidp->oid_arg1, "debug.acpi.layer") == 0) { + tag = &dbg_layer[0]; + dbg = &AcpiDbgLayer; + } else { + tag = &dbg_level[0]; + dbg = &AcpiDbgLevel; + } + + /* Get old values if this is a get request. */ + if (*dbg == 0) { + strlcpy(options, "NONE", sizeof(options)); + } else if (req->newptr == NULL) { + for (; tag->name != NULL; tag++) { + if ((*dbg & tag->value) == tag->value) { + strlcat(options, tag->name, len); + strlcat(options, " ", len); /* XXX */ + } + } + } + + error = sysctl_handle_string(oidp, options, len, req); + + /* If the user is setting a string, parse it. */ + if (error == 0 && req->newptr != NULL) { + *dbg = 0; + setenv((char *)oidp->oid_arg1, (char *)req->newptr); + acpi_set_debugging(NULL); + } + FREE(options, M_TEMP); + + return (error); +} +SYSCTL_PROC(_debug_acpi, OID_AUTO, layer, CTLFLAG_RW | CTLTYPE_STRING, + "debug.acpi.layer", 0, acpi_debug_sysctl, "A", ""); +SYSCTL_PROC(_debug_acpi, OID_AUTO, level, CTLFLAG_RW | CTLTYPE_STRING, + "debug.acpi.level", 0, acpi_debug_sysctl, "A", ""); #endif static int ==== //depot/projects/netperf/sys/dev/adlink/adlink.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/adlink/adlink.c,v 1.5 2003/09/05 11:05:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/adlink/adlink.c,v 1.6 2003/09/27 12:00:58 phk Exp $"); #ifdef _KERNEL #include @@ -394,7 +394,6 @@ static struct cdevsw adlink_cdevsw = { .d_open = adlink_open, - .d_close = nullclose, .d_ioctl = adlink_ioctl, .d_mmap = adlink_mmap, .d_name = "adlink", ==== //depot/projects/netperf/sys/dev/ata/ata-all.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.189 2003/09/08 08:30:43 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.190 2003/09/27 12:00:58 phk Exp $"); #include "opt_ata.h" #include @@ -57,8 +57,6 @@ /* device structures */ static d_ioctl_t ata_ioctl; static struct cdevsw ata_cdevsw = { - .d_open = nullopen, - .d_close = nullclose, .d_ioctl = ata_ioctl, .d_name = "ata", .d_maj = 159, ==== //depot/projects/netperf/sys/dev/isp/isp_freebsd.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.93 2003/09/15 06:41:33 markm Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.94 2003/09/27 12:00:58 phk Exp $"); #include #include @@ -54,8 +54,6 @@ #define ISP_CDEV_MAJOR 248 static struct cdevsw isp_cdevsw = { - .d_open = nullopen, - .d_close = nullclose, .d_ioctl = ispioctl, .d_name = "isp", .d_maj = ISP_CDEV_MAJOR, ==== //depot/projects/netperf/sys/dev/kbd/kbd.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/kbd/kbd.c,v 1.34 2003/08/24 17:49:15 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/kbd/kbd.c,v 1.35 2003/09/27 08:29:57 phk Exp $"); #include "opt_kbd.h" @@ -447,20 +447,16 @@ int kbd_attach(keyboard_t *kbd) { - dev_t dev; if (kbd->kb_index >= keyboards) return EINVAL; if (keyboard[kbd->kb_index] != kbd) return EINVAL; - dev = make_dev(&kbd_cdevsw, kbd->kb_index, UID_ROOT, GID_WHEEL, 0600, + kbd->kb_dev = make_dev(&kbd_cdevsw, kbd->kb_index, UID_ROOT, GID_WHEEL, 0600, "kbd%r", kbd->kb_index); - if (dev->si_drv1 == NULL) - dev->si_drv1 = malloc(sizeof(genkbd_softc_t), M_DEVBUF, - M_WAITOK); - bzero(dev->si_drv1, sizeof(genkbd_softc_t)); - + kbd->kb_dev->si_drv1 = malloc(sizeof(genkbd_softc_t), M_DEVBUF, + M_WAITOK | M_ZERO); printf("kbd%d at %s%d\n", kbd->kb_index, kbd->kb_name, kbd->kb_unit); return 0; } @@ -468,17 +464,14 @@ int kbd_detach(keyboard_t *kbd) { - dev_t dev; if (kbd->kb_index >= keyboards) return EINVAL; if (keyboard[kbd->kb_index] != kbd) return EINVAL; - dev = makedev(kbd_cdevsw.d_maj, kbd->kb_index); - if (dev->si_drv1) - free(dev->si_drv1, M_DEVBUF); - destroy_dev(dev); + free(kbd->kb_dev->si_drv1, M_DEVBUF); + destroy_dev(kbd->kb_dev); return 0; } ==== //depot/projects/netperf/sys/dev/kbd/kbdreg.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/sys/dev/kbd/kbdreg.h,v 1.15 2001/07/20 14:49:54 yokota Exp $ + * $FreeBSD: src/sys/dev/kbd/kbdreg.h,v 1.16 2003/09/27 08:29:58 phk Exp $ */ #ifndef _DEV_KBD_KBDREG_H_ @@ -90,6 +90,7 @@ #define KB_DELAY2 100 unsigned long kb_count; /* # of processed key strokes */ u_char kb_lastact[NUM_KEYS/2]; + dev_t kb_dev; }; #define KBD_IS_VALID(k) ((k)->kb_flags & KB_VALID) ==== //depot/projects/netperf/sys/dev/md/md.c#5 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.105 2003/08/07 15:04:25 jhb Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.106 2003/09/27 12:00:59 phk Exp $ * */ @@ -116,8 +116,6 @@ static d_ioctl_t mdctlioctl; static struct cdevsw mdctl_cdevsw = { - .d_open = nullopen, - .d_close = nullclose, .d_ioctl = mdctlioctl, .d_name = MD_NAME, .d_maj = CDEV_MAJOR ==== //depot/projects/netperf/sys/dev/mii/brgphy.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.26 2003/08/24 17:54:10 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.27 2003/09/28 04:16:16 ps Exp $"); /* * Driver for the Broadcom BCR5400 1000baseTX PHY. Speed is always @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.26 2003/08/24 17:54:10 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.27 2003/09/28 04:16:16 ps Exp $"); #include #include @@ -622,7 +622,7 @@ /* Enable Ethernet@WireSpeed. */ PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x7007); val = PHY_READ(sc, BRGPHY_MII_AUXCTL); - PHY_WRITE(sc, BRGPHY_MII_AUXCTL, val | (1 << 15) || (1 << 4)); + PHY_WRITE(sc, BRGPHY_MII_AUXCTL, val | (1 << 15) | (1 << 4)); /* Enable Link LED on Dell boxes */ if (bge_sc->bge_no_3_led) { ==== //depot/projects/netperf/sys/dev/nmdm/nmdm.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.15 2003/08/24 17:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.16 2003/09/28 20:48:12 phk Exp $"); /* * Pseudo-nulmodem driver @@ -604,8 +604,8 @@ nextdev2 = makedev(CDEV_MAJOR, (i+i) + 1); ptr1 = nextdev1->si_drv1; if (ptr1) { - revoke_and_destroy_dev(nextdev1); - revoke_and_destroy_dev(nextdev2); + destroy_dev(nextdev1); + destroy_dev(nextdev2); free(ptr1, M_NLMDM); } else { freedev(nextdev1); ==== //depot/projects/netperf/sys/dev/null/null.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/null/null.c,v 1.19 2003/08/24 17:54:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/null/null.c,v 1.21 2003/09/27 12:27:23 phk Exp $"); #include #include @@ -53,8 +53,6 @@ #define ZERO_MINOR 12 static struct cdevsw null_cdevsw = { - .d_open = nullopen, - .d_close = nullclose, .d_read = null_read, .d_write = null_write, .d_ioctl = null_ioctl, @@ -64,8 +62,6 @@ }; static struct cdevsw zero_cdevsw = { - .d_open = nullopen, - .d_close = nullclose, .d_read = zero_read, .d_write = null_write, .d_name = "zero", @@ -96,7 +92,7 @@ int error; if (cmd != DIOCSKERNELDUMP) - return (noioctl(dev, cmd, data, flags, td)); + return (ENOIOCTL); error = suser(td); if (error) return (error); ==== //depot/projects/netperf/sys/dev/ofw/ofw_console.c#4 (text+ko) ==== @@ -24,10 +24,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.14 2003/09/26 10:55:07 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.17 2003/09/28 06:51:47 jake Exp $"); #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.14 2003/09/26 10:55:07 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.17 2003/09/28 06:51:47 jake Exp $"); #include "opt_ddb.h" #include "opt_comconsole.h" @@ -92,15 +92,17 @@ { phandle_t options; char output[32]; + dev_t dev; - if (ofw_consdev.cn_dev != NULL) { + if (ofw_consdev.cn_pri != CN_DEAD && + ofw_consdev.cn_name[0] != '\0') { if ((options = OF_finddevice("/options")) == -1 || OF_getprop(options, "output-device", output, sizeof(output)) == -1) return; - make_dev(&ofw_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "%s", + dev = make_dev(&ofw_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "%s", >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 30 14:12:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51F3416A4E0; Tue, 30 Sep 2003 14:12: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 2929816A4C0 for ; Tue, 30 Sep 2003 14:12:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6884D43FB1 for ; Tue, 30 Sep 2003 14:12:13 -0700 (PDT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8ULCDXJ024394 for ; Tue, 30 Sep 2003 14:12:13 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8ULCCLZ024391 for perforce@freebsd.org; Tue, 30 Sep 2003 14:12:12 -0700 (PDT) (envelope-from imp@freebsd.org) Date: Tue, 30 Sep 2003 14:12:12 -0700 (PDT) Message-Id: <200309302112.h8ULCCLZ024391@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 38917 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, 30 Sep 2003 21:12:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=38917 Change 38917 by imp@imp_koguchi on 2003/09/30 14:11:19 phk's sc = dev->si_drv1; Start on attach() some whitespace for clarity. Affected files ... .. //depot/doc/strawman-driver.c#2 edit Differences ... ==== //depot/doc/strawman-driver.c#2 (text+ko) ==== @@ -16,6 +16,9 @@ static int foo_ctl_ioctl(dev_t dev, u_long cmd, caddr_t data, nit flag, struct thread *td) { + foo_softc *sc; + + sc = dev->si_drv1; ... case FOO_GERBIL: /* Wait for a weird GERBIL event in the device and return it */ @@ -37,25 +40,48 @@ } static int +foo_attach(device_t dev) +{ + int unit; + foo_softc *sc; + + sc = device_get_softc(dev); + unit = device_get_unit(dev); + + /* allocate resoureces, initailze thigns */ + /* xXX show how we allocate mtx, cv, irq, ih */ + + /* Allocate device */ + sc->d = make_dev(devsw, 1, 0, 0, 0755, "fooctl%d", unit); + sc->d->si_drv1 = sc; +} + +static int foo_detach(device_t dev) { sc = device_get_softc(dev); foo_disable_intr(sc); /* disable hardware intr ??? */ + /* Everybody active here */ callout_reset(&sc->stat_ch, hz, fxp_tick, sc); + /* Network, ISR and devsw active */ bus_teardown_intr(sc->dev, sc->irq, sc->ih); + /* Network and devsw active */ ether_ifdetach(&sc->arpcom.ac_if); sc->ih = NULL; foo_wakeup_my_sleepers(sc); + /* devsw active */ destroy_dev(sc->d); + /* only mutex alive */ mtx_destroy(&sc->mtx); cv_destroy(&sc->cv); - /* release the resources */ + + /* release the hardware resources */ bus_release_resource(sc->dev, SYS_RES_IRQ, 0, sc->irq); // etc } From owner-p4-projects@FreeBSD.ORG Tue Sep 30 14:14:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 479C516A4C0; Tue, 30 Sep 2003 14:14: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 2262A16A4B3 for ; Tue, 30 Sep 2003 14:14:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BE2643FFB for ; Tue, 30 Sep 2003 14:14:16 -0700 (PDT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8ULEGXJ024493 for ; Tue, 30 Sep 2003 14:14:16 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8ULEGV4024490 for perforce@freebsd.org; Tue, 30 Sep 2003 14:14:16 -0700 (PDT) (envelope-from imp@freebsd.org) Date: Tue, 30 Sep 2003 14:14:16 -0700 (PDT) Message-Id: <200309302114.h8ULEGV4024490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 38918 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, 30 Sep 2003 21:14:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=38918 Change 38918 by imp@imp_koguchi on 2003/09/30 14:14:04 unlock the mutex Affected files ... .. //depot/doc/strawman-driver.c#3 edit Differences ... ==== //depot/doc/strawman-driver.c#3 (text+ko) ==== @@ -21,10 +21,12 @@ sc = dev->si_drv1; ... case FOO_GERBIL: - /* Wait for a weird GERBIL event in the device and return it */ + /* + * Wait for a weird GERBIL event in the device and return it */ mtx_lock(&sc->mtx); cv_wait(&sc->cv, &sc->mtx); + mtx_unlock(&sc->mtx); if (sc->dead) return EGONE; ... From owner-p4-projects@FreeBSD.ORG Tue Sep 30 14:17:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3247116A4C0; Tue, 30 Sep 2003 14:17:22 -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 E8AA716A4B3 for ; Tue, 30 Sep 2003 14:17:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDE0543FD7 for ; Tue, 30 Sep 2003 14:17:20 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8ULHKXJ024607 for ; Tue, 30 Sep 2003 14:17:20 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8ULHKTX024604 for perforce@freebsd.org; Tue, 30 Sep 2003 14:17:20 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Tue, 30 Sep 2003 14:17:20 -0700 (PDT) Message-Id: <200309302117.h8ULHKTX024604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 38919 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, 30 Sep 2003 21:17:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=38919 Change 38919 by sam@sam_ebb on 2003/09/30 14:16:42 cleanup and lock routing socket support: o use ansi decls o remove egregious shorthand #defines for info[*] o eliminate route_proto global variable o make route_cb and associated struct decl private o remove lots of register decls Affected files ... .. //depot/projects/netperf/sys/net/route.c#10 edit .. //depot/projects/netperf/sys/net/route.h#5 edit .. //depot/projects/netperf/sys/net/rtsock.c#4 edit Differences ... ==== //depot/projects/netperf/sys/net/route.c#10 (text+ko) ==== @@ -53,7 +53,6 @@ #define SA(p) ((struct sockaddr *)(p)) -struct route_cb route_cb; static struct rtstat rtstat; struct radix_node_head *rt_tables[AF_MAX+1]; ==== //depot/projects/netperf/sys/net/route.h#5 (text+ko) ==== @@ -257,13 +257,6 @@ struct ifnet *rti_ifp; }; -struct route_cb { - int ip_count; - int ip6_count; - int ipx_count; - int any_count; -}; - #ifdef _KERNEL #define RT_LOCK_INIT(_rt) \ @@ -288,7 +281,6 @@ RTFREE_LOCKED(_rt); \ } while (0) -extern struct route_cb route_cb; extern struct radix_node_head *rt_tables[AF_MAX+1]; struct ifmultiaddr; ==== //depot/projects/netperf/sys/net/rtsock.c#4 (text+ko) ==== @@ -34,7 +34,6 @@ * $FreeBSD: src/sys/net/rtsock.c,v 1.89 2003/03/05 19:24:22 peter Exp $ */ - #include #include #include @@ -55,10 +54,24 @@ MALLOC_DEFINE(M_RTABLE, "routetbl", "routing tables"); +/* NB: these are not modified */ static struct sockaddr route_dst = { 2, PF_ROUTE, }; static struct sockaddr route_src = { 2, PF_ROUTE, }; static struct sockaddr sa_zero = { sizeof(sa_zero), AF_INET, }; -static struct sockproto route_proto = { PF_ROUTE, }; + +static struct { + int ip_count; /* attacked w/ AF_INET */ + int ip6_count; /* attached w/ AF_INET6 */ + int ipx_count; /* attached w/ AF_IPX */ + int any_count; /* total attached */ +} route_cb; + +struct mtx rtsock_mtx; +MTX_SYSINIT(rtsock, &rtsock_mtx, "rtsock route_cb lock", MTX_DEF); + +#define RTSOCK_LOCK() mtx_lock(&rtsock_mtx) +#define RTSOCK_UNLOCK() mtx_unlock(&rtsock_mtx) +#define RTSOCK_LOCK_ASSERT() mtx_assert(&rtsock_mtx, MA_OWNED) struct walkarg { int w_tmemsize; @@ -67,23 +80,14 @@ struct sysctl_req *w_req; }; -static struct mbuf * - rt_msg1(int, struct rt_addrinfo *); +static struct mbuf *rt_msg1(int, struct rt_addrinfo *); static int rt_msg2(int, struct rt_addrinfo *, caddr_t, struct walkarg *); static int rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *); static int sysctl_dumpentry(struct radix_node *rn, void *vw); static int sysctl_iflist(int af, struct walkarg *w); -static int route_output(struct mbuf *, struct socket *); -static void rt_setmetrics(u_long, struct rt_metrics *, struct rt_metrics *); - -/* Sleazy use of local variables throughout file, warning!!!! */ -#define dst info.rti_info[RTAX_DST] -#define gate info.rti_info[RTAX_GATEWAY] -#define netmask info.rti_info[RTAX_NETMASK] -#define genmask info.rti_info[RTAX_GENMASK] -#define ifpaddr info.rti_info[RTAX_IFP] -#define ifaaddr info.rti_info[RTAX_IFA] -#define brdaddr info.rti_info[RTAX_BRD] +static int route_output(struct mbuf *, struct socket *); +static void rt_setmetrics(u_long, struct rt_metrics *, struct rt_metrics *); +static void rt_dispatch(struct mbuf *, struct sockaddr *); /* * It really doesn't make any sense at all for this code to share much @@ -131,6 +135,7 @@ free(rp, M_PCB); return error; } + RTSOCK_LOCK(); switch(rp->rcb_proto.sp_protocol) { case AF_INET: route_cb.ip_count++; @@ -144,6 +149,7 @@ } rp->rcb_faddr = &route_src; route_cb.any_count++; + RTSOCK_UNLOCK(); soisconnected(so); so->so_options |= SO_USELOOPBACK; splx(s); @@ -181,6 +187,7 @@ s = splnet(); if (rp != 0) { + RTSOCK_LOCK(); switch(rp->rcb_proto.sp_protocol) { case AF_INET: route_cb.ip_count--; @@ -193,6 +200,7 @@ break; } route_cb.any_count--; + RTSOCK_UNLOCK(); } error = raw_usrreqs.pru_detach(so); splx(s); @@ -271,6 +279,7 @@ register struct mbuf *m; struct socket *so; { +#define sa_equal(a1, a2) (bcmp((a1), (a2), (a1)->sa_len) == 0) register struct rt_msghdr *rtm = 0; register struct rtentry *rt = 0; struct radix_node_head *rnh; @@ -288,36 +297,40 @@ len = m->m_pkthdr.len; if (len < sizeof(*rtm) || len != mtod(m, struct rt_msghdr *)->rtm_msglen) { - dst = 0; + info.rti_info[RTAX_DST] = 0; senderr(EINVAL); } R_Malloc(rtm, struct rt_msghdr *, len); if (rtm == 0) { - dst = 0; + info.rti_info[RTAX_DST] = 0; senderr(ENOBUFS); } m_copydata(m, 0, len, (caddr_t)rtm); if (rtm->rtm_version != RTM_VERSION) { - dst = 0; + info.rti_info[RTAX_DST] = 0; senderr(EPROTONOSUPPORT); } rtm->rtm_pid = curproc->p_pid; bzero(&info, sizeof(info)); info.rti_addrs = rtm->rtm_addrs; if (rt_xaddrs((caddr_t)(rtm + 1), len + (caddr_t)rtm, &info)) { - dst = 0; + info.rti_info[RTAX_DST] = 0; senderr(EINVAL); } info.rti_flags = rtm->rtm_flags; - if (dst == 0 || (dst->sa_family >= AF_MAX) - || (gate != 0 && (gate->sa_family >= AF_MAX))) + if (info.rti_info[RTAX_DST] == 0 || + info.rti_info[RTAX_DST]->sa_family >= AF_MAX || + (info.rti_info[RTAX_GATEWAY] != 0 && + info.rti_info[RTAX_GATEWAY]->sa_family >= AF_MAX)) senderr(EINVAL); - if (genmask) { + if (info.rti_info[RTAX_GENMASK]) { struct radix_node *t; - t = rn_addmask((caddr_t)genmask, 0, 1); - if (t && Bcmp((caddr_t *)genmask + 1, (caddr_t *)t->rn_key + 1, + t = rn_addmask((caddr_t) info.rti_info[RTAX_GENMASK], 0, 1); + if (t && Bcmp((caddr_t *) info.rti_info[RTAX_GENMASK] + 1, + (caddr_t *)t->rn_key + 1, *(u_char *)t->rn_key - 1) == 0) - genmask = (struct sockaddr *)(t->rn_key); + info.rti_info[RTAX_GENMASK] = + (struct sockaddr *)(t->rn_key); else senderr(ENOBUFS); } @@ -333,7 +346,7 @@ struct rtentry *saved_nrt; case RTM_ADD: - if (gate == 0) + if (info.rti_info[RTAX_GATEWAY] == 0) senderr(EINVAL); saved_nrt = 0; error = rtrequest1(RTM_ADD, &info, &saved_nrt); @@ -345,7 +358,7 @@ saved_nrt->rt_rmx.rmx_locks |= (rtm->rtm_inits & rtm->rtm_rmx.rmx_locks); saved_nrt->rt_refcnt--; - saved_nrt->rt_genmask = genmask; + saved_nrt->rt_genmask = info.rti_info[RTAX_GENMASK]; RT_UNLOCK(saved_nrt); } break; @@ -363,36 +376,40 @@ case RTM_GET: case RTM_CHANGE: case RTM_LOCK: - if ((rnh = rt_tables[dst->sa_family]) == 0) + rnh = rt_tables[info.rti_info[RTAX_DST]->sa_family]; + if (rnh == 0) senderr(EAFNOSUPPORT); RADIX_NODE_HEAD_LOCK(rnh); - rt = (struct rtentry *) rnh->rnh_lookup(dst, netmask, rnh); + rt = (struct rtentry *) rnh->rnh_lookup(info.rti_info[RTAX_DST], + info.rti_info[RTAX_NETMASK], rnh); RADIX_NODE_HEAD_UNLOCK(rnh); - if (rt != NULL) { /* XXX looks bogus */ - RT_LOCK(rt); - rt->rt_refcnt++; - } else + if (rt == NULL) /* XXX looks bogus */ senderr(ESRCH); + RT_LOCK(rt); + rt->rt_refcnt++; switch(rtm->rtm_type) { case RTM_GET: report: - dst = rt_key(rt); - gate = rt->rt_gateway; - netmask = rt_mask(rt); - genmask = rt->rt_genmask; + RT_LOCK_ASSERT(rt); + info.rti_info[RTAX_DST] = rt_key(rt); + info.rti_info[RTAX_GATEWAY] = rt->rt_gateway; + info.rti_info[RTAX_NETMASK] = rt_mask(rt); + info.rti_info[RTAX_GENMASK] = rt->rt_genmask; if (rtm->rtm_addrs & (RTA_IFP | RTA_IFA)) { ifp = rt->rt_ifp; if (ifp) { - ifpaddr = TAILQ_FIRST(&ifp->if_addrhead)->ifa_addr; - ifaaddr = rt->rt_ifa->ifa_addr; + info.rti_info[RTAX_IFP] = TAILQ_FIRST(&ifp->if_addrhead)->ifa_addr; + info.rti_info[RTAX_IFA] = + rt->rt_ifa->ifa_addr; if (ifp->if_flags & IFF_POINTOPOINT) - brdaddr = rt->rt_ifa->ifa_dstaddr; + info.rti_info[RTAX_BRD] = + rt->rt_ifa->ifa_dstaddr; rtm->rtm_index = ifp->if_index; } else { - ifpaddr = 0; - ifaaddr = 0; + info.rti_info[RTAX_IFP] = 0; + info.rti_info[RTAX_IFA] = 0; } } len = rt_msg2(rtm->rtm_type, &info, (caddr_t)0, @@ -415,22 +432,25 @@ break; case RTM_CHANGE: - /* new gateway could require new ifaddr, ifp; - flags may also be different; ifp may be specified - by ll sockaddr when protocol address is ambiguous */ -/* compare two sockaddr structures */ -#define sa_equal(a1, a2) (bcmp((a1), (a2), (a1)->sa_len) == 0) - if (((rt->rt_flags & RTF_GATEWAY) && gate != NULL) || - ifpaddr != NULL || - (ifaaddr != NULL && - !sa_equal(ifaaddr, rt->rt_ifa->ifa_addr))) { + /* + * New gateway could require new ifaddr, ifp; + * flags may also be different; ifp may be specified + * by ll sockaddr when protocol address is ambiguous + */ + if (((rt->rt_flags & RTF_GATEWAY) && + info.rti_info[RTAX_GATEWAY] != NULL) || + info.rti_info[RTAX_IFP] != NULL || + (info.rti_info[RTAX_IFA] != NULL && + !sa_equal(info.rti_info[RTAX_IFA], + rt->rt_ifa->ifa_addr))) { if ((error = rt_getifa(&info)) != 0) { RT_UNLOCK(rt); senderr(error); } } - if (gate != NULL && - (error = rt_setgate(rt, rt_key(rt), gate)) != 0) { + if (info.rti_info[RTAX_GATEWAY] != NULL && + (error = rt_setgate(rt, rt_key(rt), + info.rti_info[RTAX_GATEWAY])) != 0) { RT_UNLOCK(rt); senderr(error); } @@ -453,8 +473,8 @@ &rt->rt_rmx); if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest) rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt, &info); - if (genmask) - rt->rt_genmask = genmask; + if (info.rti_info[RTAX_GENMASK]) + rt->rt_genmask = info.rti_info[RTAX_GENMASK]; /* FALLTHROUGH */ case RTM_LOCK: rt->rt_rmx.rmx_locks &= ~(rtm->rtm_inits); @@ -502,22 +522,26 @@ m_adj(m, rtm->rtm_msglen - m->m_pkthdr.len); Free(rtm); } - if (rp) - rp->rcb_proto.sp_family = 0; /* Avoid us */ - if (dst) - route_proto.sp_protocol = dst->sa_family; - if (m) - raw_input(m, &route_proto, &route_src, &route_dst); - if (rp) - rp->rcb_proto.sp_family = PF_ROUTE; + if (m) { + if (rp) { + /* + * XXX insure we don't get a copy by + * invalidating our protocol + */ + unsigned short family = rp->rcb_proto.sp_family; + rp->rcb_proto.sp_family = 0; + rt_dispatch(m, info.rti_info[RTAX_DST]); + rp->rcb_proto.sp_family = family; + } else + rt_dispatch(m, info.rti_info[RTAX_DST]); + } } return (error); +#undef sa_equal } static void -rt_setmetrics(which, in, out) - u_long which; - register struct rt_metrics *in, *out; +rt_setmetrics(u_long which, struct rt_metrics *in, struct rt_metrics *out) { #define metric(f, e) if (which & (f)) out->e = in->e; metric(RTV_RPIPE, rmx_recvpipe); @@ -533,33 +557,28 @@ #define ROUNDUP(a) \ ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) -#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) - /* * Extract the addresses of the passed sockaddrs. * Do a little sanity checking so as to avoid bad memory references. * This data is derived straight from userland. */ static int -rt_xaddrs(cp, cplim, rtinfo) - register caddr_t cp, cplim; - register struct rt_addrinfo *rtinfo; +rt_xaddrs(caddr_t cp, caddr_t cplim, struct rt_addrinfo *rtinfo) { +#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) register struct sockaddr *sa; register int i; - for (i = 0; (i < RTAX_MAX) && (cp < cplim); i++) { + for (i = 0; i < RTAX_MAX && cp < cplim; i++) { if ((rtinfo->rti_addrs & (1 << i)) == 0) continue; sa = (struct sockaddr *)cp; /* * It won't fit. */ - if ( (cp + sa->sa_len) > cplim ) { + if (cp + sa->sa_len > cplim) return (EINVAL); - } - /* * there are no more.. quit now * If there are more bits, they are in error. @@ -571,18 +590,16 @@ rtinfo->rti_info[i] = &sa_zero; return (0); /* should be EINVAL but for compat */ } - /* accept it */ rtinfo->rti_info[i] = sa; ADVANCE(cp, sa); } return (0); +#undef ADVANCE } static struct mbuf * -rt_msg1(type, rtinfo) - int type; - register struct rt_addrinfo *rtinfo; +rt_msg1(int type, struct rt_addrinfo *rtinfo) { register struct rt_msghdr *rtm; register struct mbuf *m; @@ -648,11 +665,7 @@ } static int -rt_msg2(type, rtinfo, cp, w) - int type; - register struct rt_addrinfo *rtinfo; - caddr_t cp; - struct walkarg *w; +rt_msg2(int type, struct rt_addrinfo *rtinfo, caddr_t cp, struct walkarg *w) { register int i; int len, dlen, second_time = 0; @@ -727,12 +740,10 @@ * destination. */ void -rt_missmsg(type, rtinfo, flags, error) - int type, flags, error; - register struct rt_addrinfo *rtinfo; +rt_missmsg(int type, struct rt_addrinfo *rtinfo, int flags, int error) { - register struct rt_msghdr *rtm; - register struct mbuf *m; + struct rt_msghdr *rtm; + struct mbuf *m; struct sockaddr *sa = rtinfo->rti_info[RTAX_DST]; if (route_cb.any_count == 0) @@ -744,8 +755,7 @@ rtm->rtm_flags = RTF_DONE | flags; rtm->rtm_errno = error; rtm->rtm_addrs = rtinfo->rti_addrs; - route_proto.sp_protocol = sa ? sa->sa_family : 0; - raw_input(m, &route_proto, &route_src, &route_dst); + rt_dispatch(m, sa); } /* @@ -753,10 +763,9 @@ * socket indicating that the status of a network interface has changed. */ void -rt_ifmsg(ifp) - register struct ifnet *ifp; +rt_ifmsg(struct ifnet *ifp) { - register struct if_msghdr *ifm; + struct if_msghdr *ifm; struct mbuf *m; struct rt_addrinfo info; @@ -771,8 +780,7 @@ ifm->ifm_flags = ifp->if_flags; ifm->ifm_data = ifp->if_data; ifm->ifm_addrs = 0; - route_proto.sp_protocol = 0; - raw_input(m, &route_proto, &route_src, &route_dst); + rt_dispatch(m, NULL); } /* @@ -784,10 +792,7 @@ * copies of it. */ void -rt_newaddrmsg(cmd, ifa, error, rt) - int cmd, error; - register struct ifaddr *ifa; - register struct rtentry *rt; +rt_newaddrmsg(int cmd, struct ifaddr *ifa, int error, struct rtentry *rt) { struct rt_addrinfo info; struct sockaddr *sa = 0; @@ -804,10 +809,10 @@ register struct ifa_msghdr *ifam; int ncmd = cmd == RTM_ADD ? RTM_NEWADDR : RTM_DELADDR; - ifaaddr = sa = ifa->ifa_addr; - ifpaddr = TAILQ_FIRST(&ifp->if_addrhead)->ifa_addr; - netmask = ifa->ifa_netmask; - brdaddr = ifa->ifa_dstaddr; + info.rti_info[RTAX_IFA] = sa = ifa->ifa_addr; + info.rti_info[RTAX_IFP] = TAILQ_FIRST(&ifp->if_addrhead)->ifa_addr; + info.rti_info[RTAX_NETMASK] = ifa->ifa_netmask; + info.rti_info[RTAX_BRD] = ifa->ifa_dstaddr; if ((m = rt_msg1(ncmd, &info)) == NULL) continue; ifam = mtod(m, struct ifa_msghdr *); @@ -822,9 +827,9 @@ if (rt == 0) continue; - netmask = rt_mask(rt); - dst = sa = rt_key(rt); - gate = rt->rt_gateway; + info.rti_info[RTAX_NETMASK] = rt_mask(rt); + info.rti_info[RTAX_DST] = sa = rt_key(rt); + info.rti_info[RTAX_GATEWAY] = rt->rt_gateway; if ((m = rt_msg1(cmd, &info)) == NULL) continue; rtm = mtod(m, struct rt_msghdr *); @@ -833,8 +838,7 @@ rtm->rtm_errno = error; rtm->rtm_addrs = info.rti_addrs; } - route_proto.sp_protocol = sa ? sa->sa_family : 0; - raw_input(m, &route_proto, &route_src, &route_dst); + rt_dispatch(m, sa); } } @@ -844,9 +848,7 @@ * there is no route state to worry about. */ void -rt_newmaddrmsg(cmd, ifma) - int cmd; - struct ifmultiaddr *ifma; +rt_newmaddrmsg(int cmd, struct ifmultiaddr *ifma) { struct rt_addrinfo info; struct mbuf *m = 0; @@ -857,23 +859,24 @@ return; bzero((caddr_t)&info, sizeof(info)); - ifaaddr = ifma->ifma_addr; + info.rti_info[RTAX_IFA] = ifma->ifma_addr; if (ifp && TAILQ_FIRST(&ifp->if_addrhead)) - ifpaddr = TAILQ_FIRST(&ifp->if_addrhead)->ifa_addr; + info.rti_info[RTAX_IFP] = + TAILQ_FIRST(&ifp->if_addrhead)->ifa_addr; else - ifpaddr = NULL; + info.rti_info[RTAX_IFP] = NULL; /* * If a link-layer address is present, present it as a ``gateway'' * (similarly to how ARP entries, e.g., are presented). */ - gate = ifma->ifma_lladdr; - if ((m = rt_msg1(cmd, &info)) == NULL) + info.rti_info[RTAX_GATEWAY] = ifma->ifma_lladdr; + m = rt_msg1(cmd, &info); + if (m == NULL) return; ifmam = mtod(m, struct ifma_msghdr *); ifmam->ifmam_index = ifp->if_index; ifmam->ifmam_addrs = info.rti_addrs; - route_proto.sp_protocol = ifma->ifma_addr->sa_family; - raw_input(m, &route_proto, &route_src, &route_dst); + rt_dispatch(m, ifma->ifma_addr); } /* @@ -881,9 +884,7 @@ * network interface arrival and departure. */ void -rt_ifannouncemsg(ifp, what) - struct ifnet *ifp; - int what; +rt_ifannouncemsg(struct ifnet *ifp, int what) { struct if_announcemsghdr *ifan; struct mbuf *m; @@ -900,39 +901,47 @@ snprintf(ifan->ifan_name, sizeof(ifan->ifan_name), "%s%d", ifp->if_name, ifp->if_unit); ifan->ifan_what = what; - route_proto.sp_protocol = 0; + rt_dispatch(m, NULL); + } + +static void +rt_dispatch(struct mbuf *m, struct sockaddr *sa) +{ + struct sockproto route_proto; + + route_proto.sp_family = PF_ROUTE; + route_proto.sp_protocol = sa ? sa->sa_family : 0; raw_input(m, &route_proto, &route_src, &route_dst); - } +} /* * This is used in dumping the kernel table via sysctl(). */ static int -sysctl_dumpentry(rn, vw) - struct radix_node *rn; - void *vw; +sysctl_dumpentry(struct radix_node *rn, void *vw) { - register struct walkarg *w = vw; - register struct rtentry *rt = (struct rtentry *)rn; + struct walkarg *w = vw; + struct rtentry *rt = (struct rtentry *)rn; int error = 0, size; struct rt_addrinfo info; if (w->w_op == NET_RT_FLAGS && !(rt->rt_flags & w->w_arg)) return 0; bzero((caddr_t)&info, sizeof(info)); - dst = rt_key(rt); - gate = rt->rt_gateway; - netmask = rt_mask(rt); - genmask = rt->rt_genmask; + info.rti_info[RTAX_DST] = rt_key(rt); + info.rti_info[RTAX_GATEWAY] = rt->rt_gateway; + info.rti_info[RTAX_NETMASK] = rt_mask(rt); + info.rti_info[RTAX_GENMASK] = rt->rt_genmask; if (rt->rt_ifp) { - ifpaddr = TAILQ_FIRST(&rt->rt_ifp->if_addrhead)->ifa_addr; - ifaaddr = rt->rt_ifa->ifa_addr; + info.rti_info[RTAX_IFP] = + TAILQ_FIRST(&rt->rt_ifp->if_addrhead)->ifa_addr; + info.rti_info[RTAX_IFA] = rt->rt_ifa->ifa_addr; if (rt->rt_ifp->if_flags & IFF_POINTOPOINT) - brdaddr = rt->rt_ifa->ifa_dstaddr; + info.rti_info[RTAX_BRD] = rt->rt_ifa->ifa_dstaddr; } size = rt_msg2(RTM_GET, &info, 0, w); if (w->w_req && w->w_tmem) { - register struct rt_msghdr *rtm = (struct rt_msghdr *)w->w_tmem; + struct rt_msghdr *rtm = (struct rt_msghdr *)w->w_tmem; rtm->rtm_flags = rt->rt_flags; rtm->rtm_use = rt->rt_use; @@ -947,14 +956,12 @@ } static int -sysctl_iflist(af, w) - int af; - register struct walkarg *w; +sysctl_iflist(int af, struct walkarg *w) { - register struct ifnet *ifp; - register struct ifaddr *ifa; - struct rt_addrinfo info; - int len, error = 0; + struct ifnet *ifp; + struct ifaddr *ifa; + struct rt_addrinfo info; + int len, error = 0; bzero((caddr_t)&info, sizeof(info)); /* IFNET_RLOCK(); */ /* could sleep XXX */ @@ -962,11 +969,11 @@ if (w->w_arg && w->w_arg != ifp->if_index) continue; ifa = TAILQ_FIRST(&ifp->if_addrhead); - ifpaddr = ifa->ifa_addr; + info.rti_info[RTAX_IFP] = ifa->ifa_addr; len = rt_msg2(RTM_IFINFO, &info, (caddr_t)0, w); - ifpaddr = 0; + info.rti_info[RTAX_IFP] = 0; if (w->w_req && w->w_tmem) { - register struct if_msghdr *ifm; + struct if_msghdr *ifm; ifm = (struct if_msghdr *)w->w_tmem; ifm->ifm_index = ifp->if_index; @@ -983,12 +990,12 @@ if (jailed(curthread->td_ucred) && prison_if(curthread->td_ucred, ifa->ifa_addr)) continue; - ifaaddr = ifa->ifa_addr; - netmask = ifa->ifa_netmask; - brdaddr = ifa->ifa_dstaddr; + info.rti_info[RTAX_IFA] = ifa->ifa_addr; + info.rti_info[RTAX_NETMASK] = ifa->ifa_netmask; + info.rti_info[RTAX_BRD] = ifa->ifa_dstaddr; len = rt_msg2(RTM_NEWADDR, &info, 0, w); if (w->w_req && w->w_tmem) { - register struct ifa_msghdr *ifam; + struct ifa_msghdr *ifam; ifam = (struct ifa_msghdr *)w->w_tmem; ifam->ifam_index = ifa->ifa_ifp->if_index; @@ -1000,7 +1007,8 @@ goto done; } } - ifaaddr = netmask = brdaddr = 0; + info.rti_info[RTAX_IFA] = info.rti_info[RTAX_NETMASK] = + info.rti_info[RTAX_BRD] = 0; } done: /* IFNET_RUNLOCK(); */ /* XXX */ @@ -1012,7 +1020,7 @@ { int *name = (int *)arg1; u_int namelen = arg2; - register struct radix_node_head *rnh; + struct radix_node_head *rnh; int i, s, error = EINVAL; u_char af; struct walkarg w; From owner-p4-projects@FreeBSD.ORG Tue Sep 30 14:30:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63FF116A4C1; Tue, 30 Sep 2003 14:30:38 -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 2309416A4BF for ; Tue, 30 Sep 2003 14:30:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E5B343F3F for ; Tue, 30 Sep 2003 14:30:37 -0700 (PDT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8ULUbXJ025258 for ; Tue, 30 Sep 2003 14:30:37 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8ULUbgU025255 for perforce@freebsd.org; Tue, 30 Sep 2003 14:30:37 -0700 (PDT) (envelope-from imp@freebsd.org) Date: Tue, 30 Sep 2003 14:30:37 -0700 (PDT) Message-Id: <200309302130.h8ULUbgU025255@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 38920 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, 30 Sep 2003 21:30:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=38920 Change 38920 by imp@imp_koguchi on 2003/09/30 14:30:31 Document two races. One against setting/testing 'dead'. The other against si_drv1 being nulled out in destroy_dev(). Affected files ... .. //depot/doc/strawman-driver.c#4 edit Differences ... ==== //depot/doc/strawman-driver.c#4 (text+ko) ==== @@ -18,7 +18,11 @@ { foo_softc *sc; - sc = dev->si_drv1; + sc = dev->si_drv1; /* RACE #2, a */ + if (sc == NULL) + return EGONE; + if (sc->dead) /* RACE #1, a */ + return EGONE; ... case FOO_GERBIL: /* @@ -27,7 +31,7 @@ mtx_lock(&sc->mtx); cv_wait(&sc->cv, &sc->mtx); mtx_unlock(&sc->mtx); - if (sc->dead) + if (sc->dead) /* Race #1, b */ return EGONE; ... } @@ -35,7 +39,7 @@ static void foo_wakeup_my_sleepers(foo_softc *sc) { - sc->dead = 1; + sc->dead = 1; /* Race #1, c */ mtx_lock(&sc->mtx); cv_broadcast(&sc->cv); mtx_unlock(&sc->mtx); @@ -63,6 +67,8 @@ { sc = device_get_softc(dev); + sc->d->si_drv1 = NULL /* Race #2, b */ + foo_disable_intr(sc); /* disable hardware intr ??? */ /* Everybody active here */ @@ -96,3 +102,28 @@ * destroy_dev() makes sure that no devsw calls in flight. */ +/* Races */ + +/* #1 + * + * We have a race here. + * + * The test points 'a' and 'b' might lose the race with the set point 'c'. + * + * If 'c' wins the race with either 'a' or 'b', then we're OK. We properly + * bail out early. If we lose the race that's OK too. In 'b' case, we go + * ahead and maybe sleep in the cv_wait. However, since we're using a condvar + * in that case, we don't sleep and 'win' the race at 'c'. When we're + * racing against 'c', then we'll access state of the device after + * we've started destroying it. That's OK, so long as the driver knows + * what can/can't be active at this point. + */ + +/* #2 + * + * We need to lock the door in a race here with the destroy_dev() + * function setting to NULL before we can get in and do something + * at point 'a'. So at point 'b' we set it to NULL. If 'b' happens + * before 'a', that's OK, because sc is guaranteed to be valid for the + * life of the call to ioctl, or any of the devsw functions. + */ From owner-p4-projects@FreeBSD.ORG Tue Sep 30 14:39:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33D4616A4C0; Tue, 30 Sep 2003 14:39: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 EC44F16A4B3 for ; Tue, 30 Sep 2003 14:39:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4853F43FDD for ; Tue, 30 Sep 2003 14:39:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8ULdnXJ025498 for ; Tue, 30 Sep 2003 14:39:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8ULdm0M025495 for perforce@freebsd.org; Tue, 30 Sep 2003 14:39:48 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Sep 2003 14:39:48 -0700 (PDT) Message-Id: <200309302139.h8ULdm0M025495@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 38921 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, 30 Sep 2003 21:39:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=38921 Change 38921 by peter@peter_hammer on 2003/09/30 14:39:43 tidy some stuff up. There is no need for the startup glue code to be in asm when it can be in init_secondary(). Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#10 edit .. //depot/projects/hammer/sys/amd64/amd64/mpboot.s#7 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#10 (text+ko) ==== @@ -316,16 +316,17 @@ /* XXX: List I/O APICs? They are done differently now. */ } -#ifdef SMP_ME_HARDER /* * AP cpu's call this to sync up protected mode. */ void init_secondary(void) { +#ifdef SMP_ME_HARDER int gsel_tss; int x, myid = bootAP; u_int cr0; + u_int32 value; gdt_segs[GPRIV_SEL].ssd_base = (long) &SMP_prvspace[myid]; gdt_segs[GPROC0_SEL].ssd_base = @@ -363,8 +364,17 @@ cr0 = rcr0(); cr0 &= ~(CR0_CD | CR0_NW | CR0_EM); load_cr0(cr0); + + /* Disable local apic just to be sure. */ + value = lapic->svr; + value &= ~(APIC_SVR_SWEN); + lapic->svr = value; + + mp_naps++; + + ap_init(); /* kick things off, this does not return */ +#endif } -#endif /******************************************************************* * local functions and data ==== //depot/projects/hammer/sys/amd64/amd64/mpboot.s#7 (text+ko) ==== @@ -43,22 +43,14 @@ /* * the APs enter here from their trampoline code (bootMP, below) */ + .section .data32 .p2align 4 - .section .data32 .code32 -NON_GPROF_ENTRY(MPentry) - /* - * Enable features on this processor. We don't support SMP on - * CPUs older than a Pentium, so we know that we can use the cpuid - * instruction. - */ - movl $1,%eax - cpuid /* Retrieve features */ + .globl MPentry +MPentry: movl %cr4,%eax - orl $CR4_PSE,%eax /* Enable PSE */ - orl $CR4_PGE,%eax /* Enable PGE */ - orl $CR4_PAE, %eax + orl $CR4_PSE|CR4_PGE|CR4_PAE,%eax /* Enable features */ movl %eax,%cr4 /* Now enable paging mode */ @@ -69,45 +61,18 @@ movl %eax,%cr0 /* let the games begin! */ movl bootSTK32,%esp /* boot stack end loc. */ - pushl $mp_begin /* jump to high mem */ +#ifdef SMP_ME_HARDER /* 64 bit reference in 32 bit code */ + pushl $init_secondary /* jump to high mem */ +#endif ret - /* - * Wait for the booting CPU to signal startup - */ -mp_begin: /* now running relocated at KERNBASE */ - .code64 -#ifdef SMP_ME_HARDER - call init_secondary /* load i386 tables */ -#endif - - /* disable the APIC, just to be SURE */ - movq lapic, %rdx - movl LA_SVR(%rdx), %eax /* get spurious vector reg. */ - andl $~APIC_SVR_SWEN, %eax /* clear software enable bit */ - movl %eax, LA_SVR(%rdx) - - /* signal our startup to the BSP */ - incl mp_naps /* signal BSP */ - - /* Now, let's prepare for some REAL WORK :-) This doesn't return. */ - call ap_init - -/* - * This is the embedded trampoline or bootstrap that is - * copied into 'real-mode' low memory, it is where the - * secondary processor "wakes up". When it is executed - * the processor will eventually jump into the routine - * MPentry, which resides in normal kernel text above - * 1Meg. -jackv - */ - .p2align 4 -BOOTMP1: +BOOTMP_start: -NON_GPROF_ENTRY(bootMP) - .code16 + .code16 + .globl bootMP +bootMP: cli /* First guarantee a 'clean slate' */ xorl %eax, %eax @@ -166,9 +131,6 @@ /* this will be modified by mpInstallTramp() */ ljmp $0x08, $0 /* far jmp to MPentry() */ -dead: hlt /* We should never get here */ - jmp dead - /* * MP boot strap Global Descriptor Table */ @@ -228,11 +190,11 @@ /* * GDT pointer for the lgdt call */ - .globl mp_gdtbase MP_GDTptr: mp_gdtlimit: .word 0x0028 + .globl mp_gdtbase mp_gdtbase: /* this will be modified by mpInstallTramp() */ .long 0 @@ -246,7 +208,8 @@ IdlePTD32: .long 0 -BOOTMP2: +BOOTMP_end: + .globl bootMP_size bootMP_size: - .long BOOTMP2 - BOOTMP1 + .long BOOTMP_end - BOOTMP_start From owner-p4-projects@FreeBSD.ORG Tue Sep 30 14:57:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 695BD16A4C0; Tue, 30 Sep 2003 14:57:11 -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 4216316A4B3 for ; Tue, 30 Sep 2003 14:57:11 -0700 (PDT) Received: from mail.speakeasy.net (mail9.speakeasy.net [216.254.0.209]) by mx1.FreeBSD.org (Postfix) with ESMTP id B623744015 for ; Tue, 30 Sep 2003 14:57:07 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 17144 invoked from network); 30 Sep 2003 21:57:06 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 30 Sep 2003 21:57:06 -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 h8ULv06Y060133; Tue, 30 Sep 2003 17:57:00 -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: <200309302139.h8ULdm0M025495@repoman.freebsd.org> Date: Tue, 30 Sep 2003 17:57:05 -0400 (EDT) From: John Baldwin To: Peter Wemm X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: Perforce Change Reviews Subject: RE: PERFORCE change 38921 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, 30 Sep 2003 21:57:11 -0000 On 30-Sep-2003 Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=38921 > > Change 38921 by peter@peter_hammer on 2003/09/30 14:39:43 > > tidy some stuff up. There is no need for the startup glue code > to be in asm when it can be in init_secondary(). > > Affected files ... > > .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#10 edit > .. //depot/projects/hammer/sys/amd64/amd64/mpboot.s#7 edit > > Differences ... > > ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#10 (text+ko) ==== > > @@ -316,16 +316,17 @@ > /* XXX: List I/O APICs? They are done differently now. */ > } > > -#ifdef SMP_ME_HARDER > /* > * AP cpu's call this to sync up protected mode. > */ > void > init_secondary(void) > { > +#ifdef SMP_ME_HARDER > int gsel_tss; > int x, myid = bootAP; > u_int cr0; > + u_int32 value; > > gdt_segs[GPRIV_SEL].ssd_base = (long) &SMP_prvspace[myid]; > gdt_segs[GPROC0_SEL].ssd_base = > @@ -363,8 +364,17 @@ > cr0 = rcr0(); > cr0 &= ~(CR0_CD | CR0_NW | CR0_EM); > load_cr0(cr0); > + > + /* Disable local apic just to be sure. */ > + value = lapic->svr; > + value &= ~(APIC_SVR_SWEN); > + lapic->svr = value; > + > + mp_naps++; > + > + ap_init(); /* kick things off, this does not return */ > +#endif > } > -#endif I should do this for i386, too, huh. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Tue Sep 30 15:02:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D79016A4C0; Tue, 30 Sep 2003 15:02: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 EDA7316A4B3 for ; Tue, 30 Sep 2003 15:02:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CF0044017 for ; Tue, 30 Sep 2003 15:02:18 -0700 (PDT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8UM2IXJ026603 for ; Tue, 30 Sep 2003 15:02:18 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8UM2HsO026596 for perforce@freebsd.org; Tue, 30 Sep 2003 15:02:17 -0700 (PDT) (envelope-from imp@freebsd.org) Date: Tue, 30 Sep 2003 15:02:17 -0700 (PDT) Message-Id: <200309302202.h8UM2HsO026596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 38924 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, 30 Sep 2003 22:02:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=38924 Change 38924 by imp@imp_koguchi on 2003/09/30 15:01:37 More tweaking with input from jhb. phk has indicated he'd like to see new/old examples, so I'll try to do that later. gotta get back to work. Affected files ... .. //depot/doc/strawman-driver.c#5 edit Differences ... ==== //depot/doc/strawman-driver.c#5 (text+ko) ==== @@ -40,6 +40,7 @@ foo_wakeup_my_sleepers(foo_softc *sc) { sc->dead = 1; /* Race #1, c */ + sc->d->si_drv1 = NULL; /* Race #2, b */ mtx_lock(&sc->mtx); cv_broadcast(&sc->cv); mtx_unlock(&sc->mtx); @@ -67,23 +68,23 @@ { sc = device_get_softc(dev); - sc->d->si_drv1 = NULL /* Race #2, b */ + foo_wakeup_my_sleepers(sc); foo_disable_intr(sc); /* disable hardware intr ??? */ /* Everybody active here */ - callout_reset(&sc->stat_ch, hz, fxp_tick, sc); + if (callout_stop(&sc->stat_ch, hz, fxp_tick, sc) == 0) + printf("Maybe we just lost a race\n"); /* Network, ISR and devsw active */ bus_teardown_intr(sc->dev, sc->irq, sc->ih); - /* Network and devsw active */ + /* network and devsw active */ + destroy_dev(sc->d); + + /* Network active */ ether_ifdetach(&sc->arpcom.ac_if); sc->ih = NULL; - foo_wakeup_my_sleepers(sc); - - /* devsw active */ - destroy_dev(sc->d); /* only mutex alive */ mtx_destroy(&sc->mtx); From owner-p4-projects@FreeBSD.ORG Tue Sep 30 15:23:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 939ED16A4C0; Tue, 30 Sep 2003 15:23:45 -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 69E3B16A4B3 for ; Tue, 30 Sep 2003 15:23:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6B5944020 for ; Tue, 30 Sep 2003 15:23:44 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8UMNiXJ028238 for ; Tue, 30 Sep 2003 15:23:44 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8UMNiRq028235 for perforce@freebsd.org; Tue, 30 Sep 2003 15:23:44 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Tue, 30 Sep 2003 15:23:44 -0700 (PDT) Message-Id: <200309302223.h8UMNiRq028235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 38925 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, 30 Sep 2003 22:23:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=38925 Change 38925 by sam@sam_ebb on 2003/09/30 15:23:04 explicitly include mbuf.h instead of depending on route.h to define a stub type Affected files ... .. //depot/projects/netperf/sys/netatalk/at_rmx.c#2 edit Differences ... ==== //depot/projects/netperf/sys/netatalk/at_rmx.c#2 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include +#include #include int at_inithead(void **head, int off); From owner-p4-projects@FreeBSD.ORG Tue Sep 30 15:43:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 375E316A4C1; Tue, 30 Sep 2003 15:43:10 -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 11FE216A4B3 for ; Tue, 30 Sep 2003 15:43:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 80E0A43FD7 for ; Tue, 30 Sep 2003 15:43:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8UMh9XJ029056 for ; Tue, 30 Sep 2003 15:43:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8UMh97o029053 for perforce@freebsd.org; Tue, 30 Sep 2003 15:43:09 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Sep 2003 15:43:09 -0700 (PDT) Message-Id: <200309302243.h8UMh97o029053@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 38927 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, 30 Sep 2003 22:43:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=38927 Change 38927 by peter@peter_hammer on 2003/09/30 15:42:58 oops, this is kinda important Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#55 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#55 (text+ko) ==== @@ -582,7 +582,7 @@ * Initialize segments & interrupt table */ -struct user_segment_descriptor gdt[NGDT];/* global descriptor table */ +struct user_segment_descriptor gdt[NGDT * MAXCPU];/* global descriptor table */ static struct gate_descriptor idt0[NIDT]; struct gate_descriptor *idt = &idt0[0]; /* interrupt descriptor table */ From owner-p4-projects@FreeBSD.ORG Tue Sep 30 15:45:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C955016A4C0; Tue, 30 Sep 2003 15:45: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 A54B716A4B3 for ; Tue, 30 Sep 2003 15:45:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2AE044005 for ; Tue, 30 Sep 2003 15:45:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8UMjCXJ029171 for ; Tue, 30 Sep 2003 15:45:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8UMjCdo029168 for perforce@freebsd.org; Tue, 30 Sep 2003 15:45:12 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Sep 2003 15:45:12 -0700 (PDT) Message-Id: <200309302245.h8UMjCdo029168@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 38928 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, 30 Sep 2003 22:45:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=38928 Change 38928 by peter@peter_hammer on 2003/09/30 15:44:53 yohoho Affected files ... .. //depot/projects/hammer/sys/amd64/include/param.h#10 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/param.h#10 (text+ko) ==== @@ -83,7 +83,11 @@ #define MACHINE_ARCH "amd64" #endif +#ifdef SMP +#define MAXCPU 16 +#else #define MAXCPU 1 +#endif #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) From owner-p4-projects@FreeBSD.ORG Tue Sep 30 15:52:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9303816A4E7; Tue, 30 Sep 2003 15:52:23 -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 5164C16A4DF for ; Tue, 30 Sep 2003 15:52:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3569C43FE3 for ; Tue, 30 Sep 2003 15:52:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8UMqLXJ029444 for ; Tue, 30 Sep 2003 15:52:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8UMqL41029438 for perforce@freebsd.org; Tue, 30 Sep 2003 15:52:21 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Sep 2003 15:52:21 -0700 (PDT) Message-Id: <200309302252.h8UMqL41029438@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 38929 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, 30 Sep 2003 22:52:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=38929 Change 38929 by peter@peter_hammer on 2003/09/30 15:51:24 I'm not going to do a P==V hack for amd64, I'll use a custom page table tree for boot and reclaim the pages. Start killing the vile SMPpt[] and SMP_prvspace nastiness. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#11 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#11 (text+ko) ==== @@ -435,14 +435,6 @@ outb(CMOS_REG, BIOS_RESET); mpbiosreason = inb(CMOS_DATA); - /* set up temporary P==V mapping for AP boot */ - /* XXX this is a hack, we should boot the AP on its own stack/PTD */ - kptbase = (uintptr_t)(void *)KPTphys; - for (i = 0; i < NKPT; i++) - PTD[i] = (pd_entry_t)(PG_V | PG_RW | - ((kptbase + i * PAGE_SIZE) & PG_FRAME)); - invltlb(); - /* start each AP */ for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { if (!cpu_info[apic_id].cpu_present || @@ -450,20 +442,11 @@ continue; cpu++; - /* first page of AP's private space */ - pg = cpu * amd64_btop(sizeof(struct privatespace)); - /* allocate a new private data page */ pc = (struct pcpu *)kmem_alloc(kernel_map, PAGE_SIZE); - /* wire it into the private page table page */ - SMPpt[pg] = (pt_entry_t)(PG_V | PG_RW | vtophys(pc)); - /* allocate and set up an idle stack data page */ - stack = (char *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); /* XXXKSE */ - for (i = 0; i < KSTACK_PAGES; i++) - SMPpt[pg + 1 + i] = (pt_entry_t) - (PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack)); + stack = (char *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); /* prime data page for it to use */ pcpu_init(pc, cpu, sizeof(struct pcpu)); @@ -831,9 +814,6 @@ while (!aps_ready) ia32_pause(); - /* BSP may have changed PTD while we were waiting */ - invltlb(); - /* set up CPU registers and state */ cpu_setregs(); From owner-p4-projects@FreeBSD.ORG Tue Sep 30 17:07:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D942916A4C1; Tue, 30 Sep 2003 17:07:55 -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 B56F516A4BF for ; Tue, 30 Sep 2003 17:07:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E52B43FA3 for ; Tue, 30 Sep 2003 17:07:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9107tXJ040213 for ; Tue, 30 Sep 2003 17:07:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9107sqR040210 for perforce@freebsd.org; Tue, 30 Sep 2003 17:07:54 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Sep 2003 17:07:54 -0700 (PDT) Message-Id: <200310010007.h9107sqR040210@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 38932 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, 01 Oct 2003 00:07:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=38932 Change 38932 by peter@peter_hammer on 2003/09/30 17:07:34 add lapic_disable() rather than having mpboot.s do it in asm. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#10 edit .. //depot/projects/hammer/sys/amd64/include/apicvar.h#5 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#10 (text+ko) ==== @@ -280,6 +280,24 @@ intr_restore(eflags); } +void +lapic_disable(void) +{ + struct lapic *la; + u_int32_t value; + register_t eflags; + + la = &lapics[lapic_id()]; + KASSERT(la->la_present, ("missing APIC structure")); + eflags = intr_disable(); + + /* Disable local APIC to be safe during boot */ + value = lapic->svr; + value &= ~APIC_SVR_SWEN; + lapic->svr = value; + intr_restore(eflags); +} + int lapic_id(void) { ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#5 (text+ko) ==== @@ -159,6 +159,7 @@ int lapic_set_lvt_polarity(u_int apic_id, u_int lvt, u_char activehi); int lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, u_char edgetrigger); void lapic_setup(void); +void lapic_disable(void); #endif /* !LOCORE */ #endif /* _MACHINE_APICVAR_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Sep 30 17:45:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8247916A4C1; Tue, 30 Sep 2003 17:45:43 -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 5C64816A4B3 for ; Tue, 30 Sep 2003 17:45:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B95243FF5 for ; Tue, 30 Sep 2003 17:45:42 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h910jgXJ041894 for ; Tue, 30 Sep 2003 17:45:42 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h910jg9N041891 for perforce@freebsd.org; Tue, 30 Sep 2003 17:45:42 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Sep 2003 17:45:42 -0700 (PDT) Message-Id: <200310010045.h910jg9N041891@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 38935 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, 01 Oct 2003 00:45:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=38935 Change 38935 by peter@peter_hammer on 2003/09/30 17:44:55 bioswarmvec is a 32 bit int (actually 2x16 bits next to each other). XXX alignment checking will break here. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#13 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#13 (text+ko) ==== @@ -402,9 +402,8 @@ static int start_all_aps(u_int boot_addr) { -#ifdef SMP_ME_HARDER u_char mpbiosreason; - u_long mpbioswarmvec; + u_int32_t mpbioswarmvec; struct pcpu *pc; char *stack; uintptr_t kptbase; @@ -416,7 +415,7 @@ install_ap_tramp(boot_addr); /* save the current value of the warm-start vector */ - mpbioswarmvec = *((u_long *) WARMBOOT_OFF); + mpbioswarmvec = *((u_int32_t *) WARMBOOT_OFF); outb(CMOS_REG, BIOS_RESET); mpbiosreason = inb(CMOS_DATA); @@ -475,7 +474,7 @@ PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask)); /* restore the warmstart vector */ - *(u_long *) WARMBOOT_OFF = mpbioswarmvec; + *(u_int32_t *) WARMBOOT_OFF = mpbioswarmvec; outb(CMOS_REG, BIOS_RESET); outb(CMOS_DATA, mpbiosreason); @@ -497,7 +496,6 @@ PTD[i] = 0; invltlb(); -#endif /* number of APs actually started */ return mp_naps; } From owner-p4-projects@FreeBSD.ORG Tue Sep 30 18:02:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 700A716A4C0; Tue, 30 Sep 2003 18:02:03 -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 45FEB16A4B3 for ; Tue, 30 Sep 2003 18:02:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0B6543FA3 for ; Tue, 30 Sep 2003 18:02:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h91122XJ042586 for ; Tue, 30 Sep 2003 18:02:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h91122Uv042583 for perforce@freebsd.org; Tue, 30 Sep 2003 18:02:02 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Sep 2003 18:02:02 -0700 (PDT) Message-Id: <200310010102.h91122Uv042583@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 38936 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, 01 Oct 2003 01:02:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=38936 Change 38936 by peter@peter_hammer on 2003/09/30 18:01:10 externify r_idt, like it should be on i386 instead of dupe declarations for #ifdef SMP Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#57 edit .. //depot/projects/hammer/sys/amd64/include/segments.h#13 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#57 (text+ko) ==== @@ -147,6 +147,7 @@ struct kva_md_info kmi; static struct trapframe proc0_tf; +struct region_descriptor r_gdt, r_idt; struct pcpu __pcpu[MAXCPU]; @@ -1106,7 +1107,6 @@ { caddr_t kmdp; int gsel_tss, off, x; - struct region_descriptor r_gdt, r_idt; struct pcpu *pc; u_int64_t msr; char *env; ==== //depot/projects/hammer/sys/amd64/include/segments.h#13 (text+ko) ==== @@ -215,6 +215,7 @@ extern struct user_segment_descriptor gdt[]; extern struct soft_segment_descriptor gdt_segs[]; extern struct gate_descriptor *idt; +extern struct region_descriptor r_gdt, r_idt; void lgdt(struct region_descriptor *rdp); void sdtossd(struct user_segment_descriptor *sdp, From owner-p4-projects@FreeBSD.ORG Tue Sep 30 18:03:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 913CC16A4C0; Tue, 30 Sep 2003 18:03:05 -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 6648C16A4B3 for ; Tue, 30 Sep 2003 18:03:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4A1F43F3F for ; Tue, 30 Sep 2003 18:03:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h91134XJ043568 for ; Tue, 30 Sep 2003 18:03:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h91134w9043565 for perforce@freebsd.org; Tue, 30 Sep 2003 18:03:04 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Sep 2003 18:03:04 -0700 (PDT) Message-Id: <200310010103.h91134w9043565@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 38937 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, 01 Oct 2003 01:03:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=38937 Change 38937 by peter@peter_hammer on 2003/09/30 18:02:19 paste together a bit more. There are still bits missing. use extern'ed r_idt/r_gdt. Finish getting rid of SMP_* evilness. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#14 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#14 (text+ko) ==== @@ -99,9 +99,6 @@ /** XXX FIXME: where does this really belong, isa.h/isa.c perhaps? */ int current_postcode; -/** XXX FIXME: what system files declare these??? */ -extern struct region_descriptor r_gdt, r_idt; - int mp_naps; /* # of Applications processors */ int boot_cpu_id = -1; /* designated BSP */ extern int nkpt; @@ -117,6 +114,9 @@ char *bootSTK; static int bootAP; +/* Free these after use */ +void *bootstacks[MAXCPU]; + /* Hotwire a 0->4MB V==P mapping */ extern pt_entry_t *KPTphys; @@ -158,9 +158,7 @@ static void set_logical_apic_ids(void); static int start_all_aps(u_int boot_addr); -#ifdef SMP_ME_HARDER static void install_ap_tramp(u_int boot_addr); -#endif static int start_ap(int apic_id, u_int boot_addr); void ap_init(void); static void release_aps(void *dummy); @@ -338,8 +336,6 @@ lidt(&r_idt); - common_tss[myid] = common_tss[0]; - common_tss[myid].tss_rsp0 = 0; /* not used until after switch */ gsel_tss = GSEL(GPROC0_SEL, SEL_KPL); ltr(gsel_tss); @@ -405,9 +401,7 @@ u_char mpbiosreason; u_int32_t mpbioswarmvec; struct pcpu *pc; - char *stack; - uintptr_t kptbase; - int i, pg, apic_id, cpu; + int x, apic_id, cpu; mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN); @@ -427,26 +421,31 @@ cpu++; /* Get per-cpu data */ - pc = &__pcpu[myid]; + pc = &__pcpu[cpu]; /* allocate and set up an idle stack data page */ - stack = (char *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); + bootstacks[cpu] = (char *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); + + /* Init tss */ + common_tss[cpu] = common_tss[0]; + common_tss[cpu].tss_rsp0 = 0; /* not used until after switch */ - gdt_segs[GPROC0_SEL].ssd_base = - (long) &SMP_prvspace[myid].pcpu.pc_common_tss; - pc->pc_prvspace = pc; + gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu]; - for (x = 0; x < NGDT; x++) - if (x != GPROC0_SEL && x != (GPROC0_SEL + 1)) - ssdtosd(&gdt_segs[x], &gdt[myid * NGDT + x].sd); - ssdtosyssd(&gdt_segs[GPROC0_SEL], (struct system_segment_descriptor *)&gdt[GPROC0_SEL]); + for (x = 0; x < NGDT; x++) + if (x != GPROC0_SEL && x != (GPROC0_SEL + 1)) + ssdtosd(&gdt_segs[x], &gdt[cpu * NGDT + x]); + ssdtosyssd(&gdt_segs[GPROC0_SEL], + (struct system_segment_descriptor *)&gdt[cpu * NGDT + GPROC0_SEL]); - r_gdt.rd_limit = NGDT * sizeof(gdt[0]) - 1; - r_gdt.rd_base = (long) &gdt[myid * NGDT]; + r_gdt.rd_limit = NGDT * sizeof(gdt[0]) - 1; + r_gdt.rd_base = (long) &gdt[cpu * NGDT]; /* prime data page for it to use */ pcpu_init(pc, cpu, sizeof(struct pcpu)); pc->pc_apic_id = apic_id; + pc->pc_prvspace = pc; + pc->pc_curthread = 0; /* setup a vector to our boot code */ *((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET; @@ -454,8 +453,7 @@ outb(CMOS_REG, BIOS_RESET); outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ - bootSTK = &SMP_prvspace[apic_id].idlekstack[KSTACK_PAGES * - PAGE_SIZE]; + bootSTK = bootstacks[cpu]; bootAP = cpu; /* attempt to start the Application Processor */ @@ -479,23 +477,6 @@ outb(CMOS_REG, BIOS_RESET); outb(CMOS_DATA, mpbiosreason); - /* - * Set up the idle context for the BSP. Similar to above except - * that some was done by locore, some by pmap.c and some is implicit - * because the BSP is cpu#0 and the page is initially zero and also - * because we can refer to variables by name on the BSP.. - */ - - /* Allocate and setup BSP idle stack */ - stack = (char *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); - for (i = 0; i < KSTACK_PAGES; i++) - SMPpt[1 + i] = (pt_entry_t) - (PG_V | PG_RW | vtophys(PAGE_SIZE * i + stack)); - - for (i = 0; i < NKPT; i++) - PTD[i] = 0; - invltlb(); - /* number of APs actually started */ return mp_naps; } @@ -512,10 +493,12 @@ extern void MPentry(void); extern u_int MP_GDT; extern u_int mp_gdtbase; +#endif static void install_ap_tramp(u_int boot_addr) { +#ifdef SMP_ME_HARDER int x; int size = *(int *) ((u_long) & bootMP_size); u_char *src = (u_char *) ((u_long) bootMP); @@ -556,8 +539,8 @@ dst8 = (u_int8_t *) (dst16 + 1); *dst16 = (u_int) boot_addr & 0xffff; *dst8 = ((u_int) boot_addr >> 16) & 0xff; +#endif } -#endif void compile_hack(void); void From owner-p4-projects@FreeBSD.ORG Tue Sep 30 18:13:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B924716A4C0; Tue, 30 Sep 2003 18:13: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 8E00B16A4B3; Tue, 30 Sep 2003 18:13:33 -0700 (PDT) Received: from sccrmhc11.comcast.net (sccrmhc11.comcast.net [204.127.202.55]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C4DB43FE5; Tue, 30 Sep 2003 18:13:32 -0700 (PDT) (envelope-from julian@elischer.org) Received: from interjet.elischer.org ([12.233.125.100]) by comcast.net (sccrmhc11) with ESMTP id <2003100101133001100m0e03e>; Wed, 1 Oct 2003 01:13:31 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id OAA53443; Tue, 30 Sep 2003 14:49:33 -0700 (PDT) Date: Tue, 30 Sep 2003 14:49:32 -0700 (PDT) From: Julian Elischer To: Warner Losh In-Reply-To: <200309302112.h8ULCCLZ024391@repoman.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Perforce Change Reviews Subject: Re: PERFORCE change 38917 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, 01 Oct 2003 01:13:34 -0000 Someone who understands all this stuff should update /usr/share/examples/drivers/make_device_driver.sh On Tue, 30 Sep 2003, Warner Losh wrote: > http://perforce.freebsd.org/chv.cgi?CH=38917 > > Change 38917 by imp@imp_koguchi on 2003/09/30 14:11:19 > > phk's sc = dev->si_drv1; > Start on attach() > some whitespace for clarity. > > Affected files ... > > .. //depot/doc/strawman-driver.c#2 edit > > Differences ... > > ==== //depot/doc/strawman-driver.c#2 (text+ko) ==== > > @@ -16,6 +16,9 @@ > static int > foo_ctl_ioctl(dev_t dev, u_long cmd, caddr_t data, nit flag, struct thread *td) > { > + foo_softc *sc; > + > + sc = dev->si_drv1; > ... > case FOO_GERBIL: > /* Wait for a weird GERBIL event in the device and return it */ > @@ -37,25 +40,48 @@ > } > > static int > +foo_attach(device_t dev) > +{ > + int unit; > + foo_softc *sc; > + > + sc = device_get_softc(dev); > + unit = device_get_unit(dev); > + > + /* allocate resoureces, initailze thigns */ > + /* xXX show how we allocate mtx, cv, irq, ih */ > + > + /* Allocate device */ > + sc->d = make_dev(devsw, 1, 0, 0, 0755, "fooctl%d", unit); > + sc->d->si_drv1 = sc; > +} > + > +static int > foo_detach(device_t dev) > { > sc = device_get_softc(dev); > > foo_disable_intr(sc); /* disable hardware intr ??? */ > + > /* Everybody active here */ > callout_reset(&sc->stat_ch, hz, fxp_tick, sc); > + > /* Network, ISR and devsw active */ > bus_teardown_intr(sc->dev, sc->irq, sc->ih); > + > /* Network and devsw active */ > ether_ifdetach(&sc->arpcom.ac_if); > sc->ih = NULL; > foo_wakeup_my_sleepers(sc); > + > /* devsw active */ > destroy_dev(sc->d); > + > /* only mutex alive */ > mtx_destroy(&sc->mtx); > cv_destroy(&sc->cv); > - /* release the resources */ > + > + /* release the hardware resources */ > bus_release_resource(sc->dev, SYS_RES_IRQ, 0, sc->irq); > // etc > } > From owner-p4-projects@FreeBSD.ORG Tue Sep 30 18:50:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AF2416A4C0; Tue, 30 Sep 2003 18:50:34 -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 4280516A4B3 for ; Tue, 30 Sep 2003 18:50:34 -0700 (PDT) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2532444003 for ; Tue, 30 Sep 2003 18:50:31 -0700 (PDT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.9p1/8.12.9) with ESMTP id h911oSAD098008; Tue, 30 Sep 2003 19:50:28 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Tue, 30 Sep 2003 19:50:29 -0600 (MDT) Message-Id: <20030930.195029.26965475.imp@bsdimp.com> To: julian@elischer.org From: "M. Warner Losh" In-Reply-To: References: <200309302112.h8ULCCLZ024391@repoman.freebsd.org> X-Mailer: Mew version 2.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@freebsd.org Subject: Re: PERFORCE change 38917 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, 01 Oct 2003 01:50:34 -0000 In message: Julian Elischer writes: : Someone who understands all this stuff should update : : /usr/share/examples/drivers/make_device_driver.sh That's premature at this time. We're trying to hash out the guarnatees that various subsystems need to make in order to ensure that we can successfully detach drivers. Warner From owner-p4-projects@FreeBSD.ORG Tue Sep 30 21:26:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF2CE16A4C0; Tue, 30 Sep 2003 21:26: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 8622316A4B3 for ; Tue, 30 Sep 2003 21:26:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FF6D44011 for ; Tue, 30 Sep 2003 21:26:18 -0700 (PDT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h914QIXJ059499 for ; Tue, 30 Sep 2003 21:26:18 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h914QHpp059496 for perforce@freebsd.org; Tue, 30 Sep 2003 21:26:17 -0700 (PDT) (envelope-from imp@freebsd.org) Date: Tue, 30 Sep 2003 21:26:17 -0700 (PDT) Message-Id: <200310010426.h914QHpp059496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 38945 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, 01 Oct 2003 04:26:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=38945 Change 38945 by imp@imp_koguchi on 2003/09/30 21:26:14 unlock -- per rwatson Affected files ... .. //depot/doc/strawman-driver.c#7 edit Differences ... ==== //depot/doc/strawman-driver.c#7 (text+ko) ==== @@ -32,9 +32,11 @@ mtx_lock(&sc->mtx); sc->sc_gerbil = 0; while (!sc->sc_gerbil) { - if (sc->dead) /* Race #1, b */ + cv_wait(&sc->cv, &sc->mtx); + if (sc->dead) { /* Race #1, b */ + mtx_unlock(&sc->mtx); return EGONE; - cv_wait(&sc->cv, &sc->mtx); + } } mtx_unlock(&sc->mtx); return (0); From owner-p4-projects@FreeBSD.ORG Tue Sep 30 21:37:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77C5C16A4EA; Tue, 30 Sep 2003 21:37:34 -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 4B91E16A4E8 for ; Tue, 30 Sep 2003 21:37:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3F3343F93 for ; Tue, 30 Sep 2003 21:37:33 -0700 (PDT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h914bXXJ059945 for ; Tue, 30 Sep 2003 21:37:33 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h914bXI4059942 for perforce@freebsd.org; Tue, 30 Sep 2003 21:37:33 -0700 (PDT) (envelope-from imp@freebsd.org) Date: Tue, 30 Sep 2003 21:37:33 -0700 (PDT) Message-Id: <200310010437.h914bXI4059942@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 38947 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, 01 Oct 2003 04:37:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=38947 Change 38947 by imp@imp_koguchi on 2003/09/30 21:36:37 document the race in the callout api. this one sucks since if we lose this one we can have a crash. Affected files ... .. //depot/doc/strawman-driver.c#8 edit Differences ... ==== //depot/doc/strawman-driver.c#8 (text+ko) ==== @@ -83,7 +83,7 @@ /* Everybody active here */ if (callout_stop(&sc->stat_ch, hz, fxp_tick, sc) == 0) - printf("Maybe we just lost a race\n"); + printf("Maybe we just lost a race\n"); /* race 3 */ /* Network, ISR and devsw active */ bus_teardown_intr(sc->dev, sc->irq, sc->ih); @@ -116,8 +116,6 @@ /* #1 * - * We have a race here. - * * The test points 'a' and 'b' might lose the race with the set point 'c'. * * If 'c' wins the race with either 'a' or 'b', then we're OK. We properly @@ -137,3 +135,13 @@ * before 'a', that's OK, because sc is guaranteed to be valid for the * life of the call to ioctl, or any of the devsw functions. */ + +/* #3 + * + * Callout interface is inharently racy. We have no way of knowing + * when a callout might be in progress or complete. A return value of + * 0 means either the callout has happened, or is happening. However, + * we can't tell if the code has finished executing or not. This + * means that if the code is executing and we try to unload the page + * that is executing, then we've set ourselves up for a crash. + */ From owner-p4-projects@FreeBSD.ORG Tue Sep 30 22:53:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3FBB16A4C1; Tue, 30 Sep 2003 22: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 9B80B16A4B3 for ; Tue, 30 Sep 2003 22:53:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2687643FF5 for ; Tue, 30 Sep 2003 22:53:08 -0700 (PDT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h915r7XJ064076 for ; Tue, 30 Sep 2003 22:53:07 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h915r7VL064073 for perforce@freebsd.org; Tue, 30 Sep 2003 22:53:07 -0700 (PDT) (envelope-from imp@freebsd.org) Date: Tue, 30 Sep 2003 22:53:07 -0700 (PDT) Message-Id: <200310010553.h915r7VL064073@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 38953 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, 01 Oct 2003 05:53:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=38953 Change 38953 by imp@imp_koguchi on 2003/09/30 22:52:38 Document that in FreeBSD 5 the callout wheel locking precludes the race documented here as race #3. Affected files ... .. //depot/doc/strawman-driver.c#9 edit Differences ... ==== //depot/doc/strawman-driver.c#9 (text+ko) ==== @@ -144,4 +144,7 @@ * we can't tell if the code has finished executing or not. This * means that if the code is executing and we try to unload the page * that is executing, then we've set ourselves up for a crash. + * + * However, given how FreeBSD 5 locks the callout code, the race can + * never be lost. */ From owner-p4-projects@FreeBSD.ORG Wed Oct 1 08:09:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0084216A4C0; Wed, 1 Oct 2003 08:09:37 -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 CC68E16A4B3 for ; Wed, 1 Oct 2003 08:09:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5780943FBF for ; Wed, 1 Oct 2003 08:09:37 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h91F9bXJ007987 for ; Wed, 1 Oct 2003 08:09:37 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h91F9aix007984 for perforce@freebsd.org; Wed, 1 Oct 2003 08:09:36 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Wed, 1 Oct 2003 08:09:36 -0700 (PDT) Message-Id: <200310011509.h91F9aix007984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 38977 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, 01 Oct 2003 15:09:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=38977 Change 38977 by areisse@areisse_tislabs on 2003/10/01 08:09:25 changed style Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.c#6 (text+ko) ==== @@ -107,10 +107,10 @@ size_t fread(void *ptr, size_t size, size_t nmemb, FILE *fp) { + struct thread *td = curthread; + if (size == 0) - return 0; - - struct thread *td = curthread; + return (0); fp->FILE_uio.uio_iov->iov_base = ptr; fp->FILE_uio.uio_resid = fp->FILE_uio.uio_iov->iov_len = size * nmemb; From owner-p4-projects@FreeBSD.ORG Wed Oct 1 12:23:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53A0C16A4C0; Wed, 1 Oct 2003 12:23:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 931) id 1424816A4BF; Wed, 1 Oct 2003 12:23:49 -0700 (PDT) Date: Wed, 1 Oct 2003 14:23:49 -0500 From: Juli Mallett To: "M. Warner Losh" Message-ID: <20031001142349.A87379@FreeBSD.org> References: <200309302112.h8ULCCLZ024391@repoman.freebsd.org> <20030930.195029.26965475.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <20030930.195029.26965475.imp@bsdimp.com>; from imp@bsdimp.com on Tue, Sep 30, 2003 at 07:50:29PM -0600 X-Title: Code Maven X-Towel: Yes X-Negacore: Yes X-Authentication-Warning: localhost: juli pwned teh intarweb cc: perforce@freebsd.org cc: julian@elischer.org Subject: Re: PERFORCE change 38917 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, 01 Oct 2003 19:23:49 -0000 * "M. Warner Losh" [ Date: 2003-09-30 ] [ w.r.t. Re: PERFORCE change 38917 for review ] > In message: > Julian Elischer writes: > : Someone who understands all this stuff should update > : > : /usr/share/examples/drivers/make_device_driver.sh > > That's premature at this time. We're trying to hash out the > guarnatees that various subsystems need to make in order to ensure > that we can successfully detach drivers. In other words, the strawman is being used to find the fundamental flaws/races/... that we need to grow the APIs/etc. to accomodate? Groovy. Better APIs and primitives :D -- juli mallett. email: jmallett@freebsd.org; efnet: juli; aim: bsdflata; i have lost my way home early - i don't care cause i won't stay there. From owner-p4-projects@FreeBSD.ORG Wed Oct 1 12:28:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F07716A4C1; Wed, 1 Oct 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 25A0D16A4B3; Wed, 1 Oct 2003 12:28:49 -0700 (PDT) Received: from critter.freebsd.dk (critter.freebsd.dk [212.242.86.163]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A69B43F3F; Wed, 1 Oct 2003 12:28:47 -0700 (PDT) (envelope-from phk@phk.freebsd.dk) Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.12.9/8.12.9) with ESMTP id h91JSTbw004061; Wed, 1 Oct 2003 21:28:29 +0200 (CEST) (envelope-from phk@phk.freebsd.dk) To: Juli Mallett From: "Poul-Henning Kamp" In-Reply-To: Your message of "Wed, 01 Oct 2003 14:23:49 CDT." <20031001142349.A87379@FreeBSD.org> Date: Wed, 01 Oct 2003 21:28:29 +0200 Message-ID: <4060.1065036509@critter.freebsd.dk> cc: perforce@freebsd.org cc: julian@elischer.org cc: "M. Warner Losh" Subject: Re: PERFORCE change 38917 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, 01 Oct 2003 19:28:49 -0000 In message <20031001142349.A87379@FreeBSD.org>, Juli Mallett writes: >* "M. Warner Losh" [ Date: 2003-09-30 ] > [ w.r.t. Re: PERFORCE change 38917 for review ] >> In message: >> Julian Elischer writes: >> : Someone who understands all this stuff should update >> : >> : /usr/share/examples/drivers/make_device_driver.sh >> >> That's premature at this time. We're trying to hash out the >> guarnatees that various subsystems need to make in order to ensure >> that we can successfully detach drivers. > >In other words, the strawman is being used to find the fundamental >flaws/races/... that we need to grow the APIs/etc. to accomodate? Yes, that's the concept. It is rather trivial to solve the actual problems, throw enough mutexes at it and you're done. It is far more tricky to do it in a way where you get both readable source code (so people understand what it does and how it does it), simple conceptual models (so people can understand it) etc. And then of course, once we have that we need a transistion plan, and that in itself is a problem because we want to minimize code sweeps, and we have a lot of practically untestable drivers. >Groovy. Better APIs and primitives :D Yeah, well, eventually. -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From owner-p4-projects@FreeBSD.ORG Wed Oct 1 14:16:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 023D116A4B3; Wed, 1 Oct 2003 14:16: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 CC9D516A4B3 for ; Wed, 1 Oct 2003 14:16:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18F8443FE1 for ; Wed, 1 Oct 2003 14:16:15 -0700 (PDT) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h91LGEXJ041786 for ; Wed, 1 Oct 2003 14:16:14 -0700 (PDT) (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h91LGEnR041783 for perforce@freebsd.org; Wed, 1 Oct 2003 14:16:14 -0700 (PDT) (envelope-from brooks@freebsd.org) Date: Wed, 1 Oct 2003 14:16:14 -0700 (PDT) Message-Id: <200310012116.h91LGEnR041783@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Subject: PERFORCE change 39003 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, 01 Oct 2003 21:16:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=39003 Change 39003 by brooks@brooks_minya on 2003/10/01 14:15:19 Move arpcom to the top of the softc where the networking code currently requires it to live. Affected files ... .. //depot/doc/strawman-driver.c#10 edit Differences ... ==== //depot/doc/strawman-driver.c#10 (text+ko) ==== @@ -4,8 +4,8 @@ struct foo_softc { + struct arpcom arpcom; /* per-interface network data */ struct callout stat_ch; /* stat callout */ - struct arpcom arpcom; /* per-interface network data */ struct resource *irq; /* resource descriptor for interrupt */ void *ih; /* interrupt handler cookie */ dev_t d; From owner-p4-projects@FreeBSD.ORG Wed Oct 1 15:43:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C2ED16A4C1; Wed, 1 Oct 2003 15:43: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 EA86716A4C0; Wed, 1 Oct 2003 15:43:30 -0700 (PDT) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3089F43FDD; Wed, 1 Oct 2003 15:43:29 -0700 (PDT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.9p1/8.12.9) with ESMTP id h91MhHAD011307; Wed, 1 Oct 2003 16:43:19 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Wed, 01 Oct 2003 16:43:15 -0600 (MDT) Message-Id: <20031001.164315.11988972.imp@bsdimp.com> To: jmallett@FreeBSD.ORG From: "M. Warner Losh" In-Reply-To: <20031001142349.A87379@FreeBSD.org> References: <20030930.195029.26965475.imp@bsdimp.com> <20031001142349.A87379@FreeBSD.org> X-Mailer: Mew version 2.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@FreeBSD.ORG cc: julian@elischer.org Subject: Re: PERFORCE change 38917 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, 01 Oct 2003 22:43:31 -0000 In message: <20031001142349.A87379@FreeBSD.org> Juli Mallett writes: : * "M. Warner Losh" [ Date: 2003-09-30 ] : [ w.r.t. Re: PERFORCE change 38917 for review ] : > In message: : > Julian Elischer writes: : > : Someone who understands all this stuff should update : > : : > : /usr/share/examples/drivers/make_device_driver.sh : > : > That's premature at this time. We're trying to hash out the : > guarnatees that various subsystems need to make in order to ensure : > that we can successfully detach drivers. : : In other words, the strawman is being used to find the fundamental : flaws/races/... that we need to grow the APIs/etc. to accomodate? : : Groovy. Better APIs and primitives :D Yes. This is an anal-rentive view at our APIs and how they are implement to make sure that we get all the driver issues dealt with properly to effectively support removable drivers. Warner From owner-p4-projects@FreeBSD.ORG Wed Oct 1 19:21:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74D6516A4C0; Wed, 1 Oct 2003 19:21:37 -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 4AE2616A4B3; Wed, 1 Oct 2003 19:21:37 -0700 (PDT) Received: from perrin.nxad.com (internal.nxad.com [69.1.70.251]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA55743FDD; Wed, 1 Oct 2003 19:21:36 -0700 (PDT) (envelope-from hmp@nxad.com) Received: by perrin.nxad.com (Postfix, from userid 1072) id D309F20F01; Wed, 1 Oct 2003 19:21:35 -0700 (PDT) Date: Wed, 1 Oct 2003 19:21:35 -0700 From: Hiten Pandya To: "M. Warner Losh" Message-ID: <20031002022135.GA26666@perrin.nxad.com> References: <20030930.195029.26965475.imp@bsdimp.com> <20031001142349.A87379@FreeBSD.org> <20031001.164315.11988972.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20031001.164315.11988972.imp@bsdimp.com> X-Operating-System: FreeBSD FreeBSD 4.7-STABLE User-Agent: Mutt/1.5.4i cc: jmallett@FreeBSD.ORG cc: perforce@FreeBSD.ORG cc: julian@elischer.org Subject: Re: PERFORCE change 38917 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, 02 Oct 2003 02:21:38 -0000 On Wed, Oct 01, 2003 at 04:43:15PM -0600, M. Warner Losh wrote: : Yes. This is an anal-rentive view at our APIs and how they are : implement to make sure that we get all the driver issues dealt with : properly to effectively support removable drivers. : : Warner Does this also include PCI Hotplugging or is this going to be a separate effort? Regards, -- Hiten Pandya hmp@backplane.com From owner-p4-projects@FreeBSD.ORG Wed Oct 1 19:52:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF12A16A4C0; Wed, 1 Oct 2003 19:52:55 -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 864ED16A4B3 for ; Wed, 1 Oct 2003 19:52:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8B4343FDF for ; Wed, 1 Oct 2003 19:52:48 -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.9/8.12.9) with ESMTP id h922qmXJ066237 for ; Wed, 1 Oct 2003 19:52:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h922qVI4066032 for perforce@freebsd.org; Wed, 1 Oct 2003 19:52:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 Oct 2003 19:52:31 -0700 (PDT) Message-Id: <200310020252.h922qVI4066032@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 39025 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, 02 Oct 2003 02:52:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=39025 Change 39025 by rwatson@rwatson_paprika on 2003/10/01 19:51:47 Integrate the TrustedBSD base branch from the FreeBSD vendor branch, bringing in boatloads of stuff, including: WITH_DYNAMICROOT -- build system fully dynamic amd update dhcp client update libreadline update sendmail security fixes openssh security fixes openssl security fixes, import various other updates loopback libc/posix1e mac_prepare_type() bugfix to return error via errno, rather than direct return. libdisk now rejects less many m:n threading fixes LIBMAP now enabled by default new broadcom driver static arp support much internationalization support for filesystems disk API man pages VM man pages pmap cleanups, vm locking cleanups lots of amd64, ia64 stuff color beastie in the loader uart driver coda upgrades acpi fixes pfil cleanup, locking rijndael bug fix sha2 bugfixes i386 zeroing optimizations bosko's p4 stability fix scottl's drivers lose hard-coded major numbers atang bugfixes 802.11/atheros bug fixes bktr bugfixes if_em and other network device driver locking cloning API fixes cdevsw initialization cleanups, make_dev fixes, device revocation cleanups raidframe cleanup vinum dev_t fixes vcc addition to procfs: list the path of mapped files in procfs map entry Loopback of mac_syscall() static policy list support bugfix "conservative_signals" signal permission changes, SIGALRM now permitted. sched_ule fixes taskqueue kthread, fast taskqueue support pipes now giant-free, locking fixes buffer cache fixes, locking new realtek driver network bridge cleanup M_PREPEND cleanups VLAN locking ip_divert cleanup, locking dummynet locking ipflow locking ipfw2 locking ip fragment queue locking multicast route locking multicast virtual interface locking raw socket locking fixes, general raw socket cleanup ipv6 randomized ip ids various ipv6 bug fixes ipsec cleanups, assertions, locking busdmaification of various drivers freebsd/ppc progress swap pager now uses geom removal/cleanup of kerberosIV bits from rlogin Affected files ... .. //depot/projects/trustedbsd/base/Makefile#27 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#44 integrate .. //depot/projects/trustedbsd/base/UPDATING#37 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#16 integrate .. //depot/projects/trustedbsd/base/bin/ls/util.c#9 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.1#16 integrate .. //depot/projects/trustedbsd/base/bin/sh/arith.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/arith.y#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/arith_lex.l#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/mkbuiltins#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#13 integrate .. //depot/projects/trustedbsd/base/bin/sh/shell.h#4 integrate .. //depot/projects/trustedbsd/base/bin/test/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/AUTHORS#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/BUGS#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/COPYING#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/INSTALL#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/MIRRORS#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/NEWS#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/README.ldap#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/am_ops.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amd.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amd.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_auto.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_direct.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_error.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_host.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_inherit.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_link.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_linkx.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_nfsl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_nfsx.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_program.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_root.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_toplvl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_union.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amq_subr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amq_svc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/autil.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/clock.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/conf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/conf_parse.y#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/conf_tok.l#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/get_args.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_file.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_hesiod.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_ldap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_ndbm.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_nis.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_nisplus.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_passwd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_union.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/map.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/mapc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/mntfs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/nfs_prot_svc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/nfs_start.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/nfs_subr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_TEMPLATE.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_autofs.c#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_cachefs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_cdfs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_efs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_lofs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_mfs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_nfs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_nfs3.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_nullfs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_pcfs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_tfs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_tmpfs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_ufs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_umapfs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_unionfs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_xfs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/opts.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/restart.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/rpc_fwd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/sched.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/srvr_amfs_auto.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/srvr_nfs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq_clnt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq_xdr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/pawd.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/pawd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/aux_conf.h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/bootstrap#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/commit#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/mount/mount_default.c#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/conf/transp/transp_sockets.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/umount/umount_bsd44.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/config.guess#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/config.guess.long#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/config.sub#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/configure.in#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/cvs-server.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/depcomp#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/doc/am-utils.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/doc/mdate-sh#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/doc/stamp-vti#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/doc/texinfo.tex#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/doc/version.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fixmount/fixmount.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fixmount/fixmount.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_analyze.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_data.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_dict.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_gram.y#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_lex.l#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_util.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsinfo.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsinfo.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsinfo.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/wr_atab.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/wr_bparam.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/wr_dumpset.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/wr_exportfs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/wr_fstab.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/hlfsd.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/hlfsd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/hlfsd.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/homedir.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/stubs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/am_compat.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/am_defs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/am_utils.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/am_xdr_func.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/amq_defs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/mount_headers1.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/install-sh#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/libamu/amu.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/hasmntopt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/misc_rpc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/mount_fs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/mtab.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/libamu/util.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/wire.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/xdr_func.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/xutil.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/ltmain.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/amindent#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/autopat#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/c_void_p.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/cache_check_dynamic.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_amu_fs.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_checkmount_style.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_extern.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_fhandle.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_field.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_fs_headers.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_fs_mntent.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_gnu_getopt.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_hide_mount_type.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_lib2.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_map_funcs.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnttab_file_name.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnttab_location.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnttab_opt.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnttab_style.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mnttab_type.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mount_style.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mount_trap.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mount_type.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mtype_printf_type.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_mtype_type.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_network_transport_type.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_nfs_fh_dref.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_nfs_hn_dref.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_nfs_prot_headers.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_nfs_sa_dref.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_nfs_socket_connection.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_os_libs.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_restartable_signal_handler.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_umount_style.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_unmount_args.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/check_unmount_call.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/expand_cpp_hex.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/expand_cpp_int.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/expand_cpp_string.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/expand_run_string.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/extern_optarg.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/extern_sys_errlist.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/func_bad_memcmp.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/func_bad_yp_all.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/header_templates.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/host_macros.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/linux_headers.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/localconfig.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/mount_headers.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/name_package.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/name_version.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/opt_amu_cflags.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/opt_cppflags.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/opt_debug.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/opt_ldflags.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/opt_libs.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/os_cflags.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/os_cppflags.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/os_ldflags.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/package_bugreport.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/package_name.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/package_version.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/save_state.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/struct_field_nfs_fh.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/struct_mntent.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/struct_mnttab.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/struct_nfs_args.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/struct_nfs_fh.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/struct_nfs_fh3.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/try_compile_anyfs.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/try_compile_nfs.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/try_compile_rpc.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_auth_create_gidlist.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_cachefs_args.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_cdfs_args.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_efs_args.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_lofs_args.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_mfs_args.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_pcfs_args.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_rfs_args.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_svc_in_arg.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_time_t.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_tmpfs_args.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_ufs_args.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_xdrproc_t.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_xfs_args.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/type_yp_order_outorder.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/with_addon.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/mkconf#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/missing#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/mkinstalldirs#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/scripts/amd.conf-sample#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/amd.conf.5#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/automount2amd.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/ctl-amd.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/ctl-hlfsd.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/expn.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/expn.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/lostaltmail.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/tasks#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/wire-test/wire-test.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/wire-test/wire-test.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd-spec.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/ABOUT-NLS#2 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/NEWS#2 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/README-alpha#2 delete .. //depot/projects/trustedbsd/base/contrib/gnu-sort/THANKS#2 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/lib/getopt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/lib/getopt.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/lib/getopt1.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/lib/gettext.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gnu-sort/lib/hard-locale.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/lib/xmalloc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/man/sort.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/src/sort.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/src/sys2.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gnu-sort/src/system.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grotty/grotty.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-common#13 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-syms#5 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc.tmac#7 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/eqnrc#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/groff_mdoc.man#11 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/troffrc#8 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/tty-char.tmac#5 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/tty.tmac#4 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/README#6 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/RELNOTES#6 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/clparse.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.conf.5#6 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/scripts/freebsd#5 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/dhcp-options.5#5 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/discover.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/options.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/parse.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/print.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/tables.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/dhcpd.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/version.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_mkupdate.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/result.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/CHANGELOG#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/CHANGES#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/INSTALL#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/MANIFEST#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/ansi_stdlib.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/bind.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/callback.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/chardefs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/compat.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/complete.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/config.h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/configure#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/configure.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/display.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/hist.texinfo#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/history.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/hstech.texinfo#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/hsuser.texinfo#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/manvers.texinfo#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/readline.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rlman.texinfo#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rltech.texinfo#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rluser.texinfo#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rluserman.texinfo#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/emacs_keymap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/Inputrc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/fileman.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/histexamp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/manexamp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/readlinebuf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlcat.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rltest.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rlversion.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/funmap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/histexpand.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/histfile.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/histlib.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/history.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/history.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/histsearch.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/input.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/isearch.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/keymaps.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/kill.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/macro.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/mbutil.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/misc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/nls.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/parens.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/posixdir.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/readline.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/readline.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rlconf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rldefs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rlmbutil.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/rlprivate.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rlshell.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rlstdc.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rltty.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rltypedefs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/search.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/shell.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/shlib/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/signals.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/config.guess#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/config.sub#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/install.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/mkdirs#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/mkdist#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/shlib-install#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/shobj-conf#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/wcwidth.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/terminal.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/text.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/tilde.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/tilde.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/undo.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/util.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/vi_keymap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/vi_mode.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/xmalloc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/xmalloc.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/LICENSE#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/README#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.mc#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/cfhead.m4#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/proto.m4#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/contrib/domainmap.m4#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/contrib/doublebounce.pl#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/contrib/expn.pl#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/doc/op/op.me#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/conf.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/errstring.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/io.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_aix.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/shm.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/README#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/sample.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_chgheader.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_register.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setconn.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setreply.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/engine.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/libmilter.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/listener.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/signal.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/clock.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/errstring.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/flags.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/ldap.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/shm.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/smstdio.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/stdio.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/vasprintf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsmdb/smdb2.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/mail.local.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/README#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/smrsh.8#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/README#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/TRACEFLAGS#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/alias.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/bf.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/collect.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/control.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/daemon.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/domain.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/headers.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/main.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/map.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mci.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/milter.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mime.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/parseaddr.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/readcf.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/recipient.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.8#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sfsasl.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/stab.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/udb.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/usersmtp.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/util.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.X#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-tricks#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-chall.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pam-freebsd.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/buffer.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/deattack.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/misc.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.c#16 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config.5#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config.5#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/version.h#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/CHANGES#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Configure#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FAQ#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/LICENSE#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.org#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.ssl#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/NEWS#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/PROBLEMS#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/README#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.pl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/apps.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ca.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/crl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/der_chop#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/engine.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ocsp.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/openssl.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/pkcs8.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_apps.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_client.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_server.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/smime.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/x509.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/bugs/SSLv3#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/config#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_cbc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_ctr.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_mbstr.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_strex.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_strnid.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_lib.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_dec.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_print.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bf_buff.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_bio.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_file.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mul.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bntest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/exptest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/cfb_enc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/destest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_key.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dhtest.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_ossl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_sign.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_vrf.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsatest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_dlfcn.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_mult.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_fat.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/engine.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ubsec.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_b64.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_enc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/c_all.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/digest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_acnf.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/md2test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/asm/md5-586.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/asm/md5-sparcv9.S#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/o_time.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/ocsp_ht.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslconf.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslv.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/x86ms.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/x86nasm.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/x86unix.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/p12_npas.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_doit.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_mime.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_smime.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pkcs7.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_win.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_eay.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_sign.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_test.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/threads/mttest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/threads/solaris.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/by_file.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_trs.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_vfy.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509type.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_conf.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_cpols.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_prn.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/engines/zencod/hw_zencod.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/HOWTO/certificates.txt#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/HOWTO/keys.txt#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/ca.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/ocsp.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/s_client.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/s_server.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/BIO_f_base64.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/BIO_f_cipher.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/openssl-shared.txt#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_free.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_sess_set_get_cb.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_verify.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_accept.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_connect.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/e_os.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/openssl.spec#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/kssl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/kssl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_clnt.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_srvr.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_ciph.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_lib.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_rsa.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_sess.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssltest.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/test/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/test/evptests.txt#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/tools/c_rehash#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/extract-names.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/libeay.num#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mk1mf.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mkdef.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mkerr.pl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/Mingw32.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/Mingw32f.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/util/point.sh#3 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#34 integrate .. //depot/projects/trustedbsd/base/etc/defaults/devfs.rules#2 integrate .. //depot/projects/trustedbsd/base/etc/defaults/pccard.conf#19 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#31 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#7 integrate .. //depot/projects/trustedbsd/base/etc/etc.ia64/ttys#3 integrate .. //depot/projects/trustedbsd/base/etc/etc.sparc64/ttys#5 integrate .. //depot/projects/trustedbsd/base/etc/gettytab#3 integrate .. //depot/projects/trustedbsd/base/etc/pccard_ether#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#14 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/dhclient#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipfilter#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/localdaemons#4 delete .. //depot/projects/trustedbsd/base/etc/rc.d/network1#11 delete .. //depot/projects/trustedbsd/base/etc/rc.d/network2#5 delete .. //depot/projects/trustedbsd/base/etc/rc.d/network3#6 delete .. //depot/projects/trustedbsd/base/etc/sendmail/Makefile#11 integrate .. //depot/projects/trustedbsd/base/etc/services#10 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes-o.real#6 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2#16 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libreadline/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libreadline/config.h#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libreadline/readline/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/Makefile#10 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/cvsbug/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/lib/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/font/devkoi8-r/R.proto#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/Makefile#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/fr.ISO8859-1#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/koi8-r.tmac#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#16 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/ru.KOI8-R#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/manpath/manpath.config#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/sort/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/sort/config.h#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/sort/libintl.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/tar/config.h#3 integrate .. //depot/projects/trustedbsd/base/include/Makefile#31 integrate .. //depot/projects/trustedbsd/base/include/pthread.h#5 integrate .. //depot/projects/trustedbsd/base/include/varargs.h#1 branch .. //depot/projects/trustedbsd/base/lib/Makefile#23 integrate .. //depot/projects/trustedbsd/base/lib/libalias/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libalias/alias.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libalias/alias.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libalias/alias_db.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libalias/alias_local.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libalias/alias_skinny.c#1 branch .. //depot/projects/trustedbsd/base/lib/libalias/libalias.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fabs.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/getcontext.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/vfork.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/sigvec.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/btree.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/dbm.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/dbopen.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/hash.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/recno.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/confstr.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ctermid.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/devname.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dlinfo.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/exec.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fnmatch.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fts.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getcwd.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getdomainname.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getfsent.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getgrent.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/gethostname.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getpwent.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/glob.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/msgctl.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/signal.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sysconf.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sysctl.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/tcsetattr.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/uname.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/wordexp.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/getcontext.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_get_ldt.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/ctype.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/nl_langinfo.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/rune.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/table.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/addr2ascii.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/ethers.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getifaddrs.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnameinfo.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/if_indextoname.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet6_option_space.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet6_rthdr_space.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet_net_pton.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/resolver.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_get.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/regex/regex.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/publickey.5#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_clnt_create.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_svc_calls.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_svc_create.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/funopen.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/tmpnam.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/exit.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/getopt.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/grantpt.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/hcreate.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/qsort.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/rand.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/ctime.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/bcmp.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/bcopy.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/bzero.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/ffs.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/index.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strcasecmp.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strchr.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/accept.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/acct.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/chmod.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/clock_gettime.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getitimer.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getlogin.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getsockopt.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/gettimeofday.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/intro.2#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ioctl.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kqueue.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ktrace.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mincore.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mount.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ntp_gettime.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/open.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/poll.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ptrace.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/quotactl.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/read.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/reboot.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/recv.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/select.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/send.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/setgroups.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigaction.2#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigprocmask.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/socket.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/stat.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sysarch.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/syscall.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_condattr.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_once.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_write.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libcalendar/calendar.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libcam/cam_cdbparse.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libcompat/4.1/ftime.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libcompat/4.4/cuserid.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libdevinfo/devinfo.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libdevstat/devstat.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/disk.c#25 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/libdisk.h#15 integrate .. //depot/projects/trustedbsd/base/lib/libedit/editline.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/fetch.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/ftp.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/ipsec_strerror.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libkiconv/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libkiconv/kiconv.3#1 branch .. //depot/projects/trustedbsd/base/lib/libkiconv/quirks.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkiconv/quirks.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkiconv/xlat16_iconv.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkiconv/xlat16_sysctl.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_getprocs.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_proc.c#17 integrate .. //depot/projects/trustedbsd/base/lib/libmp/libmp.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libncurses/Makefile#14 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ssh/pam_ssh.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/alpha/include/atomic_ops.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/alpha/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/context.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/include/atomic_ops.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/include/pthread_md.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/thr_getcontext.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/include/atomic_ops.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/include/pthread_md.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/ia64/context.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/include/pthread_md.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_condattr.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_once.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/pthread.map#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/support/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/sys/lock.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/sys/lock.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setguardsize.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setinheritsched.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setscope.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_barrier.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_barrierattr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_concurrency.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_creat.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_create.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_exit.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_info.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_once.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_pause.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#14 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_pspinlock.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_rwlock.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigaction.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigmask.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sleep.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_stack.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_system.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_tcdrain.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_wait.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_wait4.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_waitpid.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libradius/libradius.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libstand/libstand.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libtacplus/libtacplus.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libusbhid/usbhid.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libutil/realhostname.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libutil/realhostname_sa.3#5 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.8#13 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#20 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/popen.c#4 integrate .. //depot/projects/trustedbsd/base/libexec/lukemftpd/Makefile#11 integrate .. //depot/projects/trustedbsd/base/libexec/lukemftpd/nbsd2fbsd.h#2 integrate .. //depot/projects/trustedbsd/base/libexec/rpc.rquotad/rquotad.c#5 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/Makefile#8 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/libmap.c#4 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/libmap.h#2 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#18 integrate .. //depot/projects/trustedbsd/base/libexec/talkd/talkd.8#3 integrate .. //depot/projects/trustedbsd/base/libexec/talkd/talkd.c#4 integrate .. //depot/projects/trustedbsd/base/release/Makefile#50 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#8 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/errata/article.sgml#12 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#20 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#44 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/readme/article.sgml#13 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#73 integrate .. //depot/projects/trustedbsd/base/release/i386/drivers.conf#17 integrate .. //depot/projects/trustedbsd/base/release/i386/fixit_crunch.conf#6 integrate .. //depot/projects/trustedbsd/base/release/ia64/boot_crunch.conf#5 integrate .. //depot/projects/trustedbsd/base/release/pc98/fixit-small_crunch.conf#4 integrate .. //depot/projects/trustedbsd/base/release/pc98/fixit_crunch.conf#6 integrate .. //depot/projects/trustedbsd/base/release/scripts/doFS.sh#15 integrate .. //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#19 integrate .. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#19 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.5#2 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.8#9 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/devfs.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/disklabel/disklabel.5#7 integrate .. //depot/projects/trustedbsd/base/sbin/disklabel/disklabel.8#16 integrate .. //depot/projects/trustedbsd/base/sbin/dump/optr.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#21 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#16 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/ip6fw/ip6fw.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#26 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#19 integrate .. //depot/projects/trustedbsd/base/sbin/mdconfig/mdconfig.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/mksnap_ffs/mksnap_ffs.8#3 integrate .. //depot/projects/trustedbsd/base/sbin/mount_cd9660/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/mount_cd9660/mount_cd9660.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/mount_cd9660/mount_cd9660.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/mount_msdosfs/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sbin/mount_msdosfs/iso22dos#2 delete .. //depot/projects/trustedbsd/base/sbin/mount_msdosfs/iso72dos#2 delete .. //depot/projects/trustedbsd/base/sbin/mount_msdosfs/koi2dos#2 delete .. //depot/projects/trustedbsd/base/sbin/mount_msdosfs/koi8u2dos#2 delete .. //depot/projects/trustedbsd/base/sbin/mount_msdosfs/mount_msdosfs.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/mount_msdosfs/mount_msdosfs.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nfs/mount_nfs.8#9 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 2 14:45:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4AE116A4C0; Thu, 2 Oct 2003 14:45:35 -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 95AD016A4B3 for ; Thu, 2 Oct 2003 14:45:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E80443FE1 for ; Thu, 2 Oct 2003 14:45:31 -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.9/8.12.9) with ESMTP id h92LjVXJ071619 for ; Thu, 2 Oct 2003 14:45:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h92LipIK071491 for perforce@freebsd.org; Thu, 2 Oct 2003 14:44:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 2 Oct 2003 14:44:51 -0700 (PDT) Message-Id: <200310022144.h92LipIK071491@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 39070 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, 02 Oct 2003 21:45:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=39070 Change 39070 by rwatson@rwatson_tislabs on 2003/10/02 14:44:20 Integ the TrustedBSD MAC branch from the TrustedBSD base branch: WITH_DYNAMICROOT -- build system fully dynamic amd update dhcp client update libreadline update sendmail security fixes openssh security fixes openssl security fixes, import various other updates loopback libc/posix1e mac_prepare_type() bugfix to return error via errno, rather than direct return. libdisk now rejects less many m:n threading fixes LIBMAP now enabled by default new broadcom driver static arp support much internationalization support for filesystems disk API man pages VM man pages pmap cleanups, vm locking cleanups lots of amd64, ia64 stuff color beastie in the loader uart driver coda upgrades acpi fixes pfil cleanup, locking rijndael bug fix sha2 bugfixes i386 zeroing optimizations bosko's p4 stability fix scottl's drivers lose hard-coded major numbers atang bugfixes 802.11/atheros bug fixes bktr bugfixes if_em and other network device driver locking cloning API fixes cdevsw initialization cleanups, make_dev fixes, device revocation cleanups raidframe cleanup vinum dev_t fixes vcc addition to procfs: list the path of mapped files in procfs map entry Loopback of mac_syscall() static policy list support bugfix "conservative_signals" signal permission changes, SIGALRM now permitted. sched_ule fixes taskqueue kthread, fast taskqueue support pipes now giant-free, locking fixes buffer cache fixes, locking new realtek driver network bridge cleanup M_PREPEND cleanups VLAN locking ip_divert cleanup, locking dummynet locking ipflow locking ipfw2 locking ip fragment queue locking multicast route locking multicast virtual interface locking raw socket locking fixes, general raw socket cleanup ipv6 randomized ip ids various ipv6 bug fixes ipsec cleanups, assertions, locking busdmaification of various drivers freebsd/ppc progress swap pager now uses geom removal/cleanup of kerberosIV bits from rlogin Affected files ... .. //depot/projects/trustedbsd/mac/Makefile#24 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#41 integrate .. //depot/projects/trustedbsd/mac/UPDATING#31 integrate .. //depot/projects/trustedbsd/mac/bin/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.c#16 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#20 integrate .. //depot/projects/trustedbsd/mac/bin/ls/util.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/ps/extern.h#15 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#18 integrate .. //depot/projects/trustedbsd/mac/bin/ps/print.c#22 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#18 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/setfacl.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/setfacl.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/arith.h#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/arith.y#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/arith_lex.l#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mkbuiltins#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#14 integrate .. //depot/projects/trustedbsd/mac/bin/sh/shell.h#5 integrate .. //depot/projects/trustedbsd/mac/bin/test/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/AUTHORS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/BUGS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/COPYING#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/INSTALL#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/MIRRORS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/NEWS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/README.ldap#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/am_ops.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amd.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amd.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amd.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_auto.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_direct.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_error.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_host.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_inherit.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_link.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_linkx.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_nfsl.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_nfsx.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_program.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_root.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_toplvl.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_union.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amq_subr.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amq_svc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/autil.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/clock.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/conf.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/conf_parse.y#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/conf_tok.l#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/get_args.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_file.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_hesiod.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_ldap.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_ndbm.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_nis.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_nisplus.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_passwd.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_union.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/map.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/mapc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/mntfs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/nfs_prot_svc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/nfs_start.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/nfs_subr.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_TEMPLATE.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_autofs.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_cachefs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_cdfs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_efs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_lofs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_mfs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_nfs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_nfs3.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_nullfs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_pcfs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_tfs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_tmpfs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_ufs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_umapfs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_unionfs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_xfs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/opts.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/restart.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/rpc_fwd.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/sched.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/srvr_amfs_auto.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/srvr_nfs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq_clnt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq_xdr.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/pawd.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/pawd.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/aux_conf.h.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/bootstrap#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/commit#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/conf/checkmount/checkmount_bsd44.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/mount/mount_default.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/conf/mtab/mtab_bsd.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/conf/transp/transp_sockets.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/umount/umount_bsd44.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/config.guess#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/config.guess.long#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/config.sub#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/configure.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/cvs-server.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/depcomp#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/doc/am-utils.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/doc/mdate-sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/doc/stamp-vti#3 delete .. //depot/projects/trustedbsd/mac/contrib/amd/doc/texinfo.tex#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/doc/version.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fixmount/fixmount.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fixmount/fixmount.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_analyze.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_data.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_dict.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_gram.y#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_lex.l#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_util.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_atab.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_bparam.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_dumpset.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_exportfs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_fstab.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/homedir.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/nfs_prot_svc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/stubs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/am_compat.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/am_defs.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/am_utils.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/am_xdr_func.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/amq_defs.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/mount_headers1.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/install-sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/amu.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/hasmntopt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/misc_rpc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/mount_fs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/mtab.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/nfs_prot_xdr.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/util.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/wire.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/xdr_func.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/xutil.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/ltmain.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/amindent#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/autopat#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/c_void_p.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/cache_check_dynamic.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_amu_fs.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_checkmount_style.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_extern.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_fhandle.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_field.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_fs_headers.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_fs_mntent.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_gnu_getopt.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_hide_mount_type.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_lib2.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_map_funcs.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnttab_file_name.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnttab_location.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnttab_opt.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnttab_style.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnttab_type.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mount_style.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mount_trap.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mount_type.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mtype_printf_type.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mtype_type.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_network_transport_type.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_nfs_fh_dref.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_nfs_hn_dref.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_nfs_prot_headers.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_nfs_sa_dref.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_nfs_socket_connection.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_os_libs.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_restartable_signal_handler.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_umount_style.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_unmount_args.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_unmount_call.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/expand_cpp_hex.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/expand_cpp_int.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/expand_cpp_string.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/expand_run_string.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/extern_optarg.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/extern_sys_errlist.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/func_bad_memcmp.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/func_bad_yp_all.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/header_templates.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/host_macros.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/linux_headers.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/localconfig.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/mount_headers.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/name_package.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/name_version.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/opt_amu_cflags.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/opt_cppflags.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/opt_debug.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/opt_ldflags.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/opt_libs.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/os_cflags.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/os_cppflags.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/os_ldflags.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/package_bugreport.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/package_name.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/package_version.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/save_state.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_field_nfs_fh.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_mntent.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_mnttab.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_nfs_args.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_nfs_fh.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_nfs_fh3.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/try_compile_anyfs.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/try_compile_nfs.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/try_compile_rpc.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_auth_create_gidlist.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_cachefs_args.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_cdfs_args.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_efs_args.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_lofs_args.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_mfs_args.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_pcfs_args.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_rfs_args.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_svc_in_arg.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_time_t.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_tmpfs_args.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_ufs_args.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_xdrproc_t.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_xfs_args.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_yp_order_outorder.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/with_addon.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/mkconf#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/missing#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/mk-amd-map/mk-amd-map.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/mk-amd-map/mk-amd-map.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/mkinstalldirs#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/amd.conf-sample#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/amd.conf.5#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/automount2amd.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/ctl-amd.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/ctl-hlfsd.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/expn.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/expn.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/lostaltmail.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/tasks#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/wire-test/wire-test.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/wire-test/wire-test.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/Makefile.in#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-decl.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-lex.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-pragma.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-typeck.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/calls.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/freebsd.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/darwin.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/freebsd-spec.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#15 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd64.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/gthr-win32.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/winnt.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/ia64.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/ia64.md#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/freebsd.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/ChangeLog#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/call.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/class.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cp-tree.h#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/decl.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/init.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/method.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/parse.y#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/pt.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/search.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppexp.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppinit.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dbxout.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/c-tree.texi#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/collect2.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/cpp.texi#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/cppopts.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/extend.texi#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/fragments.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/headerdirs.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/include/texinfo.tex#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/invoke.texi#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/md.texi#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/portability.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/rtl.texi#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/sourcebuild.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/trouble.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dwarf2out.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/expr.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/ChangeLog#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/flow.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcse.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/integrate.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/libgcc-std.ver#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/loop.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/optabs.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sched-deps.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sched-ebb.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sched-int.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sched-rgn.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/toplev.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree-inline.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unroll.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-c.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/varasm.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/version.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/ABOUT-NLS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/NEWS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/README-alpha#3 delete .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/THANKS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/lib/getopt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/lib/getopt.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/lib/getopt1.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/lib/gettext.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/lib/hard-locale.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/lib/xmalloc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/man/sort.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/src/sort.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/src/sys2.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gnu-sort/src/system.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grotty/grotty.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-common#12 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-syms#6 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc.tmac#8 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/eqnrc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_mdoc.man#11 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/troffrc#9 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/tty-char.tmac#6 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/tty.tmac#5 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/README#7 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/RELNOTES#7 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/clparse.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.conf.5#7 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/scripts/freebsd#6 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/dhcp-options.5#6 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/discover.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/dispatch.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/options.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/parse.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/print.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/tables.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/dhcpd.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/version.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/res_mkupdate.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/result.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/ChangeLog#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libobjc/ChangeLog#10 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/CHANGELOG#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/CHANGES#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/INSTALL#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/MANIFEST#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/ansi_stdlib.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/bind.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/callback.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/chardefs.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/compat.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/complete.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/config.h.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/configure#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/configure.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/display.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/hist.texinfo#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/history.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/hstech.texinfo#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/hsuser.texinfo#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/manvers.texinfo#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/readline.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rlman.texinfo#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rltech.texinfo#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rluser.texinfo#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rluserman.texinfo#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/emacs_keymap.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/Inputrc#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/fileman.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/histexamp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/manexamp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/readlinebuf.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rl.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlcat.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rltest.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlversion.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/funmap.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/histexpand.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/histfile.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/histlib.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/history.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/history.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/histsearch.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/input.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/isearch.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/keymaps.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/kill.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/macro.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/mbutil.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/misc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/nls.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/parens.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/posixdir.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/readline.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/readline.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rlconf.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rldefs.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rlmbutil.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/rlprivate.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rlshell.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rlstdc.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rltty.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rltypedefs.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/search.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/shell.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/shlib/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/signals.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/config.guess#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/config.sub#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/install.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/mkdirs#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/mkdist#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/shlib-install#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/shobj-conf#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/wcwidth.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/terminal.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/text.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/tilde.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/tilde.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/undo.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/util.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/vi_keymap.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/vi_mode.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/xmalloc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/xmalloc.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/ChangeLog#11 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/hppa-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/mips-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/sparc-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/x86_64-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/configure#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/configure.in#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/c++config#10 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/locale_facets.tcc#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/FREEBSD-upgrade#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/LICENSE#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/RELEASE_NOTES#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/README#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.cf#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.mc#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/cfhead.m4#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/proto.m4#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/version.m4#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/domainmap.m4#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/doublebounce.pl#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/expn.pl#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/doc/op/op.me#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/conf.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/errstring.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/io.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_aix.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/shm.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/README#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/sample.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_chgheader.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_register.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setconn.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setreply.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/engine.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/libmilter.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/listener.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/signal.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/clock.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/errstring.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/flags.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/ldap.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/shm.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/smstdio.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/stdio.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vasprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsmdb/smdb2.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/mail.local.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/README#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/smrsh.8#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/README#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/TRACEFLAGS#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/alias.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/bf.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/collect.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/control.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/daemon.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/domain.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/headers.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/main.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/map.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mci.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/milter.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mime.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/parseaddr.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/queue.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/readcf.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/recipient.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.8#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.h#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sfsasl.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/srvrsmtp.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/stab.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/udb.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/usersmtp.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/util.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/version.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/smbutil/common.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/top/top.X#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-tricks#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-chall.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pam-freebsd.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/buffer.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/channels.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/deattack.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/misc.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/session.c#17 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config.5#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/version.h#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/CHANGES#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Configure#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/FAQ#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/LICENSE#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.org#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.ssl#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/NEWS#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/PROBLEMS#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/README#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/CA.pl#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/apps.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ca.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/crl.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/der_chop#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/engine.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ocsp.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/openssl.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/pkcs8.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_apps.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_client.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_server.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/smime.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/x509.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/bugs/SSLv3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/config#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_cbc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_ctr.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_mbstr.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_strex.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_strnid.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_lib.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/tasn_dec.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_print.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bf_buff.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_bio.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_file.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_mul.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bntest.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/exptest.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/cfb_enc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/destest.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_key.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dhtest.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_ossl.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_sign.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_vrf.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsatest.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/dso_dlfcn.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_mult.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_fat.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/engine.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_ubsec.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/err.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/err.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/bio_b64.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/bio_enc.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/c_all.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/digest.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_acnf.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md2/md2test.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/asm/md5-586.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/asm/md5-sparcv9.S#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/o_time.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ocsp/ocsp_ht.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/opensslconf.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/opensslv.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/perlasm/x86ms.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/perlasm/x86nasm.pl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/perlasm/x86unix.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/p12_npas.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_doit.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_mime.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_smime.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pkcs7.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_win.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_eay.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_lib.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_sign.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_test.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/threads/mttest.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/threads/solaris.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/by_file.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_trs.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_vfy.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509type.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_conf.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_cpols.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_prn.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/engines/zencod/hw_zencod.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/HOWTO/certificates.txt#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/HOWTO/keys.txt#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/ca.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/ocsp.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/s_client.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/s_server.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/BIO_f_base64.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/BIO_f_cipher.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/openssl-shared.txt#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_free.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_sess_set_get_cb.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_set_verify.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_accept.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_connect.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/e_os.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/openssl.spec#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/kssl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/kssl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_clnt.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_srvr.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_ciph.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_lib.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_rsa.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_sess.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssltest.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/evptests.txt#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/tools/c_rehash#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/extract-names.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/libeay.num#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/mk1mf.pl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/mkdef.pl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/mkerr.pl#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/Mingw32.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/Mingw32f.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/util/point.sh#3 integrate .. //depot/projects/trustedbsd/mac/etc/Makefile#32 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/devfs.rules#1 branch .. //depot/projects/trustedbsd/mac/etc/defaults/pccard.conf#16 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#29 integrate .. //depot/projects/trustedbsd/mac/etc/devd.conf#6 integrate .. //depot/projects/trustedbsd/mac/etc/etc.ia64/ttys#3 integrate .. //depot/projects/trustedbsd/mac/etc/etc.sparc64/ttys#5 integrate .. //depot/projects/trustedbsd/mac/etc/gettytab#3 integrate .. //depot/projects/trustedbsd/mac/etc/isdn/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#16 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.root.dist#9 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#26 integrate .. //depot/projects/trustedbsd/mac/etc/network.subr#4 integrate .. //depot/projects/trustedbsd/mac/etc/newsyslog.conf#10 integrate .. //depot/projects/trustedbsd/mac/etc/pccard_ether#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/devfs#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/dhclient#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/initdiskless#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipfilter#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/jail#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ldconfig#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/localdaemons#4 delete .. //depot/projects/trustedbsd/mac/etc/rc.d/network1#11 delete .. //depot/projects/trustedbsd/mac/etc/rc.d/network2#5 delete .. //depot/projects/trustedbsd/mac/etc/rc.d/network3#6 delete .. //depot/projects/trustedbsd/mac/etc/rc.d/routing#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.subr#13 integrate .. //depot/projects/trustedbsd/mac/etc/sendmail/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/etc/services#9 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes-o.real#6 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2#16 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/startrek#5 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/config.h#2 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/readline/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/as/amd64-freebsd/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/as/i386-freebsd/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.alpha#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.amd64#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.i386#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.ia64#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.powerpc#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.sparc64#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/cvsbug/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/lib/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/font/devkoi8-r/R.proto#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/fr.ISO8859-1#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/koi8-r.tmac#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#15 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/ru.KOI8-R#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/manpath/manpath.config#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/send-pr.sh#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/sort/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/sort/config.h#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/sort/libintl.h#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/tar/config.h#3 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#35 integrate .. //depot/projects/trustedbsd/mac/include/pthread.h#5 integrate .. //depot/projects/trustedbsd/mac/include/unistd.h#15 integrate .. //depot/projects/trustedbsd/mac/include/varargs.h#1 branch .. //depot/projects/trustedbsd/mac/lib/Makefile#23 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/alias.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/alias.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/alias_db.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/alias_local.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/alias_skinny.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libalias/libalias.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libatm/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/alpha/gen/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/alpha/gen/signalcontext.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/alpha/sys/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/alpha/sys/Ovfork.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/alpha/sys/fork.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/alpha/sys/pipe.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/alpha/sys/setlogin.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/fabs.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/sys/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/sys/getcontext.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/amd64/sys/vfork.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/compat-43/sigvec.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/db/man/btree.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/db/man/dbm.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/db/man/dbopen.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/db/man/hash.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/db/man/recno.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/Makefile.inc#16 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/confstr.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/ctermid.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/devname.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/dlinfo.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/exec.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/fnmatch.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/fts.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getcwd.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getdomainname.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getfsent.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getgrent.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/gethostname.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/gethostname.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getpwent.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/glob.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/msgctl.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/pmadvise.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/signal.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/sysconf.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/sysctl.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/tcsetattr.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/uname.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/wordexp.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/getcontext.S#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_get_ldt.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/fpgetmask.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/fpsetmask.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/Makefile.inc#14 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/big5.5#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/btowc.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/ctype.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/gb18030.5#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/gbk.5#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/mblen.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbstowcs.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbtowc.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/mskanji.5#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/multibyte.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/nl_langinfo.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/rune.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/table.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/wcstombs.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctob.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctomb.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/addr2ascii.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/ethers.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getifaddrs.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getnameinfo.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/if_indextoname.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet6_option_space.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet6_rthdr_space.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_net_pton.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/resolver.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.3#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.3#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_is_present_np.3#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_prepare.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.3#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.3#14 integrate .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/sys/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/regex/regex.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/publickey.5#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_clnt_create.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_svc_calls.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_svc_create.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/signalcontext.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/funopen.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/tmpnam.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/abort.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/exit.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/getopt.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/grantpt.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/hcreate.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/qsort.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/rand.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/random.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/ctime.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/bcmp.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/bcopy.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/bzero.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/ffs.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/index.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strcasecmp.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strchr.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/Makefile.inc#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/accept.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/acct.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/chmod.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/clock_gettime.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/getitimer.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/getlogin.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/getsockopt.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/gettimeofday.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/intro.2#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/ioctl.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/kqueue.2#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/ktrace.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/madvise.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/mincore.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/mlockall.2#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/mount.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/ntp_gettime.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/open.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/poll.2#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 2 14:46:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 890B716A4C0; Thu, 2 Oct 2003 14:46: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 56BBF16A4B3; Thu, 2 Oct 2003 14:46:51 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61DE743FE5; Thu, 2 Oct 2003 14:46:46 -0700 (PDT) (envelope-from arr@watson.org) Received: from fledge.watson.org (localhost [127.0.0.1]) by fledge.watson.org (8.12.9p2/8.12.9) with ESMTP id h92Lk67R028693; Thu, 2 Oct 2003 17:46:06 -0400 (EDT) (envelope-from arr@watson.org) Received: from localhost (arr@localhost)h92Lk622028690; Thu, 2 Oct 2003 17:46:06 -0400 (EDT) (envelope-from arr@watson.org) X-Authentication-Warning: fledge.watson.org: arr owned process doing -bs Date: Thu, 2 Oct 2003 17:46:05 -0400 (EDT) From: "Andrew R. Reiter" To: Robert Watson In-Reply-To: <200310022144.h92LipIK071491@repoman.freebsd.org> Message-ID: <20031002174551.J27461@fledge.watson.org> References: <200310022144.h92LipIK071491@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Perforce Change Reviews Subject: Re: PERFORCE change 39070 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, 02 Oct 2003 21:46:52 -0000 Boy, it'd be nice to have these kind of updates that you listed below in an email every week :) On Thu, 2 Oct 2003, Robert Watson wrote: :http://perforce.freebsd.org/chv.cgi?CH=39070 : :Change 39070 by rwatson@rwatson_tislabs on 2003/10/02 14:44:20 : : Integ the TrustedBSD MAC branch from the TrustedBSD base branch: : : WITH_DYNAMICROOT -- build system fully dynamic : amd update : dhcp client update : libreadline update : sendmail security fixes : openssh security fixes : openssl security fixes, import : various other updates : loopback libc/posix1e mac_prepare_type() bugfix to return error : via errno, rather than direct return. : libdisk now rejects less : many m:n threading fixes : LIBMAP now enabled by default : new broadcom driver : static arp support : much internationalization support for filesystems : disk API man pages : VM man pages : pmap cleanups, vm locking cleanups : lots of amd64, ia64 stuff : color beastie in the loader : uart driver : coda upgrades : acpi fixes : pfil cleanup, locking : rijndael bug fix : sha2 bugfixes : i386 zeroing optimizations : bosko's p4 stability fix : scottl's drivers lose hard-coded major numbers : atang bugfixes : 802.11/atheros bug fixes : bktr bugfixes : if_em and other network device driver locking : cloning API fixes : cdevsw initialization cleanups, make_dev fixes, device revocation : cleanups : raidframe cleanup : vinum dev_t fixes : vcc addition to procfs: list the path of mapped files in procfs : map entry : Loopback of mac_syscall() static policy list support bugfix : "conservative_signals" signal permission changes, SIGALRM now : permitted. : sched_ule fixes : taskqueue kthread, fast taskqueue support : pipes now giant-free, locking fixes : buffer cache fixes, locking : new realtek driver : network bridge cleanup : M_PREPEND cleanups : VLAN locking : ip_divert cleanup, locking : dummynet locking : ipflow locking : ipfw2 locking : ip fragment queue locking : multicast route locking : multicast virtual interface locking : raw socket locking fixes, general raw socket cleanup : ipv6 randomized ip ids : various ipv6 bug fixes : ipsec cleanups, assertions, locking : busdmaification of various drivers : freebsd/ppc progress : swap pager now uses geom : removal/cleanup of kerberosIV bits from rlogin : :Affected files ... : :.. //depot/projects/trustedbsd/mac/Makefile#24 integrate :.. //depot/projects/trustedbsd/mac/Makefile.inc1#41 integrate :.. //depot/projects/trustedbsd/mac/UPDATING#31 integrate :.. //depot/projects/trustedbsd/mac/bin/Makefile.inc#8 integrate :.. //depot/projects/trustedbsd/mac/bin/df/df.c#16 integrate :.. //depot/projects/trustedbsd/mac/bin/ls/ls.1#20 integrate :.. //depot/projects/trustedbsd/mac/bin/ls/util.c#11 integrate :.. //depot/projects/trustedbsd/mac/bin/ps/extern.h#15 integrate :.. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#18 integrate :.. //depot/projects/trustedbsd/mac/bin/ps/print.c#22 integrate :.. //depot/projects/trustedbsd/mac/bin/ps/ps.1#18 integrate :.. //depot/projects/trustedbsd/mac/bin/setfacl/setfacl.1#5 integrate :.. //depot/projects/trustedbsd/mac/bin/setfacl/setfacl.c#7 integrate :.. //depot/projects/trustedbsd/mac/bin/sh/arith.h#4 integrate :.. //depot/projects/trustedbsd/mac/bin/sh/arith.y#5 integrate :.. //depot/projects/trustedbsd/mac/bin/sh/arith_lex.l#5 integrate :.. //depot/projects/trustedbsd/mac/bin/sh/mkbuiltins#5 integrate :.. //depot/projects/trustedbsd/mac/bin/sh/sh.1#14 integrate :.. //depot/projects/trustedbsd/mac/bin/sh/shell.h#5 integrate :.. //depot/projects/trustedbsd/mac/bin/test/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/AUTHORS#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/BUGS#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/COPYING#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/ChangeLog#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/FREEBSD-upgrade#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/INSTALL#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/MIRRORS#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/NEWS#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/README#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/README.ldap#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/am_ops.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amd.8#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amd.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amd.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_auto.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_direct.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_error.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_host.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_inherit.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_link.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_linkx.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_nfsl.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_nfsx.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_program.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_root.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_toplvl.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_union.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amq_subr.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/amq_svc.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/autil.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/clock.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/conf.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/conf_parse.y#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/conf_tok.l#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/get_args.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_file.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_hesiod.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_ldap.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_ndbm.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_nis.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_nisplus.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_passwd.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_union.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/map.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/mapc.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/mntfs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/nfs_prot_svc.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/nfs_start.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/nfs_subr.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_TEMPLATE.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_autofs.c#3 delete :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_cachefs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_cdfs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_efs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_lofs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_mfs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_nfs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_nfs3.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_nullfs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_pcfs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_tfs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_tmpfs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_ufs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_umapfs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_unionfs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_xfs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/opts.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/restart.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/rpc_fwd.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/sched.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/srvr_amfs_auto.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amd/srvr_nfs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq.8#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq.c#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq_clnt.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq_xdr.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amq/pawd.1#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/amq/pawd.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/aux_conf.h.in#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/bootstrap#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/commit#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/conf/checkmount/checkmount_bsd44.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/conf/mount/mount_default.c#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/conf/mtab/mtab_bsd.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/conf/transp/transp_sockets.c#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/conf/umount/umount_bsd44.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/config.guess#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/config.guess.long#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/config.sub#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/configure.in#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/cvs-server.txt#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/depcomp#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/doc/am-utils.texi#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/doc/mdate-sh#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/doc/stamp-vti#3 delete :.. //depot/projects/trustedbsd/mac/contrib/amd/doc/texinfo.tex#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/doc/version.texi#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fixmount/fixmount.8#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fixmount/fixmount.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_analyze.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_data.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_dict.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_gram.y#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_lex.l#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_util.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.8#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_atab.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_bparam.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_dumpset.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_exportfs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_fstab.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.8#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.h#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/homedir.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/nfs_prot_svc.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/stubs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/include/am_compat.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/include/am_defs.h#5 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/include/am_utils.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/include/am_xdr_func.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/include/amq_defs.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/include/mount_headers1.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/install-sh#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/libamu/amu.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/libamu/hasmntopt.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/libamu/misc_rpc.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/libamu/mount_fs.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/libamu/mtab.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/libamu/nfs_prot_xdr.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/libamu/strerror.c#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/libamu/util.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/libamu/wire.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/libamu/xdr_func.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/libamu/xutil.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/ltmain.sh#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/GNUmakefile#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/amdgrep#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/amindent#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/autopat#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/chop-aclocal.pl#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/copy-if-newbig#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/HEADER#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/TRAILER#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/c_void_p.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/cache_check_dynamic.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_amu_fs.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_checkmount_style.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_extern.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_fhandle.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_field.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_fs_headers.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_fs_mntent.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_gnu_getopt.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_hide_mount_type.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_lib2.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_map_funcs.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnttab_file_name.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnttab_location.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnttab_opt.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnttab_style.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnttab_type.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mount_style.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mount_trap.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mount_type.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mtype_printf_type.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mtype_type.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_network_transport_type.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_nfs_fh_dref.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_nfs_hn_dref.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_nfs_prot_headers.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_nfs_sa_dref.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_nfs_socket_connection.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_os_libs.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_restartable_signal_handler.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_umount_style.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_unmount_args.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_unmount_call.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/expand_cpp_hex.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/expand_cpp_int.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/expand_cpp_string.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/expand_run_string.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/extern_optarg.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/extern_sys_errlist.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/func_bad_memcmp.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/func_bad_yp_all.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/header_templates.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/host_macros.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/linux_headers.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/localconfig.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/mount_headers.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/name_package.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/name_version.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/opt_amu_cflags.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/opt_cppflags.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/opt_debug.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/opt_ldflags.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/opt_libs.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/os_cflags.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/os_cppflags.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/os_ldflags.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/package_bugreport.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/package_name.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/package_version.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/save_state.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_field_nfs_fh.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_mntent.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_mnttab.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_nfs_args.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_nfs_fh.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_nfs_fh3.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/try_compile_anyfs.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/try_compile_nfs.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/try_compile_rpc.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_auth_create_gidlist.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_cachefs_args.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_cdfs_args.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_efs_args.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_lofs_args.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_mfs_args.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_pcfs_args.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_rfs_args.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_svc_in_arg.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_time_t.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_tmpfs_args.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_ufs_args.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_xdrproc_t.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_xfs_args.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_yp_order_outorder.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/with_addon.m4#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/mk-aclocal#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/mkconf#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/rmtspc#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/m4/update_build_version#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/missing#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/mk-amd-map/mk-amd-map.8#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/mk-amd-map/mk-amd-map.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/mkinstalldirs#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/scripts/amd.conf-sample#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/scripts/amd.conf.5#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/scripts/automount2amd.8#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/scripts/ctl-amd.in#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/scripts/ctl-hlfsd.in#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/scripts/expn.1#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/scripts/expn.in#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/scripts/lostaltmail.in#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/scripts/redhat-ctl-amd.in#1 branch :.. //depot/projects/trustedbsd/mac/contrib/amd/tasks#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/wire-test/wire-test.8#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/amd/wire-test/wire-test.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog#12 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/Makefile.in#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/c-decl.c#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/c-lex.c#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/c-pragma.c#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/c-typeck.c#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/calls.c#12 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/freebsd.h#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/config/darwin.c#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/config/freebsd-spec.h#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#15 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd64.h#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/gthr-win32.c#2 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/winnt.c#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/ia64.c#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/ia64.md#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.c#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/freebsd.h#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc.c#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/cp/ChangeLog#12 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/cp/call.c#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/cp/class.c#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cp-tree.h#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/cp/decl.c#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/cp/init.c#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/cp/method.c#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/cp/parse.y#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/cp/pt.c#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/cp/search.c#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/cppexp.c#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/cppinit.c#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/dbxout.c#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/doc/c-tree.texi#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/doc/collect2.texi#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/doc/cpp.texi#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/doc/cppopts.texi#5 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/doc/extend.texi#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/doc/fragments.texi#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/doc/headerdirs.texi#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/doc/include/texinfo.tex#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/doc/invoke.texi#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/doc/md.texi#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/doc/portability.texi#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/doc/rtl.texi#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/doc/sourcebuild.texi#5 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/doc/trouble.texi#5 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/dwarf2out.c#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/expr.c#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/f/ChangeLog#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/flow.c#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/gcse.c#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/integrate.c#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/libgcc-std.ver#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/loop.c#12 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/optabs.c#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/sched-deps.c#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/sched-ebb.c#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/sched-int.h#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/sched-rgn.c#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/toplev.c#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/tree-inline.c#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/unroll.c#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-c.c#2 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/varasm.c#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/gcc/version.c#12 integrate :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/ABOUT-NLS#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/ChangeLog#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/FREEBSD-upgrade#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/NEWS#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/README#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/README-alpha#3 delete :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/THANKS#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/lib/getopt.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/lib/getopt.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/lib/getopt1.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/lib/gettext.h#1 branch :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/lib/hard-locale.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/lib/xmalloc.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/man/sort.1#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/src/sort.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/src/sys2.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/gnu-sort/src/system.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grotty/grotty.man#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-common#12 integrate :.. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-syms#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc.tmac#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/groff/tmac/eqnrc#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_mdoc.man#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/groff/tmac/troffrc#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/groff/tmac/tty-char.tmac#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/groff/tmac/tty.tmac#5 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/FREEBSD-upgrade#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/README#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/RELNOTES#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/clparse.c#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.c#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.conf.5#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/scripts/freebsd#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/dhcp-options.5#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/discover.c#5 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/dispatch.c#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/options.c#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/parse.c#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/print.c#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/tables.c#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/dhcpd.h#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/version.h#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/res_mkupdate.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/result.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libf2c/ChangeLog#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/libobjc/ChangeLog#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/CHANGELOG#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/CHANGES#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/FREEBSD-upgrade#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/INSTALL#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/MANIFEST#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/Makefile.in#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/README#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/aclocal.m4#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/ansi_stdlib.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/bind.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/callback.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/chardefs.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/compat.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/complete.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/config.h.in#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/configure#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/configure.in#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/display.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/Makefile.in#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/hist.texinfo#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/history.3#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/hstech.texinfo#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/hsuser.texinfo#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/manvers.texinfo#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/readline.3#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rlman.texinfo#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rltech.texinfo#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rluser.texinfo#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rluserman.texinfo#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/emacs_keymap.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/Inputrc#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/Makefile.in#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/fileman.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/histexamp.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/manexamp.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/readlinebuf.h#1 branch :.. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rl.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlcat.c#1 branch :.. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rltest.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rlversion.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/funmap.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/histexpand.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/histfile.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/histlib.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/history.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/history.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/histsearch.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/input.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/isearch.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/keymaps.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/kill.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/macro.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/mbutil.c#1 branch :.. //depot/projects/trustedbsd/mac/contrib/libreadline/misc.c#1 branch :.. //depot/projects/trustedbsd/mac/contrib/libreadline/nls.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/parens.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/posixdir.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/readline.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/readline.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/rlconf.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/rldefs.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/rlmbutil.h#1 branch :.. //depot/projects/trustedbsd/mac/contrib/libreadline/rlprivate.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/rlshell.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/rlstdc.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/rltty.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/rltypedefs.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/search.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/shell.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/shlib/Makefile.in#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/signals.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/support/config.guess#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/support/config.sub#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/support/install.sh#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/support/mkdirs#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/support/mkdist#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/support/shlib-install#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/support/shobj-conf#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/support/wcwidth.c#1 branch :.. //depot/projects/trustedbsd/mac/contrib/libreadline/terminal.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/text.c#1 branch :.. //depot/projects/trustedbsd/mac/contrib/libreadline/tilde.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/tilde.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/undo.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/util.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/vi_keymap.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/vi_mode.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/xmalloc.c#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libreadline/xmalloc.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/libstdc++/ChangeLog#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/hppa-linux-gnu/baseline_symbols.txt#1 branch :.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/mips-linux-gnu/baseline_symbols.txt#1 branch :.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/sparc-linux-gnu/baseline_symbols.txt#1 branch :.. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/x86_64-linux-gnu/baseline_symbols.txt#2 integrate :.. //depot/projects/trustedbsd/mac/contrib/libstdc++/configure#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/libstdc++/configure.in#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/c++config#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/locale_facets.tcc#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/FREEBSD-upgrade#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/LICENSE#5 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/RELEASE_NOTES#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/README#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.cf#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.mc#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/cfhead.m4#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/proto.m4#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/version.m4#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/domainmap.m4#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/doublebounce.pl#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/expn.pl#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/doc/op/op.me#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/conf.h#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/errstring.h#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/io.h#5 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_aix.h#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/shm.h#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/README#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/sample.html#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_chgheader.html#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_register.html#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setconn.html#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setreply.html#5 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/engine.c#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/libmilter.h#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/listener.c#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/signal.c#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/clock.c#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/errstring.c#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/flags.c#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/ldap.c#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/shm.c#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/smstdio.c#5 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/stdio.c#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vasprintf.c#4 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/libsmdb/smdb2.c#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/mail.local.c#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/README#5 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/smrsh.8#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/README#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/TRACEFLAGS#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/alias.c#5 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/bf.c#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/collect.c#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.c#12 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/control.c#7 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/daemon.c#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#15 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/domain.c#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/headers.c#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/main.c#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/map.c#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mci.c#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/milter.c#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mime.c#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/parseaddr.c#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/queue.c#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/readcf.c#10 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/recipient.c#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.8#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.h#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sfsasl.c#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/srvrsmtp.c#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/stab.c#5 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/udb.c#6 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/usersmtp.c#9 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/util.c#8 integrate :.. //depot/projects/trustedbsd/mac/contrib/sendmail/src/version.c#11 integrate :.. //depot/projects/trustedbsd/mac/contrib/smbfs/smbutil/common.h#3 integrate :.. //depot/projects/trustedbsd/mac/contrib/telnet/telnetd/telnetd.c#2 integrate :.. //depot/projects/trustedbsd/mac/contrib/top/top.X#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-tricks#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-chall.c#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pam-freebsd.c#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/buffer.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/channels.c#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/deattack.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/misc.c#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/session.c#17 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.c#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#11 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config.5#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#12 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/version.h#11 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/CHANGES#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/Configure#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/FAQ#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/FREEBSD-Xlist#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/LICENSE#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.org#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.ssl#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/NEWS#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/PROBLEMS#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/README#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/CA.pl#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/Makefile.ssl#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/apps.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ca.c#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/crl.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/der_chop#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/engine.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ocsp.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/openssl.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/pkcs8.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_apps.h#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_client.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_server.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/smime.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/apps/x509.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/bugs/SSLv3#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/config#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes.h#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_cbc.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_ctr.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_mbstr.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_strex.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_strnid.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1.h#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_lib.c#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/tasn_dec.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_print.c#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bf_buff.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_bio.c#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_file.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/Makefile.ssl#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn.h#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_mul.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bntest.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/exptest.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/cfb_enc.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/destest.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/Makefile.ssl#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_key.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dhtest.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/Makefile.ssl#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_ossl.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_sign.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_vrf.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsatest.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/dso_dlfcn.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_mult.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_fat.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/engine.h#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_ubsec.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/err.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/err.h#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/Makefile.ssl#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/bio_b64.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/bio_enc.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/c_all.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/digest.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_acnf.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md2/md2test.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/Makefile.ssl#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/asm/md5-586.pl#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/asm/md5-sparcv9.S#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/o_time.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ocsp/ocsp_ht.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/opensslconf.h#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/opensslv.h#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/perlasm/x86ms.pl#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/perlasm/x86nasm.pl#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/perlasm/x86unix.pl#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/p12_npas.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_doit.c#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_mime.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_smime.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pkcs7.h#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_win.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/Makefile.ssl#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa.h#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_eay.c#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_lib.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_sign.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_test.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/threads/mttest.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/threads/solaris.sh#2 delete :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/by_file.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_trs.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_vfy.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509type.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_conf.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_cpols.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_lib.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_prn.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/demos/engines/zencod/hw_zencod.h#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/HOWTO/certificates.txt#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/HOWTO/keys.txt#1 branch :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/ca.pod#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/ocsp.pod#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/s_client.pod#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/s_server.pod#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/BIO_f_base64.pod#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/BIO_f_cipher.pod#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/openssl-shared.txt#1 branch :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_free.pod#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_sess_set_get_cb.pod#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_set_verify.pod#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_accept.pod#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_connect.pod#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/e_os.h#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/openssl.spec#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/kssl.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/kssl.h#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_clnt.c#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_srvr.c#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_ciph.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_lib.c#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_rsa.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_sess.c#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssltest.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/test/Makefile.ssl#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/test/evptests.txt#1 branch :.. //depot/projects/trustedbsd/mac/crypto/openssl/tools/c_rehash#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/util/extract-names.pl#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/util/libeay.num#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/util/mk1mf.pl#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/util/mkdef.pl#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/util/mkerr.pl#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/Mingw32.pl#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/Mingw32f.pl#2 delete :.. //depot/projects/trustedbsd/mac/crypto/openssl/util/point.sh#3 integrate :.. //depot/projects/trustedbsd/mac/etc/Makefile#32 integrate :.. //depot/projects/trustedbsd/mac/etc/defaults/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/etc/defaults/devfs.rules#1 branch :.. //depot/projects/trustedbsd/mac/etc/defaults/pccard.conf#16 integrate :.. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#29 integrate :.. //depot/projects/trustedbsd/mac/etc/devd.conf#6 integrate :.. //depot/projects/trustedbsd/mac/etc/etc.ia64/ttys#3 integrate :.. //depot/projects/trustedbsd/mac/etc/etc.sparc64/ttys#5 integrate :.. //depot/projects/trustedbsd/mac/etc/gettytab#3 integrate :.. //depot/projects/trustedbsd/mac/etc/isdn/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#16 integrate :.. //depot/projects/trustedbsd/mac/etc/mtree/BSD.root.dist#9 integrate :.. //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#26 integrate :.. //depot/projects/trustedbsd/mac/etc/network.subr#4 integrate :.. //depot/projects/trustedbsd/mac/etc/newsyslog.conf#10 integrate :.. //depot/projects/trustedbsd/mac/etc/pccard_ether#7 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#14 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.d/devfs#5 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.d/dhclient#7 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.d/initdiskless#9 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.d/ipfilter#10 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.d/jail#3 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.d/ldconfig#8 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.d/localdaemons#4 delete :.. //depot/projects/trustedbsd/mac/etc/rc.d/network1#11 delete :.. //depot/projects/trustedbsd/mac/etc/rc.d/network2#5 delete :.. //depot/projects/trustedbsd/mac/etc/rc.d/network3#6 delete :.. //depot/projects/trustedbsd/mac/etc/rc.d/routing#2 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.subr#13 integrate :.. //depot/projects/trustedbsd/mac/etc/sendmail/Makefile#9 integrate :.. //depot/projects/trustedbsd/mac/etc/services#9 integrate :.. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes-o.real#6 integrate :.. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2#16 integrate :.. //depot/projects/trustedbsd/mac/games/fortune/datfiles/startrek#5 integrate :.. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/Makefile.inc#3 integrate :.. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/config.h#2 integrate :.. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/readline/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/Makefile#9 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/as/amd64-freebsd/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/as/i386-freebsd/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile#10 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.alpha#7 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.amd64#3 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.i386#6 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.ia64#6 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.powerpc#7 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.sparc64#6 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/cvsbug/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/lib/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/font/devkoi8-r/R.proto#2 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/Makefile#8 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/fr.ISO8859-1#3 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/koi8-r.tmac#1 branch :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#15 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/ru.KOI8-R#3 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/manpath/manpath.config#5 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/send-pr.sh#6 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/sort/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/sort/config.h#4 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/sort/libintl.h#2 delete :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/tar/config.h#3 integrate :.. //depot/projects/trustedbsd/mac/include/Makefile#35 integrate :.. //depot/projects/trustedbsd/mac/include/pthread.h#5 integrate :.. //depot/projects/trustedbsd/mac/include/unistd.h#15 integrate :.. //depot/projects/trustedbsd/mac/include/varargs.h#1 branch :.. //depot/projects/trustedbsd/mac/lib/Makefile#23 integrate :.. //depot/projects/trustedbsd/mac/lib/libalias/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libalias/alias.c#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libalias/alias.h#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libalias/alias_db.c#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libalias/alias_local.h#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libalias/alias_skinny.c#1 branch :.. //depot/projects/trustedbsd/mac/lib/libalias/libalias.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libatm/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/Makefile#9 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/alpha/gen/Makefile.inc#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/alpha/gen/signalcontext.c#1 branch :.. //depot/projects/trustedbsd/mac/lib/libc/alpha/sys/Makefile.inc#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/alpha/sys/Ovfork.S#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/alpha/sys/fork.S#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/alpha/sys/pipe.S#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/alpha/sys/setlogin.S#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/fabs.S#2 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/amd64/sys/Makefile.inc#2 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/amd64/sys/getcontext.S#1 branch :.. //depot/projects/trustedbsd/mac/lib/libc/amd64/sys/vfork.S#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/compat-43/sigvec.2#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/db/man/btree.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/db/man/dbm.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/db/man/dbopen.3#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/db/man/hash.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/db/man/recno.3#2 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/Makefile.inc#16 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/confstr.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/ctermid.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/devname.3#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/dlinfo.3#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/exec.3#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/fnmatch.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/fts.3#6 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/getcwd.3#2 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/getdomainname.3#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/getfsent.3#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/getgrent.3#6 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/gethostname.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/gethostname.c#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/getpwent.3#7 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/glob.3#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/msgctl.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/pmadvise.c#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/signal.3#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/sysconf.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/sysctl.3#7 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/tcsetattr.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/uname.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/gen/wordexp.3#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/Makefile.inc#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/getcontext.S#1 branch :.. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_get_ldt.2#6 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/fpgetmask.c#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/fpsetmask.c#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/Makefile.inc#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/locale/Makefile.inc#14 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/locale/big5.5#1 branch :.. //depot/projects/trustedbsd/mac/lib/libc/locale/btowc.c#2 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/locale/ctype.3#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/locale/gb18030.5#1 branch :.. //depot/projects/trustedbsd/mac/lib/libc/locale/gbk.5#1 branch :.. //depot/projects/trustedbsd/mac/lib/libc/locale/mblen.c#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/locale/mbstowcs.c#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/locale/mbtowc.c#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/locale/mskanji.5#1 branch :.. //depot/projects/trustedbsd/mac/lib/libc/locale/multibyte.3#7 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/locale/nl_langinfo.3#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/locale/rune.3#7 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/locale/table.c#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/locale/wcstombs.c#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/locale/wctob.c#2 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/locale/wctomb.c#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/net/addr2ascii.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/net/ethers.3#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.3#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/net/getifaddrs.3#2 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/net/getnameinfo.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/net/if_indextoname.3#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/net/inet6_option_space.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/net/inet6_rthdr_space.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/net/inet_net_pton.c#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/net/resolver.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.c#11 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.3#12 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.3#11 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_is_present_np.3#9 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_prepare.3#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.3#10 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.3#14 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/powerpc/sys/Makefile.inc#2 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/regex/regex.3#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/rpc/publickey.5#2 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc.3#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_clnt_create.3#6 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_svc_calls.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_svc_create.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/Makefile.inc#7 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/signalcontext.c#1 branch :.. //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/Makefile.inc#7 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/stdio/funopen.3#2 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/stdio/tmpnam.3#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/stdlib/abort.c#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/stdlib/exit.3#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/stdlib/getopt.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/stdlib/grantpt.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/stdlib/hcreate.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.c#14 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/stdlib/qsort.3#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/stdlib/rand.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/stdlib/random.c#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/stdtime/ctime.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/string/bcmp.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/string/bcopy.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/string/bzero.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/string/ffs.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/string/index.3#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/string/strcasecmp.3#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/string/strchr.3#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/Makefile.inc#11 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/accept.2#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/acct.2#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/chmod.2#6 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/clock_gettime.2#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/getitimer.2#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/getlogin.2#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/getsockopt.2#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/gettimeofday.2#6 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/intro.2#12 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/ioctl.2#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/kqueue.2#7 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/ktrace.2#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/madvise.2#6 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/mincore.2#6 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/mlockall.2#1 branch :.. //depot/projects/trustedbsd/mac/lib/libc/sys/mount.2#6 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/ntp_gettime.2#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/open.2#6 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/poll.2#4 integrate : :>>> TRUNCATED FOR MAIL (1000 lines) <<< : -- Andrew R. Reiter arr@watson.org arr@FreeBSD.org From owner-p4-projects@FreeBSD.ORG Thu Oct 2 23:00:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80FA916A4C0; Thu, 2 Oct 2003 23:00:57 -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 54CFB16A4B3; Thu, 2 Oct 2003 23:00:57 -0700 (PDT) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5916E43FB1; Thu, 2 Oct 2003 23:00:56 -0700 (PDT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.9p1/8.12.9) with ESMTP id h9360nAD026778; Fri, 3 Oct 2003 00:00:49 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Fri, 03 Oct 2003 00:00:52 -0600 (MDT) Message-Id: <20031003.000052.96921421.imp@bsdimp.com> To: hmp@nxad.com From: "M. Warner Losh" In-Reply-To: <20031002022135.GA26666@perrin.nxad.com> References: <20031001142349.A87379@FreeBSD.org> <20031001.164315.11988972.imp@bsdimp.com> <20031002022135.GA26666@perrin.nxad.com> X-Mailer: Mew version 2.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: jmallett@freebsd.org cc: perforce@freebsd.org cc: julian@elischer.org Subject: Re: PERFORCE change 38917 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, 03 Oct 2003 06:00:58 -0000 In message: <20031002022135.GA26666@perrin.nxad.com> Hiten Pandya writes: : Does this also include PCI Hotplugging or is this going to be : a separate effort? Yes and no. We already have removable devices in the tree. CardBus, PC Card, USB and Firewire. Right now the drivers take liberties and chances and there are a number of ugly races that rear their ugly heads. This is an effort to clean that up and make things totally safe in all the cases that we can think of, and to document those areas where we can't. There's no specific plans on my part to implement the hot plug state transition and deal with it. People have raised their hands in the past to work on it, but so far no one has made significant progress in public view. Warner From owner-p4-projects@FreeBSD.ORG Fri Oct 3 06:04:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07BBE16A4DC; Fri, 3 Oct 2003 06:04:12 -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 D2D5916A4D5 for ; Fri, 3 Oct 2003 06:04:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EE8743FFB for ; Fri, 3 Oct 2003 06:04:11 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h93D4AXJ070400 for ; Fri, 3 Oct 2003 06:04:10 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h93D48Xi070397 for perforce@freebsd.org; Fri, 3 Oct 2003 06:04:08 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Fri, 3 Oct 2003 06:04:08 -0700 (PDT) Message-Id: <200310031304.h93D48Xi070397@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 39084 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, 03 Oct 2003 13:04:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=39084 Change 39084 by areisse@areisse_tislabs on 2003/10/03 06:04:05 Initial support for automatic pty labelling, using the new make_dev_cred and dev_clone_cred support. ptys are created with the user that caused the cloning. mpo_create_devfs_device takes optional cred. sebsd policy updated. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/fs/devfs/devfs_devs.c#5 edit .. //depot/projects/trustedbsd/sebsd/sys/fs/devfs/devfs_vnops.c#5 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#5 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#10 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/tty_pty.c#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#20 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/conf.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#7 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/mac_policy.h#7 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/ssh.te#6 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/global_macros.te#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/fs/devfs/devfs_devs.c#5 (text+ko) ==== @@ -363,7 +363,7 @@ de->de_dirent->d_type = DT_CHR; } #ifdef MAC - mac_create_devfs_device(dm->dm_mount, dev, de, + mac_create_devfs_device(dev->si_cred, dm->dm_mount, dev, de, dev->si_name); #endif *dep = de; ==== //depot/projects/trustedbsd/sebsd/sys/fs/devfs/devfs_vnops.c#5 (text+ko) ==== @@ -376,6 +376,7 @@ goto notfound; cdev = NODEV; + EVENTHANDLER_INVOKE(dev_clone_cred, td->td_ucred, pname, strlen(pname), &cdev); EVENTHANDLER_INVOKE(dev_clone, pname, strlen(pname), &cdev); if (cdev == NODEV) goto notfound; ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#5 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include #include +#include static MALLOC_DEFINE(M_DEVT, "dev_t", "dev_t storage"); @@ -214,6 +215,8 @@ if (dev->si_devsw || dev->si_drv1 || dev->si_drv2) return; LIST_REMOVE(dev, si_hash); + if (dev->si_cred) + crfree (dev->si_cred); if (dev->si_flags & SI_STASHED) { bzero(dev, sizeof(*dev)); dev->si_flags |= SI_STASHED; @@ -266,11 +269,11 @@ return ((x << 8) | y); } -dev_t -make_dev(struct cdevsw *devsw, int minor, uid_t uid, gid_t gid, int perms, const char *fmt, ...) +static dev_t +make_dev_credv(struct cdevsw *devsw, int minor, uid_t uid, gid_t gid, struct ucred *cr, + int perms, const char *fmt, va_list ap) { dev_t dev; - va_list ap; int i; KASSERT((minor & ~0xffff00ff) == 0, @@ -319,16 +322,15 @@ dev->si_name); panic("don't do that"); } - va_start(ap, fmt); i = vsnrprintf(dev->__si_namebuf, sizeof dev->__si_namebuf, 32, fmt, ap); if (i > (sizeof dev->__si_namebuf - 1)) { printf("WARNING: Device name truncated! (%s)", dev->__si_namebuf); } - va_end(ap); dev->si_devsw = devsw; - dev->si_uid = uid; - dev->si_gid = gid; + dev->si_uid = cr ? cr->cr_uid : uid; + dev->si_gid = cr ? cr->cr_gid : gid; + dev->si_cred = cr ? crhold (cr) : NULL; dev->si_mode = perms; dev->si_flags |= SI_NAMED; @@ -336,6 +338,26 @@ return (dev); } +dev_t +make_dev_cred(struct cdevsw *devsw, int minor, struct ucred *cr, int perms, const char *fmt, ...) +{ + va_list ap; + va_start (ap, fmt); + dev_t ret = make_dev_credv (devsw, minor, 0, 0, cr, perms, fmt, ap); + va_end (ap); + return (ret); +} + +dev_t +make_dev(struct cdevsw *devsw, int minor, uid_t uid, gid_t gid, int perms, const char *fmt, ...) +{ + va_list ap; + va_start (ap, fmt); + dev_t ret = make_dev_credv (devsw, minor, uid, gid, NULL, perms, fmt, ap); + va_end (ap); + return (ret); +} + int dev_named(dev_t pdev, const char *name) { ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#10 (text+ko) ==== @@ -3785,11 +3785,11 @@ } void -mac_create_devfs_device(struct mount *mp, dev_t dev, struct devfs_dirent *de, +mac_create_devfs_device(struct ucred *cr, struct mount *mp, dev_t dev, struct devfs_dirent *de, const char *fullpath) { - MAC_PERFORM(create_devfs_device, mp, dev, de, &de->de_label, + MAC_PERFORM(create_devfs_device, cr, mp, dev, de, &de->de_label, fullpath); } ==== //depot/projects/trustedbsd/sebsd/sys/kern/tty_pty.c#5 (text+ko) ==== @@ -66,7 +66,7 @@ static void ptsstart(struct tty *tp); static void ptsstop(struct tty *tp, int rw); static void ptcwakeup(struct tty *tp, int flag); -static dev_t ptyinit(dev_t cdev); +static dev_t ptyinit(dev_t cdev, struct thread *td); static d_open_t ptsopen; static d_close_t ptsclose; @@ -136,7 +136,7 @@ * than 256 ptys. */ static dev_t -ptyinit(dev_t devc) +ptyinit(dev_t devc, struct thread *td) { dev_t devs; struct pt_ioctl *pt; @@ -150,8 +150,8 @@ devc->si_flags &= ~SI_CHEAPCLONE; pt = malloc(sizeof(*pt), M_PTY, M_WAITOK | M_ZERO); - pt->devs = devs = make_dev(&pts_cdevsw, n, - UID_ROOT, GID_WHEEL, 0666, "tty%c%r", names[n / 32], n % 32); + pt->devs = devs = make_dev_cred(&pts_cdevsw, n, + td->td_ucred, 0666, "tty%c%r", names[n / 32], n % 32); pt->devc = devc; devs->si_drv1 = devc->si_drv1 = pt; @@ -346,7 +346,7 @@ struct pt_ioctl *pti; if (!dev->si_drv1) - ptyinit(dev); + ptyinit(dev, td); if (!dev->si_drv1) return(ENXIO); tp = dev->si_tty; @@ -818,10 +818,11 @@ static void ptc_drvinit(void *unused); -static void pty_clone(void *arg, char *name, int namelen, dev_t *dev); +static void pty_clone(void *arg, struct ucred *cr, char *name, int namelen, dev_t *dev); static void -pty_clone(arg, name, namelen, dev) +pty_clone(arg, cr, name, namelen, dev) + struct ucred *cr; void *arg; char *name; int namelen; @@ -852,8 +853,8 @@ u += name[4] - 'a' + 10; else return; - *dev = make_dev(&ptc_cdevsw, u, - UID_ROOT, GID_WHEEL, 0666, "pty%c%r", names[u / 32], u % 32); + *dev = make_dev_cred (&ptc_cdevsw, u, + cr, 0666, "pty%c%r", names[u / 32], u % 32); (*dev)->si_flags |= SI_CHEAPCLONE; return; } @@ -863,7 +864,7 @@ void *unused; { - EVENTHANDLER_REGISTER(dev_clone, pty_clone, 0, 1000); + EVENTHANDLER_REGISTER(dev_clone_cred, pty_clone, 0, 1000); } SYSINIT(ptcdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR_C,ptc_drvinit,NULL) ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#20 (text+ko) ==== @@ -518,7 +518,7 @@ } static void -sebsd_create_devfs_device(struct mount *mp, dev_t dev, +sebsd_create_devfs_device(struct ucred *cr, struct mount *mp, dev_t dev, struct devfs_dirent *devfs_dirent, struct label *label, const char *fullpath) { @@ -543,9 +543,23 @@ strcpy(&path[1], fullpath); rc = security_genfs_sid(mp->mnt_vfc->vfc_name, path, dirent->sclass, &newsid); + if (rc == 0) dirent->sid = newsid; + /* If there was a creating process (currently only for /dev/pty*), + try a type_transition rule. */ + if (cr != NULL) { + struct task_security_struct *task = SLOT(&cr->cr_label); + + /* XXX: uses the type specified by genfs instead of the parent directory + like it should! */ + int error = security_transition_sid(task->sid, dirent->sid, dirent->sclass, + &newsid); + if (error == 0) + dirent->sid = newsid; + } + /* TBD: debugging */ if (sebsd_verbose > 1) { printf("sebsd_create_devfs_device(%s): sbsid=%d, " @@ -794,7 +808,7 @@ int error; int tclass; - task = SLOT(&cred->cr_label); + task = SLOT(&cred->cr_label); dir = SLOT(parentlabel); vsec = SLOT(childlabel); tclass = vnode_type_to_security_class (child->v_type); ==== //depot/projects/trustedbsd/sebsd/sys/sys/conf.h#5 (text+ko) ==== @@ -83,6 +83,7 @@ uid_t si_uid; gid_t si_gid; mode_t si_mode; + struct ucred *si_cred; /* optional cred of creating process (e.g. pty) */ u_long si_usecount; union { struct { @@ -314,6 +315,8 @@ dev_t makebdev(int _maj, int _min); dev_t make_dev(struct cdevsw *_devsw, int _minor, uid_t _uid, gid_t _gid, int _perms, const char *_fmt, ...) __printflike(6, 7); +dev_t make_dev_cred(struct cdevsw *_devsw, int _minor, struct ucred *cr, + int _perms, const char *_fmt, ...) __printflike(5, 6); dev_t make_dev_alias(dev_t _pdev, const char *_fmt, ...) __printflike(2, 3); int dev2unit(dev_t _dev); int unit2minor(int _unit); @@ -339,6 +342,9 @@ int dev_stdclone(char *_name, char **_namep, const char *_stem, int *_unit); EVENTHANDLER_DECLARE(dev_clone, dev_clone_fn); +typedef void (*dev_clone_cred_fn)(void *arg, struct ucred *cr, char *name, int namelen, dev_t *result); +EVENTHANDLER_DECLARE(dev_clone_cred, dev_clone_cred_fn); + /* Stuff relating to kernel-dump */ struct dumperinfo { ==== //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#7 (text+ko) ==== @@ -186,7 +186,7 @@ struct vnode *vp); int mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp); void mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp); -void mac_create_devfs_device(struct mount *mp, dev_t dev, +void mac_create_devfs_device(struct ucred *cr, struct mount *mp, dev_t dev, struct devfs_dirent *de, const char *fullpath); void mac_create_devfs_directory(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *de, const char *fullpath); ==== //depot/projects/trustedbsd/sebsd/sys/sys/mac_policy.h#7 (text+ko) ==== @@ -167,7 +167,8 @@ void (*mpo_associate_vnode_singlelabel)(struct mount *mp, struct label *fslabel, struct vnode *vp, struct label *vlabel); - void (*mpo_create_devfs_device)(struct mount *mp, dev_t dev, + /* cr is optional in create_devfs_device. */ + void (*mpo_create_devfs_device)(struct ucred *cr, struct mount *mp, dev_t dev, struct devfs_dirent *de, struct label *label, const char *fullpath); void (*mpo_create_devfs_directory)(struct mount *mp, char *dirname, ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/ssh.te#6 (text+ko) ==== @@ -167,7 +167,7 @@ # spawned by sshd # Use the pty created by sshd -allow sshd_login_t sshd_devpts_t:chr_file { setattr rw_file_perms }; +allow sshd_login_t sshd_devpts_t:chr_file { setattr rw_file_perms poll }; # Write to /var/log/lastlog allow sshd_login_t lastlog_t:file rw_file_perms; @@ -177,7 +177,7 @@ allow sshd_login_t userpty_type:chr_file { getattr relabelfrom relabelto }; # open old-style ptys -allow sshd_login_t devpts_t:chr_file { read write relabelfrom relabelto getattr setattr }; +#allow sshd_login_t devpts_t:chr_file { read write relabelfrom relabelto getattr setattr }; allow sshd_login_t self:capability { linux_immutable sys_resource }; @@ -212,6 +212,8 @@ role system_r types sshd_user_shell_t; role system_r types user_cvs_rw_t; +allow sshd_user_shell_t sshd_devpts_t:chr_file { getattr setattr rw_file_perms poll }; + allow sshd_user_shell_t { self sshd_t }:fd { create use }; allow sshd_user_shell_t { sbin_t bin_t home_root_t user_home_dir_t usr_t etc_t }:dir search; allow sshd_user_shell_t etc_t:file r_file_perms; ==== //depot/projects/trustedbsd/sebsd_policy/policy/macros/global_macros.te#5 (text+ko) ==== @@ -625,8 +625,8 @@ allow $1_t devpts_t:dir { getattr read search }; # For systems without /dev/ptmx -allow $1_t devpts_t:chr_file { poll getattr setattr read write }; -type_change $1_t devpts_t:chr_file $1_devpts_t; +#allow $1_t devpts_t:chr_file { poll getattr setattr read write }; +#type_change $1_t devpts_t:chr_file $1_devpts_t; ') ################################## From owner-p4-projects@FreeBSD.ORG Fri Oct 3 09:20:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE67C16A4C0; Fri, 3 Oct 2003 09:20:11 -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 B586816A4B3 for ; Fri, 3 Oct 2003 09:20:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39DF843FE3 for ; Fri, 3 Oct 2003 09:20:11 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h93GKBXJ088096 for ; Fri, 3 Oct 2003 09:20:11 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h93GKAbJ088093 for perforce@freebsd.org; Fri, 3 Oct 2003 09:20:10 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Fri, 3 Oct 2003 09:20:10 -0700 (PDT) Message-Id: <200310031620.h93GKAbJ088093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 39089 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, 03 Oct 2003 16:20:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=39089 Change 39089 by sam@sam_ebb on 2003/10/03 09:20:07 move locking #defines under #ifdef _KERNEL Affected files ... .. //depot/projects/netperf/sys/netinet/in_pcb.h#5 edit Differences ... ==== //depot/projects/netperf/sys/netinet/in_pcb.h#5 (text+ko) ==== @@ -248,19 +248,6 @@ struct mtx ipi_mtx; }; -#define INP_LOCK_INIT(inp, d) \ - mtx_init(&(inp)->inp_mtx, (d), NULL, MTX_DEF | MTX_RECURSE | MTX_DUPOK) -#define INP_LOCK_DESTROY(inp) mtx_destroy(&(inp)->inp_mtx) -#define INP_LOCK(inp) mtx_lock(&(inp)->inp_mtx) -#define INP_UNLOCK(inp) mtx_unlock(&(inp)->inp_mtx) - -#define INP_INFO_LOCK_INIT(ipi, d) \ - mtx_init(&(ipi)->ipi_mtx, (d), NULL, MTX_DEF | MTX_RECURSE) -#define INP_INFO_RLOCK(ipi) mtx_lock(&(ipi)->ipi_mtx) -#define INP_INFO_WLOCK(ipi) mtx_lock(&(ipi)->ipi_mtx) -#define INP_INFO_RUNLOCK(ipi) mtx_unlock(&(ipi)->ipi_mtx) -#define INP_INFO_WUNLOCK(ipi) mtx_unlock(&(ipi)->ipi_mtx) - #define INP_PCBHASH(faddr, lport, fport, mask) \ (((faddr) ^ ((faddr) >> 16) ^ ntohs((lport) ^ (fport))) & (mask)) #define INP_PCBPORTHASH(lport, mask) \ @@ -319,6 +306,19 @@ #define INP_CHECK_SOCKAF(so, af) (INP_SOCKAF(so) == af) #ifdef _KERNEL +#define INP_LOCK_INIT(inp, d) \ + mtx_init(&(inp)->inp_mtx, (d), NULL, MTX_DEF | MTX_RECURSE | MTX_DUPOK) +#define INP_LOCK_DESTROY(inp) mtx_destroy(&(inp)->inp_mtx) +#define INP_LOCK(inp) mtx_lock(&(inp)->inp_mtx) +#define INP_UNLOCK(inp) mtx_unlock(&(inp)->inp_mtx) + +#define INP_INFO_LOCK_INIT(ipi, d) \ + mtx_init(&(ipi)->ipi_mtx, (d), NULL, MTX_DEF | MTX_RECURSE) +#define INP_INFO_RLOCK(ipi) mtx_lock(&(ipi)->ipi_mtx) +#define INP_INFO_WLOCK(ipi) mtx_lock(&(ipi)->ipi_mtx) +#define INP_INFO_RUNLOCK(ipi) mtx_unlock(&(ipi)->ipi_mtx) +#define INP_INFO_WUNLOCK(ipi) mtx_unlock(&(ipi)->ipi_mtx) + extern int ipport_lowfirstauto; extern int ipport_lowlastauto; extern int ipport_firstauto; From owner-p4-projects@FreeBSD.ORG Fri Oct 3 09:21:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEE9C16A4B3; Fri, 3 Oct 2003 09:21: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 9A07616A4B3 for ; Fri, 3 Oct 2003 09:21:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2535143FEC for ; Fri, 3 Oct 2003 09:21:13 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h93GLCXJ088212 for ; Fri, 3 Oct 2003 09:21:12 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h93GLC5n088209 for perforce@freebsd.org; Fri, 3 Oct 2003 09:21:12 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Fri, 3 Oct 2003 09:21:12 -0700 (PDT) Message-Id: <200310031621.h93GLC5n088209@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 39090 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, 03 Oct 2003 16:21:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=39090 Change 39090 by sam@sam_ebb on 2003/10/03 09:20:41 hide some kernel-specific data structures from user-mode apps Affected files ... .. //depot/projects/netperf/sys/netinet/ip_dummynet.h#2 edit Differences ... ==== //depot/projects/netperf/sys/netinet/ip_dummynet.h#2 (text+ko) ==== @@ -109,6 +109,7 @@ struct dn_heap_entry *p ; /* really an array of "size" entries */ } ; +#ifdef _KERNEL /* * struct dn_pkt identifies a packet in the dummynet queue, but * is also used to tag packets passed back to the various destinations @@ -142,6 +143,7 @@ struct route ro; /* route, for ip_output. MUST COPY */ int flags ; /* flags, for ip_output (IPv6 ?) */ }; +#endif /* _KERNEL */ /* * Overall structure of dummynet (with WF2Q+): From owner-p4-projects@FreeBSD.ORG Fri Oct 3 09:34:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EA7816A4C0; Fri, 3 Oct 2003 09:34:30 -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 3A2DA16A4B3 for ; Fri, 3 Oct 2003 09:34:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8C2643FE5 for ; Fri, 3 Oct 2003 09:34:29 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h93GYTXJ088728 for ; Fri, 3 Oct 2003 09:34:29 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h93GYTna088725 for perforce@freebsd.org; Fri, 3 Oct 2003 09:34:29 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Fri, 3 Oct 2003 09:34:29 -0700 (PDT) Message-Id: <200310031634.h93GYTna088725@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 39091 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, 03 Oct 2003 16:34:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=39091 Change 39091 by sam@sam_ebb on 2003/10/03 09:33:31 remove use of static struct sockaddr in arplookup (kern/28417 from bms@spc.org) Affected files ... .. //depot/projects/netperf/sys/netinet/if_ether.c#10 edit Differences ... ==== //depot/projects/netperf/sys/netinet/if_ether.c#10 (text+ko) ==== @@ -912,11 +912,15 @@ int create, proxy; { register struct rtentry *rt; - static struct sockaddr_inarp sin = {sizeof(sin), AF_INET }; + struct sockaddr_inarp sin; const char *why = 0; + bzero(&sin, sizeof(sin)); + sin.sin_len = sizeof(sin); + sin.sin_family = AF_INET; sin.sin_addr.s_addr = addr; - sin.sin_other = proxy ? SIN_PROXY : 0; + if (proxy) + sin.sin_other = SIN_PROXY; rt = rtalloc1((struct sockaddr *)&sin, create, 0UL); if (rt == 0) return (0); From owner-p4-projects@FreeBSD.ORG Fri Oct 3 10:17:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB1CF16A4C0; Fri, 3 Oct 2003 10:17: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 9D14A16A4B3 for ; Fri, 3 Oct 2003 10:17:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D90B43FF2 for ; Fri, 3 Oct 2003 10:17:32 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h93HHWXJ091782 for ; Fri, 3 Oct 2003 10:17:32 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h93HHRLT091778 for perforce@freebsd.org; Fri, 3 Oct 2003 10:17:27 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Fri, 3 Oct 2003 10:17:27 -0700 (PDT) Message-Id: <200310031717.h93HHRLT091778@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 39096 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, 03 Oct 2003 17:17:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=39096 Change 39096 by sam@sam_ebb on 2003/10/03 10:17:11 IFC @39092 (with revision of static ARP for rtentry locking) Affected files ... .. //depot/projects/netperf/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/netperf/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/netperf/sys/amd64/include/clock.h#3 integrate .. //depot/projects/netperf/sys/amd64/include/ucontext.h#3 integrate .. //depot/projects/netperf/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_cd.c#6 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_targ_bh.c#3 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/netperf/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/netperf/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/netperf/sys/conf/files#10 integrate .. //depot/projects/netperf/sys/conf/kmod.mk#5 integrate .. //depot/projects/netperf/sys/conf/ldscript.i386#2 integrate .. //depot/projects/netperf/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/netperf/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/netperf/sys/dev/firewire/firewire.h#4 integrate .. //depot/projects/netperf/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/netperf/sys/dev/firewire/fwcrom.c#4 integrate .. //depot/projects/netperf/sys/dev/firewire/fwdev.c#3 integrate .. //depot/projects/netperf/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/netperf/sys/dev/firewire/fwmem.h#2 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohci.c#6 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohcireg.h#4 integrate .. //depot/projects/netperf/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/netperf/sys/dev/firewire/sbp.c#6 integrate .. //depot/projects/netperf/sys/dev/firewire/sbp.h#1 branch .. //depot/projects/netperf/sys/dev/usb/ugen.c#5 integrate .. //depot/projects/netperf/sys/dev/usb/uscanner.c#5 integrate .. //depot/projects/netperf/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/netperf/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/netperf/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/netperf/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/bios.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/locore.s#3 integrate .. //depot/projects/netperf/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/netperf/sys/i386/i386/mpboot.s#2 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#12 integrate .. //depot/projects/netperf/sys/i386/i386/support.s#3 integrate .. //depot/projects/netperf/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/netperf/sys/i386/include/md_var.h#3 integrate .. //depot/projects/netperf/sys/i386/include/pcb.h#2 integrate .. //depot/projects/netperf/sys/i386/include/pmap.h#3 integrate .. //depot/projects/netperf/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/netperf/sys/ia64/ia64/syscall.S#4 integrate .. //depot/projects/netperf/sys/ia64/ia64/vm_machdep.c#6 integrate .. //depot/projects/netperf/sys/kern/init_main.c#5 integrate .. //depot/projects/netperf/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/netperf/sys/kern/kern_subr.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_synch.c#5 integrate .. //depot/projects/netperf/sys/modules/firewire/sbp/Makefile#2 integrate .. //depot/projects/netperf/sys/net/bridge.c#12 integrate .. //depot/projects/netperf/sys/net/if.h#2 integrate .. //depot/projects/netperf/sys/net/netisr.c#3 integrate .. //depot/projects/netperf/sys/netinet/if_ether.c#11 integrate .. //depot/projects/netperf/sys/netinet6/frag6.c#2 integrate .. //depot/projects/netperf/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/netperf/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/netperf/sys/netinet6/ip6_forward.c#5 integrate .. //depot/projects/netperf/sys/netinet6/ip6_id.c#1 branch .. //depot/projects/netperf/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/netperf/sys/netinet6/ip6_output.c#7 integrate .. //depot/projects/netperf/sys/netinet6/ip6_var.h#4 integrate .. //depot/projects/netperf/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/netperf/sys/netkey/key.c#3 integrate .. //depot/projects/netperf/sys/netkey/key_debug.h#3 integrate .. //depot/projects/netperf/sys/netkey/keysock.c#3 integrate .. //depot/projects/netperf/sys/pci/agp_i810.c#3 integrate .. //depot/projects/netperf/sys/sparc64/include/endian.h#2 integrate .. //depot/projects/netperf/sys/sys/cdefs.h#3 integrate .. //depot/projects/netperf/sys/sys/mac.h#5 integrate .. //depot/projects/netperf/sys/sys/proc.h#4 integrate .. //depot/projects/netperf/sys/sys/systm.h#3 integrate .. //depot/projects/netperf/sys/sys/uio.h#2 integrate Differences ... ==== //depot/projects/netperf/sys/amd64/amd64/genassym.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.148 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.149 2003/09/30 04:52:24 jeff Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -85,7 +85,6 @@ ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_INTR_NESTING_LEVEL, offsetof(struct thread, td_intr_nesting_level)); ASSYM(TD_CRITNEST, offsetof(struct thread, td_critnest)); -ASSYM(TD_SWITCHIN, offsetof(struct thread, td_switchin)); ASSYM(TD_MD, offsetof(struct thread, td_md)); ASSYM(P_MD, offsetof(struct proc, p_md)); ==== //depot/projects/netperf/sys/amd64/amd64/support.S#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.101 2003/05/30 00:58:48 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.102 2003/10/02 05:08:13 alc Exp $ */ #include "opt_ddb.h" @@ -64,46 +64,18 @@ /* Address: %rdi */ ENTRY(pagezero) - movq $512, %rcx - cld - - ALIGN_TEXT + lea 4096(%rdi),%rsi + xorq %rax,%rax 1: - xorq %rax, %rax - repe - scasq - jnz 2f - - ret - - ALIGN_TEXT - -2: - incq %rcx - subq $8, %rdi - - movq %rcx, %rdx - cmpq $16, %rcx - - jge 3f - - movq %rdi, %r8 - andq $0x7f, %r8 - shrq $3, %r8 - movq $16, %rcx - subq %r8, %rcx - -3: - subq %rcx, %rdx - rep - stosq - - movq %rdx, %rcx - testq %rdx, %rdx - jnz 1b - - ret - + movnti %rax,(%rdi) + movnti %rax,8(%rdi) + movnti %rax,16(%rdi) + movnti %rax,24(%rdi) + addq $32,%rdi + cmpq %rsi,%rdi + jne 1b + sfence + retq ENTRY(bcmp) xorq %rax,%rax ==== //depot/projects/netperf/sys/amd64/include/clock.h#3 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.46 2003/09/22 23:02:24 peter Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.47 2003/09/30 06:38:11 peter Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -30,9 +30,11 @@ */ struct clockframe; +#ifndef BURN_BRIDGES int acquire_timer0(int rate, void (*function)(struct clockframe *frame)); +int release_timer0(void); +#endif int acquire_timer2(int mode); -int release_timer0(void); int release_timer2(void); int rtcin(int val); int sysbeep(int pitch, int period); ==== //depot/projects/netperf/sys/amd64/include/ucontext.h#3 (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/amd64/include/ucontext.h,v 1.14 2003/09/05 20:47:27 peter Exp $ + * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.15 2003/10/01 01:08:04 peter Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -37,30 +37,30 @@ * sigcontext. So that we can support sigcontext * and ucontext_t at the same time. */ - register_t mc_onstack; /* XXX - sigcontext compat. */ - register_t mc_rdi; /* machine state (struct trapframe) */ - register_t mc_rsi; - register_t mc_rdx; - register_t mc_rcx; - register_t mc_r8; - register_t mc_r9; - register_t mc_rax; - register_t mc_rbx; - register_t mc_rbp; - register_t mc_r10; - register_t mc_r11; - register_t mc_r12; - register_t mc_r13; - register_t mc_r14; - register_t mc_r15; - register_t mc_trapno; - register_t mc_addr; - register_t mc_err; - register_t mc_rip; - register_t mc_cs; - register_t mc_rflags; - register_t mc_rsp; - register_t mc_ss; + __register_t mc_onstack; /* XXX - sigcontext compat. */ + __register_t mc_rdi; /* machine state (struct trapframe) */ + __register_t mc_rsi; + __register_t mc_rdx; + __register_t mc_rcx; + __register_t mc_r8; + __register_t mc_r9; + __register_t mc_rax; + __register_t mc_rbx; + __register_t mc_rbp; + __register_t mc_r10; + __register_t mc_r11; + __register_t mc_r12; + __register_t mc_r13; + __register_t mc_r14; + __register_t mc_r15; + __register_t mc_trapno; + __register_t mc_addr; + __register_t mc_err; + __register_t mc_rip; + __register_t mc_cs; + __register_t mc_rflags; + __register_t mc_rsp; + __register_t mc_ss; long mc_len; /* sizeof(mcontext_t) */ #define _MC_FPFMT_NODEV 0x10000 /* device not present or configured */ ==== //depot/projects/netperf/sys/amd64/isa/clock.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.202 2003/09/22 23:02:24 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.204 2003/09/30 06:42:47 peter Exp $"); /* * Routines to handle clock hardware. @@ -87,11 +87,12 @@ * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we * can use a simple formula for leap years. */ -#define LEAPYEAR(y) ((u_int)(y) % 4 == 0) +#define LEAPYEAR(y) (((u_int)(y) % 4 == 0) ? 1 : 0) #define DAYSPERYEAR (31+28+31+30+31+30+31+31+30+31+30+31) #define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x)) +#ifndef BURN_BRIDGES /* * Time in timer cycles that it takes for microtime() to disable interrupts * and latch the count. microtime() currently uses "cli; outb ..." so it @@ -107,6 +108,7 @@ * before the next timer interrupt. */ #define TIMER0_MAX_FREQ 20000 +#endif int adjkerntz; /* local offset from GMT in seconds */ int clkintr_pending; @@ -128,6 +130,7 @@ static u_int32_t i8254_lastcount; static u_int32_t i8254_offset; static int i8254_ticked; +#ifndef BURN_BRIDGES /* * XXX new_function and timer_func should not handle clockframes, but * timer_func currently needs to hold hardclock to handle the @@ -136,9 +139,11 @@ */ static void (*new_function)(struct clockframe *frame); static u_int new_rate; +static u_int timer0_prescaler_count; +static u_char timer0_state; +#endif static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR | RTCSB_PINTR; -static u_int timer0_prescaler_count; /* Values for timerX_state: */ #define RELEASED 0 @@ -146,7 +151,6 @@ #define ACQUIRED 2 #define ACQUIRE_PENDING 3 -static u_char timer0_state; static u_char timer2_state; static void (*timer_func)(struct clockframe *frame) = hardclock; @@ -158,7 +162,8 @@ 0, /* no poll_pps */ ~0u, /* counter_mask */ 0, /* frequency */ - "i8254" /* name */ + "i8254", /* name */ + 0 /* quality */ }; static void @@ -177,6 +182,7 @@ mtx_unlock_spin(&clock_lock); } timer_func(&frame); +#ifndef BURN_BRIDGES switch (timer0_state) { case RELEASED: @@ -222,8 +228,10 @@ } break; } +#endif } +#ifndef BURN_BRIDGES /* * The acquire and release functions must be called at ipl >= splclock(). */ @@ -259,6 +267,7 @@ old_rate = new_rate = rate; return (0); } +#endif int acquire_timer2(int mode) @@ -280,6 +289,7 @@ return (0); } +#ifndef BURN_BRIDGES int release_timer0() { @@ -299,6 +309,7 @@ } return (0); } +#endif int release_timer2() @@ -931,8 +942,10 @@ freq = timer_freq; error = sysctl_handle_int(oidp, &freq, sizeof(freq), req); if (error == 0 && req->newptr != NULL) { +#ifndef BURN_BRIDGES if (timer0_state != RELEASED) return (EBUSY); /* too much trouble to handle */ +#endif set_timer_freq(freq, hz); i8254_timecounter.tc_frequency = freq; } ==== //depot/projects/netperf/sys/cam/scsi/scsi_cd.c#6 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.83 2003/09/11 19:27:24 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.84 2003/09/30 07:52:15 phk Exp $"); #include "opt_cd.h" @@ -63,6 +63,7 @@ #include #include #include +#include #include #include @@ -146,15 +147,10 @@ struct cd_params params; union ccb saved_ccb; cd_quirks quirks; - struct devstat *device_stats; STAILQ_ENTRY(cd_softc) changer_links; struct cdchanger *changer; int bufs_left; struct cam_periph *periph; - dev_t dev; -#ifdef GONE_IN_5 - eventhandler_tag clonetag; -#endif int minimum_command_size; int outstanding_cmds; struct task sysctl_task; @@ -162,6 +158,7 @@ struct sysctl_oid *sysctl_tree; STAILQ_HEAD(, cd_mode_params) mode_queue; struct cd_tocdata toc; + struct disk disk; }; struct cd_page_sizes { @@ -217,12 +214,10 @@ } }; -#define CD_CDEV_MAJOR 15 - -static d_open_t cdopen; -static d_close_t cdclose; -static d_ioctl_t cdioctl; -static d_strategy_t cdstrategy; +static disk_open_t cdopen; +static disk_close_t cdclose; +static disk_ioctl_t cdioctl; +static disk_strategy_t cdstrategy; static periph_init_t cdinit; static periph_ctor_t cdregister; @@ -294,17 +289,6 @@ PERIPHDRIVER_DECLARE(cd, cddriver); -static struct cdevsw cd_cdevsw = { - .d_open = cdopen, - .d_close = cdclose, - .d_read = physread, - .d_write = physwrite, - .d_ioctl = cdioctl, - .d_strategy = cdstrategy, - .d_name = "cd", - .d_maj = CD_CDEV_MAJOR, - .d_flags = D_DISK, -}; static int num_changers; @@ -343,27 +327,6 @@ static STAILQ_HEAD(changerlist, cdchanger) changerq; -#ifdef GONE_IN_5 -static void -cdclone(void *arg, char *name, int namelen, dev_t *dev) -{ - struct cd_softc *softc; - const char *p; - int l; - - softc = arg; - p = devtoname(softc->dev); - l = strlen(p); - if (bcmp(name, p, l)) - return; - if (name[l] != 'a' && name[l] != 'c') - return; - if (name[l + 1] != '\0') - return; - *dev = softc->dev; - return; -} -#endif static void cdinit(void) @@ -533,11 +496,6 @@ free(softc->changer, M_DEVBUF); num_changers--; } - devstat_remove_entry(softc->device_stats); - destroy_dev(softc->dev); -#ifdef GONE_IN_5 - EVENTHANDLER_DEREGISTER(dev_clone, softc->clonetag); -#endif free(softc, M_DEVBUF); splx(s); } @@ -774,18 +732,18 @@ * WORM peripheral driver. WORM drives will also have the WORM * driver attached to them. */ - softc->device_stats = devstat_new_entry("cd", + softc->disk.d_devstat = devstat_new_entry("cd", periph->unit_number, 0, DEVSTAT_BS_UNAVAILABLE, DEVSTAT_TYPE_CDROM | DEVSTAT_TYPE_IF_SCSI, DEVSTAT_PRIORITY_CD); - softc->dev = make_dev(&cd_cdevsw, periph->unit_number, - UID_ROOT, GID_OPERATOR, 0640, "cd%d", periph->unit_number); - softc->dev->si_drv1 = periph; -#ifdef GONE_IN_5 - softc->clonetag = - EVENTHANDLER_REGISTER(dev_clone, cdclone, softc, 1000); -#endif + softc->disk.d_open = cdopen; + softc->disk.d_close = cdclose; + softc->disk.d_strategy = cdstrategy; + softc->disk.d_ioctl = cdioctl; + softc->disk.d_name = "cd"; + disk_create(periph->unit_number, &softc->disk, 0, NULL, NULL); + softc->disk.d_drv1 = periph; /* * Add an async callback so that we get @@ -1028,14 +986,14 @@ } static int -cdopen(dev_t dev, int flags, int fmt, struct thread *td) +cdopen(struct disk *dp) { struct cam_periph *periph; struct cd_softc *softc; int error; int s; - periph = (struct cam_periph *)dev->si_drv1; + periph = (struct cam_periph *)dp->d_drv1; if (periph == NULL) return (ENXIO); @@ -1075,13 +1033,13 @@ } static int -cdclose(dev_t dev, int flag, int fmt, struct thread *td) +cdclose(struct disk *dp) { struct cam_periph *periph; struct cd_softc *softc; int error; - periph = (struct cam_periph *)dev->si_drv1; + periph = (struct cam_periph *)dp->d_drv1; if (periph == NULL) return (ENXIO); @@ -1097,7 +1055,7 @@ * Since we're closing this CD, mark the blocksize as unavailable. * It will be marked as available when the CD is opened again. */ - softc->device_stats->flags |= DEVSTAT_BS_UNAVAILABLE; + softc->disk.d_devstat->flags |= DEVSTAT_BS_UNAVAILABLE; /* * We'll check the media and toc again at the next open(). @@ -1391,7 +1349,7 @@ softc = (struct cd_softc *)periph->softc; error = cam_periph_runccb(ccb, error_routine, cam_flags, sense_flags, - softc->device_stats); + softc->disk.d_devstat); if (softc->flags & CD_FLAG_CHANGER) cdchangerschedule(softc); @@ -1453,7 +1411,7 @@ struct cd_softc *softc; int s; - periph = (struct cam_periph *)bp->bio_dev->si_drv1; + periph = (struct cam_periph *)bp->bio_disk->d_drv1; if (periph == NULL) { biofinish(bp, NULL, ENXIO); return; @@ -1547,7 +1505,7 @@ } else { bioq_remove(&softc->bio_queue, bp); - devstat_start_transaction_bio(softc->device_stats, bp); + devstat_start_transaction_bio(softc->disk.d_devstat, bp); scsi_read_write(&start_ccb->csio, /*retries*/4, @@ -1703,7 +1661,7 @@ if (softc->flags & CD_FLAG_CHANGER) cdchangerschedule(softc); - biofinish(bp, softc->device_stats, 0); + biofinish(bp, softc->disk.d_devstat, 0); break; } case CD_CCB_PROBE: @@ -1939,14 +1897,14 @@ } static int -cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) +cdioctl(struct disk *dp, u_long cmd, void *addr, int flag, struct thread *td) { struct cam_periph *periph; struct cd_softc *softc; int error; - periph = (struct cam_periph *)dev->si_drv1; + periph = (struct cam_periph *)dp->d_drv1; if (periph == NULL) return(ENXIO); @@ -1977,14 +1935,6 @@ switch (cmd) { - case DIOCGMEDIASIZE: - *(off_t *)addr = - (off_t)softc->params.blksize * softc->params.disksize; - break; - case DIOCGSECTORSIZE: - *(u_int *)addr = softc->params.blksize; - break; - case CDIOCPLAYTRACKS: { struct ioc_play_track *args @@ -2749,6 +2699,10 @@ } } +/* + * XXX: the disk media and sector size is only really able to change + * XXX: while the device is closed. + */ static int cdcheckmedia(struct cam_periph *periph) { @@ -2761,6 +2715,9 @@ softc = (struct cd_softc *)periph->softc; cdprevent(periph, PR_PREVENT); + softc->disk.d_maxsize = DFLTPHYS; + softc->disk.d_sectorsize = 0; + softc->disk.d_mediasize = 0; /* * Get the disc size and block size. If we can't get it, we don't @@ -2860,6 +2817,10 @@ } softc->flags |= CD_FLAG_VALID_TOC; + softc->disk.d_maxsize = DFLTPHYS; + softc->disk.d_sectorsize = softc->params.blksize; + softc->disk.d_mediasize = + (off_t)softc->params.blksize * softc->params.disksize; bailout: @@ -2870,9 +2831,9 @@ * XXX problems here if some slice or partition is still * open with the old size? */ - if ((softc->device_stats->flags & DEVSTAT_BS_UNAVAILABLE) != 0) - softc->device_stats->flags &= ~DEVSTAT_BS_UNAVAILABLE; - softc->device_stats->block_size = softc->params.blksize; + if ((softc->disk.d_devstat->flags & DEVSTAT_BS_UNAVAILABLE) != 0) + softc->disk.d_devstat->flags &= ~DEVSTAT_BS_UNAVAILABLE; + softc->disk.d_devstat->block_size = softc->params.blksize; return (error); } ==== //depot/projects/netperf/sys/cam/scsi/scsi_targ_bh.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.19 2003/09/25 05:02:19 simokawa Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.20 2003/09/30 08:03:52 simokawa Exp $"); #include #include @@ -186,14 +186,21 @@ struct cam_path *path, void *arg) { struct cam_path *new_path; + struct ccb_pathinq *cpi; + path_id_t bus_path_id; cam_status status; + cpi = (struct ccb_pathinq *)arg; + if (code == AC_PATH_REGISTERED) + bus_path_id = cpi->ccb_h.path_id; + else + bus_path_id = xpt_path_path_id(path); /* * Allocate a peripheral instance for * this target instance. */ status = xpt_create_path(&new_path, NULL, - xpt_path_path_id(path), + bus_path_id, CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); if (status != CAM_REQ_CMP) { printf("targbhasync: Unable to create path " @@ -204,10 +211,6 @@ switch (code) { case AC_PATH_REGISTERED: { - struct ccb_pathinq *cpi; - - cpi = (struct ccb_pathinq *)arg; - /* Only attach to controllers that support target mode */ if ((cpi->target_sprt & PIT_PROCESSOR) == 0) break; @@ -222,7 +225,10 @@ } case AC_PATH_DEREGISTERED: { - cam_periph_invalidate(cam_periph_find(new_path, "targbh")); + struct cam_periph *periph; + + if ((periph = cam_periph_find(new_path, "targbh")) != NULL) + cam_periph_invalidate(periph); break; } default: ==== //depot/projects/netperf/sys/cam/scsi/scsi_target.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.56 2003/09/04 16:30:03 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.57 2003/10/02 08:56:14 simokawa Exp $"); #include #include @@ -556,12 +556,12 @@ ("write - uiomove failed (%d)\n", error)); break; } - priority = fuword(&user_ccb->ccb_h.pinfo.priority); + priority = fuword32(&user_ccb->ccb_h.pinfo.priority); if (priority == -1) { error = EINVAL; break; } - func_code = fuword(&user_ccb->ccb_h.func_code); + func_code = fuword32(&user_ccb->ccb_h.func_code); switch (func_code) { case XPT_ACCEPT_TARGET_IO: case XPT_IMMED_NOTIFY: @@ -683,10 +683,10 @@ * preserved, the rest we get from the user ccb. (See xpt_merge_ccb) */ xpt_setup_ccb(k_ccbh, softc->path, descr->priority); - k_ccbh->retry_count = fuword(&u_ccbh->retry_count); + k_ccbh->retry_count = fuword32(&u_ccbh->retry_count); k_ccbh->func_code = descr->func_code; - k_ccbh->flags = fuword(&u_ccbh->flags); - k_ccbh->timeout = fuword(&u_ccbh->timeout); + k_ccbh->flags = fuword32(&u_ccbh->flags); + k_ccbh->timeout = fuword32(&u_ccbh->timeout); ccb_len = targccblen(k_ccbh->func_code) - sizeof(struct ccb_hdr); error = copyin(u_ccbh + 1, k_ccbh + 1, ccb_len); if (error != 0) { ==== //depot/projects/netperf/sys/compat/linprocfs/linprocfs.c#7 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.74 2003/09/22 16:05:11 des Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.75 2003/09/30 13:35:19 des Exp $"); #include #include @@ -413,7 +413,8 @@ static int linprocfs_dostat(PFS_FILL_ARGS) { - int name[2], olen, plen; + unsigned int olen, plen; + int name[2]; int i, ncpu; name[0] = CTL_HW; ==== //depot/projects/netperf/sys/conf/Makefile.amd64#2 (text+ko) ==== @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.9 2003/05/30 01:03:43 peter Exp $ +# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.10 2003/09/30 03:49:09 peter Exp $ # # Makefile for FreeBSD # @@ -31,7 +31,7 @@ .endif .include "$S/conf/kern.pre.mk" -DDB_ENABLED!= grep DDB opt_ddb.h +DDB_ENABLED!= grep DDB opt_ddb.h || true .if ${DDB_ENABLED} != "" CFLAGS+= -fno-omit-frame-pointer .endif ==== //depot/projects/netperf/sys/conf/files#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.827 2003/09/27 12:53:32 phk Exp $ +# $FreeBSD: src/sys/conf/files,v 1.828 2003/10/01 15:13:29 ume Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1456,6 +1456,7 @@ netinet6/in6_src.c optional inet6 netinet6/ip6_forward.c optional inet6 netinet6/ip6_fw.c optional inet6 ipv6firewall +netinet6/ip6_id.c optional inet6 netinet6/ip6_input.c optional inet6 netinet6/ip6_mroute.c optional inet6 netinet6/ip6_output.c optional inet6 ==== //depot/projects/netperf/sys/conf/kmod.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.141 2003/09/06 23:23:25 marcel Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.142 2003/10/02 21:34:06 ru Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -169,7 +169,7 @@ SYSDIR= ${_dir} .endif .endfor -.if !defined(SYSDIR) || !exists(${SYSDIR}/kern) +.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) .error "can't find kernel source tree" .endif ==== //depot/projects/netperf/sys/conf/ldscript.i386#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/conf/ldscript.i386,v 1.7 2003/01/06 07:37:15 phk Exp $ */ +/* $FreeBSD: src/sys/conf/ldscript.i386,v 1.8 2003/10/01 23:46:07 peter Exp $ */ OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd", "elf32-i386-freebsd") OUTPUT_ARCH(i386) ENTRY(btext) @@ -6,7 +6,7 @@ SECTIONS { /* Read-only sections, merged into text segment: */ - . = kernbase + 0x00100000 + SIZEOF_HEADERS; + . = kernbase + kernload + SIZEOF_HEADERS; .interp : { *(.interp) } .hash : { *(.hash) } .dynsym : { *(.dynsym) } ==== //depot/projects/netperf/sys/dev/acpica/Osd/OsdSchedule.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.24 2003/09/29 07:29:26 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.26 2003/10/02 05:09:37 njl Exp $ */ /* @@ -243,7 +243,7 @@ * make do with that. */ void -AcpiOsSleep (UINT32 Seconds, UINT32 Milliseconds) +AcpiOsSleep(UINT32 Seconds, UINT32 Milliseconds) { int timo; static int dummy; @@ -251,31 +251,30 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); timo = (Seconds * hz) + Milliseconds * hz / 1000; - if (timo == 0) - timo = 1; - tsleep(&dummy, 0, "acpislp", timo); + + /* + * If requested sleep time is less than our hz resolution, use + * DELAY instead for better granularity. + */ + if (timo > 0) + tsleep(&dummy, 0, "acpislp", timo); + else + DELAY(Milliseconds * 1000); + return_VOID; } void -AcpiOsStall (UINT32 Microseconds) +AcpiOsStall(UINT32 Microseconds) { ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - /* - * Maximum length for stall is 100 us. If longer, assume caller - * really meant "sleep". - */ - if (Microseconds <= 100) - DELAY(Microseconds); - else - AcpiOsSleep(Microseconds / 1000, Microseconds % 1000); - + DELAY(Microseconds); return_VOID; } UINT32 -AcpiOsGetThreadId (void) +AcpiOsGetThreadId(void) { struct proc *p; /* XXX do not add FUNCTION_TRACE here, results in recursive call */ ==== //depot/projects/netperf/sys/dev/ata/ata-lowlevel.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.16 2003/09/20 08:38:33 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.17 2003/10/01 09:58:19 sos Exp $"); #include "opt_ata.h" #include @@ -644,11 +644,13 @@ static int ata_wait(struct ata_device *atadev, u_int8_t mask) { + u_int8_t status; int timeout = 0; - u_int8_t status; DELAY(1); - while (timeout < 5000000) { /* timeout 5 secs */ + + /* wait 5 seconds for device to get !BUSY */ + while (timeout < 5000000) { status = ATA_IDX_INB(atadev->channel, ATA_STATUS); /* if drive fails status, reselect the drive just to be sure */ @@ -678,8 +680,10 @@ return -1; if (!mask) return (status & ATA_S_ERROR); + + DELAY(1); - /* wait 50 msec for bits wanted. */ + /* wait 50 msec for bits wanted */ timeout = 5000; while (timeout--) { status = ATA_IDX_INB(atadev->channel, ATA_STATUS); ==== //depot/projects/netperf/sys/dev/firewire/firewire.c#4 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 3 10:18:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 866CE16A4C2; Fri, 3 Oct 2003 10:18:35 -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 4A9B116A4C0 for ; Fri, 3 Oct 2003 10:18:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E05743FE3 for ; Fri, 3 Oct 2003 10:18:34 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h93HIYXJ091929 for ; Fri, 3 Oct 2003 10:18:34 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h93HIXw8091926 for perforce@freebsd.org; Fri, 3 Oct 2003 10:18:33 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Fri, 3 Oct 2003 10:18:33 -0700 (PDT) Message-Id: <200310031718.h93HIXw8091926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 39097 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, 03 Oct 2003 17:18:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=39097 Change 39097 by areisse@areisse_tislabs on 2003/10/03 10:18:28 SEBSD gets the policy from the bootloader or user memory instead of reading files in the kernel. Affected files ... .. //depot/projects/trustedbsd/sebsd/lib/libsebsd/system.c#3 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#21 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscall.c#4 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/init.c#4 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/security.h#5 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/services.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/lib/libsebsd/system.c#3 (text+ko) ==== @@ -34,7 +34,9 @@ * $FreeBSD$ */ #include - +#include +#include +#include #include "sebsd.h" @@ -57,8 +59,28 @@ return i; } +struct lp_args +{ + void *data; + size_t len; +}; + int sebsd_load_policy(const char *path) { - return mac_syscall(SEBSD_ID_STRING, SEBSDCALL_LOAD_POLICY, path); + FILE *fp; + struct lp_args la; + + fp = fopen (path, "rb"); + if (fp == NULL) + return errno; + + fseek (fp, 0, SEEK_END); + la.len = ftell (fp); + fseek (fp, 0, SEEK_SET); + la.data = malloc (la.len); + if (1 != fread (la.data, la.len, 1, fp)) + return EIO; + + return mac_syscall(SEBSD_ID_STRING, SEBSDCALL_LOAD_POLICY, &la); } ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#21 (text+ko) ==== @@ -78,8 +78,11 @@ static void sebsd_init(struct mac_policy_conf *mpc) { - printf("sebsd:: init\n"); + avc_init(); + if (security_init()) { + panic("SEBSD: couldn't read policy file"); + } } static void @@ -772,10 +775,6 @@ { struct vnode *vp, *nvp; - avc_init(); - if (security_init()) { - panic("SEBSD: couldn't read policy file"); - } /* * Go through all open vnodes and reload their labels. */ ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscall.c#4 (text+ko) ==== @@ -44,27 +44,30 @@ #include #include #include -#include #include +struct lp_args +{ + void *data; + size_t len; +}; + static int -sys_load_policy(struct thread *td, char *path) +sys_load_policy(struct thread *td, void *data, size_t len) { - FILE *fp; int rc; rc = thread_has_security(td, SECURITY__LOAD_POLICY); if (rc) return (rc); - fp = sebsd_fopen(path, "r", UIO_USERSPACE); - if (!fp) { - printf("ss: unable to open policy file\n"); - return (EINVAL); - } + void *kdata = malloc (len, M_SEBSD, M_WAITOK); + rc = copyin (data, kdata, len); + if (rc) + return (rc); - rc = security_load_policy(fp); - (void)fclose(fp); + rc = security_load_policy (kdata, len); + free (kdata, M_SEBSD); return (rc); } @@ -73,10 +76,13 @@ sebsd_syscall(struct thread *td, int call, void *args) { int err = EINVAL; + struct lp_args p; switch(call) { case SEBSDCALL_LOAD_POLICY: - err = sys_load_policy(td, (char *)args); + if (copyin (args, &p, sizeof (struct lp_args))) + return (EFAULT); + err = sys_load_policy (td, p.data, p.len); break; default: err = EINVAL; ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/init.c#4 (text+ko) ==== @@ -13,10 +13,11 @@ #include #include #include +#include +#include #include #include -#include #include #include #include @@ -28,31 +29,39 @@ int security_init(void) { - FILE *fp; int rc; + caddr_t lh, tmp; + void *policy_data; + size_t policy_len; + + printf("security: starting up (compiled " __DATE__ ")\n"); + + lh = preload_search_by_type ("sebsd_policy"); + if (lh == NULL) + goto loaderr; - snprintf(policyfile, MAXPATHLEN, "%s.%d", POLICYDB_PATHPREFIX, - POLICYDB_VERSION); + tmp = preload_search_info (lh, MODINFO_ADDR); + if (tmp == NULL) + goto loaderr; + policy_data = *(void **) tmp; + tmp = preload_search_info (lh, MODINFO_SIZE); + if (tmp == NULL) + goto loaderr; + policy_len = *(size_t *) tmp; - printf("security: starting up (compiled " __DATE__ ")\n"); - printf("security: loading policy configuration from %s\n", policyfile); + printf("security: reading policy configuration\n"); - fp = fopen(policyfile, "r"); - if (!fp) { - printf("security: unable to open %s, cannot initialize.\n", policyfile); - return EINVAL; - } - - rc = security_load_policy(fp); + rc = security_load_policy (policy_data, policy_len); if (rc) { - printf("security: error while loading %s, cannot initialize.\n", policyfile); - fclose(fp); + printf("security: error while reading policy, cannot initialize.\n"); return EINVAL; } - fclose(fp); + return 0; - return 0; +loaderr: + printf("security: policy not supplied by bootloader\n"); + return EINVAL; } /* FLASK */ ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/security.h#5 (text+ko) ==== @@ -8,7 +8,6 @@ #include #include -#include #define SECSID_NULL 0x00000000 /* unspecified SID */ #define SECSID_WILD 0xffffffff /* wildcard SID */ @@ -16,7 +15,7 @@ #define SELINUX_MAGIC 0xf97cff8c -int security_load_policy(FILE * data); +int security_load_policy(void *kdata, size_t len); struct av_decision { access_vector_t allowed; ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/services.c#6 (text+ko) ==== @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -984,10 +983,8 @@ * This function will flush the access vector cache after * loading the new policy. */ -int security_load_policy(FILE *infile) +int security_load_policy(void *data, size_t len) { - void *data; - size_t len; struct policydb oldpolicydb, newpolicydb; struct sidtab oldsidtab, newsidtab; struct convert_context_args args; @@ -995,28 +992,6 @@ int rc = 0; struct policy_file file, *fp = &file; -#ifdef _KERNEL - struct vattr vat; - - vn_lock (infile->FILE_vp, LK_SHARED | LK_RETRY | LK_NOPAUSE, curthread); - rc = VOP_GETATTR (infile->FILE_vp, &vat, curthread->td_ucred, curthread); - VOP_UNLOCK(infile->FILE_vp, 0, curthread); - if (rc) - return rc; - - len = vat.va_size; - data = malloc (len, M_SEBSD, M_WAITOK); - -#else - fseek (infile, 0, SEEK_END); - len = ftell (infile); - fseek (infile, 0, SEEK_SET); - data = malloc (len); -#endif - - if (1 != fread (data, len, 1, infile)) - return EIO; - file.data = data; file.len = len; From owner-p4-projects@FreeBSD.ORG Fri Oct 3 10:19:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E56B316A4C1; Fri, 3 Oct 2003 10:19: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 BC76216A4B3 for ; Fri, 3 Oct 2003 10:19:36 -0700 (PDT) Received: from mail.speakeasy.net (mail16.speakeasy.net [216.254.0.216]) by mx1.FreeBSD.org (Postfix) with ESMTP id 35A3743FF2 for ; Fri, 3 Oct 2003 10:19:35 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 23533 invoked from network); 3 Oct 2003 17:19:33 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 3 Oct 2003 17:19:33 -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 h93HHr6Y074606; Fri, 3 Oct 2003 13:17:53 -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: <20031003.000052.96921421.imp@bsdimp.com> Date: Fri, 03 Oct 2003 13:17:59 -0400 (EDT) From: John Baldwin To: "M. Warner Losh" X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: jmallett@freebsd.org cc: hmp@nxad.com cc: perforce@freebsd.org cc: julian@elischer.org Subject: Re: PERFORCE change 38917 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, 03 Oct 2003 17:19:37 -0000 On 03-Oct-2003 M. Warner Losh wrote: > In message: <20031002022135.GA26666@perrin.nxad.com> > Hiten Pandya writes: >: Does this also include PCI Hotplugging or is this going to be >: a separate effort? > > Yes and no. > > We already have removable devices in the tree. CardBus, PC Card, USB > and Firewire. Right now the drivers take liberties and chances and > there are a number of ugly races that rear their ugly heads. This is > an effort to clean that up and make things totally safe in all the > cases that we can think of, and to document those areas where we > can't. > > There's no specific plans on my part to implement the hot plug state > transition and deal with it. People have raised their hands in the > past to work on it, but so far no one has made significant progress in > public view. BTW, I thought of a locking concern in attach routines this morning. Basically, as soon as a driver does bus_setup_intr(), it needs to start using any locks shared with its interrupt handler and the hardware and driver state need to be able to handle having the handler invoked when that function is called. The reason is that the device may be attached to an interrupt line shared with another device and thus the other device may generate an interrupt and call the new devices handler before bus_setup_intr() even returns. Similarly, locking will be needed after calls to disk_create(), if_attach(), etc. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Fri Oct 3 12:29:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4180816A4C1; Fri, 3 Oct 2003 12:29:18 -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 1AC7416A4B3 for ; Fri, 3 Oct 2003 12:29:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E95843FA3 for ; Fri, 3 Oct 2003 12:29:17 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h93JTHXJ099645 for ; Fri, 3 Oct 2003 12:29:17 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h93JTGQs099642 for perforce@freebsd.org; Fri, 3 Oct 2003 12:29:16 -0700 (PDT) (envelope-from cvance@nailabs.com) Date: Fri, 3 Oct 2003 12:29:16 -0700 (PDT) Message-Id: <200310031929.h93JTGQs099642@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 39104 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, 03 Oct 2003 19:29:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=39104 Change 39104 by cvance@cvance_osx_laptop on 2003/10/03 12:28:22 Correctly comment out security label field Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/mbuf.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/mbuf.h#4 (text+ko) ==== @@ -131,7 +131,7 @@ struct mbuf *aux; /* extra data buffer; ipsec/others */ void *reserved1; /* for future use */ void *reserved2; /* for future use */ - /* struct label label; /* MAC label for packet */ + /* struct label label; */ /* MAC label for packet */ }; From owner-p4-projects@FreeBSD.ORG Fri Oct 3 12:29:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AFE116A4E7; Fri, 3 Oct 2003 12:29:18 -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 3E80B16A4BF for ; Fri, 3 Oct 2003 12:29:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 922F043FE1 for ; Fri, 3 Oct 2003 12:29:17 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h93JTHXJ099651 for ; Fri, 3 Oct 2003 12:29:17 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h93JTHUB099648 for perforce@freebsd.org; Fri, 3 Oct 2003 12:29:17 -0700 (PDT) (envelope-from cvance@nailabs.com) Date: Fri, 3 Oct 2003 12:29:17 -0700 (PDT) Message-Id: <200310031929.h93JTHUB099648@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 39105 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, 03 Oct 2003 19:29:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=39105 Change 39105 by cvance@cvance_osx_laptop on 2003/10/03 12:29:03 Install extattr.h, it will be needed outside the bsd kernel code Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/Makefile#5 (text+ko) ==== @@ -24,7 +24,7 @@ acct.h attr.h buf.h callout.h cdefs.h clist.h conf.h \ condvar.h \ dir.h dirent.h disk.h disklabel.h disktab.h dkstat.h dmap.h domain.h \ - errno.h ev.h exec.h fcntl.h file.h filedesc.h filio.h gmon.h ioccom.h ioctl.h \ + errno.h ev.h exec.h extattr.h fcntl.h file.h filedesc.h filio.h gmon.h ioccom.h ioctl.h \ ioctl_compat.h ipc.h kernel.h kern_event.h ktrace.h loadable_fs.h lock.h lockf.h mach_swapon.h malloc.h \ kdebug.h linker_set.h md5.h kern_control.h \ mac.h mac_policy.h \ From owner-p4-projects@FreeBSD.ORG Fri Oct 3 15:52:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69D9516A4C0; Fri, 3 Oct 2003 15:52:55 -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 3613E16A4B3; Fri, 3 Oct 2003 15:52:55 -0700 (PDT) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id B787E44020; Fri, 3 Oct 2003 15:51:29 -0700 (PDT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.9p1/8.12.9) with ESMTP id h93MpDAD038686; Fri, 3 Oct 2003 16:51:14 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Fri, 03 Oct 2003 16:51:14 -0600 (MDT) Message-Id: <20031003.165114.08027459.imp@bsdimp.com> To: jhb@freebsd.org From: "M. Warner Losh" In-Reply-To: References: <20031003.000052.96921421.imp@bsdimp.com> X-Mailer: Mew version 2.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: jmallett@freebsd.org cc: hmp@nxad.com cc: perforce@freebsd.org cc: julian@elischer.org Subject: Re: PERFORCE change 38917 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, 03 Oct 2003 22:52:56 -0000 In message: John Baldwin writes: : : On 03-Oct-2003 M. Warner Losh wrote: : > In message: <20031002022135.GA26666@perrin.nxad.com> : > Hiten Pandya writes: : >: Does this also include PCI Hotplugging or is this going to be : >: a separate effort? : > : > Yes and no. : > : > We already have removable devices in the tree. CardBus, PC Card, USB : > and Firewire. Right now the drivers take liberties and chances and : > there are a number of ugly races that rear their ugly heads. This is : > an effort to clean that up and make things totally safe in all the : > cases that we can think of, and to document those areas where we : > can't. : > : > There's no specific plans on my part to implement the hot plug state : > transition and deal with it. People have raised their hands in the : > past to work on it, but so far no one has made significant progress in : > public view. : : BTW, I thought of a locking concern in attach routines this morning. : Basically, as soon as a driver does bus_setup_intr(), it needs to start : using any locks shared with its interrupt handler and the hardware : and driver state need to be able to handle having the handler invoked : when that function is called. The reason is that the device may be : attached to an interrupt line shared with another device and thus the : other device may generate an interrupt and call the new devices handler : before bus_setup_intr() even returns. Similarly, locking will be : needed after calls to disk_create(), if_attach(), etc. Yes. That's true. I'll keep it in mind. Warner From owner-p4-projects@FreeBSD.ORG Fri Oct 3 15:59:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCB1916A4E4; Fri, 3 Oct 2003 15:59: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 A4A8716A4B3 for ; Fri, 3 Oct 2003 15:59:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F350F43FE3 for ; Fri, 3 Oct 2003 15:59:39 -0700 (PDT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h93MxdXJ018282 for ; Fri, 3 Oct 2003 15:59:39 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h93Mxdn5018279 for perforce@freebsd.org; Fri, 3 Oct 2003 15:59:39 -0700 (PDT) (envelope-from imp@freebsd.org) Date: Fri, 3 Oct 2003 15:59:39 -0700 (PDT) Message-Id: <200310032259.h93Mxdn5018279@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 39117 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, 03 Oct 2003 22:59:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=39117 Change 39117 by imp@imp_koguchi on 2003/10/03 15:59:36 Add comments to jhb's latest additions. Affected files ... .. //depot/projects/power/notes#6 edit Differences ... ==== //depot/projects/power/notes#6 (text+ko) ==== @@ -22,10 +22,19 @@ our power shadow tree in the acpi_SetPowerState() function. - define a bus method for powering up/down devices - bus_set_powerstate(parent, child, state) where state is on or off + # actually on/off is insufficient for a power management daemon that + # wants to actively manage the D level of a device. We should make + # this more flexible so that it can be mapped into states that are + # neither on or off. - define either a device or syscall for asking new-bus to dispatch commands to a given device + # devctl is the perfect place for this, in one of my trees I have + # ioctls for doing this already. - The power command would be sent to the parent device using device_get_parent() for the simple case (power off fdc0) + # would also potentially need a method for powering off arbitrary devices + # in the tree that aren't attached for busses whose default policy is + # to not power down unattached devices. - define a bus method to locate a child of a specific device by name using a 'parent:child' syntax where the format of the "child" string is defined by the parent driver. Thus, 'pci0::' might be @@ -34,12 +43,22 @@ - Convert device_power() to use this method to look up the child device if the name contains a colon instead of treating the name as a pure name of the child device + # We have almost what we need now in the location_str stuff. However, + # that's more of a 'long string' rather than the short string that's + # wanted for this. - Perhaps rename device_power() to device_command() to allow for other commands like eject, etc. + # methods should be unique. Command interfaces to userland should dispatch + # the right method. Otherwise we've reinvented ioctl :-) - convert to a model of suspending the device via device_suspend()/resume() rather than detach()/attach() - This may require fixes to drivers so that they continue to function appropriately when their hardware has been suspended + # NO. This cannot be implemented reliably. pccard bridges do not tell + # us that a device has been removed while the system was asleep. That's + # why we detach/reattach on suspend/resume for devices on pccard/cardbus + # bridges. usb bridges can tell about this, and they properly use the + # suspend/resume functions. The second stage will be to make the powering off of devices more automated. This is still in early design stage. It may involve a powerd, it may From owner-p4-projects@FreeBSD.ORG Fri Oct 3 22:22:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADA8816A4C0; Fri, 3 Oct 2003 22:22: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 828C716A4B3 for ; Fri, 3 Oct 2003 22:22:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8CD143FD7 for ; Fri, 3 Oct 2003 22:22:30 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h945MUXJ052531 for ; Fri, 3 Oct 2003 22:22:30 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h945MSqT052502 for perforce@freebsd.org; Fri, 3 Oct 2003 22:22:28 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Fri, 3 Oct 2003 22:22:28 -0700 (PDT) Message-Id: <200310040522.h945MSqT052502@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 39125 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, 04 Oct 2003 05:22:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=39125 Change 39125 by marcel@marcel_nfs on 2003/10/03 22:21:57 IFC @39124 Affected files ... .. //depot/projects/ia64/UPDATING#56 integrate .. //depot/projects/ia64/crypto/openssl/CHANGES#6 integrate .. //depot/projects/ia64/crypto/openssl/Configure#6 integrate .. //depot/projects/ia64/crypto/openssl/FAQ#6 integrate .. //depot/projects/ia64/crypto/openssl/FREEBSD-Xlist#3 integrate .. //depot/projects/ia64/crypto/openssl/LICENSE#3 integrate .. //depot/projects/ia64/crypto/openssl/Makefile.org#6 integrate .. //depot/projects/ia64/crypto/openssl/Makefile.ssl#6 integrate .. //depot/projects/ia64/crypto/openssl/NEWS#6 integrate .. //depot/projects/ia64/crypto/openssl/PROBLEMS#4 integrate .. //depot/projects/ia64/crypto/openssl/README#6 integrate .. //depot/projects/ia64/crypto/openssl/apps/CA.pl#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/Makefile.ssl#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/apps.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/ca.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/crl.c#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/der_chop#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/engine.c#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/ocsp.c#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/openssl.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/pkcs8.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/s_apps.h#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/s_client.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/s_server.c#4 integrate .. //depot/projects/ia64/crypto/openssl/apps/smime.c#5 integrate .. //depot/projects/ia64/crypto/openssl/apps/x509.c#5 integrate .. //depot/projects/ia64/crypto/openssl/bugs/SSLv3#2 integrate .. //depot/projects/ia64/crypto/openssl/config#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/aes/aes.h#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/aes/aes_cbc.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/aes/aes_ctr.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_mbstr.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_strex.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_strnid.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/asn1.h#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/asn1_lib.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/tasn_dec.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/b_print.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bf_buff.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bss_bio.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bss_file.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/Makefile.ssl#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn.h#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn_mul.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bntest.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/exptest.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/des/cfb_enc.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/des/destest.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dh/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dh/dh_key.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dh/dhtest.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dsa/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dsa/dsa_ossl.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dsa/dsa_sign.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dsa/dsa_vrf.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dsa/dsatest.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dso/dso_dlfcn.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ec/ec_mult.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/eng_fat.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/engine.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/engine/hw_ubsec.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/err/err.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/err/err.h#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/bio_b64.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/bio_enc.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/c_all.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/digest.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/evp_acnf.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md2/md2test.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md5/Makefile.ssl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md5/asm/md5-586.pl#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md5/asm/md5-sparcv9.S#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/o_time.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ocsp/ocsp_ht.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/opensslconf.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/opensslv.h#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/perlasm/x86ms.pl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/perlasm/x86nasm.pl#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/perlasm/x86unix.pl#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs12/p12_npas.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/pk7_doit.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/pk7_mime.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/pk7_smime.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/pkcs7.h#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rand/rand_win.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa.h#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_eay.c#7 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_lib.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_sign.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_test.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/threads/mttest.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/threads/solaris.sh#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/x509/by_file.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509_trs.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509_vfy.c#4 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/x509type.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_conf.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_cpols.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_lib.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_prn.c#3 integrate .. //depot/projects/ia64/crypto/openssl/demos/engines/zencod/hw_zencod.h#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/HOWTO/certificates.txt#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/HOWTO/keys.txt#1 branch .. //depot/projects/ia64/crypto/openssl/doc/apps/ca.pod#5 integrate .. //depot/projects/ia64/crypto/openssl/doc/apps/ocsp.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/apps/s_client.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/apps/s_server.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/BIO_f_base64.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/BIO_f_cipher.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/openssl-shared.txt#1 branch .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_free.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_sess_set_get_cb.pod#4 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#5 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_set_verify.pod#4 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_accept.pod#4 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_connect.pod#4 integrate .. //depot/projects/ia64/crypto/openssl/e_os.h#5 integrate .. //depot/projects/ia64/crypto/openssl/openssl.spec#6 integrate .. //depot/projects/ia64/crypto/openssl/ssl/kssl.c#2 integrate .. //depot/projects/ia64/crypto/openssl/ssl/kssl.h#2 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_clnt.c#5 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_srvr.c#6 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_ciph.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_lib.c#6 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_rsa.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_sess.c#4 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssltest.c#5 integrate .. //depot/projects/ia64/crypto/openssl/test/Makefile.ssl#5 integrate .. //depot/projects/ia64/crypto/openssl/test/evptests.txt#1 branch .. //depot/projects/ia64/crypto/openssl/tools/c_rehash#4 integrate .. //depot/projects/ia64/crypto/openssl/util/extract-names.pl#2 integrate .. //depot/projects/ia64/crypto/openssl/util/libeay.num#6 integrate .. //depot/projects/ia64/crypto/openssl/util/mk1mf.pl#5 integrate .. //depot/projects/ia64/crypto/openssl/util/mkdef.pl#5 integrate .. //depot/projects/ia64/crypto/openssl/util/mkerr.pl#5 integrate .. //depot/projects/ia64/crypto/openssl/util/pl/Mingw32.pl#3 integrate .. //depot/projects/ia64/crypto/openssl/util/pl/Mingw32f.pl#2 delete .. //depot/projects/ia64/crypto/openssl/util/point.sh#3 integrate .. //depot/projects/ia64/etc/Makefile#36 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#43 integrate .. //depot/projects/ia64/etc/rc.d/diskless#9 integrate .. //depot/projects/ia64/etc/rc.d/ipfilter#12 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#19 integrate .. //depot/projects/ia64/lib/libc/stdlib/qsort.3#5 integrate .. //depot/projects/ia64/lib/libpthread/arch/alpha/alpha/context.S#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_attr_get_np.3#3 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_mutex_init.3#2 integrate .. //depot/projects/ia64/lib/libpthread/sys/lock.c#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#128 integrate .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#29 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#21 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.c#16 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#27 integrate .. //depot/projects/ia64/share/examples/drivers/make_device_driver.sh#4 integrate .. //depot/projects/ia64/share/examples/netgraph/ngctl#2 integrate .. //depot/projects/ia64/share/examples/netgraph/udp.tunnel#2 integrate .. //depot/projects/ia64/share/man/man9/Makefile#33 integrate .. //depot/projects/ia64/share/man/man9/pmap.9#2 integrate .. //depot/projects/ia64/share/man/man9/pmap_is_prefaultable.9#1 branch .. //depot/projects/ia64/share/man/man9/pmap_prefault.9#2 delete .. //depot/projects/ia64/share/man/man9/timeout.9#2 integrate .. //depot/projects/ia64/share/man/man9/vm_fault_prefault.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_check_protection.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_clean.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_create.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_delete.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_find.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_findspace.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_inherit.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_init.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_insert.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_lock.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_lookup.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_madvise.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_max.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_protect.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_remove.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_simplify_entry.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_stack.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_submap.9#1 branch .. //depot/projects/ia64/share/man/man9/vm_map_wire.9#1 branch .. //depot/projects/ia64/share/mk/sys.mk#12 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#44 integrate .. //depot/projects/ia64/sys/amd64/amd64/genassym.c#6 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#27 integrate .. //depot/projects/ia64/sys/amd64/amd64/support.S#5 integrate .. //depot/projects/ia64/sys/amd64/include/clock.h#3 integrate .. //depot/projects/ia64/sys/amd64/include/ucontext.h#4 integrate .. //depot/projects/ia64/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#21 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_targ_bh.c#8 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_target.c#12 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#24 integrate .. //depot/projects/ia64/sys/conf/Makefile.amd64#6 integrate .. //depot/projects/ia64/sys/conf/files#104 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#27 integrate .. //depot/projects/ia64/sys/conf/ldscript.i386#4 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdSchedule.c#11 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#11 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#37 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.h#13 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#22 integrate .. //depot/projects/ia64/sys/dev/firewire/fwcrom.c#9 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#20 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.c#15 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.h#5 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#35 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcireg.h#12 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#19 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#43 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.h#1 branch .. //depot/projects/ia64/sys/dev/usb/ugen.c#19 integrate .. //depot/projects/ia64/sys/dev/usb/uscanner.c#16 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_dbregs.c#8 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_fpregs.c#8 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_regs.c#8 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#21 integrate .. //depot/projects/ia64/sys/i386/i386/bios.c#17 integrate .. //depot/projects/ia64/sys/i386/i386/genassym.c#18 integrate .. //depot/projects/ia64/sys/i386/i386/locore.s#14 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#46 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#30 integrate .. //depot/projects/ia64/sys/i386/i386/mpboot.s#3 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#67 integrate .. //depot/projects/ia64/sys/i386/i386/support.s#11 integrate .. //depot/projects/ia64/sys/i386/i386/swtch.s#12 integrate .. //depot/projects/ia64/sys/i386/include/md_var.h#16 integrate .. //depot/projects/ia64/sys/i386/include/pcb.h#9 integrate .. //depot/projects/ia64/sys/i386/include/pmap.h#15 integrate .. //depot/projects/ia64/sys/i386/include/vmparam.h#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#96 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#78 integrate .. //depot/projects/ia64/sys/ia64/ia64/syscall.S#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#37 integrate .. //depot/projects/ia64/sys/kern/init_main.c#38 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#64 integrate .. //depot/projects/ia64/sys/kern/kern_subr.c#23 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#45 integrate .. //depot/projects/ia64/sys/modules/firewire/sbp/Makefile#3 integrate .. //depot/projects/ia64/sys/net/bpf.c#24 integrate .. //depot/projects/ia64/sys/net/bridge.c#23 integrate .. //depot/projects/ia64/sys/net/if.c#26 integrate .. //depot/projects/ia64/sys/net/if.h#12 integrate .. //depot/projects/ia64/sys/net/if_disc.c#8 integrate .. //depot/projects/ia64/sys/net/if_faith.c#12 integrate .. //depot/projects/ia64/sys/net/if_loop.c#19 integrate .. //depot/projects/ia64/sys/net/if_stf.c#16 integrate .. //depot/projects/ia64/sys/net/netisr.c#4 integrate .. //depot/projects/ia64/sys/net/route.c#13 integrate .. //depot/projects/ia64/sys/net/route.h#9 integrate .. //depot/projects/ia64/sys/net/rtsock.c#20 integrate .. //depot/projects/ia64/sys/netinet/if_atm.c#6 integrate .. //depot/projects/ia64/sys/netinet/if_ether.c#20 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#26 integrate .. //depot/projects/ia64/sys/netinet/in_proto.c#9 integrate .. //depot/projects/ia64/sys/netinet/in_rmx.c#5 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.h#10 integrate .. //depot/projects/ia64/sys/netinet/ip_flow.c#4 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.c#15 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#33 integrate .. //depot/projects/ia64/sys/netinet6/frag6.c#5 integrate .. //depot/projects/ia64/sys/netinet6/icmp6.c#18 integrate .. //depot/projects/ia64/sys/netinet6/in6.c#10 integrate .. //depot/projects/ia64/sys/netinet6/in6_ifattach.c#7 integrate .. //depot/projects/ia64/sys/netinet6/in6_pcb.c#16 integrate .. //depot/projects/ia64/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/ia64/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/ia64/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/ia64/sys/netinet6/ip6_forward.c#7 integrate .. //depot/projects/ia64/sys/netinet6/ip6_id.c#1 branch .. //depot/projects/ia64/sys/netinet6/ip6_input.c#18 integrate .. //depot/projects/ia64/sys/netinet6/ip6_output.c#15 integrate .. //depot/projects/ia64/sys/netinet6/ip6_var.h#7 integrate .. //depot/projects/ia64/sys/netinet6/ipsec.c#12 integrate .. //depot/projects/ia64/sys/netinet6/nd6.c#13 integrate .. //depot/projects/ia64/sys/netinet6/nd6_rtr.c#9 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.c#7 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_input.c#7 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_mbuf.c#8 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_osdep.h#1 branch .. //depot/projects/ia64/sys/netipsec/ipsec_output.c#8 integrate .. //depot/projects/ia64/sys/netipsec/key.c#8 integrate .. //depot/projects/ia64/sys/netipsec/key_debug.c#2 integrate .. //depot/projects/ia64/sys/netipsec/keydb.h#3 integrate .. //depot/projects/ia64/sys/netipsec/keysock.c#6 integrate .. //depot/projects/ia64/sys/netipsec/xform_ah.c#6 integrate .. //depot/projects/ia64/sys/netipsec/xform_esp.c#8 integrate .. //depot/projects/ia64/sys/netipsec/xform_ipcomp.c#6 integrate .. //depot/projects/ia64/sys/netipsec/xform_ipip.c#6 integrate .. //depot/projects/ia64/sys/netkey/key.c#14 integrate .. //depot/projects/ia64/sys/netkey/key_debug.h#5 integrate .. //depot/projects/ia64/sys/netkey/keysock.c#17 integrate .. //depot/projects/ia64/sys/pci/agp_i810.c#17 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#31 integrate .. //depot/projects/ia64/sys/sparc64/include/endian.h#9 integrate .. //depot/projects/ia64/sys/sparc64/include/param.h#10 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#48 integrate .. //depot/projects/ia64/sys/sys/cdefs.h#18 integrate .. //depot/projects/ia64/sys/sys/mac.h#20 integrate .. //depot/projects/ia64/sys/sys/proc.h#76 integrate .. //depot/projects/ia64/sys/sys/systm.h#30 integrate .. //depot/projects/ia64/sys/sys/uio.h#11 integrate .. //depot/projects/ia64/sys/vm/pmap.h#22 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#37 integrate .. //depot/projects/ia64/tools/regression/usr.bin/make/Makefile#10 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.australia#3 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.holiday#9 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.music#4 integrate .. //depot/projects/ia64/usr.bin/make/compat.c#10 integrate .. //depot/projects/ia64/usr.bin/make/dir.c#11 integrate .. //depot/projects/ia64/usr.bin/make/main.c#20 integrate .. //depot/projects/ia64/usr.bin/make/make.1#13 integrate .. //depot/projects/ia64/usr.bin/netstat/route.c#8 integrate .. //depot/projects/ia64/usr.bin/tftp/main.c#8 integrate .. //depot/projects/ia64/usr.bin/tftp/tftp.1#7 integrate .. //depot/projects/ia64/usr.sbin/Makefile#51 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.4#4 integrate .. //depot/projects/ia64/usr.sbin/mptable/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/mptable/mptable.c#3 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/ptimes.c#4 integrate .. //depot/projects/ia64/usr.sbin/route6d/route6d.c#5 integrate .. //depot/projects/ia64/usr.sbin/timed/timed/timed.8#4 integrate Differences ... ==== //depot/projects/ia64/UPDATING#56 (text+ko) ==== @@ -1199,8 +1199,8 @@ If you are updating from a prior version of FreeBSD (even one just a few days old), you should follow this procedure. With a /usr/obj tree with a fresh buildworld, - make buildkernel KERNCONF=YOUR_KERNEL_HERE - make installkernel KERNCONF=YOUR_KERNEL_HERE + make -DALWAYS_CHECK_MAKE buildkernel KERNCONF=YOUR_KERNEL_HERE + make -DALWAYS_CHECK_MAKE installkernel KERNCONF=YOUR_KERNEL_HERE To just build a kernel when you know that it won't mess you up -------------------------------------------------------------- @@ -1384,4 +1384,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.270 2003/09/28 16:25:35 phk Exp $ +$FreeBSD: src/UPDATING,v 1.271 2003/10/03 18:29:06 ru Exp $ ==== //depot/projects/ia64/crypto/openssl/CHANGES#6 (text+ko) ==== @@ -2,6 +2,92 @@ OpenSSL CHANGES _______________ + Changes between 0.9.7b and 0.9.7c [30 Sep 2003] + + *) Fix various bugs revealed by running the NISCC test suite: + + Stop out of bounds reads in the ASN1 code when presented with + invalid tags (CAN-2003-0543 and CAN-2003-0544). + + Free up ASN1_TYPE correctly if ANY type is invalid (CAN-2003-0545). + + If verify callback ignores invalid public key errors don't try to check + certificate signature with the NULL public key. + + [Steve Henson] + + *) New -ignore_err option in ocsp application to stop the server + exiting on the first error in a request. + [Steve Henson] + + *) In ssl3_accept() (ssl/s3_srvr.c) only accept a client certificate + if the server requested one: as stated in TLS 1.0 and SSL 3.0 + specifications. + [Steve Henson] + + *) In ssl3_get_client_hello() (ssl/s3_srvr.c), tolerate additional + extra data after the compression methods not only for TLS 1.0 + but also for SSL 3.0 (as required by the specification). + [Bodo Moeller; problem pointed out by Matthias Loepfe] + + *) Change X509_certificate_type() to mark the key as exported/exportable + when it's 512 *bits* long, not 512 bytes. + [Richard Levitte] + + *) Change AES_cbc_encrypt() so it outputs exact multiple of + blocks during encryption. + [Richard Levitte] + + *) Various fixes to base64 BIO and non blocking I/O. On write + flushes were not handled properly if the BIO retried. On read + data was not being buffered properly and had various logic bugs. + This also affects blocking I/O when the data being decoded is a + certain size. + [Steve Henson] + + *) Various S/MIME bugfixes and compatibility changes: + output correct application/pkcs7 MIME type if + PKCS7_NOOLDMIMETYPE is set. Tolerate some broken signatures. + Output CR+LF for EOL if PKCS7_CRLFEOL is set (this makes opening + of files as .eml work). Correctly handle very long lines in MIME + parser. + [Steve Henson] + + Changes between 0.9.7a and 0.9.7b [10 Apr 2003] + + *) Countermeasure against the Klima-Pokorny-Rosa extension of + Bleichbacher's attack on PKCS #1 v1.5 padding: treat + a protocol version number mismatch like a decryption error + in ssl3_get_client_key_exchange (ssl/s3_srvr.c). + [Bodo Moeller] + + *) Turn on RSA blinding by default in the default implementation + to avoid a timing attack. Applications that don't want it can call + RSA_blinding_off() or use the new flag RSA_FLAG_NO_BLINDING. + They would be ill-advised to do so in most cases. + [Ben Laurie, Steve Henson, Geoff Thorpe, Bodo Moeller] + + *) Change RSA blinding code so that it works when the PRNG is not + seeded (in this case, the secret RSA exponent is abused as + an unpredictable seed -- if it is not unpredictable, there + is no point in blinding anyway). Make RSA blinding thread-safe + by remembering the creator's thread ID in rsa->blinding and + having all other threads use local one-time blinding factors + (this requires more computation than sharing rsa->blinding, but + avoids excessive locking; and if an RSA object is not shared + between threads, blinding will still be very fast). + [Bodo Moeller] + + *) Fixed a typo bug that would cause ENGINE_set_default() to set an + ENGINE as defaults for all supported algorithms irrespective of + the 'flags' parameter. 'flags' is now honoured, so applications + should make sure they are passing it correctly. + [Geoff Thorpe] + + *) Target "mingw" now allows native Windows code to be generated in + the Cygwin environment as well as with the MinGW compiler. + [Ulf Moeller] + Changes between 0.9.7 and 0.9.7a [19 Feb 2003] *) In ssl3_get_record (ssl/s3_pkt.c), minimize information leaked @@ -85,6 +171,9 @@ Changes between 0.9.6h and 0.9.7 [31 Dec 2002] + [NB: OpenSSL 0.9.6i and later 0.9.6 patch levels were released after + OpenSSL 0.9.7.] + *) Fix session ID handling in SSLv2 client code: the SERVER FINISHED code (06) was taken as the first octet of the session ID and the last octet was ignored consequently. As a result SSLv2 client side session @@ -1903,6 +1992,57 @@ *) Clean old EAY MD5 hack from e_os.h. [Richard Levitte] + Changes between 0.9.6j and 0.9.6k [30 Sep 2003] + + *) Fix various bugs revealed by running the NISCC test suite: + + Stop out of bounds reads in the ASN1 code when presented with + invalid tags (CAN-2003-0543 and CAN-2003-0544). + + If verify callback ignores invalid public key errors don't try to check + certificate signature with the NULL public key. + + [Steve Henson] + + *) In ssl3_accept() (ssl/s3_srvr.c) only accept a client certificate + if the server requested one: as stated in TLS 1.0 and SSL 3.0 + specifications. + [Steve Henson] + + *) In ssl3_get_client_hello() (ssl/s3_srvr.c), tolerate additional + extra data after the compression methods not only for TLS 1.0 + but also for SSL 3.0 (as required by the specification). + [Bodo Moeller; problem pointed out by Matthias Loepfe] + + *) Change X509_certificate_type() to mark the key as exported/exportable + when it's 512 *bits* long, not 512 bytes. + [Richard Levitte] + + Changes between 0.9.6i and 0.9.6j [10 Apr 2003] + + *) Countermeasure against the Klima-Pokorny-Rosa extension of + Bleichbacher's attack on PKCS #1 v1.5 padding: treat + a protocol version number mismatch like a decryption error + in ssl3_get_client_key_exchange (ssl/s3_srvr.c). + [Bodo Moeller] + + *) Turn on RSA blinding by default in the default implementation + to avoid a timing attack. Applications that don't want it can call + RSA_blinding_off() or use the new flag RSA_FLAG_NO_BLINDING. + They would be ill-advised to do so in most cases. + [Ben Laurie, Steve Henson, Geoff Thorpe, Bodo Moeller] + + *) Change RSA blinding code so that it works when the PRNG is not + seeded (in this case, the secret RSA exponent is abused as + an unpredictable seed -- if it is not unpredictable, there + is no point in blinding anyway). Make RSA blinding thread-safe + by remembering the creator's thread ID in rsa->blinding and + having all other threads use local one-time blinding factors + (this requires more computation than sharing rsa->blinding, but + avoids excessive locking; and if an RSA object is not shared + between threads, blinding will still be very fast). + [Bodo Moeller] + Changes between 0.9.6h and 0.9.6i [19 Feb 2003] *) In ssl3_get_record (ssl/s3_pkt.c), minimize information leaked ==== //depot/projects/ia64/crypto/openssl/Configure#6 (text+ko) ==== @@ -219,7 +219,7 @@ # './Configure irix-[g]cc' manually. # -mips4 flag is added by ./config when appropriate. "irix-mips3-gcc","gcc:-mabi=n32 -mmips-as -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"irix-mips3-cc", "cc:-n32 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix-mips3-cc", "cc:-n32 -mips3 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # N64 ABI builds. "irix64-mips4-gcc","gcc:-mabi=64 -mips4 -mmips-as -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -390,6 +390,7 @@ "linux-s390", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-s390x", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-ia64-ecc", "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -506,10 +507,8 @@ "BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN::::::::::win32", "BC-16","bcc:::(unknown):WIN16::BN_LLONG DES_PTR RC4_INDEX SIXTEEN_BIT:::", -# Mingw32 -# (Note: the real CFLAGS for Windows builds are defined by util/mk1mf.pl -# and its library files in util/pl/*) -"Mingw32", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", +# MinGW +"mingw", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -mno-cygwin -Wall:::MINGW32:-mno-cygwin -lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:win32::::.dll", # UWIN "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", @@ -561,6 +560,8 @@ "vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::", "vxworks-ppc750","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h \$(DEBUG_FLAG):::VXWORKS:-r:::::", "vxworks-ppc750-debug","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g:::VXWORKS:-r:::::", +"vxworks-ppc860","ccppc:-nostdinc -msoft-float -DCPU=PPC860 -DNO_STRINGS_H -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::", +"vxworks-mipsle","ccmips:-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -DL_ENDIAN -EL -Wl,-EL -mips2 -mno-branch-likely -G 0 -fno-builtin -msoft-float -DCPU=MIPS32 -DMIPSEL -DNO_STRINGS_H -I\$(WIND_BASE)/target/h:::VXWORKS:-r::::::::::::::::ranlibmips:", ##### Compaq Non-Stop Kernel (Tandem) "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::", ==== //depot/projects/ia64/crypto/openssl/FAQ#6 (text+ko) ==== @@ -68,7 +68,7 @@ * Which is the current version of OpenSSL? The current version is available from . -OpenSSL 0.9.7a was released on February 19, 2003. +OpenSSL 0.9.7c was released on September 30, 2003. In addition to the current stable release, you can also access daily snapshots of the OpenSSL development version at allobjs ; \ OBJS= ; export OBJS ; \ for obj in `ar t lib$$i.a` ; do \ - OBJS="$${OBJS} `grep $$obj allobjs`" ; \ + OBJS="$${OBJS} `grep /$$obj allobjs`" ; \ done ; \ - set -x; ${CC} -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + set -x; ${CC} ${SHARED_LDFLAGS} \ + -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ $${OBJS} $$libs ${EX_LIBS} ) || exit 1; \ libs="-l$$i $$libs"; \ @@ -429,13 +431,16 @@ libs="$(LIBKRB5) $$libs"; \ fi; \ ( PATH=/usr/ccs/bin:$$PATH ; export PATH; \ + SHARE_FLAG='-G'; \ + (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \ find . -name "*.o" -print > allobjs ; \ OBJS= ; export OBJS ; \ for obj in `ar t lib$$i.a` ; do \ - OBJS="$${OBJS} `grep $$obj allobjs`" ; \ + OBJS="$${OBJS} `grep /$$obj allobjs`" ; \ done ; \ - set -x; ${CC} ${SHARED_LDFLAGS} \ - -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + set -x; LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \ + ${CC} ${SHARED_LDFLAGS} \ + $${SHARE_FLAG} -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ $${OBJS} $$libs ${EX_LIBS} ) || exit 1; \ libs="-l$$i $$libs"; \ @@ -589,10 +594,10 @@ @false libclean: - rm -f *.a */lib */*/lib + rm -f *.map *.so *.so.* engines/*.so *.a */lib */*/lib -clean: - rm -f shlib/*.o *.o core a.out fluff *.map rehash.time testlog make.log cctest cctest.c +clean: libclean + rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c @for i in $(DIRS) ;\ do \ if [ -d "$$i" ]; then \ @@ -602,7 +607,7 @@ fi; \ done; rm -f openssl.pc - rm -f *.a *.o speed.* *.map *.so .pure core + rm -f speed.* .pure rm -f $(TARFILE) @for i in $(ONEDIRS) ;\ do \ @@ -652,7 +657,10 @@ rehash.time: certs @(OPENSSL="`pwd`/apps/openssl"; OPENSSL_DEBUG_MEMORY=on; \ export OPENSSL OPENSSL_DEBUG_MEMORY; \ - LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \ + LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \ + DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \ + SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \ + LIBPATH="`pwd`:$$LIBPATH"; \ if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ $(PERL) tools/c_rehash certs) @@ -663,10 +671,13 @@ tests: rehash @(cd test && echo "testing..." && \ $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests ); - @LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \ - if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ - export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ - apps/openssl version -a + @LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \ + DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \ + SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \ + LIBPATH="`pwd`:$$LIBPATH"; \ + if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ + export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ + apps/openssl version -a report: @$(PERL) util/selftest.pl @@ -821,6 +832,7 @@ fi; \ fi cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig install_docs: @$(PERL) $(TOP)/util/mkdir-p.pl \ @@ -837,33 +849,33 @@ for i in doc/apps/*.pod; do \ fn=`basename $$i .pod`; \ if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \ - echo "installing man$$sec/$$fn.$$sec"; \ + echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ (cd `$(PERL) util/dirname.pl $$i`; \ sh -c "$$pod2man \ --section=$$sec --center=OpenSSL \ --release=$(VERSION) `basename $$i`") \ - > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \ + > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ $(PERL) util/extract-names.pl < $$i | \ grep -v $$filecase "^$$fn\$$" | \ (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ while read n; do \ - $$here/util/point.sh $$fn.$$sec $$n.$$sec; \ + $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \ done); \ done; \ for i in doc/crypto/*.pod doc/ssl/*.pod; do \ fn=`basename $$i .pod`; \ if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \ - echo "installing man$$sec/$$fn.$$sec"; \ + echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ (cd `$(PERL) util/dirname.pl $$i`; \ sh -c "$$pod2man \ --section=$$sec --center=OpenSSL \ --release=$(VERSION) `basename $$i`") \ - > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \ + > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ $(PERL) util/extract-names.pl < $$i | \ grep -v $$filecase "^$$fn\$$" | \ (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ while read n; do \ - $$here/util/point.sh $$fn.$$sec $$n.$$sec; \ + $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \ done); \ done ==== //depot/projects/ia64/crypto/openssl/Makefile.ssl#6 (text+ko) ==== @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=0.9.7a +VERSION=0.9.7c MAJOR=0 MINOR=9.7 SHLIB_VERSION_NUMBER=0.9.7 @@ -12,9 +12,9 @@ SHLIB_MAJOR=0 SHLIB_MINOR=9.7 SHLIB_EXT= -PLATFORM=dist +PLATFORM=VC-WIN16 OPTIONS= no-krb5 -CONFIGURE_ARGS=dist +CONFIGURE_ARGS=VC-WIN16 SHLIB_TARGET= # HERE indicates where this Makefile lives. This can be used to indicate @@ -59,9 +59,9 @@ # equal 4. # PKCS1_CHECK - pkcs1 tests. -CC= cc +CC= cl #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM -CFLAG= -DOPENSSL_NO_KRB5 -O +CFLAG= -DOPENSSL_SYSNAME_WIN16 -DOPENSSL_NO_KRB5 DEPFLAG= PEX_LIBS= EX_LIBS= @@ -69,7 +69,7 @@ ARFLAGS= AR=ar $(ARFLAGS) r RANLIB= /usr/bin/ranlib -PERL= /usr/local/bin/perl +PERL= /usr/local/bin/perl5 TAR= tar TARFLAGS= --no-recursion MAKEDEPPROG=makedepend @@ -80,7 +80,7 @@ # gcc, then the driver will automatically translate it to -xarch=v8plus # and pass it down to assembler. AS=$(CC) -c -ASFLAGS=$(CFLAG) +ASFLAG=$(CFLAG) # Set BN_ASM to bn_asm.o if you want to use the C version BN_ASM= bn_asm.o @@ -196,6 +196,7 @@ MANDIR=$(OPENSSLDIR)/man MAN1=1 MAN3=3 +MANSUFFIX= SHELL=/bin/sh TOP= . @@ -227,7 +228,7 @@ do \ if [ -d "$$i" ]; then \ (cd $$i && echo "making all in $$i..." && \ - $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAGS='${ASFLAGS}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \ + $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAG='${ASFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \ else \ $(MAKE) $$i; \ fi; \ @@ -412,9 +413,10 @@ find . -name "*.o" -print > allobjs ; \ OBJS= ; export OBJS ; \ for obj in `ar t lib$$i.a` ; do \ - OBJS="$${OBJS} `grep $$obj allobjs`" ; \ + OBJS="$${OBJS} `grep /$$obj allobjs`" ; \ done ; \ - set -x; ${CC} -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + set -x; ${CC} ${SHARED_LDFLAGS} \ + -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ $${OBJS} $$libs ${EX_LIBS} ) || exit 1; \ libs="-l$$i $$libs"; \ @@ -431,13 +433,16 @@ libs="$(LIBKRB5) $$libs"; \ fi; \ ( PATH=/usr/ccs/bin:$$PATH ; export PATH; \ + SHARE_FLAG='-G'; \ + (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \ find . -name "*.o" -print > allobjs ; \ OBJS= ; export OBJS ; \ for obj in `ar t lib$$i.a` ; do \ - OBJS="$${OBJS} `grep $$obj allobjs`" ; \ + OBJS="$${OBJS} `grep /$$obj allobjs`" ; \ done ; \ - set -x; ${CC} ${SHARED_LDFLAGS} \ - -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ + set -x; LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \ + ${CC} ${SHARED_LDFLAGS} \ + $${SHARE_FLAG} -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ $${OBJS} $$libs ${EX_LIBS} ) || exit 1; \ libs="-l$$i $$libs"; \ @@ -591,10 +596,10 @@ @false libclean: - rm -f *.a */lib */*/lib + rm -f *.map *.so *.so.* engines/*.so *.a */lib */*/lib -clean: - rm -f shlib/*.o *.o core a.out fluff *.map rehash.time testlog make.log cctest cctest.c +clean: libclean + rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c @for i in $(DIRS) ;\ do \ if [ -d "$$i" ]; then \ @@ -604,7 +609,7 @@ fi; \ done; rm -f openssl.pc - rm -f *.a *.o speed.* *.map *.so .pure core + rm -f speed.* .pure rm -f $(TARFILE) @for i in $(ONEDIRS) ;\ do \ @@ -654,7 +659,10 @@ rehash.time: certs @(OPENSSL="`pwd`/apps/openssl"; OPENSSL_DEBUG_MEMORY=on; \ export OPENSSL OPENSSL_DEBUG_MEMORY; \ - LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \ + LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \ + DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \ + SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \ + LIBPATH="`pwd`:$$LIBPATH"; \ if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ $(PERL) tools/c_rehash certs) @@ -665,10 +673,13 @@ tests: rehash @(cd test && echo "testing..." && \ $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests ); - @LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \ - if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ - export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ - apps/openssl version -a + @LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \ + DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \ + SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \ + LIBPATH="`pwd`:$$LIBPATH"; \ + if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ + export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ + apps/openssl version -a report: @$(PERL) util/selftest.pl @@ -823,6 +834,7 @@ fi; \ fi cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig install_docs: @$(PERL) $(TOP)/util/mkdir-p.pl \ @@ -839,33 +851,33 @@ for i in doc/apps/*.pod; do \ fn=`basename $$i .pod`; \ if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \ - echo "installing man$$sec/$$fn.$$sec"; \ + echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ (cd `$(PERL) util/dirname.pl $$i`; \ sh -c "$$pod2man \ --section=$$sec --center=OpenSSL \ --release=$(VERSION) `basename $$i`") \ - > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \ + > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ $(PERL) util/extract-names.pl < $$i | \ grep -v $$filecase "^$$fn\$$" | \ (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ while read n; do \ - $$here/util/point.sh $$fn.$$sec $$n.$$sec; \ + $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \ done); \ done; \ for i in doc/crypto/*.pod doc/ssl/*.pod; do \ fn=`basename $$i .pod`; \ if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \ - echo "installing man$$sec/$$fn.$$sec"; \ + echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ (cd `$(PERL) util/dirname.pl $$i`; \ sh -c "$$pod2man \ --section=$$sec --center=OpenSSL \ --release=$(VERSION) `basename $$i`") \ - > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \ + > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ $(PERL) util/extract-names.pl < $$i | \ grep -v $$filecase "^$$fn\$$" | \ (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ while read n; do \ - $$here/util/point.sh $$fn.$$sec $$n.$$sec; \ + $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \ done); \ done >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 3 22:29:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D81A16A4C0; Fri, 3 Oct 2003 22:29:43 -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 DA8D616A4B3 for ; Fri, 3 Oct 2003 22:29:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 013BF43FCB for ; Fri, 3 Oct 2003 22:29:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h945TeXJ054912 for ; Fri, 3 Oct 2003 22:29:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h945TdoR054909 for perforce@freebsd.org; Fri, 3 Oct 2003 22:29:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Fri, 3 Oct 2003 22:29:39 -0700 (PDT) Message-Id: <200310040529.h945TdoR054909@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 39126 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, 04 Oct 2003 05:29:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=39126 Change 39126 by marcel@marcel_nfs on 2003/10/03 22:29:10 IFC @39124 Affected files ... .. //depot/projects/uart/alpha/alpha/pmap.c#13 integrate .. //depot/projects/uart/amd64/amd64/genassym.c#3 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#19 integrate .. //depot/projects/uart/amd64/amd64/support.S#2 integrate .. //depot/projects/uart/amd64/include/clock.h#3 integrate .. //depot/projects/uart/amd64/include/ucontext.h#3 integrate .. //depot/projects/uart/amd64/isa/clock.c#4 integrate .. //depot/projects/uart/cam/scsi/scsi_cd.c#5 integrate .. //depot/projects/uart/cam/scsi/scsi_targ_bh.c#3 integrate .. //depot/projects/uart/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/uart/conf/Makefile.amd64#2 integrate .. //depot/projects/uart/conf/files#26 integrate .. //depot/projects/uart/conf/kmod.mk#7 integrate .. //depot/projects/uart/conf/ldscript.i386#2 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/uart/dev/ata/ata-lowlevel.c#10 integrate .. //depot/projects/uart/dev/firewire/firewire.c#7 integrate .. //depot/projects/uart/dev/firewire/firewire.h#5 integrate .. //depot/projects/uart/dev/firewire/firewirereg.h#4 integrate .. //depot/projects/uart/dev/firewire/fwcrom.c#4 integrate .. //depot/projects/uart/dev/firewire/fwdev.c#5 integrate .. //depot/projects/uart/dev/firewire/fwmem.c#4 integrate .. //depot/projects/uart/dev/firewire/fwmem.h#2 integrate .. //depot/projects/uart/dev/firewire/fwohci.c#10 integrate .. //depot/projects/uart/dev/firewire/fwohcireg.h#4 integrate .. //depot/projects/uart/dev/firewire/if_fwe.c#6 integrate .. //depot/projects/uart/dev/firewire/sbp.c#9 integrate .. //depot/projects/uart/dev/firewire/sbp.h#1 branch .. //depot/projects/uart/dev/usb/ugen.c#7 integrate .. //depot/projects/uart/dev/usb/uscanner.c#8 integrate .. //depot/projects/uart/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/uart/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/uart/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/uart/i386/i386/bios.c#3 integrate .. //depot/projects/uart/i386/i386/genassym.c#2 integrate .. //depot/projects/uart/i386/i386/locore.s#4 integrate .. //depot/projects/uart/i386/i386/machdep.c#6 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/uart/i386/i386/mpboot.s#2 integrate .. //depot/projects/uart/i386/i386/pmap.c#20 integrate .. //depot/projects/uart/i386/i386/support.s#3 integrate .. //depot/projects/uart/i386/i386/swtch.s#3 integrate .. //depot/projects/uart/i386/include/md_var.h#3 integrate .. //depot/projects/uart/i386/include/pcb.h#2 integrate .. //depot/projects/uart/i386/include/pmap.h#3 integrate .. //depot/projects/uart/i386/include/vmparam.h#2 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#14 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#12 integrate .. //depot/projects/uart/ia64/ia64/syscall.S#5 integrate .. //depot/projects/uart/ia64/ia64/vm_machdep.c#7 integrate .. //depot/projects/uart/kern/init_main.c#5 integrate .. //depot/projects/uart/kern/kern_descrip.c#7 integrate .. //depot/projects/uart/kern/kern_subr.c#2 integrate .. //depot/projects/uart/kern/kern_synch.c#5 integrate .. //depot/projects/uart/modules/firewire/sbp/Makefile#2 integrate .. //depot/projects/uart/net/bpf.c#5 integrate .. //depot/projects/uart/net/bridge.c#5 integrate .. //depot/projects/uart/net/if.c#4 integrate .. //depot/projects/uart/net/if.h#2 integrate .. //depot/projects/uart/net/if_disc.c#2 integrate .. //depot/projects/uart/net/if_faith.c#2 integrate .. //depot/projects/uart/net/if_loop.c#3 integrate .. //depot/projects/uart/net/if_stf.c#2 integrate .. //depot/projects/uart/net/netisr.c#2 integrate .. //depot/projects/uart/net/route.c#2 integrate .. //depot/projects/uart/net/route.h#3 integrate .. //depot/projects/uart/net/rtsock.c#2 integrate .. //depot/projects/uart/netinet/if_atm.c#4 integrate .. //depot/projects/uart/netinet/if_ether.c#3 integrate .. //depot/projects/uart/netinet/in_pcb.c#3 integrate .. //depot/projects/uart/netinet/in_proto.c#3 integrate .. //depot/projects/uart/netinet/in_rmx.c#2 integrate .. //depot/projects/uart/netinet/ip_dummynet.h#2 integrate .. //depot/projects/uart/netinet/ip_flow.c#3 integrate .. //depot/projects/uart/netinet/ip_icmp.c#3 integrate .. //depot/projects/uart/netinet/ip_output.c#7 integrate .. //depot/projects/uart/netinet6/frag6.c#2 integrate .. //depot/projects/uart/netinet6/icmp6.c#2 integrate .. //depot/projects/uart/netinet6/in6.c#2 integrate .. //depot/projects/uart/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/uart/netinet6/in6_pcb.c#3 integrate .. //depot/projects/uart/netinet6/in6_proto.c#2 integrate .. //depot/projects/uart/netinet6/in6_rmx.c#2 integrate .. //depot/projects/uart/netinet6/in6_src.c#2 integrate .. //depot/projects/uart/netinet6/ip6_forward.c#3 integrate .. //depot/projects/uart/netinet6/ip6_id.c#1 branch .. //depot/projects/uart/netinet6/ip6_input.c#3 integrate .. //depot/projects/uart/netinet6/ip6_output.c#3 integrate .. //depot/projects/uart/netinet6/ip6_var.h#3 integrate .. //depot/projects/uart/netinet6/ipsec.c#2 integrate .. //depot/projects/uart/netinet6/nd6.c#4 integrate .. //depot/projects/uart/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/uart/netipsec/ipsec.c#4 integrate .. //depot/projects/uart/netipsec/ipsec.h#3 integrate .. //depot/projects/uart/netipsec/ipsec_input.c#4 integrate .. //depot/projects/uart/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/uart/netipsec/ipsec_osdep.h#1 branch .. //depot/projects/uart/netipsec/ipsec_output.c#4 integrate .. //depot/projects/uart/netipsec/key.c#4 integrate .. //depot/projects/uart/netipsec/key_debug.c#2 integrate .. //depot/projects/uart/netipsec/keydb.h#3 integrate .. //depot/projects/uart/netipsec/keysock.c#2 integrate .. //depot/projects/uart/netipsec/xform_ah.c#4 integrate .. //depot/projects/uart/netipsec/xform_esp.c#4 integrate .. //depot/projects/uart/netipsec/xform_ipcomp.c#4 integrate .. //depot/projects/uart/netipsec/xform_ipip.c#2 integrate .. //depot/projects/uart/netkey/key.c#3 integrate .. //depot/projects/uart/netkey/key_debug.h#3 integrate .. //depot/projects/uart/netkey/keysock.c#3 integrate .. //depot/projects/uart/pci/agp_i810.c#3 integrate .. //depot/projects/uart/powerpc/powerpc/pmap.c#8 integrate .. //depot/projects/uart/sparc64/include/endian.h#2 integrate .. //depot/projects/uart/sparc64/include/param.h#3 integrate .. //depot/projects/uart/sparc64/sparc64/pmap.c#11 integrate .. //depot/projects/uart/sys/cdefs.h#4 integrate .. //depot/projects/uart/sys/mac.h#5 integrate .. //depot/projects/uart/sys/proc.h#7 integrate .. //depot/projects/uart/sys/systm.h#5 integrate .. //depot/projects/uart/sys/uio.h#2 integrate .. //depot/projects/uart/vm/pmap.h#6 integrate .. //depot/projects/uart/vm/vm_fault.c#4 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/pmap.c#13 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.138 2003/09/12 07:07:47 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.139 2003/10/03 22:46:52 alc Exp $"); #include #include @@ -2093,105 +2093,6 @@ } /* - * pmap_prefault provides a quick way of clustering - * pagefaults into a processes address space. It is a "cousin" - * of pmap_object_init_pt, except it runs at page fault time instead - * of mmap time. - */ -#define PFBAK 4 -#define PFFOR 4 -#define PAGEORDER_SIZE (PFBAK+PFFOR) - -static int pmap_prefault_pageorder[] = { - -1 * PAGE_SIZE, 1 * PAGE_SIZE, - -2 * PAGE_SIZE, 2 * PAGE_SIZE, - -3 * PAGE_SIZE, 3 * PAGE_SIZE, - -4 * PAGE_SIZE, 4 * PAGE_SIZE -}; - -void -pmap_prefault(pmap, addra, entry) - pmap_t pmap; - vm_offset_t addra; - vm_map_entry_t entry; -{ - int i; - vm_offset_t starta; - vm_offset_t addr; - vm_pindex_t pindex; - vm_page_t m, mpte; - vm_object_t object; - - if (!curthread || (pmap != vmspace_pmap(curthread->td_proc->p_vmspace))) - return; - - object = entry->object.vm_object; - - starta = addra - PFBAK * PAGE_SIZE; - if (starta < entry->start) { - starta = entry->start; - } else if (starta > addra) { - starta = 0; - } - - mpte = NULL; - for (i = 0; i < PAGEORDER_SIZE; i++) { - vm_object_t backing_object, lobject; - pt_entry_t *pte; - - addr = addra + pmap_prefault_pageorder[i]; - if (addr > addra + (PFFOR * PAGE_SIZE)) - addr = 0; - - if (addr < starta || addr >= entry->end) - continue; - - if (!pmap_pte_v(pmap_lev1pte(pmap, addr)) - || !pmap_pte_v(pmap_lev2pte(pmap, addr))) - continue; - - pte = vtopte(addr); - if (*pte) - continue; - - pindex = ((addr - entry->start) + entry->offset) >> PAGE_SHIFT; - lobject = object; - VM_OBJECT_LOCK(lobject); - while ((m = vm_page_lookup(lobject, pindex)) == NULL && - lobject->type == OBJT_DEFAULT && - (backing_object = lobject->backing_object) != NULL) { - if (lobject->backing_object_offset & PAGE_MASK) - break; - pindex += lobject->backing_object_offset >> PAGE_SHIFT; - VM_OBJECT_LOCK(backing_object); - VM_OBJECT_UNLOCK(lobject); - lobject = backing_object; - } - VM_OBJECT_UNLOCK(lobject); - /* - * give-up when a page is not in memory - */ - if (m == NULL) - break; - vm_page_lock_queues(); - if (((m->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL) && - (m->busy == 0) && - (m->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) { - - if ((m->queue - m->pc) == PQ_CACHE) { - vm_page_deactivate(m); - } - vm_page_busy(m); - vm_page_unlock_queues(); - mpte = pmap_enter_quick(pmap, addr, m, mpte); - vm_page_lock_queues(); - vm_page_wakeup(m); - } - vm_page_unlock_queues(); - } -} - -/* * Routine: pmap_change_wiring * Function: Change the wiring attribute for a map/virtual-address * pair. @@ -2557,6 +2458,26 @@ } /* + * pmap_is_prefaultable: + * + * Return whether or not the specified virtual address is elgible + * for prefault. + */ +boolean_t +pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr) +{ + pt_entry_t *pte; + + if (!pmap_pte_v(pmap_lev1pte(pmap, addr)) || + !pmap_pte_v(pmap_lev2pte(pmap, addr))) + return (FALSE); + pte = vtopte(addr); + if (*pte) + return (FALSE); + return (TRUE); +} + +/* * Clear the modify bits on the specified physical page. */ void ==== //depot/projects/uart/amd64/amd64/genassym.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.148 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.149 2003/09/30 04:52:24 jeff Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -85,7 +85,6 @@ ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_INTR_NESTING_LEVEL, offsetof(struct thread, td_intr_nesting_level)); ASSYM(TD_CRITNEST, offsetof(struct thread, td_critnest)); -ASSYM(TD_SWITCHIN, offsetof(struct thread, td_switchin)); ASSYM(TD_MD, offsetof(struct thread, td_md)); ASSYM(P_MD, offsetof(struct proc, p_md)); ==== //depot/projects/uart/amd64/amd64/pmap.c#19 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.440 2003/09/27 20:53:00 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.441 2003/10/03 22:46:52 alc Exp $"); /* * Manages physical address maps. @@ -2124,106 +2124,6 @@ } /* - * pmap_prefault provides a quick way of clustering - * pagefaults into a processes address space. It is a "cousin" - * of pmap_object_init_pt, except it runs at page fault time instead - * of mmap time. - */ -#define PFBAK 4 -#define PFFOR 4 -#define PAGEORDER_SIZE (PFBAK+PFFOR) - -static int pmap_prefault_pageorder[] = { - -1 * PAGE_SIZE, 1 * PAGE_SIZE, - -2 * PAGE_SIZE, 2 * PAGE_SIZE, - -3 * PAGE_SIZE, 3 * PAGE_SIZE, - -4 * PAGE_SIZE, 4 * PAGE_SIZE -}; - -void -pmap_prefault(pmap, addra, entry) - pmap_t pmap; - vm_offset_t addra; - vm_map_entry_t entry; -{ - int i; - vm_offset_t starta; - vm_offset_t addr; - vm_pindex_t pindex; - vm_page_t m, mpte; - vm_object_t object; - pd_entry_t *pde; - - if (!curthread || (pmap != vmspace_pmap(curthread->td_proc->p_vmspace))) - return; - - object = entry->object.vm_object; - - starta = addra - PFBAK * PAGE_SIZE; - if (starta < entry->start) { - starta = entry->start; - } else if (starta > addra) { - starta = 0; - } - - mpte = NULL; - for (i = 0; i < PAGEORDER_SIZE; i++) { - vm_object_t backing_object, lobject; - pt_entry_t *pte; - - addr = addra + pmap_prefault_pageorder[i]; - if (addr > addra + (PFFOR * PAGE_SIZE)) - addr = 0; - - if (addr < starta || addr >= entry->end) - continue; - - pde = pmap_pde(pmap, addr); - if (pde == NULL || (*pde & PG_V) == 0) - continue; - - pte = vtopte(addr); - if ((*pte & PG_V) == 0) - continue; - - pindex = ((addr - entry->start) + entry->offset) >> PAGE_SHIFT; - lobject = object; - VM_OBJECT_LOCK(lobject); - while ((m = vm_page_lookup(lobject, pindex)) == NULL && - lobject->type == OBJT_DEFAULT && - (backing_object = lobject->backing_object) != NULL) { - if (lobject->backing_object_offset & PAGE_MASK) - break; - pindex += lobject->backing_object_offset >> PAGE_SHIFT; - VM_OBJECT_LOCK(backing_object); - VM_OBJECT_UNLOCK(lobject); - lobject = backing_object; - } - VM_OBJECT_UNLOCK(lobject); - /* - * give-up when a page is not in memory - */ - if (m == NULL) - break; - vm_page_lock_queues(); - if (((m->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL) && - (m->busy == 0) && - (m->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) { - - if ((m->queue - m->pc) == PQ_CACHE) { - vm_page_deactivate(m); - } - vm_page_busy(m); - vm_page_unlock_queues(); - mpte = pmap_enter_quick(pmap, addr, m, mpte); - vm_page_lock_queues(); - vm_page_wakeup(m); - } - vm_page_unlock_queues(); - } -} - -/* * Routine: pmap_change_wiring * Function: Change the wiring attribute for a map/virtual-address * pair. @@ -2598,6 +2498,27 @@ } /* + * pmap_is_prefaultable: + * + * Return whether or not the specified virtual address is elgible + * for prefault. + */ +boolean_t +pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr) +{ + pd_entry_t *pde; + pt_entry_t *pte; + + pde = pmap_pde(pmap, addr); + if (pde == NULL || (*pde & PG_V) == 0) + return (FALSE); + pte = vtopte(addr); + if ((*pte & PG_V) == 0) + return (FALSE); + return (TRUE); +} + +/* * Clear the given bit in each of the given page's ptes. */ static __inline void ==== //depot/projects/uart/amd64/amd64/support.S#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.101 2003/05/30 00:58:48 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.102 2003/10/02 05:08:13 alc Exp $ */ #include "opt_ddb.h" @@ -64,46 +64,18 @@ /* Address: %rdi */ ENTRY(pagezero) - movq $512, %rcx - cld - - ALIGN_TEXT + lea 4096(%rdi),%rsi + xorq %rax,%rax 1: - xorq %rax, %rax - repe - scasq - jnz 2f - - ret - - ALIGN_TEXT - -2: - incq %rcx - subq $8, %rdi - - movq %rcx, %rdx - cmpq $16, %rcx - - jge 3f - - movq %rdi, %r8 - andq $0x7f, %r8 - shrq $3, %r8 - movq $16, %rcx - subq %r8, %rcx - -3: - subq %rcx, %rdx - rep - stosq - - movq %rdx, %rcx - testq %rdx, %rdx - jnz 1b - - ret - + movnti %rax,(%rdi) + movnti %rax,8(%rdi) + movnti %rax,16(%rdi) + movnti %rax,24(%rdi) + addq $32,%rdi + cmpq %rsi,%rdi + jne 1b + sfence + retq ENTRY(bcmp) xorq %rax,%rax ==== //depot/projects/uart/amd64/include/clock.h#3 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.46 2003/09/22 23:02:24 peter Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.47 2003/09/30 06:38:11 peter Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -30,9 +30,11 @@ */ struct clockframe; +#ifndef BURN_BRIDGES int acquire_timer0(int rate, void (*function)(struct clockframe *frame)); +int release_timer0(void); +#endif int acquire_timer2(int mode); -int release_timer0(void); int release_timer2(void); int rtcin(int val); int sysbeep(int pitch, int period); ==== //depot/projects/uart/amd64/include/ucontext.h#3 (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/amd64/include/ucontext.h,v 1.14 2003/09/05 20:47:27 peter Exp $ + * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.15 2003/10/01 01:08:04 peter Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -37,30 +37,30 @@ * sigcontext. So that we can support sigcontext * and ucontext_t at the same time. */ - register_t mc_onstack; /* XXX - sigcontext compat. */ - register_t mc_rdi; /* machine state (struct trapframe) */ - register_t mc_rsi; - register_t mc_rdx; - register_t mc_rcx; - register_t mc_r8; - register_t mc_r9; - register_t mc_rax; - register_t mc_rbx; - register_t mc_rbp; - register_t mc_r10; - register_t mc_r11; - register_t mc_r12; - register_t mc_r13; - register_t mc_r14; - register_t mc_r15; - register_t mc_trapno; - register_t mc_addr; - register_t mc_err; - register_t mc_rip; - register_t mc_cs; - register_t mc_rflags; - register_t mc_rsp; - register_t mc_ss; + __register_t mc_onstack; /* XXX - sigcontext compat. */ + __register_t mc_rdi; /* machine state (struct trapframe) */ + __register_t mc_rsi; + __register_t mc_rdx; + __register_t mc_rcx; + __register_t mc_r8; + __register_t mc_r9; + __register_t mc_rax; + __register_t mc_rbx; + __register_t mc_rbp; + __register_t mc_r10; + __register_t mc_r11; + __register_t mc_r12; + __register_t mc_r13; + __register_t mc_r14; + __register_t mc_r15; + __register_t mc_trapno; + __register_t mc_addr; + __register_t mc_err; + __register_t mc_rip; + __register_t mc_cs; + __register_t mc_rflags; + __register_t mc_rsp; + __register_t mc_ss; long mc_len; /* sizeof(mcontext_t) */ #define _MC_FPFMT_NODEV 0x10000 /* device not present or configured */ ==== //depot/projects/uart/amd64/isa/clock.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.202 2003/09/22 23:02:24 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.204 2003/09/30 06:42:47 peter Exp $"); /* * Routines to handle clock hardware. @@ -87,11 +87,12 @@ * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we * can use a simple formula for leap years. */ -#define LEAPYEAR(y) ((u_int)(y) % 4 == 0) +#define LEAPYEAR(y) (((u_int)(y) % 4 == 0) ? 1 : 0) #define DAYSPERYEAR (31+28+31+30+31+30+31+31+30+31+30+31) #define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x)) +#ifndef BURN_BRIDGES /* * Time in timer cycles that it takes for microtime() to disable interrupts * and latch the count. microtime() currently uses "cli; outb ..." so it @@ -107,6 +108,7 @@ * before the next timer interrupt. */ #define TIMER0_MAX_FREQ 20000 +#endif int adjkerntz; /* local offset from GMT in seconds */ int clkintr_pending; @@ -128,6 +130,7 @@ static u_int32_t i8254_lastcount; static u_int32_t i8254_offset; static int i8254_ticked; +#ifndef BURN_BRIDGES /* * XXX new_function and timer_func should not handle clockframes, but * timer_func currently needs to hold hardclock to handle the @@ -136,9 +139,11 @@ */ static void (*new_function)(struct clockframe *frame); static u_int new_rate; +static u_int timer0_prescaler_count; +static u_char timer0_state; +#endif static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR | RTCSB_PINTR; -static u_int timer0_prescaler_count; /* Values for timerX_state: */ #define RELEASED 0 @@ -146,7 +151,6 @@ #define ACQUIRED 2 #define ACQUIRE_PENDING 3 -static u_char timer0_state; static u_char timer2_state; static void (*timer_func)(struct clockframe *frame) = hardclock; @@ -158,7 +162,8 @@ 0, /* no poll_pps */ ~0u, /* counter_mask */ 0, /* frequency */ - "i8254" /* name */ + "i8254", /* name */ + 0 /* quality */ }; static void @@ -177,6 +182,7 @@ mtx_unlock_spin(&clock_lock); } timer_func(&frame); +#ifndef BURN_BRIDGES switch (timer0_state) { case RELEASED: @@ -222,8 +228,10 @@ } break; } +#endif } +#ifndef BURN_BRIDGES /* * The acquire and release functions must be called at ipl >= splclock(). */ @@ -259,6 +267,7 @@ old_rate = new_rate = rate; return (0); } +#endif int acquire_timer2(int mode) @@ -280,6 +289,7 @@ return (0); } +#ifndef BURN_BRIDGES int release_timer0() { @@ -299,6 +309,7 @@ } return (0); } +#endif int release_timer2() @@ -931,8 +942,10 @@ freq = timer_freq; error = sysctl_handle_int(oidp, &freq, sizeof(freq), req); if (error == 0 && req->newptr != NULL) { +#ifndef BURN_BRIDGES if (timer0_state != RELEASED) return (EBUSY); /* too much trouble to handle */ +#endif set_timer_freq(freq, hz); i8254_timecounter.tc_frequency = freq; } ==== //depot/projects/uart/cam/scsi/scsi_cd.c#5 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.83 2003/09/11 19:27:24 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.84 2003/09/30 07:52:15 phk Exp $"); #include "opt_cd.h" @@ -63,6 +63,7 @@ #include #include #include +#include #include #include @@ -146,15 +147,10 @@ struct cd_params params; union ccb saved_ccb; cd_quirks quirks; - struct devstat *device_stats; STAILQ_ENTRY(cd_softc) changer_links; struct cdchanger *changer; int bufs_left; struct cam_periph *periph; - dev_t dev; -#ifdef GONE_IN_5 - eventhandler_tag clonetag; -#endif int minimum_command_size; int outstanding_cmds; struct task sysctl_task; @@ -162,6 +158,7 @@ struct sysctl_oid *sysctl_tree; STAILQ_HEAD(, cd_mode_params) mode_queue; struct cd_tocdata toc; + struct disk disk; }; struct cd_page_sizes { @@ -217,12 +214,10 @@ } }; -#define CD_CDEV_MAJOR 15 - -static d_open_t cdopen; -static d_close_t cdclose; -static d_ioctl_t cdioctl; -static d_strategy_t cdstrategy; +static disk_open_t cdopen; +static disk_close_t cdclose; +static disk_ioctl_t cdioctl; +static disk_strategy_t cdstrategy; static periph_init_t cdinit; static periph_ctor_t cdregister; @@ -294,17 +289,6 @@ PERIPHDRIVER_DECLARE(cd, cddriver); -static struct cdevsw cd_cdevsw = { - .d_open = cdopen, - .d_close = cdclose, - .d_read = physread, - .d_write = physwrite, - .d_ioctl = cdioctl, - .d_strategy = cdstrategy, - .d_name = "cd", - .d_maj = CD_CDEV_MAJOR, - .d_flags = D_DISK, -}; static int num_changers; @@ -343,27 +327,6 @@ static STAILQ_HEAD(changerlist, cdchanger) changerq; -#ifdef GONE_IN_5 -static void -cdclone(void *arg, char *name, int namelen, dev_t *dev) -{ - struct cd_softc *softc; - const char *p; - int l; - - softc = arg; - p = devtoname(softc->dev); - l = strlen(p); - if (bcmp(name, p, l)) - return; - if (name[l] != 'a' && name[l] != 'c') - return; - if (name[l + 1] != '\0') - return; - *dev = softc->dev; - return; -} -#endif static void cdinit(void) @@ -533,11 +496,6 @@ free(softc->changer, M_DEVBUF); num_changers--; } - devstat_remove_entry(softc->device_stats); - destroy_dev(softc->dev); -#ifdef GONE_IN_5 - EVENTHANDLER_DEREGISTER(dev_clone, softc->clonetag); -#endif free(softc, M_DEVBUF); splx(s); } @@ -774,18 +732,18 @@ * WORM peripheral driver. WORM drives will also have the WORM * driver attached to them. */ - softc->device_stats = devstat_new_entry("cd", + softc->disk.d_devstat = devstat_new_entry("cd", periph->unit_number, 0, DEVSTAT_BS_UNAVAILABLE, DEVSTAT_TYPE_CDROM | DEVSTAT_TYPE_IF_SCSI, DEVSTAT_PRIORITY_CD); - softc->dev = make_dev(&cd_cdevsw, periph->unit_number, - UID_ROOT, GID_OPERATOR, 0640, "cd%d", periph->unit_number); - softc->dev->si_drv1 = periph; -#ifdef GONE_IN_5 - softc->clonetag = - EVENTHANDLER_REGISTER(dev_clone, cdclone, softc, 1000); -#endif + softc->disk.d_open = cdopen; + softc->disk.d_close = cdclose; + softc->disk.d_strategy = cdstrategy; + softc->disk.d_ioctl = cdioctl; + softc->disk.d_name = "cd"; + disk_create(periph->unit_number, &softc->disk, 0, NULL, NULL); + softc->disk.d_drv1 = periph; /* * Add an async callback so that we get @@ -1028,14 +986,14 @@ } static int -cdopen(dev_t dev, int flags, int fmt, struct thread *td) +cdopen(struct disk *dp) { struct cam_periph *periph; struct cd_softc *softc; int error; int s; - periph = (struct cam_periph *)dev->si_drv1; + periph = (struct cam_periph *)dp->d_drv1; if (periph == NULL) return (ENXIO); @@ -1075,13 +1033,13 @@ } static int -cdclose(dev_t dev, int flag, int fmt, struct thread *td) +cdclose(struct disk *dp) { struct cam_periph *periph; struct cd_softc *softc; int error; - periph = (struct cam_periph *)dev->si_drv1; + periph = (struct cam_periph *)dp->d_drv1; if (periph == NULL) return (ENXIO); @@ -1097,7 +1055,7 @@ * Since we're closing this CD, mark the blocksize as unavailable. * It will be marked as available when the CD is opened again. */ - softc->device_stats->flags |= DEVSTAT_BS_UNAVAILABLE; + softc->disk.d_devstat->flags |= DEVSTAT_BS_UNAVAILABLE; /* * We'll check the media and toc again at the next open(). @@ -1391,7 +1349,7 @@ softc = (struct cd_softc *)periph->softc; error = cam_periph_runccb(ccb, error_routine, cam_flags, sense_flags, - softc->device_stats); + softc->disk.d_devstat); if (softc->flags & CD_FLAG_CHANGER) cdchangerschedule(softc); @@ -1453,7 +1411,7 @@ struct cd_softc *softc; int s; - periph = (struct cam_periph *)bp->bio_dev->si_drv1; + periph = (struct cam_periph *)bp->bio_disk->d_drv1; if (periph == NULL) { biofinish(bp, NULL, ENXIO); return; @@ -1547,7 +1505,7 @@ } else { bioq_remove(&softc->bio_queue, bp); - devstat_start_transaction_bio(softc->device_stats, bp); + devstat_start_transaction_bio(softc->disk.d_devstat, bp); scsi_read_write(&start_ccb->csio, /*retries*/4, @@ -1703,7 +1661,7 @@ if (softc->flags & CD_FLAG_CHANGER) cdchangerschedule(softc); - biofinish(bp, softc->device_stats, 0); + biofinish(bp, softc->disk.d_devstat, 0); break; } case CD_CCB_PROBE: @@ -1939,14 +1897,14 @@ } static int -cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) +cdioctl(struct disk *dp, u_long cmd, void *addr, int flag, struct thread *td) { struct cam_periph *periph; struct cd_softc *softc; int error; - periph = (struct cam_periph *)dev->si_drv1; + periph = (struct cam_periph *)dp->d_drv1; if (periph == NULL) return(ENXIO); @@ -1977,14 +1935,6 @@ switch (cmd) { - case DIOCGMEDIASIZE: - *(off_t *)addr = - (off_t)softc->params.blksize * softc->params.disksize; - break; - case DIOCGSECTORSIZE: - *(u_int *)addr = softc->params.blksize; - break; - case CDIOCPLAYTRACKS: { struct ioc_play_track *args @@ -2749,6 +2699,10 @@ } } +/* + * XXX: the disk media and sector size is only really able to change + * XXX: while the device is closed. + */ static int cdcheckmedia(struct cam_periph *periph) { @@ -2761,6 +2715,9 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 4 11:03:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DBED16A4C0; Sat, 4 Oct 2003 11:03:25 -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 1238B16A4B3 for ; Sat, 4 Oct 2003 11:03:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB7D643FEA for ; Sat, 4 Oct 2003 11:03:23 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h94I3NXJ018674 for ; Sat, 4 Oct 2003 11:03:23 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h94I3MIv018671 for perforce@freebsd.org; Sat, 4 Oct 2003 11:03:22 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Sat, 4 Oct 2003 11:03:22 -0700 (PDT) Message-Id: <200310041803.h94I3MIv018671@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 39158 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, 04 Oct 2003 18:03:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=39158 Change 39158 by sam@sam_ebb on 2003/10/04 11:02:46 IFC Affected files ... .. //depot/projects/netperf/sys/alpha/alpha/pmap.c#8 integrate .. //depot/projects/netperf/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/netperf/sys/conf/kmod.mk#6 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/netperf/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/netperf/sys/net/bpf.c#7 integrate .. //depot/projects/netperf/sys/net/if.c#5 integrate .. //depot/projects/netperf/sys/net/if_disc.c#4 integrate .. //depot/projects/netperf/sys/net/if_faith.c#4 integrate .. //depot/projects/netperf/sys/net/if_loop.c#5 integrate .. //depot/projects/netperf/sys/net/if_stf.c#4 integrate .. //depot/projects/netperf/sys/net/netisr.c#4 integrate .. //depot/projects/netperf/sys/net/route.c#11 integrate .. //depot/projects/netperf/sys/net/route.h#6 integrate .. //depot/projects/netperf/sys/net/rtsock.c#5 integrate .. //depot/projects/netperf/sys/netinet/if_atm.c#6 integrate .. //depot/projects/netperf/sys/netinet/if_ether.c#12 integrate .. //depot/projects/netperf/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/netperf/sys/netinet/in_proto.c#4 integrate .. //depot/projects/netperf/sys/netinet/ip_dummynet.h#3 integrate .. //depot/projects/netperf/sys/netinet/ip_flow.c#4 integrate .. //depot/projects/netperf/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/netperf/sys/netinet/ip_output.c#9 integrate .. //depot/projects/netperf/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/netperf/sys/netinet6/in6.c#4 integrate .. //depot/projects/netperf/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/netperf/sys/netinet6/in6_pcb.c#6 integrate .. //depot/projects/netperf/sys/netinet6/in6_rmx.c#6 integrate .. //depot/projects/netperf/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/netperf/sys/netinet6/ip6_output.c#8 integrate .. //depot/projects/netperf/sys/netinet6/nd6.c#6 integrate .. //depot/projects/netperf/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/pmap.c#5 integrate .. //depot/projects/netperf/sys/sparc64/include/param.h#3 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/netperf/sys/vm/pmap.h#3 integrate .. //depot/projects/netperf/sys/vm/vm_fault.c#4 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/alpha/pmap.c#8 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.138 2003/09/12 07:07:47 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.139 2003/10/03 22:46:52 alc Exp $"); #include #include @@ -2093,105 +2093,6 @@ } /* - * pmap_prefault provides a quick way of clustering - * pagefaults into a processes address space. It is a "cousin" - * of pmap_object_init_pt, except it runs at page fault time instead - * of mmap time. - */ -#define PFBAK 4 -#define PFFOR 4 -#define PAGEORDER_SIZE (PFBAK+PFFOR) - -static int pmap_prefault_pageorder[] = { - -1 * PAGE_SIZE, 1 * PAGE_SIZE, - -2 * PAGE_SIZE, 2 * PAGE_SIZE, - -3 * PAGE_SIZE, 3 * PAGE_SIZE, - -4 * PAGE_SIZE, 4 * PAGE_SIZE -}; - -void -pmap_prefault(pmap, addra, entry) - pmap_t pmap; - vm_offset_t addra; - vm_map_entry_t entry; -{ - int i; - vm_offset_t starta; - vm_offset_t addr; - vm_pindex_t pindex; - vm_page_t m, mpte; - vm_object_t object; - - if (!curthread || (pmap != vmspace_pmap(curthread->td_proc->p_vmspace))) - return; - - object = entry->object.vm_object; - - starta = addra - PFBAK * PAGE_SIZE; - if (starta < entry->start) { - starta = entry->start; - } else if (starta > addra) { - starta = 0; - } - - mpte = NULL; - for (i = 0; i < PAGEORDER_SIZE; i++) { - vm_object_t backing_object, lobject; - pt_entry_t *pte; - - addr = addra + pmap_prefault_pageorder[i]; - if (addr > addra + (PFFOR * PAGE_SIZE)) - addr = 0; - - if (addr < starta || addr >= entry->end) - continue; - - if (!pmap_pte_v(pmap_lev1pte(pmap, addr)) - || !pmap_pte_v(pmap_lev2pte(pmap, addr))) - continue; - - pte = vtopte(addr); - if (*pte) - continue; - - pindex = ((addr - entry->start) + entry->offset) >> PAGE_SHIFT; - lobject = object; - VM_OBJECT_LOCK(lobject); - while ((m = vm_page_lookup(lobject, pindex)) == NULL && - lobject->type == OBJT_DEFAULT && - (backing_object = lobject->backing_object) != NULL) { - if (lobject->backing_object_offset & PAGE_MASK) - break; - pindex += lobject->backing_object_offset >> PAGE_SHIFT; - VM_OBJECT_LOCK(backing_object); - VM_OBJECT_UNLOCK(lobject); - lobject = backing_object; - } - VM_OBJECT_UNLOCK(lobject); - /* - * give-up when a page is not in memory - */ - if (m == NULL) - break; - vm_page_lock_queues(); - if (((m->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL) && - (m->busy == 0) && - (m->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) { - - if ((m->queue - m->pc) == PQ_CACHE) { - vm_page_deactivate(m); - } - vm_page_busy(m); - vm_page_unlock_queues(); - mpte = pmap_enter_quick(pmap, addr, m, mpte); - vm_page_lock_queues(); - vm_page_wakeup(m); - } - vm_page_unlock_queues(); - } -} - -/* * Routine: pmap_change_wiring * Function: Change the wiring attribute for a map/virtual-address * pair. @@ -2557,6 +2458,26 @@ } /* + * pmap_is_prefaultable: + * + * Return whether or not the specified virtual address is elgible + * for prefault. + */ +boolean_t +pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr) +{ + pt_entry_t *pte; + + if (!pmap_pte_v(pmap_lev1pte(pmap, addr)) || + !pmap_pte_v(pmap_lev2pte(pmap, addr))) + return (FALSE); + pte = vtopte(addr); + if (*pte) + return (FALSE); + return (TRUE); +} + +/* * Clear the modify bits on the specified physical page. */ void ==== //depot/projects/netperf/sys/amd64/amd64/pmap.c#11 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.440 2003/09/27 20:53:00 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.441 2003/10/03 22:46:52 alc Exp $"); /* * Manages physical address maps. @@ -2124,106 +2124,6 @@ } /* - * pmap_prefault provides a quick way of clustering - * pagefaults into a processes address space. It is a "cousin" - * of pmap_object_init_pt, except it runs at page fault time instead - * of mmap time. - */ -#define PFBAK 4 -#define PFFOR 4 -#define PAGEORDER_SIZE (PFBAK+PFFOR) - -static int pmap_prefault_pageorder[] = { - -1 * PAGE_SIZE, 1 * PAGE_SIZE, - -2 * PAGE_SIZE, 2 * PAGE_SIZE, - -3 * PAGE_SIZE, 3 * PAGE_SIZE, - -4 * PAGE_SIZE, 4 * PAGE_SIZE -}; - -void -pmap_prefault(pmap, addra, entry) - pmap_t pmap; - vm_offset_t addra; - vm_map_entry_t entry; -{ - int i; - vm_offset_t starta; - vm_offset_t addr; - vm_pindex_t pindex; - vm_page_t m, mpte; - vm_object_t object; - pd_entry_t *pde; - - if (!curthread || (pmap != vmspace_pmap(curthread->td_proc->p_vmspace))) - return; - - object = entry->object.vm_object; - - starta = addra - PFBAK * PAGE_SIZE; - if (starta < entry->start) { - starta = entry->start; - } else if (starta > addra) { - starta = 0; - } - - mpte = NULL; - for (i = 0; i < PAGEORDER_SIZE; i++) { - vm_object_t backing_object, lobject; - pt_entry_t *pte; - - addr = addra + pmap_prefault_pageorder[i]; - if (addr > addra + (PFFOR * PAGE_SIZE)) - addr = 0; - - if (addr < starta || addr >= entry->end) - continue; - - pde = pmap_pde(pmap, addr); - if (pde == NULL || (*pde & PG_V) == 0) - continue; - - pte = vtopte(addr); - if ((*pte & PG_V) == 0) - continue; - - pindex = ((addr - entry->start) + entry->offset) >> PAGE_SHIFT; - lobject = object; - VM_OBJECT_LOCK(lobject); - while ((m = vm_page_lookup(lobject, pindex)) == NULL && - lobject->type == OBJT_DEFAULT && - (backing_object = lobject->backing_object) != NULL) { - if (lobject->backing_object_offset & PAGE_MASK) - break; - pindex += lobject->backing_object_offset >> PAGE_SHIFT; - VM_OBJECT_LOCK(backing_object); - VM_OBJECT_UNLOCK(lobject); - lobject = backing_object; - } - VM_OBJECT_UNLOCK(lobject); - /* - * give-up when a page is not in memory - */ - if (m == NULL) - break; - vm_page_lock_queues(); - if (((m->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL) && - (m->busy == 0) && - (m->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) { - - if ((m->queue - m->pc) == PQ_CACHE) { - vm_page_deactivate(m); - } - vm_page_busy(m); - vm_page_unlock_queues(); - mpte = pmap_enter_quick(pmap, addr, m, mpte); - vm_page_lock_queues(); - vm_page_wakeup(m); - } - vm_page_unlock_queues(); - } -} - -/* * Routine: pmap_change_wiring * Function: Change the wiring attribute for a map/virtual-address * pair. @@ -2598,6 +2498,27 @@ } /* + * pmap_is_prefaultable: + * + * Return whether or not the specified virtual address is elgible + * for prefault. + */ +boolean_t +pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr) +{ + pd_entry_t *pde; + pt_entry_t *pte; + + pde = pmap_pde(pmap, addr); + if (pde == NULL || (*pde & PG_V) == 0) + return (FALSE); + pte = vtopte(addr); + if ((*pte & PG_V) == 0) + return (FALSE); + return (TRUE); +} + +/* * Clear the given bit in each of the given page's ptes. */ static __inline void ==== //depot/projects/netperf/sys/conf/kmod.mk#6 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.142 2003/10/02 21:34:06 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.143 2003/10/03 22:00:06 imp Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -165,11 +165,11 @@ # Search for kernel source tree in standard places. .for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys -.if !defined(SYSDIR) && exists(${_dir}/kern/) +.if !defined(SYSDIR) && exists(${_dir}/kern) SYSDIR= ${_dir} .endif .endfor -.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) +.if !defined(SYSDIR) || !exists(${SYSDIR}/kern) .error "can't find kernel source tree" .endif ==== //depot/projects/netperf/sys/i386/i386/pmap.c#13 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.442 2003/10/01 23:46:08 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.443 2003/10/03 22:46:52 alc Exp $"); /* * Manages physical address maps. @@ -2192,104 +2192,6 @@ } /* - * pmap_prefault provides a quick way of clustering - * pagefaults into a processes address space. It is a "cousin" - * of pmap_object_init_pt, except it runs at page fault time instead - * of mmap time. - */ -#define PFBAK 4 -#define PFFOR 4 -#define PAGEORDER_SIZE (PFBAK+PFFOR) - -static int pmap_prefault_pageorder[] = { - -1 * PAGE_SIZE, 1 * PAGE_SIZE, - -2 * PAGE_SIZE, 2 * PAGE_SIZE, - -3 * PAGE_SIZE, 3 * PAGE_SIZE, - -4 * PAGE_SIZE, 4 * PAGE_SIZE -}; - -void -pmap_prefault(pmap, addra, entry) - pmap_t pmap; - vm_offset_t addra; - vm_map_entry_t entry; -{ - int i; - vm_offset_t starta; - vm_offset_t addr; - vm_pindex_t pindex; - vm_page_t m, mpte; - vm_object_t object; - - if (!curthread || (pmap != vmspace_pmap(curthread->td_proc->p_vmspace))) - return; - - object = entry->object.vm_object; - - starta = addra - PFBAK * PAGE_SIZE; - if (starta < entry->start) { - starta = entry->start; - } else if (starta > addra) { - starta = 0; - } - - mpte = NULL; - for (i = 0; i < PAGEORDER_SIZE; i++) { - vm_object_t backing_object, lobject; - pt_entry_t *pte; - - addr = addra + pmap_prefault_pageorder[i]; - if (addr > addra + (PFFOR * PAGE_SIZE)) - addr = 0; - - if (addr < starta || addr >= entry->end) - continue; - - if ((*pmap_pde(pmap, addr)) == 0) - continue; - - pte = vtopte(addr); - if (*pte) - continue; - - pindex = ((addr - entry->start) + entry->offset) >> PAGE_SHIFT; - lobject = object; - VM_OBJECT_LOCK(lobject); - while ((m = vm_page_lookup(lobject, pindex)) == NULL && - lobject->type == OBJT_DEFAULT && - (backing_object = lobject->backing_object) != NULL) { - if (lobject->backing_object_offset & PAGE_MASK) - break; - pindex += lobject->backing_object_offset >> PAGE_SHIFT; - VM_OBJECT_LOCK(backing_object); - VM_OBJECT_UNLOCK(lobject); - lobject = backing_object; - } - VM_OBJECT_UNLOCK(lobject); - /* - * give-up when a page is not in memory - */ - if (m == NULL) - break; - vm_page_lock_queues(); - if (((m->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL) && - (m->busy == 0) && - (m->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) { - - if ((m->queue - m->pc) == PQ_CACHE) { - vm_page_deactivate(m); - } - vm_page_busy(m); - vm_page_unlock_queues(); - mpte = pmap_enter_quick(pmap, addr, m, mpte); - vm_page_lock_queues(); - vm_page_wakeup(m); - } - vm_page_unlock_queues(); - } -} - -/* * Routine: pmap_change_wiring * Function: Change the wiring attribute for a map/virtual-address * pair. @@ -2764,6 +2666,25 @@ } /* + * pmap_is_prefaultable: + * + * Return whether or not the specified virtual address is elgible + * for prefault. + */ +boolean_t +pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr) +{ + pt_entry_t *pte; + + if ((*pmap_pde(pmap, addr)) == 0) + return (FALSE); + pte = vtopte(addr); + if (*pte) + return (FALSE); + return (TRUE); +} + +/* * Clear the given bit in each of the given page's ptes. */ static __inline void ==== //depot/projects/netperf/sys/ia64/ia64/pmap.c#7 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.123 2003/09/20 19:27:48 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.124 2003/10/03 22:46:53 alc Exp $"); #include #include @@ -1736,101 +1736,6 @@ } /* - * pmap_prefault provides a quick way of clustering - * pagefaults into a processes address space. It is a "cousin" - * of pmap_object_init_pt, except it runs at page fault time instead - * of mmap time. - */ -#define PFBAK 4 -#define PFFOR 4 -#define PAGEORDER_SIZE (PFBAK+PFFOR) - -static int pmap_prefault_pageorder[] = { - -1 * PAGE_SIZE, 1 * PAGE_SIZE, - -2 * PAGE_SIZE, 2 * PAGE_SIZE, - -3 * PAGE_SIZE, 3 * PAGE_SIZE, - -4 * PAGE_SIZE, 4 * PAGE_SIZE -}; - -void -pmap_prefault(pmap, addra, entry) - pmap_t pmap; - vm_offset_t addra; - vm_map_entry_t entry; -{ - int i; - vm_offset_t starta; - vm_offset_t addr; - vm_pindex_t pindex; - vm_page_t m, mpte; - vm_object_t object; - - if (!curthread || (pmap != vmspace_pmap(curthread->td_proc->p_vmspace))) - return; - - object = entry->object.vm_object; - - starta = addra - PFBAK * PAGE_SIZE; - if (starta < entry->start) { - starta = entry->start; - } else if (starta > addra) { - starta = 0; - } - - mpte = NULL; - for (i = 0; i < PAGEORDER_SIZE; i++) { - vm_object_t backing_object, lobject; - struct ia64_lpte *pte; - - addr = addra + pmap_prefault_pageorder[i]; - if (addr > addra + (PFFOR * PAGE_SIZE)) - addr = 0; - - if (addr < starta || addr >= entry->end) - continue; - - pte = pmap_find_vhpt(addr); - if (pte && pte->pte_p) - continue; - - pindex = ((addr - entry->start) + entry->offset) >> PAGE_SHIFT; - lobject = object; - VM_OBJECT_LOCK(lobject); - while ((m = vm_page_lookup(lobject, pindex)) == NULL && - lobject->type == OBJT_DEFAULT && - (backing_object = lobject->backing_object) != NULL) { - if (lobject->backing_object_offset & PAGE_MASK) - break; - pindex += lobject->backing_object_offset >> PAGE_SHIFT; - VM_OBJECT_LOCK(backing_object); - VM_OBJECT_UNLOCK(lobject); - lobject = backing_object; - } - VM_OBJECT_UNLOCK(lobject); - /* - * give-up when a page is not in memory - */ - if (m == NULL) - break; - vm_page_lock_queues(); - if (((m->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL) && - (m->busy == 0) && - (m->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) { - - if ((m->queue - m->pc) == PQ_CACHE) { - vm_page_deactivate(m); - } - vm_page_busy(m); - vm_page_unlock_queues(); - pmap_enter_quick(pmap, addr, m, NULL); - vm_page_lock_queues(); - vm_page_wakeup(m); - } - vm_page_unlock_queues(); - } -} - -/* * Routine: pmap_change_wiring * Function: Change the wiring attribute for a map/virtual-address * pair. @@ -2148,6 +2053,23 @@ } /* + * pmap_is_prefaultable: + * + * Return whether or not the specified virtual address is elgible + * for prefault. + */ +boolean_t +pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr) +{ + struct ia64_lpte *pte; + + pte = pmap_find_vhpt(addr); + if (pte && pte->pte_p) + return (FALSE); + return (TRUE); +} + +/* * Clear the modify bits on the specified physical page. */ void ==== //depot/projects/netperf/sys/net/bpf.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ * * @(#)bpf.c 8.4 (Berkeley) 1/9/95 * - * $FreeBSD: src/sys/net/bpf.c,v 1.115 2003/09/04 22:27:45 sam Exp $ + * $FreeBSD: src/sys/net/bpf.c,v 1.116 2003/10/04 01:32:28 sam Exp $ */ #include "opt_bpf.h" @@ -1588,6 +1588,14 @@ } void +bpfattach2(ifp, dlt, hdrlen, driverp) + struct ifnet *ifp; + u_int dlt, hdrlen; + struct bpf_if **driverp; +{ +} + +void bpfdetach(ifp) struct ifnet *ifp; { ==== //depot/projects/netperf/sys/net/if.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.165 2003/09/28 20:48:12 phk Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.166 2003/10/04 03:44:48 sam Exp $ */ #include "opt_compat.h" ==== //depot/projects/netperf/sys/net/if_disc.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)if_loop.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_disc.c,v 1.35 2003/04/08 14:25:45 des Exp $ + * $FreeBSD: src/sys/net/if_disc.c,v 1.36 2003/10/04 03:44:48 sam Exp $ */ /* ==== //depot/projects/netperf/sys/net/if_faith.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_faith.c,v 1.21 2003/04/08 14:25:45 des Exp $ + * $FreeBSD: src/sys/net/if_faith.c,v 1.22 2003/10/04 03:44:48 sam Exp $ */ /* * derived from ==== //depot/projects/netperf/sys/net/if_loop.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_loop.c 8.2 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if_loop.c,v 1.85 2003/08/09 05:44:00 silby Exp $ + * $FreeBSD: src/sys/net/if_loop.c,v 1.86 2003/10/04 03:44:48 sam Exp $ */ /* ==== //depot/projects/netperf/sys/net/if_stf.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/if_stf.c,v 1.32 2003/03/04 23:19:51 jlemon Exp $ */ +/* $FreeBSD: src/sys/net/if_stf.c,v 1.33 2003/10/04 03:44:48 sam Exp $ */ /* $KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $ */ /* ==== //depot/projects/netperf/sys/net/netisr.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/netisr.c,v 1.6 2003/10/02 02:54:10 rwatson Exp $ + * $FreeBSD: src/sys/net/netisr.c,v 1.7 2003/10/03 18:27:24 rwatson Exp $ */ #include @@ -100,7 +100,6 @@ int isrs_count; /* dispatch count */ int isrs_directed; /* ...successfully dispatched */ int isrs_deferred; /* ...queued instead */ - int isrs_bypassed; /* bypassed queued packets */ int isrs_queued; /* intentionally queueued */ int isrs_swi_count; /* swi_net handlers called */ }; @@ -119,14 +118,30 @@ &isrstat.isrs_directed, 0, ""); SYSCTL_INT(_net_isr, OID_AUTO, deferred, CTLFLAG_RD, &isrstat.isrs_deferred, 0, ""); -SYSCTL_INT(_net_isr, OID_AUTO, bypassed, CTLFLAG_RD, - &isrstat.isrs_bypassed, 0, ""); SYSCTL_INT(_net_isr, OID_AUTO, queued, CTLFLAG_RD, &isrstat.isrs_queued, 0, ""); SYSCTL_INT(_net_isr, OID_AUTO, swi_count, CTLFLAG_RD, &isrstat.isrs_swi_count, 0, ""); /* + * Process all packets currently present in a netisr queue. Used to + * drain an existing set of packets waiting for processing when we + * begin direct dispatch, to avoid processing packets out of order. + */ +static void +netisr_processqueue(struct netisr *ni) +{ + struct mbuf *m; + + for (;;) { + IF_DEQUEUE(ni->ni_queue, m); + if (m == NULL) + break; + ni->ni_handler(m); + } +} + +/* * Call the netisr directly instead of queueing the packet, if possible. * * Ideally, the permissibility of calling the routine would be determined @@ -163,10 +178,9 @@ * b. fallback to queueing the packet, * c. sweep the issue under the rug and ignore it. * - * Currently, we do c), and keep a rough event counter. + * Currently, we do a). Previously, we did c). */ - if (_IF_QLEN(ni->ni_queue) > 0) - isrstat.isrs_bypassed++; + netisr_processqueue(ni); ni->ni_handler(m); mtx_unlock(&netisr_mtx); } else { @@ -204,7 +218,6 @@ swi_net(void *dummy) { struct netisr *ni; - struct mbuf *m; u_int bits; int i; #ifdef DEVICE_POLLING @@ -230,12 +243,7 @@ if (ni->ni_queue == NULL) ni->ni_handler(NULL); else - for (;;) { - IF_DEQUEUE(ni->ni_queue, m); - if (m == NULL) - break; - ni->ni_handler(m); - } + netisr_processqueue(ni); } } while (polling); mtx_unlock(&netisr_mtx); ==== //depot/projects/netperf/sys/net/route.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)route.c 8.3.1.1 (Berkeley) 2/23/95 - * $FreeBSD: src/sys/net/route.c,v 1.81 2003/04/13 06:21:02 hsu Exp $ + * $FreeBSD: src/sys/net/route.c,v 1.83 2003/10/04 03:44:48 sam Exp $ */ #include "opt_inet.h" ==== //depot/projects/netperf/sys/net/route.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)route.h 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/route.h,v 1.48 2003/07/19 00:21:13 hsu Exp $ + * $FreeBSD: src/sys/net/route.h,v 1.50 2003/10/04 03:44:48 sam Exp $ */ #ifndef _NET_ROUTE_H_ ==== //depot/projects/netperf/sys/net/rtsock.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 - * $FreeBSD: src/sys/net/rtsock.c,v 1.89 2003/03/05 19:24:22 peter Exp $ + * $FreeBSD: src/sys/net/rtsock.c,v 1.92 2003/10/04 03:44:48 sam Exp $ */ #include ==== //depot/projects/netperf/sys/netinet/if_atm.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/netinet/if_atm.c,v 1.15 2003/08/12 14:20:31 harti Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/if_atm.c,v 1.16 2003/10/04 03:44:49 sam Exp $"); /* * IP <=> ATM address resolution. @@ -329,6 +329,7 @@ RT_UNLOCK(rt); goto bad; } + RT_UNLOCK(rt); } /* ==== //depot/projects/netperf/sys/netinet/if_ether.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ether.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/if_ether.c,v 1.108 2003/10/03 09:19:23 bms Exp $ + * $FreeBSD: src/sys/netinet/if_ether.c,v 1.111 2003/10/04 03:44:49 sam Exp $ */ /* @@ -213,7 +213,10 @@ case RTM_RESOLVE: if (gate->sa_family != AF_LINK || gate->sa_len < sizeof(null_sdl)) { - log(LOG_DEBUG, "%s: bad gateway value\n", __func__); + log(LOG_DEBUG, "%s: bad gateway %s%s\n", __func__, + inet_ntoa(SIN(rt_key(rt))->sin_addr), + (gate->sa_family != AF_LINK) ? + " (!AF_LINK)": ""); break; } SDL(gate)->sdl_type = rt->rt_ifp->if_type; ==== //depot/projects/netperf/sys/netinet/in_pcb.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.122 2003/08/07 15:04:27 jhb Exp $ + * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.123 2003/10/04 03:44:49 sam Exp $ */ #include "opt_ipsec.h" ==== //depot/projects/netperf/sys/netinet/in_proto.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_proto.c 8.2 (Berkeley) 2/9/95 - * $FreeBSD: src/sys/netinet/in_proto.c,v 1.65 2003/08/07 18:16:59 hsu Exp $ + * $FreeBSD: src/sys/netinet/in_proto.c,v 1.66 2003/10/03 22:06:36 sam Exp $ */ #include "opt_ipdivert.h" ==== //depot/projects/netperf/sys/netinet/ip_dummynet.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_dummynet.h,v 1.26 2003/03/27 14:56:36 maxim Exp $ + * $FreeBSD: src/sys/netinet/ip_dummynet.h,v 1.27 2003/10/03 20:58:56 sam Exp $ */ #ifndef _IP_DUMMYNET_H ==== //depot/projects/netperf/sys/netinet/ip_flow.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_flow.c,v 1.14 2003/09/01 05:12:36 sam Exp $ + * $FreeBSD: src/sys/netinet/ip_flow.c,v 1.15 2003/10/04 03:44:49 sam Exp $ */ #include ==== //depot/projects/netperf/sys/netinet/ip_icmp.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.79 2003/08/21 18:39:15 rwatson Exp $ + * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.80 2003/10/04 03:44:49 sam Exp $ */ #include "opt_ipsec.h" ==== //depot/projects/netperf/sys/netinet/ip_output.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/netinet/ip_output.c,v 1.194 2003/09/23 17:54:03 sam Exp $ + * $FreeBSD: src/sys/netinet/ip_output.c,v 1.195 2003/10/04 03:44:49 sam Exp $ */ #include "opt_ipfw.h" ==== //depot/projects/netperf/sys/netinet6/icmp6.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/icmp6.c,v 1.32 2003/04/29 08:43:55 suz Exp $ */ +/* $FreeBSD: src/sys/netinet6/icmp6.c,v 1.33 2003/10/04 03:44:49 sam Exp $ */ /* $KAME: icmp6.c,v 1.211 2001/04/04 05:56:20 itojun Exp $ */ /* ==== //depot/projects/netperf/sys/netinet6/in6.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6.c,v 1.26 2003/02/19 05:47:35 imp Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6.c,v 1.27 2003/10/04 03:44:49 sam Exp $ */ /* $KAME: in6.c,v 1.259 2002/01/21 11:37:50 keiichi Exp $ */ /* ==== //depot/projects/netperf/sys/netinet6/in6_ifattach.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.13 2003/09/14 02:32:31 mdodd Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.14 2003/10/04 03:44:49 sam Exp $ */ /* $KAME: in6_ifattach.c,v 1.118 2001/05/24 07:44:00 itojun Exp $ */ /* ==== //depot/projects/netperf/sys/netinet6/in6_pcb.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.39 2003/10/01 21:24:28 ume Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.40 2003/10/04 03:44:49 sam Exp $ */ /* $KAME: in6_pcb.c,v 1.31 2001/05/21 05:45:10 jinmei Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 4 11:04:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 470A216A569; Sat, 4 Oct 2003 11:04: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 3E95416A526 for ; Sat, 4 Oct 2003 11:04:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 08BA943FFB for ; Sat, 4 Oct 2003 11:04:25 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h94I4PXJ018735 for ; Sat, 4 Oct 2003 11:04:25 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h94I4P0Q018732 for perforce@freebsd.org; Sat, 4 Oct 2003 11:04:25 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Sat, 4 Oct 2003 11:04:25 -0700 (PDT) Message-Id: <200310041804.h94I4P0Q018732@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 39159 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, 04 Oct 2003 18:04:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=39159 Change 39159 by sam@sam_ebb on 2003/10/04 11:03:37 interlock access to the ip forwarding route cache Affected files ... .. //depot/projects/netperf/sys/netinet/in_rmx.c#6 edit .. //depot/projects/netperf/sys/netinet/ip_input.c#8 edit .. //depot/projects/netperf/sys/netinet/ip_var.h#6 edit Differences ... ==== //depot/projects/netperf/sys/netinet/in_rmx.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/in_rmx.c,v 1.44 2003/02/10 22:01:34 hsu Exp $ + * $FreeBSD: src/sys/netinet/in_rmx.c,v 1.45 2003/10/04 03:44:49 sam Exp $ */ /* @@ -141,13 +141,10 @@ /* * If the new route created successfully, and we are forwarding, - * and there is a cached route, free it. Otherwise, we may end - * up using the wrong route. + * flush any cached routes to avoid using a stale value. */ - if (ret != NULL && ipforwarding && ipforward_rt.ro_rt) { - RTFREE(ipforward_rt.ro_rt); - ipforward_rt.ro_rt = 0; - } + if (ret != NULL && ipforwarding) + ip_forward_cacheinval(); return ret; } ==== //depot/projects/netperf/sys/netinet/ip_input.c#8 (text+ko) ==== @@ -189,8 +189,8 @@ #define IPQ_LOCK() mtx_lock(&ipqlock) #define IPQ_UNLOCK() mtx_unlock(&ipqlock) -#define IPQ_LOCK_INIT() mtx_init(&ipqlock, "ipqlock", NULL, MTX_DEF); -#define IPQ_LOCK_ASSERT() mtx_assert(&ipqlock, MA_OWNED); +#define IPQ_LOCK_INIT() mtx_init(&ipqlock, "ipqlock", NULL, MTX_DEF) +#define IPQ_LOCK_ASSERT() mtx_assert(&ipqlock, MA_OWNED) #ifdef IPCTL_DEFMTU SYSCTL_INT(_net_inet_ip, IPCTL_DEFMTU, mtu, CTLFLAG_RW, @@ -212,8 +212,42 @@ /* Dummynet hooks */ ip_dn_io_t *ip_dn_io_ptr; +/* + * One deep route cache for ip forwarding. + */ +static struct rtcache { + struct route rc_ro; /* most recently used route */ + struct mtx rc_mtx; /* update lock for cache */ +} ip_fwdcache; + +#define RTCACHE_LOCK() mtx_lock(&ip_fwdcache.rc_mtx) +#define RTCACHE_UNLOCK() mtx_unlock(&ip_fwdcache.rc_mtx) +#define RTCACHE_LOCK_INIT() \ + mtx_init(&ip_fwdcache.rc_mtx, "route cache", NULL, MTX_DEF); +#define RTCACHE_LOCK_ASSERT() mtx_assert(&ip_fwdcache.rc_mtx, MA_OWNED) + +/* + * Get the current route cache contents. + */ +#define RTCACHE_GET(_ro) do { \ + RTCACHE_LOCK(); \ + *(_ro) = ip_fwdcache.rc_ro; \ + RTCACHE_UNLOCK(); \ +} while (0); /* + * Update the cache contents. We optimize this using + * the routing table reference. XXX is this safe? + */ +#define RTCACHE_UPDATE(_ro) do { \ + if ((_ro)->ro_rt != ip_fwdcache.rc_ro.ro_rt) { \ + RTCACHE_LOCK(); \ + ip_fwdcache.rc_ro = *(_ro); \ + RTCACHE_UNLOCK(); \ + } \ +} while (0); + +/* * XXX this is ugly -- the following two global variables are * used to store packet state while it travels through the stack. * Note that the code even makes assumptions on the size and @@ -237,7 +271,7 @@ static void save_rte(u_char *, struct in_addr); static int ip_dooptions(struct mbuf *m, int, struct sockaddr_in *next_hop); -static void ip_forward(struct mbuf *m, int srcrt, +static void ip_forward(struct mbuf *m, struct route *, int srcrt, struct sockaddr_in *next_hop); static void ip_freef(struct ipqhead *, struct ipq *); static struct mbuf *ip_reass(struct mbuf *, struct ipqhead *, @@ -278,6 +312,9 @@ for (i = 0; i < IPREASS_NHASH; i++) TAILQ_INIT(&ipq[i]); + bzero(&ip_fwdcache, sizeof(ip_fwdcache)); + RTCACHE_LOCK_INIT(); + maxnipq = nmbclusters / 32; maxfragsperpacket = 16; @@ -290,11 +327,21 @@ } /* - * XXX watch out this one. It is perhaps used as a cache for - * the most recently used route ? it is cleared in in_addroute() - * when a new route is successfully created. + * Invalidate any cached route used for forwarding. */ -struct route ipforward_rt; +void +ip_forward_cacheinval(void) +{ + struct rtentry *rt = NULL; + + RTCACHE_LOCK(); + rt = ip_fwdcache.rc_ro.ro_rt; + ip_fwdcache.rc_ro.ro_rt = 0; + RTCACHE_UNLOCK(); + + if (rt != NULL) + RTFREE(rt); +} /* * Ip input routine. Checksum and byte swap header. If fragmented @@ -312,6 +359,7 @@ struct in_addr pkt_dst; u_int32_t divert_info = 0; /* packet divert/tee info */ struct ip_fw_args args; + struct route cro; /* copy of cached route */ #ifdef FAST_IPSEC struct m_tag *mtag; struct tdb_ident *tdbi; @@ -712,7 +760,8 @@ goto bad; } #endif /* FAST_IPSEC */ - ip_forward(m, 0, args.next_hop); + RTCACHE_GET(&cro); + ip_forward(m, &cro, 0, args.next_hop); } return; @@ -1312,6 +1361,14 @@ struct in_addr *sin, dst; n_time ntime; struct sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET }; + struct route cro; /* copy of cached route */ + + /* + * Grab a copy of the route cache in case we need + * to update to reflect source routing or the like. + * Could optimize this to do it later... + */ + RTCACHE_GET(&cro); dst = ip->ip_dst; cp = (u_char *)(ip + 1); @@ -1431,7 +1488,7 @@ if ((ia = (INA)ifa_ifwithdstaddr((SA)&ipaddr)) == 0) ia = (INA)ifa_ifwithnet((SA)&ipaddr); } else - ia = ip_rtaddr(ipaddr.sin_addr, &ipforward_rt); + ia = ip_rtaddr(ipaddr.sin_addr, &cro); if (ia == 0) { type = ICMP_UNREACH; code = ICMP_UNREACH_SRCFAIL; @@ -1473,8 +1530,7 @@ * use the incoming interface (should be same). */ if ((ia = (INA)ifa_ifwithaddr((SA)&ipaddr)) == 0 && - (ia = ip_rtaddr(ipaddr.sin_addr, - &ipforward_rt)) == 0) { + (ia = ip_rtaddr(ipaddr.sin_addr, &cro)) == 0) { type = ICMP_UNREACH; code = ICMP_UNREACH_HOST; goto bad; @@ -1554,7 +1610,7 @@ } } if (forward && ipforwarding) { - ip_forward(m, 1, next_hop); + ip_forward(m, &cro, 1, next_hop); return (1); } return (0); @@ -1739,7 +1795,8 @@ * via a source route. */ static void -ip_forward(struct mbuf *m, int srcrt, struct sockaddr_in *next_hop) +ip_forward(struct mbuf *m, struct route *ro, + int srcrt, struct sockaddr_in *next_hop) { struct ip *ip = mtod(m, struct ip *); struct rtentry *rt; @@ -1784,11 +1841,11 @@ } #endif - if (ip_rtaddr(pkt_dst, &ipforward_rt) == 0) { + if (ip_rtaddr(pkt_dst, ro) == 0) { icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_HOST, dest, 0); return; } else - rt = ipforward_rt.ro_rt; + rt = ro->ro_rt; /* * Save the IP header and at most 8 bytes of the payload, @@ -1878,9 +1935,13 @@ tag.mh_next = m; m = (struct mbuf *)&tag; } - error = ip_output(m, (struct mbuf *)0, &ipforward_rt, - IP_FORWARDING, 0, NULL); + error = ip_output(m, (struct mbuf *)0, ro, IP_FORWARDING, 0, NULL); } + /* + * Update the ip forwarding cache with the route we used. + * We may want to do this more selectively; not sure. + */ + RTCACHE_UPDATE(ro); if (error) ipstat.ips_cantforward++; else { @@ -1889,7 +1950,7 @@ ipstat.ips_redirectsent++; else { if (mcopy) { - ipflow_create(&ipforward_rt, mcopy); + ipflow_create(ro, mcopy); m_freem(mcopy); } return; @@ -1924,11 +1985,10 @@ * tunnel MTU = if MTU - sizeof(IP) - ESP/AH hdrsiz * XXX quickhack!!! */ - if (ipforward_rt.ro_rt) { + if (ro->ro_rt) { struct secpolicy *sp = NULL; int ipsecerror; int ipsechdr; - struct route *ro; sp = ipsec4_getpolicybyaddr(mcopy, IPSEC_DIR_OUTBOUND, @@ -1936,7 +1996,7 @@ &ipsecerror); if (sp == NULL) - destifp = ipforward_rt.ro_rt->rt_ifp; + destifp = ro->ro_rt->rt_ifp; else { /* count IPsec header size */ ipsechdr = ipsec4_hdrsiz(mcopy, @@ -1956,10 +2016,11 @@ if (sp->req != NULL && sp->req->sav != NULL && sp->req->sav->sah != NULL) { - ro = &sp->req->sav->sah->sa_route; - if (ro->ro_rt && ro->ro_rt->rt_ifp) { + struct route *saro; + saro = &sp->req->sav->sah->sa_route; + if (saro->ro_rt && saro->ro_rt->rt_ifp) { dummyifp.if_mtu = - ro->ro_rt->rt_ifp->if_mtu; + saro->ro_rt->rt_ifp->if_mtu; dummyifp.if_mtu -= ipsechdr; destifp = &dummyifp; } @@ -1975,11 +2036,10 @@ * tunnel MTU = if MTU - sizeof(IP) - ESP/AH hdrsiz * XXX quickhack!!! */ - if (ipforward_rt.ro_rt) { + if (ro->ro_rt) { struct secpolicy *sp = NULL; int ipsecerror; int ipsechdr; - struct route *ro; sp = ipsec_getpolicybyaddr(mcopy, IPSEC_DIR_OUTBOUND, @@ -1987,7 +2047,7 @@ &ipsecerror); if (sp == NULL) - destifp = ipforward_rt.ro_rt->rt_ifp; + destifp = ro->ro_rt->rt_ifp; else { /* count IPsec header size */ ipsechdr = ipsec4_hdrsiz(mcopy, @@ -2007,10 +2067,11 @@ if (sp->req != NULL && sp->req->sav != NULL && sp->req->sav->sah != NULL) { - ro = &sp->req->sav->sah->sa_route; - if (ro->ro_rt && ro->ro_rt->rt_ifp) { + struct route *saro; + saro = &sp->req->sav->sah->sa_route; + if (saro->ro_rt && saro->ro_rt->rt_ifp) { dummyifp.if_mtu = - ro->ro_rt->rt_ifp->if_mtu; + saro->ro_rt->rt_ifp->if_mtu; dummyifp.if_mtu -= ipsechdr; destifp = &dummyifp; } @@ -2020,8 +2081,8 @@ } } #else /* !IPSEC && !FAST_IPSEC */ - if (ipforward_rt.ro_rt) - destifp = ipforward_rt.ro_rt->rt_ifp; + if (ro->ro_rt) + destifp = ro->ro_rt->rt_ifp; #endif /*IPSEC*/ ipstat.ips_cantfrag++; break; ==== //depot/projects/netperf/sys/netinet/ip_var.h#6 (text+ko) ==== @@ -154,7 +154,6 @@ #endif extern int ip_defttl; /* default IP ttl */ extern int ipforwarding; /* ip forwarding */ -extern struct route ipforward_rt; /* ip forwarding cached route */ extern u_char ip_protox[]; extern struct socket *ip_rsvpd; /* reservation protocol daemon */ extern struct socket *ip_mrouter; /* multicast routing daemon */ @@ -167,6 +166,7 @@ void ip_drain(void); int ip_fragment(struct ip *ip, struct mbuf **m_frag, int mtu, u_long if_hwassist_flags, int sw_csum); +void ip_forward_cacheinval(void); void ip_freemoptions(struct ip_moptions *); void ip_init(void); extern int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *, From owner-p4-projects@FreeBSD.ORG Sat Oct 4 11:14:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 804FB16A4C0; Sat, 4 Oct 2003 11:14: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 407F316A4B3 for ; Sat, 4 Oct 2003 11:14:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED5DE44003 for ; Sat, 4 Oct 2003 11:14:39 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h94IEdXJ019194 for ; Sat, 4 Oct 2003 11:14:39 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h94IEdwC019191 for perforce@freebsd.org; Sat, 4 Oct 2003 11:14:39 -0700 (PDT) (envelope-from sam@freebsd.org) Date: Sat, 4 Oct 2003 11:14:39 -0700 (PDT) Message-Id: <200310041814.h94IEdwC019191@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 39161 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, 04 Oct 2003 18:14:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=39161 Change 39161 by sam@sam_ebb on 2003/10/04 11:14:29 IFC @ 39160 Affected files ... .. //depot/projects/netperf/sys/coda/coda_subr.c#3 integrate .. //depot/projects/netperf/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/netperf/sys/fs/nwfs/nwfs_io.c#4 integrate .. //depot/projects/netperf/sys/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/netperf/sys/fs/specfs/spec_vnops.c#5 integrate .. //depot/projects/netperf/sys/gnu/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/locore.s#4 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#14 integrate .. //depot/projects/netperf/sys/kern/sched_ule.c#6 integrate .. //depot/projects/netperf/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/netperf/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/netperf/sys/nfsclient/bootp_subr.c#5 integrate .. //depot/projects/netperf/sys/nfsclient/krpc_subr.c#2 integrate .. //depot/projects/netperf/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/netperf/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/netperf/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/netperf/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/netperf/sys/sys/vnode.h#3 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/netperf/sys/ufs/ufs/ufs_ihash.c#2 integrate .. //depot/projects/netperf/sys/ufs/ufs/ufs_quota.c#3 integrate .. //depot/projects/netperf/sys/vm/device_pager.c#3 integrate .. //depot/projects/netperf/sys/vm/vm_object.c#6 integrate Differences ... ==== //depot/projects/netperf/sys/coda/coda_subr.c#3 (text+ko) ==== @@ -52,7 +52,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_subr.c,v 1.24 2003/09/07 07:43:09 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_subr.c,v 1.25 2003/10/04 13:16:54 jeff Exp $"); #include @@ -312,11 +312,12 @@ register struct vnode *vp, *nvp; struct cnode *cp; int count = 0, bad = 0; -loop: + + mtx_lock(&mntvnode_mtx); for (vp = TAILQ_FIRST(&mp->mnt_nvnodelist); vp; vp = nvp) { + nvp = TAILQ_NEXT(vp, v_nmntvnodes); if (vp->v_mount != mp) - goto loop; - nvp = TAILQ_NEXT(vp, v_nmntvnodes); + continue; cp = VTOC(vp); count++; if (!(cp->c_flags & C_UNMOUNTING)) { @@ -325,6 +326,7 @@ cp->c_flags |= C_UNMOUNTING; } } + mtx_unlock(&mntvnode_mtx); } void ==== //depot/projects/netperf/sys/fs/msdosfs/msdosfs_vfsops.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.106 2003/09/26 20:26:23 fjoe Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.107 2003/10/04 12:52:37 jeff Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -789,8 +789,8 @@ goto loop; nvp = TAILQ_NEXT(vp, v_nmntvnodes); + VI_LOCK(vp); mtx_unlock(&mntvnode_mtx); - VI_LOCK(vp); dep = VTODE(vp); if (vp->v_type == VNON || ((dep->de_flag & ==== //depot/projects/netperf/sys/fs/nwfs/nwfs_io.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nwfs/nwfs_io.c,v 1.30 2003/09/19 23:37:49 jeff Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_io.c,v 1.31 2003/10/04 08:51:50 jeff Exp $ * */ #include @@ -607,12 +607,8 @@ /* struct nwmount *nmp = VTONWFS(vp);*/ int error = 0, slpflag, slptimeo; - if (vp->v_iflag & VI_XLOCK) { -#ifdef INVARIANTS - backtrace(); -#endif + if (vp->v_iflag & VI_XLOCK) return (0); - } if (intrflg) { slpflag = PCATCH; ==== //depot/projects/netperf/sys/fs/smbfs/smbfs_io.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.23 2003/09/19 23:37:49 jeff Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.24 2003/10/04 08:51:50 jeff Exp $ * */ #include @@ -679,12 +679,8 @@ struct smbnode *np = VTOSMB(vp); int error = 0, slpflag, slptimeo; - if (vp->v_iflag & VI_XLOCK) { -#ifdef INVARIANTS - backtrace(); -#endif + if (vp->v_iflag & VI_XLOCK) return 0; - } if (intrflg) { slpflag = PCATCH; ==== //depot/projects/netperf/sys/fs/specfs/spec_vnops.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 - * $FreeBSD: src/sys/fs/specfs/spec_vnops.c,v 1.209 2003/08/28 01:52:14 marcel Exp $ + * $FreeBSD: src/sys/fs/specfs/spec_vnops.c,v 1.210 2003/10/04 09:20:00 alc Exp $ */ #include @@ -821,7 +821,6 @@ } } vm_page_unlock_queues(); - VM_OBJECT_UNLOCK(ap->a_m[ap->a_reqpage]->object); if (!gotreqpage) { m = ap->a_m[ap->a_reqpage]; printf( @@ -833,12 +832,14 @@ printf( " nread: %d, reqpage: %d, pindex: %lu, pcount: %d\n", nread, ap->a_reqpage, (u_long)m->pindex, pcount); + VM_OBJECT_UNLOCK(m->object); /* * Free the buffer header back to the swap buffer pool. */ relpbuf(bp, NULL); return VM_PAGER_ERROR; } + VM_OBJECT_UNLOCK(ap->a_m[ap->a_reqpage]->object); /* * Free the buffer header back to the swap buffer pool. */ ==== //depot/projects/netperf/sys/gnu/ext2fs/ext2_vfsops.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.107 2003/08/28 00:56:39 jeff Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.108 2003/10/04 16:09:40 jeff Exp $ */ #include @@ -576,16 +576,18 @@ goto loop; } nvp = TAILQ_NEXT(vp, v_nmntvnodes); + VI_LOCK(vp); mtx_unlock(&mntvnode_mtx); /* * Step 4: invalidate all inactive vnodes. */ - if (vrecycle(vp, NULL, td)) - goto loop; + if (vp->v_usecount == 0) { + vgonel(vp, td); + goto loop; + } /* * Step 5: invalidate all cached file data. */ - mtx_lock(&vp->v_interlock); if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, td)) { goto loop; } @@ -903,8 +905,8 @@ if (vp->v_mount != mp) goto loop; nvp = TAILQ_NEXT(vp, v_nmntvnodes); + VI_LOCK(vp); mtx_unlock(&mntvnode_mtx); - VI_LOCK(vp); ip = VTOI(vp); if (vp->v_type == VNON || ((ip->i_flag & ==== //depot/projects/netperf/sys/i386/i386/locore.s#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/locore.s,v 1.176 2003/10/03 14:33:00 peter Exp $ + * $FreeBSD: src/sys/i386/i386/locore.s,v 1.177 2003/10/04 06:30:56 peter Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -788,7 +788,12 @@ /* Map read-only from zero to the beginning of the kernel text section */ xorl %eax, %eax +#ifdef BURN_BRIDGES xorl %edx,%edx +#else +/* XXX emulate bugs in the old PSE code so that apm works */ + movl $PG_RW,%edx +#endif movl $R(btext),%ecx addl $PAGE_MASK,%ecx shrl $PAGE_SHIFT,%ecx ==== //depot/projects/netperf/sys/i386/i386/pmap.c#14 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.443 2003/10/03 22:46:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.444 2003/10/04 13:07:53 jeff Exp $"); /* * Manages physical address maps. @@ -2366,7 +2366,7 @@ { #if defined(I686_CPU) if (cpu_class == CPUCLASS_686) { -#if defined(CPU_ENABLED_SSE) +#if defined(CPU_ENABLE_SSE) if (cpu_feature & CPUID_SSE2) sse2_pagezero(page); else ==== //depot/projects/netperf/sys/kern/sched_ule.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.56 2003/09/20 02:05:58 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.57 2003/10/04 17:41:13 jeff Exp $"); #include #include @@ -673,10 +673,12 @@ static void sched_interact_update(struct ksegrp *kg) { - /* XXX Fixme, use a linear algorithm and not a while loop. */ - while ((kg->kg_runtime + kg->kg_slptime) > SCHED_SLP_RUN_MAX) { - kg->kg_runtime = (kg->kg_runtime / 5) * 4; - kg->kg_slptime = (kg->kg_slptime / 5) * 4; + int ratio; + if ((kg->kg_runtime + kg->kg_slptime) > SCHED_SLP_RUN_MAX) { + ratio = (SCHED_SLP_RUN_MAX / + (kg->kg_runtime + kg->kg_slptime)) * 4; + kg->kg_runtime = (kg->kg_runtime * ratio) / 5; + kg->kg_slptime = (kg->kg_slptime * ratio) / 5; } } ==== //depot/projects/netperf/sys/kern/vfs_subr.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.458 2003/09/20 00:21:48 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.460 2003/10/04 18:03:53 jeff Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -818,15 +818,12 @@ /* Don't recycle if we can't get the interlock */ if (!VI_TRYLOCK(vp)) return (EWOULDBLOCK); - - /* We should be able to immediately acquire this */ - /* XXX This looks like it should panic if it fails */ - if (vn_lock(vp, LK_INTERLOCK | LK_EXCLUSIVE, td) != 0) { - if (VOP_ISLOCKED(vp, td)) - panic("vcanrecycle: locked vnode"); + /* + * This vnode may found and locked via some other list, if so we + * can't recycle it yet. + */ + if (vn_lock(vp, LK_INTERLOCK | LK_EXCLUSIVE | LK_NOWAIT, td) != 0) return (EWOULDBLOCK); - } - /* * Don't recycle if its filesystem is being suspended. */ @@ -1008,7 +1005,7 @@ vp->v_dd = vp; vp->v_vnlock = &vp->v_lock; lockinit(vp->v_vnlock, PVFS, tag, VLKTIMEOUT, LK_NOPAUSE); - cache_purge(vp); + cache_purge(vp); /* Sets up v_id. */ LIST_INIT(&vp->v_cache_src); TAILQ_INIT(&vp->v_cache_dst); } @@ -1059,12 +1056,10 @@ /* * Insert into list of vnodes for the new mount point, if available. */ - if ((vp->v_mount = mp) == NULL) { - mtx_unlock(&mntvnode_mtx); - return; + if ((vp->v_mount = mp) != NULL) { + TAILQ_INSERT_TAIL(&mp->mnt_nvnodelist, vp, v_nmntvnodes); + mp->mnt_nvnodelistsize++; } - TAILQ_INSERT_TAIL(&mp->mnt_nvnodelist, vp, v_nmntvnodes); - mp->mnt_nvnodelistsize++; mtx_unlock(&mntvnode_mtx); } @@ -1686,6 +1681,7 @@ static void sched_sync(void) { + struct synclist *next; struct synclist *slp; struct vnode *vp; struct mount *mp; @@ -1711,32 +1707,31 @@ syncer_delayno += 1; if (syncer_delayno == syncer_maxdelay) syncer_delayno = 0; + next = &syncer_workitem_pending[syncer_delayno]; while ((vp = LIST_FIRST(slp)) != NULL) { - mtx_unlock(&sync_mtx); - if (VOP_ISLOCKED(vp, NULL) == 0 && - vn_start_write(vp, &mp, V_NOWAIT) == 0) { - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - (void) VOP_FSYNC(vp, td->td_ucred, MNT_LAZY, td); - VOP_UNLOCK(vp, 0, td); + if (VOP_ISLOCKED(vp, NULL) != 0 || + vn_start_write(vp, &mp, V_NOWAIT) != 0) { + LIST_REMOVE(vp, v_synclist); + LIST_INSERT_HEAD(next, vp, v_synclist); + continue; + } + if (VI_TRYLOCK(vp) == 0) { + LIST_REMOVE(vp, v_synclist); + LIST_INSERT_HEAD(next, vp, v_synclist); vn_finished_write(mp); + continue; } + mtx_unlock(&sync_mtx); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY | LK_INTERLOCK, td); + (void) VOP_FSYNC(vp, td->td_ucred, MNT_LAZY, td); + VOP_UNLOCK(vp, 0, td); + vn_finished_write(mp); mtx_lock(&sync_mtx); if (LIST_FIRST(slp) == vp) { + VI_LOCK(vp); mtx_unlock(&sync_mtx); /* - * Note: VFS vnodes can remain on the - * worklist too with no dirty blocks, but - * since sync_fsync() moves it to a different - * slot we are safe. - */ - VI_LOCK(vp); - if (TAILQ_EMPTY(&vp->v_dirtyblkhd) && - !vn_isdisk(vp, NULL)) { - panic("sched_sync: fsync failed " - "vp %p tag %s", vp, vp->v_tag); - } - /* * Put us back on the worklist. The worklist * routine will remove us from our current * position and then add us back in at a later @@ -2084,8 +2079,10 @@ if ((flags & LK_INTERLOCK) == 0) VI_LOCK(vp); if (vp->v_iflag & VI_XLOCK && vp->v_vxproc != curthread) { - vp->v_iflag |= VI_XWANT; - msleep(vp, VI_MTX(vp), PINOD | PDROP, "vget", 0); + if ((flags & LK_NOWAIT) == 0) { + vp->v_iflag |= VI_XWANT; + msleep(vp, VI_MTX(vp), PINOD | PDROP, "vget", 0); + } return (ENOENT); } @@ -2368,6 +2365,10 @@ VI_LOCK(vp); mtx_unlock(&mntvnode_mtx); + /* + * XXX Does not check vn_lock error. Should restart loop if + * error == ENOENT. + */ vn_lock(vp, LK_INTERLOCK | LK_EXCLUSIVE | LK_RETRY, td); /* * This vnode could have been reclaimed while we were @@ -2530,9 +2531,7 @@ */ if (flags & DOCLOSE) { struct buf *bp; - VI_LOCK(vp); bp = TAILQ_FIRST(&vp->v_dirtyblkhd); - VI_UNLOCK(vp); if (bp != NULL) (void) vn_write_suspend_wait(vp, NULL, V_WAIT); if (vinvalbuf(vp, V_SAVE, NOCRED, td, 0, 0) != 0) @@ -2731,13 +2730,12 @@ * If special device, remove it from special device alias list * if it is on one. */ + VI_LOCK(vp); if (vp->v_type == VCHR && vp->v_rdev != NULL && vp->v_rdev != NODEV) { - VI_LOCK(vp); mtx_lock(&spechash_mtx); SLIST_REMOVE(&vp->v_rdev->si_hlist, vp, vnode, v_specnext); vp->v_rdev->si_usecount -= vp->v_usecount; mtx_unlock(&spechash_mtx); - VI_UNLOCK(vp); vp->v_rdev = NULL; } @@ -2751,7 +2749,6 @@ * incremented first, vgone would (incorrectly) try to * close the previous instance of the underlying object. */ - VI_LOCK(vp); if (vp->v_usecount == 0 && !(vp->v_iflag & VI_DOOMED)) { mtx_lock(&vnode_free_list_mtx); if (vp->v_iflag & VI_FREE) { ==== //depot/projects/netperf/sys/kern/vfs_vnops.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.194 2003/07/28 18:53:28 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.195 2003/10/04 14:35:22 jeff Exp $"); #include "opt_mac.h" @@ -870,12 +870,15 @@ if ((flags & LK_INTERLOCK) == 0) VI_LOCK(vp); if ((vp->v_iflag & VI_XLOCK) && vp->v_vxproc != curthread) { + if ((flags & LK_NOWAIT) != 0) { + VI_UNLOCK(vp); + return (ENOENT); + } vp->v_iflag |= VI_XWANT; msleep(vp, VI_MTX(vp), PINOD, "vn_lock", 0); - error = ENOENT; if ((flags & LK_RETRY) == 0) { VI_UNLOCK(vp); - return (error); + return (ENOENT); } } #ifdef DEBUG_LOCKS ==== //depot/projects/netperf/sys/nfsclient/bootp_subr.c#5 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.52 2003/09/05 11:12:55 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.53 2003/10/04 17:41:59 jeff Exp $"); #include "opt_bootp.h" @@ -599,6 +599,7 @@ tv.tv_sec = 1; tv.tv_usec = 0; bzero(&sopt, sizeof(sopt)); + sopt.sopt_dir = SOPT_SET; sopt.sopt_level = SOL_SOCKET; sopt.sopt_name = SO_RCVTIMEO; sopt.sopt_val = &tv; ==== //depot/projects/netperf/sys/nfsclient/krpc_subr.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/krpc_subr.c,v 1.22 2003/02/19 05:47:38 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/krpc_subr.c,v 1.23 2003/10/04 17:41:59 jeff Exp $"); #include #include @@ -222,6 +222,7 @@ tv.tv_sec = 1; tv.tv_usec = 0; bzero(&sopt, sizeof sopt); + sopt.sopt_dir = SOPT_SET; sopt.sopt_level = SOL_SOCKET; sopt.sopt_name = SO_RCVTIMEO; sopt.sopt_val = &tv; ==== //depot/projects/netperf/sys/nfsclient/nfs_bio.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_bio.c,v 1.121 2003/09/19 23:37:49 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_bio.c,v 1.122 2003/10/04 08:51:50 jeff Exp $"); #include #include @@ -1067,12 +1067,13 @@ ASSERT_VOP_LOCKED(vp, "nfs_vinvalbuf"); - if (vp->v_iflag & VI_XLOCK) { -#ifdef INVARIANTS - backtrace(); -#endif + /* + * XXX This check stops us from needlessly doing a vinvalbuf when + * being called through vclean(). It is not clear that this is + * unsafe. + */ + if (vp->v_iflag & VI_XLOCK) return (0); - } if ((nmp->nm_flag & NFSMNT_INT) == 0) intrflg = 0; ==== //depot/projects/netperf/sys/nfsclient/nfs_socket.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.98 2003/05/13 20:36:01 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.99 2003/10/04 17:41:59 jeff Exp $"); /* * Socket operations for use by nfs @@ -288,6 +288,7 @@ int val; bzero(&sopt, sizeof sopt); + sopt.sopt_dir = SOPT_SET; sopt.sopt_level = SOL_SOCKET; sopt.sopt_name = SO_KEEPALIVE; sopt.sopt_val = &val; @@ -300,6 +301,7 @@ int val; bzero(&sopt, sizeof sopt); + sopt.sopt_dir = SOPT_SET; sopt.sopt_level = IPPROTO_TCP; sopt.sopt_name = TCP_NODELAY; sopt.sopt_val = &val; ==== //depot/projects/netperf/sys/nfsclient/nfs_vfsops.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.137 2003/08/15 12:04:02 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.138 2003/10/04 13:44:51 jeff Exp $"); #include "opt_bootp.h" #include "opt_nfsroot.h" @@ -943,8 +943,9 @@ if (vp->v_mount != mp) goto loop; vnp = TAILQ_NEXT(vp, v_nmntvnodes); + /* XXX Not obeying XLOCK. */ + VI_LOCK(vp); mtx_unlock(&mntvnode_mtx); - VI_LOCK(vp); if (VOP_ISLOCKED(vp, NULL) || TAILQ_EMPTY(&vp->v_dirtyblkhd) || waitfor == MNT_LAZY) { VI_UNLOCK(vp); ==== //depot/projects/netperf/sys/nfsserver/nfs_syscalls.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_syscalls.c,v 1.91 2003/07/02 08:08:32 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_syscalls.c,v 1.92 2003/10/04 17:37:51 jeff Exp $"); #include "opt_inet6.h" #include "opt_mac.h" @@ -235,6 +235,7 @@ int val; bzero(&sopt, sizeof sopt); + sopt.sopt_dir = SOPT_SET; sopt.sopt_level = SOL_SOCKET; sopt.sopt_name = SO_KEEPALIVE; sopt.sopt_val = &val; @@ -247,6 +248,7 @@ int val; bzero(&sopt, sizeof sopt); + sopt.sopt_dir = SOPT_SET; sopt.sopt_level = IPPROTO_TCP; sopt.sopt_name = TCP_NODELAY; sopt.sopt_val = &val; ==== //depot/projects/netperf/sys/sys/vnode.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vnode.h 8.7 (Berkeley) 2/4/94 - * $FreeBSD: src/sys/sys/vnode.h,v 1.226 2003/07/27 17:04:56 phk Exp $ + * $FreeBSD: src/sys/sys/vnode.h,v 1.227 2003/10/04 14:32:55 jeff Exp $ */ #ifndef _SYS_VNODE_H_ @@ -95,8 +95,17 @@ * u - Only a reference to the vnode is needed to read. * v - vnode lock * + * Vnodes may be found on many lists. The general way to deal with operating + * on a vnode that is on a list is: + * 1) Lock the list and find the vnode. + * 2) Lock interlock so that the vnode does not go away. + * 3) Unlock the list to avoid lock order reversals. + * 4) vget with LK_INTERLOCK and check for ENOENT, or + * 5) Check for XLOCK if the vnode lock is not required. + * 6) Perform your operation, then vput(). + * * XXX Not all fields are locked yet and some fields that are marked are not - * locked consistently. This is a work in progress. + * locked consistently. This is a work in progress. Requires Giant! */ struct vnode { ==== //depot/projects/netperf/sys/ufs/ffs/ffs_snapshot.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.70 2003/06/11 06:31:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.71 2003/10/04 14:25:45 jeff Exp $"); #include #include @@ -415,22 +415,30 @@ if (xvp->v_mount != mp) goto loop; nvp = TAILQ_NEXT(xvp, v_nmntvnodes); + VI_LOCK(xvp); mtx_unlock(&mntvnode_mtx); - mp_fixme("Unlocked GETATTR."); - if (vrefcnt(xvp) == 0 || xvp->v_type == VNON || - (VTOI(xvp)->i_flags & SF_SNAPSHOT) || - (VOP_GETATTR(xvp, &vat, td->td_ucred, td) == 0 && - vat.va_nlink > 0)) { + if (xvp->v_usecount == 0 || xvp->v_type == VNON || + (VTOI(xvp)->i_flags & SF_SNAPSHOT)) { + VI_UNLOCK(xvp); mtx_lock(&mntvnode_mtx); continue; } if (snapdebug) vprint("ffs_snapshot: busy vnode", xvp); - if (vn_lock(xvp, LK_EXCLUSIVE, td) != 0) + if (vn_lock(xvp, LK_EXCLUSIVE | LK_INTERLOCK, td) != 0) { + mtx_lock(&mntvnode_mtx); goto loop; + } + if (VOP_GETATTR(xvp, &vat, td->td_ucred, td) == 0 && + vat.va_nlink > 0) { + VOP_UNLOCK(xvp, 0, td); + mtx_lock(&mntvnode_mtx); + continue; + } xp = VTOI(xvp); if (ffs_checkfreefile(copy_fs, vp, xp->i_number)) { VOP_UNLOCK(xvp, 0, td); + mtx_lock(&mntvnode_mtx); continue; } /* ==== //depot/projects/netperf/sys/ufs/ffs/ffs_softdep.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.144 2003/09/03 04:08:15 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.146 2003/10/04 15:57:05 jeff Exp $"); /* * For now we want the safety net that the DIAGNOSTIC and DEBUG flags provide. @@ -4811,13 +4811,8 @@ * not now, but then the user was not asking to have it * written, so we are not breaking any promises. */ - mp_fixme("This operation is not atomic wrt the rest of the code"); - VI_LOCK(vp); - if (vp->v_iflag & VI_XLOCK) { - VI_UNLOCK(vp); + if (vp->v_iflag & VI_XLOCK) break; - } else - VI_UNLOCK(vp); /* * We prevent deadlock by always fetching inodes from the * root, moving down the directory tree. Thus, when fetching @@ -5844,7 +5839,10 @@ * The mtx argument must be bp->b_vp's mutex in * this case. */ - ASSERT_VI_LOCKED(bp->b_vp, "getdirtybuf"); +#ifdef DEBUG_VFS_LOCKS + if (bp->b_vp->v_type != VCHR) + ASSERT_VI_LOCKED(bp->b_vp, "getdirtybuf"); +#endif bp->b_vflags |= BV_BKGRDWAIT; interlocked_sleep(&lk, SLEEP, &bp->b_xflags, mtx, PRIBIO, "getbuf", 0); ==== //depot/projects/netperf/sys/ufs/ffs/ffs_vfsops.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.216 2003/08/15 20:03:19 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.217 2003/10/04 14:27:49 jeff Exp $"); #include "opt_mac.h" #include "opt_quota.h" @@ -428,9 +428,7 @@ if (vn_isdisk(devvp, NULL)) { vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); vfs_object_create(devvp, td, td->td_ucred); - /* XXX Why lock only to release immediately?? */ - mtx_lock(&devvp->v_interlock); - VOP_UNLOCK(devvp, LK_INTERLOCK, td); + VOP_UNLOCK(devvp, 0, td); } /* @@ -504,17 +502,18 @@ goto loop; } nvp = TAILQ_NEXT(vp, v_nmntvnodes); + VI_LOCK(vp); mtx_unlock(&mntvnode_mtx); /* * Step 4: invalidate all inactive vnodes. */ - if (vrecycle(vp, NULL, td)) + if (vp->v_usecount == 0) { + vgonel(vp, td); goto loop; + } /* * Step 5: invalidate all cached file data. */ - /* XXX Why lock only to release immediately? */ - mtx_lock(&vp->v_interlock); if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, td)) { goto loop; } @@ -597,9 +596,7 @@ if (vn_isdisk(devvp, NULL)) { vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); vfs_object_create(devvp, td, cred); - /* XXX Why lock only to release immediately?? */ - mtx_lock(&devvp->v_interlock); - VOP_UNLOCK(devvp, LK_INTERLOCK, td); + VOP_UNLOCK(devvp, 0, td); } ronly = (mp->mnt_flag & MNT_RDONLY) != 0; ==== //depot/projects/netperf/sys/ufs/ufs/ufs_ihash.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_ihash.c,v 1.36 2003/06/11 06:34:30 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_ihash.c,v 1.37 2003/10/04 14:03:28 jeff Exp $"); #include #include @@ -125,7 +125,7 @@ LIST_FOREACH(ip, INOHASH(dev, inum), i_hash) { if (inum == ip->i_number && dev == ip->i_dev) { vp = ITOV(ip); - mtx_lock(&vp->v_interlock); + VI_LOCK(vp); mtx_unlock(&ufs_ihash_mtx); error = vget(vp, flags | LK_INTERLOCK, td); if (error == ENOENT) @@ -162,7 +162,7 @@ LIST_FOREACH(oip, ipp, i_hash) { if (ip->i_number == oip->i_number && ip->i_dev == oip->i_dev) { ovp = ITOV(oip); - mtx_lock(&ovp->v_interlock); + VI_LOCK(ovp); mtx_unlock(&ufs_ihash_mtx); error = vget(ovp, flags | LK_INTERLOCK, td); if (error == ENOENT) ==== //depot/projects/netperf/sys/ufs/ufs/ufs_quota.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_quota.c,v 1.66 2003/07/27 17:04:56 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_quota.c,v 1.67 2003/10/04 14:02:32 jeff Exp $"); #include #include @@ -411,6 +411,7 @@ struct dquot *dq; int error, flags; struct nameidata nd; + int restart; error = suser_cred(td->td_ucred, PRISON_ROOT); if (error) @@ -457,13 +458,14 @@ */ mtx_lock(&mntvnode_mtx); again: + restart = 0; for (vp = TAILQ_FIRST(&mp->mnt_nvnodelist); vp != NULL; vp = nextvp) { if (vp->v_mount != mp) goto again; nextvp = TAILQ_NEXT(vp, v_nmntvnodes); - + VI_LOCK(vp); mtx_unlock(&mntvnode_mtx); - if (vget(vp, LK_EXCLUSIVE, td)) { + if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, td)) { mtx_lock(&mntvnode_mtx); goto again; } @@ -473,11 +475,13 @@ continue; } error = getinoquota(VTOI(vp)); + mtx_lock(&mntvnode_mtx); + if (TAILQ_NEXT(vp, v_nmntvnodes) != nextvp) + restart = 1; vput(vp); - mtx_lock(&mntvnode_mtx); if (error) break; - if (TAILQ_NEXT(vp, v_nmntvnodes) != nextvp) + if (restart) goto again; } mtx_unlock(&mntvnode_mtx); @@ -501,6 +505,7 @@ struct ufsmount *ump = VFSTOUFS(mp); struct dquot *dq; struct inode *ip; + int restart; int error; error = suser_cred(td->td_ucred, PRISON_ROOT); @@ -516,15 +521,16 @@ */ mtx_lock(&mntvnode_mtx); again: + restart = 0; for (vp = TAILQ_FIRST(&mp->mnt_nvnodelist); vp != NULL; vp = nextvp) { if (vp->v_mount != mp) goto again; nextvp = TAILQ_NEXT(vp, v_nmntvnodes); + VI_LOCK(vp); mtx_unlock(&mntvnode_mtx); - mtx_lock(&vp->v_interlock); if (vp->v_type == VNON) { - mtx_unlock(&vp->v_interlock); + VI_UNLOCK(vp); mtx_lock(&mntvnode_mtx); continue; } @@ -536,9 +542,11 @@ dq = ip->i_dquot[type]; ip->i_dquot[type] = NODQUOT; dqrele(vp, dq); - vput(vp); mtx_lock(&mntvnode_mtx); if (TAILQ_NEXT(vp, v_nmntvnodes) != nextvp) + restart = 1; + vput(vp); + if (restart) goto again; } mtx_unlock(&mntvnode_mtx); @@ -731,6 +739,7 @@ struct thread *td = curthread; /* XXX */ struct vnode *vp, *nextvp; struct dquot *dq; + int restart; int i, error; /* @@ -748,14 +757,15 @@ */ mtx_lock(&mntvnode_mtx); again: + restart = 0; for (vp = TAILQ_FIRST(&mp->mnt_nvnodelist); vp != NULL; vp = nextvp) { if (vp->v_mount != mp) goto again; nextvp = TAILQ_NEXT(vp, v_nmntvnodes); + VI_LOCK(vp); mtx_unlock(&mntvnode_mtx); - mtx_lock(&vp->v_interlock); if (vp->v_type == VNON) { - mtx_unlock(&vp->v_interlock); + VI_UNLOCK(vp); mtx_lock(&mntvnode_mtx); continue; } @@ -771,9 +781,11 @@ if (dq != NODQUOT && (dq->dq_flags & DQ_MOD)) dqsync(vp, dq); } + if (TAILQ_NEXT(vp, v_nmntvnodes) != nextvp) + restart = 1; + mtx_lock(&mntvnode_mtx); vput(vp); - mtx_lock(&mntvnode_mtx); - if (TAILQ_NEXT(vp, v_nmntvnodes) != nextvp) + if (restart) goto again; } mtx_unlock(&mntvnode_mtx); ==== //depot/projects/netperf/sys/vm/device_pager.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/device_pager.c,v 1.67 2003/08/05 06:51:26 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/device_pager.c,v 1.68 2003/10/04 14:21:53 jeff Exp $"); #include #include @@ -95,7 +95,8 @@ sx_init(&dev_pager_sx, "dev_pager create"); mtx_init(&dev_pager_mtx, "dev_pager list", NULL, MTX_DEF); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 4 12:16:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6551B16A4C0; Sat, 4 Oct 2003 12:16:43 -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 3AFE416A4B3 for ; Sat, 4 Oct 2003 12:16:43 -0700 (PDT) Received: from perrin.nxad.com (internal.nxad.com [69.1.70.251]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0B4043F85 for ; Sat, 4 Oct 2003 12:16:42 -0700 (PDT) (envelope-from hmp@nxad.com) Received: by perrin.nxad.com (Postfix, from userid 1072) id C62E421064; Sat, 4 Oct 2003 12:16:41 -0700 (PDT) Date: Sat, 4 Oct 2003 12:16:41 -0700 From: Hiten Pandya To: "M. Warner Losh" Message-ID: <20031004191641.GA27319@perrin.nxad.com> References: <20031001142349.A87379@FreeBSD.org> <20031001.164315.11988972.imp@bsdimp.com> <20031002022135.GA26666@perrin.nxad.com> <20031003.000052.96921421.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20031003.000052.96921421.imp@bsdimp.com> X-Operating-System: FreeBSD FreeBSD 4.7-STABLE User-Agent: Mutt/1.5.4i cc: perforce@freebsd.org cc: julian@elischer.org Subject: Re: PERFORCE change 38917 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, 04 Oct 2003 19:16:43 -0000 On Fri, Oct 03, 2003 at 12:00:52AM -0600, M. Warner Losh wrote: : In message: <20031002022135.GA26666@perrin.nxad.com> : Hiten Pandya writes: : : Does this also include PCI Hotplugging or is this going to be : : a separate effort? : : Yes and no. : : We already have removable devices in the tree. CardBus, PC Card, USB : and Firewire. Right now the drivers take liberties and chances and : there are a number of ugly races that rear their ugly heads. This is : an effort to clean that up and make things totally safe in all the : cases that we can think of, and to document those areas where we : can't. : : There's no specific plans on my part to implement the hot plug state : transition and deal with it. People have raised their hands in the : past to work on it, but so far no one has made significant progress in : public view. Hmm, I see your point of view. Also, another problem with PCI Hotplug controllers is that most of them are proprietary, like for example, the IBM controllers. Regards, -- Hiten Pandya hmp@backplane.com