From owner-p4-projects@FreeBSD.ORG Sun Jul 20 21:23:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC2EF37B404; Sun, 20 Jul 2003 21:23: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 3C23937B401 for ; Sun, 20 Jul 2003 21:23:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EA3A43F3F for ; Sun, 20 Jul 2003 21:23:33 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6L4NX0U091576 for ; Sun, 20 Jul 2003 21:23:33 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6L4NWj4091573 for perforce@freebsd.org; Sun, 20 Jul 2003 21:23:32 -0700 (PDT) Date: Sun, 20 Jul 2003 21:23:32 -0700 (PDT) Message-Id: <200307210423.h6L4NWj4091573@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 34762 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, 21 Jul 2003 04:23:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=34762 Change 34762 by marcel@marcel_nfs on 2003/07/20 21:22:37 IFC @34761 Affected files ... .. //depot/projects/ia64/Makefile#29 integrate .. //depot/projects/ia64/bin/ed/Makefile#8 integrate .. //depot/projects/ia64/bin/ed/re.c#4 integrate .. //depot/projects/ia64/contrib/smbfs/mount_smbfs/mount_smbfs.c#4 integrate .. //depot/projects/ia64/lib/libpthread/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/ia64/lib/libtelnet/Makefile#5 integrate .. //depot/projects/ia64/libexec/telnetd/Makefile#5 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#7 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#14 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/ia64/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/ia64/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#44 integrate .. //depot/projects/ia64/sys/dev/wi/if_wivar.h#15 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#61 integrate .. //depot/projects/ia64/sys/net/if_media.h#11 integrate .. //depot/projects/ia64/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#34 integrate .. //depot/projects/ia64/usr.bin/telnet/Makefile#5 integrate Differences ... ==== //depot/projects/ia64/Makefile#29 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.285 2003/07/19 23:17:08 ru Exp $ +# $FreeBSD: src/Makefile,v 1.286 2003/07/20 12:38:29 ru Exp $ # # The user-driven targets are: # @@ -65,7 +65,7 @@ hierarchy install installcheck installkernel installkernel.debug\ reinstallkernel reinstallkernel.debug installmost installworld \ libraries lint maninstall \ - mk most obj objlink regress rerelease tags update + most obj objlink regress rerelease tags update BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} ==== //depot/projects/ia64/bin/ed/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.26 2003/06/29 10:03:35 ru Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.28 2003/07/20 12:26:24 ru Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c @@ -8,7 +8,7 @@ .if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) DISTRIBUTION=crypto CFLAGS+=-DDES -WARNS= 2 +WARNS?= 2 DPADD= ${LIBCRYPTO} LDADD= -lcrypto .endif ==== //depot/projects/ia64/bin/ed/re.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ed/re.c,v 1.19 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/re.c,v 1.20 2003/07/20 10:24:09 ru Exp $"); #include "ed.h" @@ -41,10 +41,10 @@ pattern_t * get_compiled_pattern(void) { - static pattern_t *exp = NULL; + static pattern_t *expr = NULL; static char error[1024]; - char *exps; + char *exprs; char delimiter; int n; @@ -52,27 +52,27 @@ errmsg = "invalid pattern delimiter"; return NULL; } else if (delimiter == '\n' || *++ibufp == '\n' || *ibufp == delimiter) { - if (!exp) + if (!expr) errmsg = "no previous pattern"; - return exp; - } else if ((exps = extract_pattern(delimiter)) == NULL) + return expr; + } else if ((exprs = extract_pattern(delimiter)) == NULL) return NULL; /* buffer alloc'd && not reserved */ - if (exp && !patlock) - regfree(exp); - else if ((exp = (pattern_t *) malloc(sizeof(pattern_t))) == NULL) { + if (expr && !patlock) + regfree(expr); + else if ((expr = (pattern_t *) malloc(sizeof(pattern_t))) == NULL) { fprintf(stderr, "%s\n", strerror(errno)); errmsg = "out of memory"; return NULL; } patlock = 0; - if ((n = regcomp(exp, exps, 0))) { - regerror(n, exp, error, sizeof error); + if ((n = regcomp(expr, exprs, 0))) { + regerror(n, expr, error, sizeof error); errmsg = error; - free(exp); - return exp = NULL; + free(expr); + return expr = NULL; } - return exp; + return expr; } ==== //depot/projects/ia64/contrib/smbfs/mount_smbfs/mount_smbfs.c#4 (text+ko) ==== @@ -30,6 +30,7 @@ * SUCH DAMAGE. * * $Id: mount_smbfs.c,v 1.17 2002/04/10 04:17:51 bp Exp $ + * $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.c,v 1.2 2003/07/20 11:27:54 tjr Exp $ */ #include #include @@ -75,7 +76,7 @@ extern void dropsuid(); extern int loadsmbvfs(); #else - struct vfsconf vfc; + struct xvfsconf vfc; #endif /* APPLE */ char *next; int opt, error, mntflags, caseopt; ==== //depot/projects/ia64/lib/libpthread/arch/amd64/include/pthread_md.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/amd64/include/pthread_md.h,v 1.1 2003/07/19 04:44:21 deischen Exp $ + * $FreeBSD: src/lib/libpthread/arch/amd64/include/pthread_md.h,v 1.2 2003/07/20 12:41:38 deischen Exp $ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -33,8 +33,10 @@ #include -#define THR_GETCONTEXT(ucp) (void)_amd64_save_context(&(ucp)->uc_mcontext) -#define THR_SETCONTEXT(ucp) (void)_amd64_restore_context(&(ucp)->uc_mcontext) +#define THR_GETCONTEXT(ucp) \ + (void)_amd64_save_context(&(ucp)->uc_mcontext) +#define THR_SETCONTEXT(ucp) \ + (void)_amd64_restore_context(&(ucp)->uc_mcontext, NULL, NULL) #define THR_ALIGNBYTES 15 #define THR_ALIGN(td) (((uintptr_t)(td) + THR_ALIGNBYTES) & ~THR_ALIGNBYTES) ==== //depot/projects/ia64/lib/libtelnet/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 12/15/93 -# $FreeBSD: src/lib/libtelnet/Makefile,v 1.15 2003/07/16 20:59:14 markm Exp $ +# $FreeBSD: src/lib/libtelnet/Makefile,v 1.16 2003/07/20 23:29:46 markm Exp $ TELNETDIR= ${.CURDIR}/../../contrib/telnet .PATH: ${TELNETDIR}/libtelnet @@ -13,7 +13,7 @@ WARNS?= 2 -.if !defined(NO_CRYPTO) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA .if !defined(NO_KERBEROS) ==== //depot/projects/ia64/libexec/telnetd/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/libexec/telnetd/Makefile,v 1.20 2003/07/16 20:59:14 markm Exp $ +# $FreeBSD: src/libexec/telnetd/Makefile,v 1.21 2003/07/20 23:29:46 markm Exp $ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. @@ -28,7 +28,7 @@ DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} LDADD= -lutil -ltermcap ${LIBTELNET} -.if !defined(NO_CRYPTO) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM} ==== //depot/projects/ia64/rescue/rescue/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/rescue/rescue/Makefile,v 1.12 2003/07/19 20:40:37 obrien Exp $ +#$FreeBSD: src/rescue/rescue/Makefile,v 1.13 2003/07/21 02:47:04 obrien Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= rescue @@ -105,7 +105,7 @@ CRUNCH_PROGS_sbin= atm atacontrol badsect bsdlabel camcontrol \ ccdconfig clri devfs dmesg dump \ dumpfs dumpon fore_dnld fsck fsck_ffs fsck_msdosfs fsdb \ - fsirand gbde ifconfig ilmid init ip6fw \ + fsirand gbde ifconfig ilmid init \ kldconfig kldload kldstat kldunload ldconfig \ md5 mdconfig mdmfs mknod mount mount_cd9660 mount_ext2fs \ mount_msdosfs mount_nfs mount_ntfs mount_nullfs \ ==== //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.34 2003/07/20 00:48:38 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.36 2003/07/20 21:12:21 njl Exp $ */ /****************************************************************************** * @@ -232,7 +232,7 @@ } ACPI_TABLE_ECDT; /* Indicate that this device has already been probed via ECDT. */ -#define DEV_ECDT_FLAG 0x80000000 +#define DEV_ECDT(x) (acpi_get_private(x) == &acpi_ec_devclass) /* Indicate that this device should use the global lock. */ #define DEV_GLK_FLAG 0x40000000 @@ -247,7 +247,8 @@ struct acpi_ec_softc { device_t ec_dev; ACPI_HANDLE ec_handle; - UINT32 ec_gpebit; + UINT8 ec_gpebit; + UINT8 ec_csrvalue; int ec_data_rid; struct resource *ec_data_res; @@ -262,7 +263,7 @@ int ec_glk; int ec_glkhandle; struct mtx ec_mtx; - UINT32 ec_polldelay; + int ec_polldelay; }; /* @@ -321,7 +322,6 @@ UINT32 width, ACPI_INTEGER *Value, void *Context, void *RegionContext); static ACPI_STATUS EcWaitEvent(struct acpi_ec_softc *sc, EC_EVENT Event); -static ACPI_STATUS EcQuery(struct acpi_ec_softc *sc, UINT8 *Data); static ACPI_STATUS EcCommand(struct acpi_ec_softc *sc, EC_COMMAND cmd); static ACPI_STATUS EcRead(struct acpi_ec_softc *sc, UINT8 Address, UINT8 *Data); @@ -401,7 +401,8 @@ * We'll determine whether we really want to use the global lock * in a later call to attach. */ - magic = DEV_ECDT_FLAG | DEV_GLK_FLAG; + acpi_set_private(child, &acpi_ec_devclass); + magic = DEV_GLK_FLAG; DEV_SET_GPEBIT(magic, ecdt->gpe_bit); acpi_set_magic(child, magic); @@ -419,11 +420,9 @@ char desc[64]; int magic, uid, glk, gpebit, ret = ENXIO; - /* Check that this is an EC device and it's not disabled. */ - if (acpi_get_type(dev) != ACPI_TYPE_DEVICE || acpi_disabled("ec") || - !acpi_MatchHid(dev, "PNP0C09")) { + /* Check that this is a device and that EC is not disabled. */ + if (acpi_get_type(dev) != ACPI_TYPE_DEVICE || acpi_disabled("ec")) return (ENXIO); - } /* * If probed via ECDT, set description and continue. Otherwise, @@ -431,12 +430,12 @@ * duplicate probe. */ magic = acpi_get_magic(dev); - if ((magic & DEV_ECDT_FLAG) != 0) { + if (DEV_ECDT(dev)) { snprintf(desc, sizeof(desc), "embedded controller: ECDT, GPE %#x, GLK", DEV_GET_GPEBIT(magic)); device_set_desc_copy(dev, desc); ret = 0; - } else { + } else if (acpi_MatchHid(dev, "PNP0C09")) { h = acpi_get_handle(dev); /* @@ -590,29 +589,6 @@ return (errval); } -static ACPI_STATUS -EcQuery(struct acpi_ec_softc *sc, UINT8 *Data) -{ - ACPI_STATUS Status; - - Status = EcLock(sc); - if (ACPI_FAILURE(Status)) - return (Status); - - /* - * Send a query command to the EC to find out which _Qxx call it - * wants to make. This command clears the SCI bit and also the - * interrupt source since we are edge-triggered. - */ - Status = EcCommand(sc, EC_COMMAND_QUERY); - if (ACPI_SUCCESS(Status)) - *Data = EC_GET_DATA(sc); - - EcUnlock(sc); - - return (Status); -} - static void EcGpeQueryHandler(void *Context) { @@ -625,32 +601,39 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); KASSERT(Context != NULL, ("EcGpeQueryHandler called with NULL")); + Status = EcLock(sc); + if (ACPI_FAILURE(Status)) { + ACPI_VPRINT(sc->ec_dev, acpi_device_get_parent_softc(sc->ec_dev), + "GpeQuery lock error: %s\n", AcpiFormatException(Status)); + return; + } + /* - * Check status for EC_SCI. - * - * Bail out if the EC_SCI bit of the status register is not set. - * Note that this function should only be called when - * this bit is set (polling is used to detect IBE/OBF events). - * - * We don't acquire the global lock here but do protect against other - * running commands (read/write/query) by grabbing ec_mtx. + * If the EC_SCI bit of the status register is not set, then pass + * it along to any potential waiters as it may be an IBE/OBF event. */ - mtx_lock(&sc->ec_mtx); EcStatus = EC_GET_CSR(sc); - mtx_unlock(&sc->ec_mtx); if ((EcStatus & EC_EVENT_SCI) == 0) { - /* If it's not an SCI, wakeup the EcWaitEvent sleep. */ - wakeup(&sc->ec_polldelay); + sc->ec_csrvalue = EcStatus; + wakeup(&sc->ec_csrvalue); + EcUnlock(sc); goto re_enable; } - /* Find out why the EC is signaling us. */ - Status = EcQuery(sc, &Data); + /* + * Send a query command to the EC to find out which _Qxx call it + * wants to make. This command clears the SCI bit and also the + * interrupt source since we are edge-triggered. + */ + Status = EcCommand(sc, EC_COMMAND_QUERY); if (ACPI_FAILURE(Status)) { + EcUnlock(sc); ACPI_VPRINT(sc->ec_dev, acpi_device_get_parent_softc(sc->ec_dev), "GPE query failed - %s\n", AcpiFormatException(Status)); goto re_enable; } + Data = EC_GET_DATA(sc); + EcUnlock(sc); /* Ignore the value for "no outstanding event". (13.3.5) */ if (Data == 0) @@ -770,7 +753,7 @@ { EC_STATUS EcStatus; ACPI_STATUS Status; - UINT32 i, period; + int i, period, retval; mtx_assert(&sc->ec_mtx, MA_OWNED); Status = AE_NO_HARDWARE_RESPONSE; @@ -812,13 +795,18 @@ * for completion, sleeping for chunks of 10 ms. */ if (Status != AE_OK) { + retval = -1; for (i = 0; i < EC_POLL_TIMEOUT / 10; i++) { - EcStatus = EC_GET_CSR(sc); + if (retval != 0) + EcStatus = EC_GET_CSR(sc); + else + EcStatus = sc->ec_csrvalue; if (EVENT_READY(Event, EcStatus)) { Status = AE_OK; break; } - msleep(&sc->ec_polldelay, &sc->ec_mtx, PZERO, "ecpoll", 10/*ms*/); + retval = msleep(&sc->ec_csrvalue, &sc->ec_mtx, PZERO, "ecpoll", + 10/*ms*/); } } ==== //depot/projects/ia64/sys/dev/ath/if_ath.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.3 2003/07/13 17:07:25 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.4 2003/07/20 21:38:20 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -129,7 +129,7 @@ static int ath_startrecv(struct ath_softc *); static void ath_next_scan(void *); static void ath_calibrate(void *); -static int ath_newstate(void *, enum ieee80211_state); +static int ath_newstate(struct ieee80211com *, enum ieee80211_state, int); static void ath_newassoc(struct ieee80211com *, struct ieee80211_node *, int); static int ath_getchannels(struct ath_softc *, u_int cc, HAL_BOOL outdoor); @@ -281,7 +281,6 @@ ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; ic->ic_softc = sc; - ic->ic_newstate = ath_newstate; ic->ic_newassoc = ath_newassoc; /* XXX not right but it's not used anywhere important */ ic->ic_phytype = IEEE80211_T_OFDM; @@ -300,7 +299,9 @@ ic->ic_node_alloc = ath_node_alloc; ic->ic_node_free = ath_node_free; ic->ic_node_copy = ath_node_copy; - + sc->sc_newstate = ic->ic_newstate; + ic->ic_newstate = ath_newstate; + /* complete initialization */ ieee80211_media_init(ifp, ath_media_change, ieee80211_media_status); if_printf(ifp, "802.11 address: %s\n", ether_sprintf(ic->ic_myaddr)); @@ -453,13 +454,12 @@ { struct ath_softc *sc = arg; struct ieee80211com *ic = &sc->sc_ic; - struct ifnet *ifp = &ic->ic_if; DPRINTF(("ath_bmiss_proc: pending %u\n", pending)); KASSERT(ic->ic_opmode == IEEE80211_M_STA, ("unexpect operating mode %u", ic->ic_opmode)); if (ic->ic_state == IEEE80211_S_RUN) - ieee80211_new_state(ifp, IEEE80211_S_SCAN, -1); + ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); } static u_int @@ -546,7 +546,7 @@ mode = ieee80211_chan2mode(ic, ni->ni_chan); if (mode != sc->sc_curmode) ath_setcurmode(sc, mode); - ieee80211_new_state(ifp, IEEE80211_S_SCAN, -1); + ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); done: mtx_unlock(&sc->sc_mtx); } @@ -554,6 +554,7 @@ static void ath_stop(struct ifnet *ifp) { + struct ieee80211com *ic = (struct ieee80211com *) ifp; struct ath_softc *sc = ifp->if_softc; struct ath_hal *ah = sc->sc_ah; @@ -587,7 +588,7 @@ sc->sc_rxlink = NULL; IF_DRAIN(&ifp->if_snd); ath_beacon_free(sc); - ieee80211_new_state(ifp, IEEE80211_S_INIT, -1); + ieee80211_new_state(ic, IEEE80211_S_INIT, -1); if (!sc->sc_invalid) ath_hal_setpower(ah, HAL_PM_FULL_SLEEP, 0); } @@ -2156,21 +2157,15 @@ } static int -ath_newstate(void *arg, enum ieee80211_state nstate) +ath_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) { - struct ath_softc *sc = arg; + struct ifnet *ifp = &ic->ic_if; + struct ath_softc *sc = ifp->if_softc; struct ath_hal *ah = sc->sc_ah; - struct ieee80211com *ic = &sc->sc_ic; - struct ifnet *ifp = &ic->ic_if; struct ieee80211_node *ni; int i, error; u_int8_t *bssid; u_int32_t rfilt; - enum ieee80211_state ostate; -#ifdef AR_DEBUG - static const char *stname[] = - { "INIT", "SCAN", "AUTH", "ASSOC", "RUN" }; -#endif /* AR_DEBUG */ static const HAL_LED_STATE leds[] = { HAL_LED_INIT, /* IEEE80211_S_INIT */ HAL_LED_SCAN, /* IEEE80211_S_SCAN */ @@ -2179,17 +2174,18 @@ HAL_LED_RUN, /* IEEE80211_S_RUN */ }; - ostate = ic->ic_state; - - DPRINTF(("%s: %s -> %s\n", __func__, stname[ostate], stname[nstate])); + DPRINTF(("%s: %s -> %s\n", __func__, + ieee80211_state_name[ic->ic_state], + ieee80211_state_name[nstate])); ath_hal_setledstate(ah, leds[nstate]); /* set LED */ if (nstate == IEEE80211_S_INIT) { sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); ath_hal_intrset(ah, sc->sc_imask); - error = 0; /* cheat + use error return */ - goto bad; + callout_stop(&sc->sc_scan_ch); + callout_stop(&sc->sc_cal_ch); + return (*sc->sc_newstate)(ic, nstate, arg); } ni = ic->ic_bss; error = ath_chan_set(sc, ni->ni_chan); @@ -2259,10 +2255,14 @@ * Reset the rate control state. */ ath_rate_ctl_reset(sc, nstate); - return 0; + /* + * Invoke the parent method to complete the work. + */ + return (*sc->sc_newstate)(ic, nstate, arg); bad: callout_stop(&sc->sc_scan_ch); callout_stop(&sc->sc_cal_ch); + /* NB: do not invoke the parent */ return error; } ==== //depot/projects/ia64/sys/dev/ath/if_athvar.h#3 (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 DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.2 2003/07/13 17:07:25 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.3 2003/07/20 21:38:20 sam Exp $ */ /* @@ -78,6 +78,8 @@ struct ath_softc { struct ieee80211com sc_ic; /* IEEE 802.11 common */ + int (*sc_newstate)(struct ieee80211com *, + enum ieee80211_state, int); device_t sc_dev; bus_space_tag_t sc_st; /* bus space tag */ bus_space_handle_t sc_sh; /* bus space handle */ ==== //depot/projects/ia64/sys/dev/usb/usb_mem.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: usb_mem.c,v 1.26 2003/02/01 06:23:40 thorpej Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usb_mem.c,v 1.1 2003/07/15 22:42:37 jmg Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_mem.c,v 1.2 2003/07/21 02:41:01 jmg Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usb_mem.c,v 1.1 2003/07/15 22:42:37 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/usb_mem.c,v 1.2 2003/07/21 02:41:01 jmg Exp $"); #include #include @@ -84,7 +84,7 @@ #endif #define USB_MEM_SMALL 64 -#define USB_MEM_CHUNKS (PAGE_SIZE / 64) +#define USB_MEM_CHUNKS (PAGE_SIZE / USB_MEM_SMALL) #define USB_MEM_BLOCK (USB_MEM_SMALL * USB_MEM_CHUNKS) /* This struct is overlayed on free fragments. */ @@ -256,6 +256,10 @@ return (err); } b->fullblock = 0; + /* XXX - override the tag, ok since we never free it */ + b->tag = tag; + KASSERT(sizeof *f <= USB_MEM_SMALL, ("USB_MEM_SMALL(%d) is too small for struct usb_frag_dma(%d)\n", + USB_MEM_SMALL, sizeof *f)); for (i = 0; i < USB_MEM_BLOCK; i += USB_MEM_SMALL) { f = (struct usb_frag_dma *)((char *)b->kaddr + i); f->block = b; ==== //depot/projects/ia64/sys/dev/wi/if_wi.c#44 (text+ko) ==== @@ -62,7 +62,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.147 2003/07/03 10:16:40 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.148 2003/07/20 21:37:32 sam Exp $"); #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -146,7 +146,7 @@ static int wi_read_rid(struct wi_softc *, int, void *, int *); static int wi_write_rid(struct wi_softc *, int, void *, int); -static int wi_newstate(void *, enum ieee80211_state); +static int wi_newstate(struct ieee80211com *, enum ieee80211_state, int); static int wi_scan_ap(struct wi_softc *, u_int16_t, u_int16_t); static void wi_scan_result(struct wi_softc *, int, int); @@ -312,7 +312,6 @@ ic->ic_opmode = IEEE80211_M_STA; ic->ic_caps = IEEE80211_C_PMGT | IEEE80211_C_AHDEMO; ic->ic_state = IEEE80211_S_INIT; - ic->ic_newstate = wi_newstate; /* * Query the card for available channels and setup the @@ -452,6 +451,9 @@ * Call MI attach routine. */ ieee80211_ifattach(ifp); + /* override state transition method */ + sc->sc_newstate = ic->ic_newstate; + ic->ic_newstate = wi_newstate; ieee80211_media_init(ifp, wi_media_change, wi_media_status); return (0); @@ -716,7 +718,7 @@ ifp->if_flags &= ~IFF_OACTIVE; if (ic->ic_opmode == IEEE80211_M_AHDEMO || ic->ic_opmode == IEEE80211_M_HOSTAP) - wi_newstate(sc, IEEE80211_S_RUN); + ieee80211_new_state(ic, IEEE80211_S_RUN, -1); /* Enable interrupts */ CSR_WRITE_2(sc, WI_INT_EN, WI_INTRS); @@ -758,12 +760,13 @@ void wi_stop(struct ifnet *ifp, int disable) { + struct ieee80211com *ic = (struct ieee80211com *) ifp; struct wi_softc *sc = ifp->if_softc; WI_LOCK_DECL(); WI_LOCK(sc); - ieee80211_new_state(ifp, IEEE80211_S_INIT, -1); + ieee80211_new_state(ic, IEEE80211_S_INIT, -1); if (sc->sc_enabled && !sc->wi_gone) { CSR_WRITE_2(sc, WI_INT_EN, 0); wi_cmd(sc, WI_CMD_DISABLE | sc->sc_portnum, 0, 0, 0); @@ -996,10 +999,11 @@ if (sc->sc_syn_timer) { if (--sc->sc_syn_timer == 0) { + struct ieee80211com *ic = (struct ieee80211com *) ifp; DPRINTF2(("wi_watchdog: %d false syns\n", sc->sc_false_syns)); sc->sc_false_syns = 0; - ieee80211_new_state(ifp, IEEE80211_S_RUN, -1); + ieee80211_new_state(ic, IEEE80211_S_RUN, -1); sc->sc_syn_timer = 5; } ifp->if_timer = 1; @@ -1244,7 +1248,7 @@ sc->sc_false_syns >= WI_MAX_FALSE_SYNS) return; - ieee80211_new_state(ifp, IEEE80211_S_RUN, -1); + ieee80211_new_state(ic, IEEE80211_S_RUN, -1); } static void @@ -1547,7 +1551,7 @@ break; /* FALLTHROUGH */ case WI_INFO_LINK_STAT_AP_CHG: - ieee80211_new_state(ifp, IEEE80211_S_RUN, -1); + ieee80211_new_state(ic, IEEE80211_S_RUN, -1); break; case WI_INFO_LINK_STAT_AP_INR: sc->sc_flags &= ~WI_FLAGS_OUTRANGE; @@ -1566,7 +1570,7 @@ case WI_INFO_LINK_STAT_DISCONNECTED: case WI_INFO_LINK_STAT_ASSOC_FAILED: if (ic->ic_opmode == IEEE80211_M_STA) - ieee80211_new_state(ifp, IEEE80211_S_INIT, -1); + ieee80211_new_state(ic, IEEE80211_S_INIT, -1); break; } break; @@ -2519,30 +2523,25 @@ } static int -wi_newstate(void *arg, enum ieee80211_state nstate) +wi_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) { - struct wi_softc *sc = arg; - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = &ic->ic_if; + struct wi_softc *sc = ifp->if_softc; struct ieee80211_node *ni = ic->ic_bss; int buflen; u_int16_t val; struct wi_ssid ssid; u_int8_t old_bssid[IEEE80211_ADDR_LEN]; - enum ieee80211_state ostate; -#ifdef WI_DEBUG - static const char *stname[] = - { "INIT", "SCAN", "AUTH", "ASSOC", "RUN" }; -#endif /* WI_DEBUG */ - ostate = ic->ic_state; - DPRINTF(("wi_newstate: %s -> %s\n", stname[ostate], stname[nstate])); + DPRINTF(("%s: %s -> %s\n", __func__, + ieee80211_state_name[ic->ic_state], + ieee80211_state_name[nstate])); - ic->ic_state = nstate; switch (nstate) { case IEEE80211_S_INIT: ic->ic_flags &= ~IEEE80211_F_SIBSS; sc->sc_flags &= ~WI_FLAGS_OUTRANGE; - return 0; + return (*sc->sc_newstate)(ic, nstate, arg); case IEEE80211_S_RUN: sc->sc_flags &= ~WI_FLAGS_OUTRANGE; @@ -2584,8 +2583,8 @@ break; } - /* skip standard ieee80211 handling */ - return EINPROGRESS; + ic->ic_state = nstate; /* NB: skip normal ieee80211 handling */ + return 0; } static int ==== //depot/projects/ia64/sys/dev/wi/if_wivar.h#15 (text+ko) ==== @@ -31,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/wi/if_wivar.h,v 1.18 2003/06/28 06:17:26 sam Exp $ + * $FreeBSD: src/sys/dev/wi/if_wivar.h,v 1.19 2003/07/20 21:37:32 sam Exp $ */ #if 0 @@ -61,6 +61,8 @@ struct wi_softc { struct ieee80211com sc_ic; + int (*sc_newstate)(struct ieee80211com *, + enum ieee80211_state, int); device_t sc_dev; #if __FreeBSD_version >= 500000 struct mtx sc_mtx; ==== //depot/projects/ia64/sys/kern/kern_sig.c#61 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.252 2003/07/17 22:52:55 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.253 2003/07/21 00:26:52 davidxu Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -1515,6 +1515,9 @@ if (td->td_upcall) td->td_upcall->ku_flags |= KUF_DOUPCALL; mtx_unlock_spin(&sched_lock); + } else { + /* UTS caused a sync signal */ + sigexit(td, SIGILL); } } else { PROC_LOCK(p); @@ -1540,6 +1543,7 @@ error = copyout(&siginfo, &td->td_mailbox->tm_syncsig, sizeof(siginfo)); PROC_LOCK(p); + /* UTS memory corrupted */ if (error) sigexit(td, SIGILL); SIGADDSET(td->td_sigmask, sig); @@ -2282,7 +2286,8 @@ #endif _STOPEVENT(p, S_SIG, sig); - if (action == SIG_DFL) { + if (!(td->td_flags & TDF_SA && td->td_mailbox) && + action == SIG_DFL) { /* * Default action, where the default is to kill * the process. (Other cases were ignored above.) @@ -2291,6 +2296,13 @@ sigexit(td, sig); /* NOTREACHED */ } else { + if (td->td_flags & TDF_SA && td->td_mailbox) { + if (sig == SIGKILL) { + mtx_unlock(&ps->ps_mtx); + sigexit(td, sig); + } + } + /* * If we get here, the signal must be caught. */ @@ -2333,7 +2345,7 @@ p->p_code = 0; p->p_sig = 0; } - if (td->td_flags & TDF_SA) + if (td->td_flags & TDF_SA && td->td_mailbox) thread_signal_add(curthread, sig); else (*p->p_sysent->sv_sendsig)(action, sig, ==== //depot/projects/ia64/sys/net/if_media.h#11 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $ */ -/* $FreeBSD: src/sys/net/if_media.h,v 1.22 2003/06/25 15:03:05 sam Exp $ */ +/* $FreeBSD: src/sys/net/if_media.h,v 1.23 2003/07/21 02:48:35 sam Exp $ */ /* * Copyright (c) 1997 @@ -194,6 +194,7 @@ #define IFM_IEEE80211_IBSS 0x00000400 /* Operate in IBSS mode */ #define IFM_IEEE80211_IBSSMASTER 0x00000800 /* Operate as an IBSS master */ #define IFM_IEEE80211_TURBO 0x00001000 /* Operate in turbo mode */ +#define IFM_IEEE80211_MONITOR 0x00002000 /* Operate in monitor mode */ /* operating mode for multi-mode devices */ #define IFM_IEEE80211_11A 1 /* 5Ghz, OFDM mode */ #define IFM_IEEE80211_11B 2 /* Direct Sequence mode */ @@ -443,6 +444,7 @@ { IFM_IEEE80211_IBSS, "ibss" }, \ { IFM_IEEE80211_IBSSMASTER, "ibss-master" }, \ { IFM_IEEE80211_TURBO, "turbo" }, \ + { IFM_IEEE80211_MONITOR, "monitor" }, \ { 0, NULL }, \ } ==== //depot/projects/ia64/sys/net80211/ieee80211.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.4 2003/06/29 20:10:54 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.6 2003/07/21 02:49:42 sam Exp $"); /* * IEEE 802.11 generic handler @@ -275,6 +275,8 @@ ADD(ic, IFM_AUTO, mopt | IFM_IEEE80211_HOSTAP); if (ic->ic_caps & IEEE80211_C_AHDEMO) ADD(ic, IFM_AUTO, mopt | IFM_IEEE80211_ADHOC | IFM_FLAG0); + if (ic->ic_caps & IEEE80211_C_MONITOR) + ADD(ic, IFM_AUTO, mopt | IFM_IEEE80211_MONITOR); if (mode == IEEE80211_MODE_AUTO) continue; if_printf(ifp, "%s rates: ", ieee80211_phymode_name[mode]); @@ -294,6 +296,8 @@ ADD(ic, mword, mopt | IFM_IEEE80211_HOSTAP); if (ic->ic_caps & IEEE80211_C_AHDEMO) ADD(ic, mword, mopt | IFM_IEEE80211_ADHOC | IFM_FLAG0); + if (ic->ic_caps & IEEE80211_C_MONITOR) + ADD(ic, mword, mopt | IFM_IEEE80211_MONITOR); /* * Add rate to the collection of all rates. */ @@ -325,6 +329,8 @@ ADD(ic, mword, IFM_IEEE80211_HOSTAP); if (ic->ic_caps & IEEE80211_C_AHDEMO) ADD(ic, mword, IFM_IEEE80211_ADHOC | IFM_FLAG0); + if (ic->ic_caps & IEEE80211_C_MONITOR) + ADD(ic, mword, IFM_IEEE80211_MONITOR); } ieee80211_media_status(ifp, &imr); ifmedia_set(&ic->ic_media, imr.ifm_active); @@ -441,6 +447,8 @@ newopmode = IEEE80211_M_HOSTAP; else if (ime->ifm_media & IFM_IEEE80211_ADHOC) newopmode = IEEE80211_M_IBSS; + else if (ime->ifm_media & IFM_IEEE80211_MONITOR) + newopmode = IEEE80211_M_MONITOR; else newopmode = IEEE80211_M_STA; @@ -486,6 +494,7 @@ case IEEE80211_M_AHDEMO: case IEEE80211_M_HOSTAP: case IEEE80211_M_STA: + case IEEE80211_M_MONITOR: ic->ic_flags &= ~IEEE80211_F_IBSSON; break; case IEEE80211_M_IBSS: @@ -534,6 +543,9 @@ case IEEE80211_M_HOSTAP: imr->ifm_active |= IFM_IEEE80211_HOSTAP; break; + case IEEE80211_M_MONITOR: + imr->ifm_active |= IFM_IEEE80211_MONITOR; + break; } switch (ic->ic_curmode) { case IEEE80211_MODE_11A: @@ -558,7 +570,7 @@ struct ieee80211com *ic = (void *)ifp; if (ic->ic_mgt_timer && --ic->ic_mgt_timer == 0) - ieee80211_new_state(ifp, IEEE80211_S_SCAN, -1); + ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); if (ic->ic_inact_timer && --ic->ic_inact_timer == 0) ieee80211_timeout_nodes(ic); ==== //depot/projects/ia64/sys/net80211/ieee80211_input.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.4 2003/06/27 05:13:52 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.6 2003/07/21 02:49:42 sam Exp $"); #include "opt_inet.h" @@ -138,6 +138,9 @@ ni = ieee80211_ref_node(ic->ic_bss); } break; + case IEEE80211_M_MONITOR: + /* NB: this should collect everything */ + goto out; default: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 20 21:24:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97D3137B404; Sun, 20 Jul 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 33A7737B401 for ; Sun, 20 Jul 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 1CEFC43F93 for ; Sun, 20 Jul 2003 21:24:35 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6L4OZ0U091609 for ; Sun, 20 Jul 2003 21:24:35 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6L4OYa2091606 for perforce@freebsd.org; Sun, 20 Jul 2003 21:24:34 -0700 (PDT) Date: Sun, 20 Jul 2003 21:24:34 -0700 (PDT) Message-Id: <200307210424.h6L4OYa2091606@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 34763 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, 21 Jul 2003 04:24:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=34763 Change 34763 by marcel@marcel_nfs on 2003/07/20 21:24:03 IFC @34761 Affected files ... .. //depot/projects/uart/dev/acpica/acpi_ec.c#5 integrate .. //depot/projects/uart/dev/ath/if_ath.c#4 integrate .. //depot/projects/uart/dev/ath/if_athvar.h#3 integrate .. //depot/projects/uart/dev/usb/usb_mem.c#2 integrate .. //depot/projects/uart/dev/wi/if_wi.c#5 integrate .. //depot/projects/uart/dev/wi/if_wivar.h#2 integrate .. //depot/projects/uart/kern/kern_sig.c#5 integrate .. //depot/projects/uart/net/if_media.h#2 integrate .. //depot/projects/uart/net80211/ieee80211.c#3 integrate .. //depot/projects/uart/net80211/ieee80211_input.c#2 integrate .. //depot/projects/uart/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/uart/net80211/ieee80211_node.c#3 integrate .. //depot/projects/uart/net80211/ieee80211_node.h#2 integrate .. //depot/projects/uart/net80211/ieee80211_output.c#2 integrate .. //depot/projects/uart/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/uart/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/uart/net80211/ieee80211_var.h#2 integrate Differences ... ==== //depot/projects/uart/dev/acpica/acpi_ec.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.34 2003/07/20 00:48:38 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.36 2003/07/20 21:12:21 njl Exp $ */ /****************************************************************************** * @@ -232,7 +232,7 @@ } ACPI_TABLE_ECDT; /* Indicate that this device has already been probed via ECDT. */ -#define DEV_ECDT_FLAG 0x80000000 +#define DEV_ECDT(x) (acpi_get_private(x) == &acpi_ec_devclass) /* Indicate that this device should use the global lock. */ #define DEV_GLK_FLAG 0x40000000 @@ -247,7 +247,8 @@ struct acpi_ec_softc { device_t ec_dev; ACPI_HANDLE ec_handle; - UINT32 ec_gpebit; + UINT8 ec_gpebit; + UINT8 ec_csrvalue; int ec_data_rid; struct resource *ec_data_res; @@ -262,7 +263,7 @@ int ec_glk; int ec_glkhandle; struct mtx ec_mtx; - UINT32 ec_polldelay; + int ec_polldelay; }; /* @@ -321,7 +322,6 @@ UINT32 width, ACPI_INTEGER *Value, void *Context, void *RegionContext); static ACPI_STATUS EcWaitEvent(struct acpi_ec_softc *sc, EC_EVENT Event); -static ACPI_STATUS EcQuery(struct acpi_ec_softc *sc, UINT8 *Data); static ACPI_STATUS EcCommand(struct acpi_ec_softc *sc, EC_COMMAND cmd); static ACPI_STATUS EcRead(struct acpi_ec_softc *sc, UINT8 Address, UINT8 *Data); @@ -401,7 +401,8 @@ * We'll determine whether we really want to use the global lock * in a later call to attach. */ - magic = DEV_ECDT_FLAG | DEV_GLK_FLAG; + acpi_set_private(child, &acpi_ec_devclass); + magic = DEV_GLK_FLAG; DEV_SET_GPEBIT(magic, ecdt->gpe_bit); acpi_set_magic(child, magic); @@ -419,11 +420,9 @@ char desc[64]; int magic, uid, glk, gpebit, ret = ENXIO; - /* Check that this is an EC device and it's not disabled. */ - if (acpi_get_type(dev) != ACPI_TYPE_DEVICE || acpi_disabled("ec") || - !acpi_MatchHid(dev, "PNP0C09")) { + /* Check that this is a device and that EC is not disabled. */ + if (acpi_get_type(dev) != ACPI_TYPE_DEVICE || acpi_disabled("ec")) return (ENXIO); - } /* * If probed via ECDT, set description and continue. Otherwise, @@ -431,12 +430,12 @@ * duplicate probe. */ magic = acpi_get_magic(dev); - if ((magic & DEV_ECDT_FLAG) != 0) { + if (DEV_ECDT(dev)) { snprintf(desc, sizeof(desc), "embedded controller: ECDT, GPE %#x, GLK", DEV_GET_GPEBIT(magic)); device_set_desc_copy(dev, desc); ret = 0; - } else { + } else if (acpi_MatchHid(dev, "PNP0C09")) { h = acpi_get_handle(dev); /* @@ -590,29 +589,6 @@ return (errval); } -static ACPI_STATUS -EcQuery(struct acpi_ec_softc *sc, UINT8 *Data) -{ - ACPI_STATUS Status; - - Status = EcLock(sc); - if (ACPI_FAILURE(Status)) - return (Status); - - /* - * Send a query command to the EC to find out which _Qxx call it - * wants to make. This command clears the SCI bit and also the - * interrupt source since we are edge-triggered. - */ - Status = EcCommand(sc, EC_COMMAND_QUERY); - if (ACPI_SUCCESS(Status)) - *Data = EC_GET_DATA(sc); - - EcUnlock(sc); - - return (Status); -} - static void EcGpeQueryHandler(void *Context) { @@ -625,32 +601,39 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); KASSERT(Context != NULL, ("EcGpeQueryHandler called with NULL")); + Status = EcLock(sc); + if (ACPI_FAILURE(Status)) { + ACPI_VPRINT(sc->ec_dev, acpi_device_get_parent_softc(sc->ec_dev), + "GpeQuery lock error: %s\n", AcpiFormatException(Status)); + return; + } + /* - * Check status for EC_SCI. - * - * Bail out if the EC_SCI bit of the status register is not set. - * Note that this function should only be called when - * this bit is set (polling is used to detect IBE/OBF events). - * - * We don't acquire the global lock here but do protect against other - * running commands (read/write/query) by grabbing ec_mtx. + * If the EC_SCI bit of the status register is not set, then pass + * it along to any potential waiters as it may be an IBE/OBF event. */ - mtx_lock(&sc->ec_mtx); EcStatus = EC_GET_CSR(sc); - mtx_unlock(&sc->ec_mtx); if ((EcStatus & EC_EVENT_SCI) == 0) { - /* If it's not an SCI, wakeup the EcWaitEvent sleep. */ - wakeup(&sc->ec_polldelay); + sc->ec_csrvalue = EcStatus; + wakeup(&sc->ec_csrvalue); + EcUnlock(sc); goto re_enable; } - /* Find out why the EC is signaling us. */ - Status = EcQuery(sc, &Data); + /* + * Send a query command to the EC to find out which _Qxx call it + * wants to make. This command clears the SCI bit and also the + * interrupt source since we are edge-triggered. + */ + Status = EcCommand(sc, EC_COMMAND_QUERY); if (ACPI_FAILURE(Status)) { + EcUnlock(sc); ACPI_VPRINT(sc->ec_dev, acpi_device_get_parent_softc(sc->ec_dev), "GPE query failed - %s\n", AcpiFormatException(Status)); goto re_enable; } + Data = EC_GET_DATA(sc); + EcUnlock(sc); /* Ignore the value for "no outstanding event". (13.3.5) */ if (Data == 0) @@ -770,7 +753,7 @@ { EC_STATUS EcStatus; ACPI_STATUS Status; - UINT32 i, period; + int i, period, retval; mtx_assert(&sc->ec_mtx, MA_OWNED); Status = AE_NO_HARDWARE_RESPONSE; @@ -812,13 +795,18 @@ * for completion, sleeping for chunks of 10 ms. */ if (Status != AE_OK) { + retval = -1; for (i = 0; i < EC_POLL_TIMEOUT / 10; i++) { - EcStatus = EC_GET_CSR(sc); + if (retval != 0) + EcStatus = EC_GET_CSR(sc); + else + EcStatus = sc->ec_csrvalue; if (EVENT_READY(Event, EcStatus)) { Status = AE_OK; break; } - msleep(&sc->ec_polldelay, &sc->ec_mtx, PZERO, "ecpoll", 10/*ms*/); + retval = msleep(&sc->ec_csrvalue, &sc->ec_mtx, PZERO, "ecpoll", + 10/*ms*/); } } ==== //depot/projects/uart/dev/ath/if_ath.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.3 2003/07/13 17:07:25 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.4 2003/07/20 21:38:20 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -129,7 +129,7 @@ static int ath_startrecv(struct ath_softc *); static void ath_next_scan(void *); static void ath_calibrate(void *); -static int ath_newstate(void *, enum ieee80211_state); +static int ath_newstate(struct ieee80211com *, enum ieee80211_state, int); static void ath_newassoc(struct ieee80211com *, struct ieee80211_node *, int); static int ath_getchannels(struct ath_softc *, u_int cc, HAL_BOOL outdoor); @@ -281,7 +281,6 @@ ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; ic->ic_softc = sc; - ic->ic_newstate = ath_newstate; ic->ic_newassoc = ath_newassoc; /* XXX not right but it's not used anywhere important */ ic->ic_phytype = IEEE80211_T_OFDM; @@ -300,7 +299,9 @@ ic->ic_node_alloc = ath_node_alloc; ic->ic_node_free = ath_node_free; ic->ic_node_copy = ath_node_copy; - + sc->sc_newstate = ic->ic_newstate; + ic->ic_newstate = ath_newstate; + /* complete initialization */ ieee80211_media_init(ifp, ath_media_change, ieee80211_media_status); if_printf(ifp, "802.11 address: %s\n", ether_sprintf(ic->ic_myaddr)); @@ -453,13 +454,12 @@ { struct ath_softc *sc = arg; struct ieee80211com *ic = &sc->sc_ic; - struct ifnet *ifp = &ic->ic_if; DPRINTF(("ath_bmiss_proc: pending %u\n", pending)); KASSERT(ic->ic_opmode == IEEE80211_M_STA, ("unexpect operating mode %u", ic->ic_opmode)); if (ic->ic_state == IEEE80211_S_RUN) - ieee80211_new_state(ifp, IEEE80211_S_SCAN, -1); + ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); } static u_int @@ -546,7 +546,7 @@ mode = ieee80211_chan2mode(ic, ni->ni_chan); if (mode != sc->sc_curmode) ath_setcurmode(sc, mode); - ieee80211_new_state(ifp, IEEE80211_S_SCAN, -1); + ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); done: mtx_unlock(&sc->sc_mtx); } @@ -554,6 +554,7 @@ static void ath_stop(struct ifnet *ifp) { + struct ieee80211com *ic = (struct ieee80211com *) ifp; struct ath_softc *sc = ifp->if_softc; struct ath_hal *ah = sc->sc_ah; @@ -587,7 +588,7 @@ sc->sc_rxlink = NULL; IF_DRAIN(&ifp->if_snd); ath_beacon_free(sc); - ieee80211_new_state(ifp, IEEE80211_S_INIT, -1); + ieee80211_new_state(ic, IEEE80211_S_INIT, -1); if (!sc->sc_invalid) ath_hal_setpower(ah, HAL_PM_FULL_SLEEP, 0); } @@ -2156,21 +2157,15 @@ } static int -ath_newstate(void *arg, enum ieee80211_state nstate) +ath_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) { - struct ath_softc *sc = arg; + struct ifnet *ifp = &ic->ic_if; + struct ath_softc *sc = ifp->if_softc; struct ath_hal *ah = sc->sc_ah; - struct ieee80211com *ic = &sc->sc_ic; - struct ifnet *ifp = &ic->ic_if; struct ieee80211_node *ni; int i, error; u_int8_t *bssid; u_int32_t rfilt; - enum ieee80211_state ostate; -#ifdef AR_DEBUG - static const char *stname[] = - { "INIT", "SCAN", "AUTH", "ASSOC", "RUN" }; -#endif /* AR_DEBUG */ static const HAL_LED_STATE leds[] = { HAL_LED_INIT, /* IEEE80211_S_INIT */ HAL_LED_SCAN, /* IEEE80211_S_SCAN */ @@ -2179,17 +2174,18 @@ HAL_LED_RUN, /* IEEE80211_S_RUN */ }; - ostate = ic->ic_state; - - DPRINTF(("%s: %s -> %s\n", __func__, stname[ostate], stname[nstate])); + DPRINTF(("%s: %s -> %s\n", __func__, + ieee80211_state_name[ic->ic_state], + ieee80211_state_name[nstate])); ath_hal_setledstate(ah, leds[nstate]); /* set LED */ if (nstate == IEEE80211_S_INIT) { sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); ath_hal_intrset(ah, sc->sc_imask); - error = 0; /* cheat + use error return */ - goto bad; + callout_stop(&sc->sc_scan_ch); + callout_stop(&sc->sc_cal_ch); + return (*sc->sc_newstate)(ic, nstate, arg); } ni = ic->ic_bss; error = ath_chan_set(sc, ni->ni_chan); @@ -2259,10 +2255,14 @@ * Reset the rate control state. */ ath_rate_ctl_reset(sc, nstate); - return 0; + /* + * Invoke the parent method to complete the work. + */ + return (*sc->sc_newstate)(ic, nstate, arg); bad: callout_stop(&sc->sc_scan_ch); callout_stop(&sc->sc_cal_ch); + /* NB: do not invoke the parent */ return error; } ==== //depot/projects/uart/dev/ath/if_athvar.h#3 (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 DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.2 2003/07/13 17:07:25 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.3 2003/07/20 21:38:20 sam Exp $ */ /* @@ -78,6 +78,8 @@ struct ath_softc { struct ieee80211com sc_ic; /* IEEE 802.11 common */ + int (*sc_newstate)(struct ieee80211com *, + enum ieee80211_state, int); device_t sc_dev; bus_space_tag_t sc_st; /* bus space tag */ bus_space_handle_t sc_sh; /* bus space handle */ ==== //depot/projects/uart/dev/usb/usb_mem.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: usb_mem.c,v 1.26 2003/02/01 06:23:40 thorpej Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usb_mem.c,v 1.1 2003/07/15 22:42:37 jmg Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_mem.c,v 1.2 2003/07/21 02:41:01 jmg Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usb_mem.c,v 1.1 2003/07/15 22:42:37 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/usb_mem.c,v 1.2 2003/07/21 02:41:01 jmg Exp $"); #include #include @@ -84,7 +84,7 @@ #endif #define USB_MEM_SMALL 64 -#define USB_MEM_CHUNKS (PAGE_SIZE / 64) +#define USB_MEM_CHUNKS (PAGE_SIZE / USB_MEM_SMALL) #define USB_MEM_BLOCK (USB_MEM_SMALL * USB_MEM_CHUNKS) /* This struct is overlayed on free fragments. */ @@ -256,6 +256,10 @@ return (err); } b->fullblock = 0; + /* XXX - override the tag, ok since we never free it */ + b->tag = tag; + KASSERT(sizeof *f <= USB_MEM_SMALL, ("USB_MEM_SMALL(%d) is too small for struct usb_frag_dma(%d)\n", + USB_MEM_SMALL, sizeof *f)); for (i = 0; i < USB_MEM_BLOCK; i += USB_MEM_SMALL) { f = (struct usb_frag_dma *)((char *)b->kaddr + i); f->block = b; ==== //depot/projects/uart/dev/wi/if_wi.c#5 (text+ko) ==== @@ -62,7 +62,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.147 2003/07/03 10:16:40 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.148 2003/07/20 21:37:32 sam Exp $"); #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -146,7 +146,7 @@ static int wi_read_rid(struct wi_softc *, int, void *, int *); static int wi_write_rid(struct wi_softc *, int, void *, int); -static int wi_newstate(void *, enum ieee80211_state); +static int wi_newstate(struct ieee80211com *, enum ieee80211_state, int); static int wi_scan_ap(struct wi_softc *, u_int16_t, u_int16_t); static void wi_scan_result(struct wi_softc *, int, int); @@ -312,7 +312,6 @@ ic->ic_opmode = IEEE80211_M_STA; ic->ic_caps = IEEE80211_C_PMGT | IEEE80211_C_AHDEMO; ic->ic_state = IEEE80211_S_INIT; - ic->ic_newstate = wi_newstate; /* * Query the card for available channels and setup the @@ -452,6 +451,9 @@ * Call MI attach routine. */ ieee80211_ifattach(ifp); + /* override state transition method */ + sc->sc_newstate = ic->ic_newstate; + ic->ic_newstate = wi_newstate; ieee80211_media_init(ifp, wi_media_change, wi_media_status); return (0); @@ -716,7 +718,7 @@ ifp->if_flags &= ~IFF_OACTIVE; if (ic->ic_opmode == IEEE80211_M_AHDEMO || ic->ic_opmode == IEEE80211_M_HOSTAP) - wi_newstate(sc, IEEE80211_S_RUN); + ieee80211_new_state(ic, IEEE80211_S_RUN, -1); /* Enable interrupts */ CSR_WRITE_2(sc, WI_INT_EN, WI_INTRS); @@ -758,12 +760,13 @@ void wi_stop(struct ifnet *ifp, int disable) { + struct ieee80211com *ic = (struct ieee80211com *) ifp; struct wi_softc *sc = ifp->if_softc; WI_LOCK_DECL(); WI_LOCK(sc); - ieee80211_new_state(ifp, IEEE80211_S_INIT, -1); + ieee80211_new_state(ic, IEEE80211_S_INIT, -1); if (sc->sc_enabled && !sc->wi_gone) { CSR_WRITE_2(sc, WI_INT_EN, 0); wi_cmd(sc, WI_CMD_DISABLE | sc->sc_portnum, 0, 0, 0); @@ -996,10 +999,11 @@ if (sc->sc_syn_timer) { if (--sc->sc_syn_timer == 0) { + struct ieee80211com *ic = (struct ieee80211com *) ifp; DPRINTF2(("wi_watchdog: %d false syns\n", sc->sc_false_syns)); sc->sc_false_syns = 0; - ieee80211_new_state(ifp, IEEE80211_S_RUN, -1); + ieee80211_new_state(ic, IEEE80211_S_RUN, -1); sc->sc_syn_timer = 5; } ifp->if_timer = 1; @@ -1244,7 +1248,7 @@ sc->sc_false_syns >= WI_MAX_FALSE_SYNS) return; - ieee80211_new_state(ifp, IEEE80211_S_RUN, -1); + ieee80211_new_state(ic, IEEE80211_S_RUN, -1); } static void @@ -1547,7 +1551,7 @@ break; /* FALLTHROUGH */ case WI_INFO_LINK_STAT_AP_CHG: - ieee80211_new_state(ifp, IEEE80211_S_RUN, -1); + ieee80211_new_state(ic, IEEE80211_S_RUN, -1); break; case WI_INFO_LINK_STAT_AP_INR: sc->sc_flags &= ~WI_FLAGS_OUTRANGE; @@ -1566,7 +1570,7 @@ case WI_INFO_LINK_STAT_DISCONNECTED: case WI_INFO_LINK_STAT_ASSOC_FAILED: if (ic->ic_opmode == IEEE80211_M_STA) - ieee80211_new_state(ifp, IEEE80211_S_INIT, -1); + ieee80211_new_state(ic, IEEE80211_S_INIT, -1); break; } break; @@ -2519,30 +2523,25 @@ } static int -wi_newstate(void *arg, enum ieee80211_state nstate) +wi_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) { - struct wi_softc *sc = arg; - struct ieee80211com *ic = &sc->sc_ic; + struct ifnet *ifp = &ic->ic_if; + struct wi_softc *sc = ifp->if_softc; struct ieee80211_node *ni = ic->ic_bss; int buflen; u_int16_t val; struct wi_ssid ssid; u_int8_t old_bssid[IEEE80211_ADDR_LEN]; - enum ieee80211_state ostate; -#ifdef WI_DEBUG - static const char *stname[] = - { "INIT", "SCAN", "AUTH", "ASSOC", "RUN" }; -#endif /* WI_DEBUG */ - ostate = ic->ic_state; - DPRINTF(("wi_newstate: %s -> %s\n", stname[ostate], stname[nstate])); + DPRINTF(("%s: %s -> %s\n", __func__, + ieee80211_state_name[ic->ic_state], + ieee80211_state_name[nstate])); - ic->ic_state = nstate; switch (nstate) { case IEEE80211_S_INIT: ic->ic_flags &= ~IEEE80211_F_SIBSS; sc->sc_flags &= ~WI_FLAGS_OUTRANGE; - return 0; + return (*sc->sc_newstate)(ic, nstate, arg); case IEEE80211_S_RUN: sc->sc_flags &= ~WI_FLAGS_OUTRANGE; @@ -2584,8 +2583,8 @@ break; } - /* skip standard ieee80211 handling */ - return EINPROGRESS; + ic->ic_state = nstate; /* NB: skip normal ieee80211 handling */ + return 0; } static int ==== //depot/projects/uart/dev/wi/if_wivar.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/wi/if_wivar.h,v 1.18 2003/06/28 06:17:26 sam Exp $ + * $FreeBSD: src/sys/dev/wi/if_wivar.h,v 1.19 2003/07/20 21:37:32 sam Exp $ */ #if 0 @@ -61,6 +61,8 @@ struct wi_softc { struct ieee80211com sc_ic; + int (*sc_newstate)(struct ieee80211com *, + enum ieee80211_state, int); device_t sc_dev; #if __FreeBSD_version >= 500000 struct mtx sc_mtx; ==== //depot/projects/uart/kern/kern_sig.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.252 2003/07/17 22:52:55 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.253 2003/07/21 00:26:52 davidxu Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -1515,6 +1515,9 @@ if (td->td_upcall) td->td_upcall->ku_flags |= KUF_DOUPCALL; mtx_unlock_spin(&sched_lock); + } else { + /* UTS caused a sync signal */ + sigexit(td, SIGILL); } } else { PROC_LOCK(p); @@ -1540,6 +1543,7 @@ error = copyout(&siginfo, &td->td_mailbox->tm_syncsig, sizeof(siginfo)); PROC_LOCK(p); + /* UTS memory corrupted */ if (error) sigexit(td, SIGILL); SIGADDSET(td->td_sigmask, sig); @@ -2282,7 +2286,8 @@ #endif _STOPEVENT(p, S_SIG, sig); - if (action == SIG_DFL) { + if (!(td->td_flags & TDF_SA && td->td_mailbox) && + action == SIG_DFL) { /* * Default action, where the default is to kill * the process. (Other cases were ignored above.) @@ -2291,6 +2296,13 @@ sigexit(td, sig); /* NOTREACHED */ } else { + if (td->td_flags & TDF_SA && td->td_mailbox) { + if (sig == SIGKILL) { + mtx_unlock(&ps->ps_mtx); + sigexit(td, sig); + } + } + /* * If we get here, the signal must be caught. */ @@ -2333,7 +2345,7 @@ p->p_code = 0; p->p_sig = 0; } - if (td->td_flags & TDF_SA) + if (td->td_flags & TDF_SA && td->td_mailbox) thread_signal_add(curthread, sig); else (*p->p_sysent->sv_sendsig)(action, sig, ==== //depot/projects/uart/net/if_media.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $ */ -/* $FreeBSD: src/sys/net/if_media.h,v 1.22 2003/06/25 15:03:05 sam Exp $ */ +/* $FreeBSD: src/sys/net/if_media.h,v 1.23 2003/07/21 02:48:35 sam Exp $ */ /* * Copyright (c) 1997 @@ -194,6 +194,7 @@ #define IFM_IEEE80211_IBSS 0x00000400 /* Operate in IBSS mode */ #define IFM_IEEE80211_IBSSMASTER 0x00000800 /* Operate as an IBSS master */ #define IFM_IEEE80211_TURBO 0x00001000 /* Operate in turbo mode */ +#define IFM_IEEE80211_MONITOR 0x00002000 /* Operate in monitor mode */ /* operating mode for multi-mode devices */ #define IFM_IEEE80211_11A 1 /* 5Ghz, OFDM mode */ #define IFM_IEEE80211_11B 2 /* Direct Sequence mode */ @@ -443,6 +444,7 @@ { IFM_IEEE80211_IBSS, "ibss" }, \ { IFM_IEEE80211_IBSSMASTER, "ibss-master" }, \ { IFM_IEEE80211_TURBO, "turbo" }, \ + { IFM_IEEE80211_MONITOR, "monitor" }, \ { 0, NULL }, \ } ==== //depot/projects/uart/net80211/ieee80211.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.4 2003/06/29 20:10:54 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.6 2003/07/21 02:49:42 sam Exp $"); /* * IEEE 802.11 generic handler @@ -275,6 +275,8 @@ ADD(ic, IFM_AUTO, mopt | IFM_IEEE80211_HOSTAP); if (ic->ic_caps & IEEE80211_C_AHDEMO) ADD(ic, IFM_AUTO, mopt | IFM_IEEE80211_ADHOC | IFM_FLAG0); + if (ic->ic_caps & IEEE80211_C_MONITOR) + ADD(ic, IFM_AUTO, mopt | IFM_IEEE80211_MONITOR); if (mode == IEEE80211_MODE_AUTO) continue; if_printf(ifp, "%s rates: ", ieee80211_phymode_name[mode]); @@ -294,6 +296,8 @@ ADD(ic, mword, mopt | IFM_IEEE80211_HOSTAP); if (ic->ic_caps & IEEE80211_C_AHDEMO) ADD(ic, mword, mopt | IFM_IEEE80211_ADHOC | IFM_FLAG0); + if (ic->ic_caps & IEEE80211_C_MONITOR) + ADD(ic, mword, mopt | IFM_IEEE80211_MONITOR); /* * Add rate to the collection of all rates. */ @@ -325,6 +329,8 @@ ADD(ic, mword, IFM_IEEE80211_HOSTAP); if (ic->ic_caps & IEEE80211_C_AHDEMO) ADD(ic, mword, IFM_IEEE80211_ADHOC | IFM_FLAG0); + if (ic->ic_caps & IEEE80211_C_MONITOR) + ADD(ic, mword, IFM_IEEE80211_MONITOR); } ieee80211_media_status(ifp, &imr); ifmedia_set(&ic->ic_media, imr.ifm_active); @@ -441,6 +447,8 @@ newopmode = IEEE80211_M_HOSTAP; else if (ime->ifm_media & IFM_IEEE80211_ADHOC) newopmode = IEEE80211_M_IBSS; + else if (ime->ifm_media & IFM_IEEE80211_MONITOR) + newopmode = IEEE80211_M_MONITOR; else newopmode = IEEE80211_M_STA; @@ -486,6 +494,7 @@ case IEEE80211_M_AHDEMO: case IEEE80211_M_HOSTAP: case IEEE80211_M_STA: + case IEEE80211_M_MONITOR: ic->ic_flags &= ~IEEE80211_F_IBSSON; break; case IEEE80211_M_IBSS: @@ -534,6 +543,9 @@ case IEEE80211_M_HOSTAP: imr->ifm_active |= IFM_IEEE80211_HOSTAP; break; + case IEEE80211_M_MONITOR: + imr->ifm_active |= IFM_IEEE80211_MONITOR; + break; } switch (ic->ic_curmode) { case IEEE80211_MODE_11A: @@ -558,7 +570,7 @@ struct ieee80211com *ic = (void *)ifp; if (ic->ic_mgt_timer && --ic->ic_mgt_timer == 0) - ieee80211_new_state(ifp, IEEE80211_S_SCAN, -1); + ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); if (ic->ic_inact_timer && --ic->ic_inact_timer == 0) ieee80211_timeout_nodes(ic); ==== //depot/projects/uart/net80211/ieee80211_input.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.4 2003/06/27 05:13:52 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.6 2003/07/21 02:49:42 sam Exp $"); #include "opt_inet.h" @@ -138,6 +138,9 @@ ni = ieee80211_ref_node(ic->ic_bss); } break; + case IEEE80211_M_MONITOR: + /* NB: this should collect everything */ + goto out; default: /* XXX catch bad values */ break; @@ -212,6 +215,8 @@ } ieee80211_unref_node(&ni); break; + case IEEE80211_M_MONITOR: + break; } if (wh->i_fc[1] & IEEE80211_FC1_WEP) { if (ic->ic_flags & IEEE80211_F_WEPON) { @@ -592,7 +597,11 @@ } IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_SIZE); IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN); - if (chan > IEEE80211_CHAN_MAX || isclr(ic->ic_chan_active, chan)) { + if ( +#if IEEE80211_CHAN_MAX < 255 + chan > IEEE80211_CHAN_MAX || +#endif + isclr(ic->ic_chan_active, chan)) { IEEE80211_DPRINTF(("%s: ignore %s with invalid channel " "%u\n", __func__, ISPROBE(subtype) ? "probe response" : "beacon", @@ -775,7 +784,7 @@ case IEEE80211_M_IBSS: if (ic->ic_state != IEEE80211_S_RUN || seq != 1) return; - ieee80211_new_state(&ic->ic_if, IEEE80211_S_AUTH, + ieee80211_new_state(ic, IEEE80211_S_AUTH, wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); break; @@ -822,9 +831,11 @@ } return; } - ieee80211_new_state(&ic->ic_if, IEEE80211_S_ASSOC, + ieee80211_new_state(ic, IEEE80211_S_ASSOC, wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); break; + case IEEE80211_M_MONITOR: + break; } break; } @@ -1011,7 +1022,7 @@ IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | IEEE80211_F_DONEGO | IEEE80211_F_DODEL); if (ni->ni_rates.rs_nrates != 0) - ieee80211_new_state(ifp, IEEE80211_S_RUN, + ieee80211_new_state(ic, IEEE80211_S_RUN, wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); break; } @@ -1026,7 +1037,7 @@ reason = le16toh(*(u_int16_t *)frm); switch (ic->ic_opmode) { case IEEE80211_M_STA: - ieee80211_new_state(&ic->ic_if, IEEE80211_S_AUTH, + ieee80211_new_state(ic, IEEE80211_S_AUTH, wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); break; case IEEE80211_M_HOSTAP: @@ -1055,7 +1066,7 @@ reason = le16toh(*(u_int16_t *)frm); switch (ic->ic_opmode) { case IEEE80211_M_STA: - ieee80211_new_state(&ic->ic_if, IEEE80211_S_ASSOC, + ieee80211_new_state(ic, IEEE80211_S_ASSOC, wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK); break; case IEEE80211_M_HOSTAP: ==== //depot/projects/uart/net80211/ieee80211_ioctl.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.3 2003/06/29 20:12:17 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.4 2003/07/20 21:36:08 sam Exp $"); /* * IEEE 802.11 ioctl support (FreeBSD-specific) @@ -659,7 +659,7 @@ if (ic->ic_opmode == IEEE80211_M_HOSTAP) break; /* NB: ignore channel list and tx rate parameters */ - error = ieee80211_new_state(ifp, IEEE80211_S_SCAN, -1); + error = ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); break; case WI_RID_SCAN_APS: if (ic->ic_opmode == IEEE80211_M_HOSTAP) @@ -703,7 +703,7 @@ if (wreq.wi_type == WI_RID_CHANNEL_LIST) error = ENETRESET; else - error = ieee80211_new_state(ifp, IEEE80211_S_SCAN, -1); + error = ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); break; default: error = EINVAL; ==== //depot/projects/uart/net80211/ieee80211_node.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.3 2003/06/29 20:13:38 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.4 2003/07/20 21:36:08 sam Exp $"); #include "opt_inet.h" @@ -110,42 +110,48 @@ * Initialize the active channel set based on the set * of available channels and the current PHY mode. */ -void +static void ieee80211_reset_scan(struct ifnet *ifp) { struct ieee80211com *ic = (void *)ifp; memcpy(ic->ic_chan_scan, ic->ic_chan_active, sizeof(ic->ic_chan_active)); + /* NB: hack, setup so next_scan starts with the first channel */ + if (ic->ic_bss->ni_chan == IEEE80211_CHAN_ANYC) + ic->ic_bss->ni_chan = &ic->ic_channels[IEEE80211_CHAN_MAX]; } /* * Begin an active scan. */ void -ieee80211_begin_scan(struct ifnet *ifp, struct ieee80211_node *ni) +ieee80211_begin_scan(struct ifnet *ifp) { struct ieee80211com *ic = (void *)ifp; + /* + * In all but hostap mode scanning starts off in + * an active mode before switching to passive. + */ + if (ic->ic_opmode != IEEE80211_M_HOSTAP) + ic->ic_flags |= IEEE80211_F_ASCAN; if (ifp->if_flags & IFF_DEBUG) if_printf(ifp, "begin %s scan\n", - ic->ic_opmode != IEEE80211_M_HOSTAP ? + (ic->ic_flags & IEEE80211_F_ASCAN) ? "active" : "passive"); - - ieee80211_reset_scan(ifp); /* - * Flush any previously seen AP's. Note that this - * assumes we don't act as both an AP and a station, - * otherwise we'll potentially flush state of stations - * associated with us. + * Clear scan state and flush any previously seen + * AP's. Note that the latter assumes we don't act + * as both an AP and a station, otherwise we'll + * potentially flush state of stations associated + * with us. */ + ieee80211_reset_scan(ifp); ieee80211_free_allnodes(ic); - clrbit(ic->ic_chan_scan, ieee80211_chan2ieee(ic, ni->ni_chan)); - if (ic->ic_opmode != IEEE80211_M_HOSTAP) { - ic->ic_flags |= IEEE80211_F_ASCAN; - IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_PROBE_REQ, 0); - } + /* Scan the next channel. */ + ieee80211_next_scan(ifp); } /* @@ -180,7 +186,7 @@ ieee80211_chan2ieee(ic, ic->ic_bss->ni_chan), ieee80211_chan2ieee(ic, chan))); ic->ic_bss->ni_chan = chan; - ieee80211_new_state(ifp, IEEE80211_S_SCAN, -1); + ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); } void @@ -213,7 +219,7 @@ ni->ni_fhdwell = 200; /* XXX */ ni->ni_fhindex = 1; } - ieee80211_new_state(ifp, IEEE80211_S_RUN, -1); + ieee80211_new_state(ic, IEEE80211_S_RUN, -1); } /* @@ -368,10 +374,10 @@ goto notfound; } ieee80211_unref_node(&selbs); - ieee80211_new_state(ifp, IEEE80211_S_RUN, -1); + ieee80211_new_state(ic, IEEE80211_S_RUN, -1); } else { ieee80211_unref_node(&selbs); - ieee80211_new_state(ifp, IEEE80211_S_AUTH, -1); + ieee80211_new_state(ic, IEEE80211_S_AUTH, -1); } } ==== //depot/projects/uart/net80211/ieee80211_node.h#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 21 12:53:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E126337B408; Mon, 21 Jul 2003 12:53: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 785DE37B401 for ; Mon, 21 Jul 2003 12:53:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE57C43F85 for ; Mon, 21 Jul 2003 12:53:34 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6LJrY0U060822 for ; Mon, 21 Jul 2003 12:53:34 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6LJrYIg060819 for perforce@freebsd.org; Mon, 21 Jul 2003 12:53:34 -0700 (PDT) Date: Mon, 21 Jul 2003 12:53:34 -0700 (PDT) Message-Id: <200307211953.h6LJrYIg060819@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 34785 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, 21 Jul 2003 19:53:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=34785 Change 34785 by des@des.at.des.thinksec.com on 2003/07/21 12:52:56 Revert the previous commit. It seemed like a good idea at the time, but it breaks at least one module in -CURRENT. Affected files ... .. //depot/projects/openpam/include/security/pam_types.h#13 edit Differences ... ==== //depot/projects/openpam/include/security/pam_types.h#13 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_types.h#12 $ + * $P4: //depot/projects/openpam/include/security/pam_types.h#13 $ */ #ifndef _PAM_TYPES_H_INCLUDED @@ -47,22 +47,22 @@ * XSSO 5.1.1 */ struct pam_message { - int msg_style; - const char *msg; + int msg_style; + char *msg; }; struct pam_response { - char *resp; - int resp_retcode; + char *resp; + int resp_retcode; }; /* * XSSO 5.1.2 */ struct pam_conv { - int (*conv)(int, const struct pam_message **, - struct pam_response **, void *); - void *appdata_ptr; + int (*conv)(int, const struct pam_message **, + struct pam_response **, void *); + void *appdata_ptr; }; /* @@ -75,9 +75,9 @@ * Solaris 9 */ typedef struct pam_repository { - char *type; - void *scope; - size_t scope_len; + char *type; + void *scope; + size_t scope_len; } pam_repository_t; #ifdef __cplusplus From owner-p4-projects@FreeBSD.ORG Mon Jul 21 12:58:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51F2E37B404; Mon, 21 Jul 2003 12:58:42 -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 1AE0637B401 for ; Mon, 21 Jul 2003 12:58:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B367E43F93 for ; Mon, 21 Jul 2003 12:58:41 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6LJwf0U061090 for ; Mon, 21 Jul 2003 12:58:41 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6LJwfAL061087 for perforce@freebsd.org; Mon, 21 Jul 2003 12:58:41 -0700 (PDT) Date: Mon, 21 Jul 2003 12:58:41 -0700 (PDT) Message-Id: <200307211958.h6LJwfAL061087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 34786 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, 21 Jul 2003 19:58:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=34786 Change 34786 by des@des.at.des.thinksec.com on 2003/07/21 12:58:11 Correct the description of the conversation function's second argument, and credit yar@ for spotting the mistake. Affected files ... .. //depot/projects/openpam/CREDITS#10 edit .. //depot/projects/openpam/doc/man/pam_conv.3#4 edit Differences ... ==== //depot/projects/openpam/CREDITS#10 (text+ko) ==== @@ -26,5 +26,6 @@ Ruslan Ermilov Solar Designer Takanori Saneto + Yar Tikhiy -$P4: //depot/projects/openpam/CREDITS#9 $ +$P4: //depot/projects/openpam/CREDITS#10 $ ==== //depot/projects/openpam/doc/man/pam_conv.3#4 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_conv.3#3 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_conv.3#4 $ .\" .Dd May 27, 2002 .Dt PAM_CONV 3 @@ -77,9 +77,9 @@ messages (up to .Dv PAM_NUM_MSG ) to process. -The second argument is a pointer to a contiguous array of -.Vt struct pam_message -containing the actual messages. +The second argument is a pointer to an array of pointers to +.Vt pam_message +structures containing the actual messages. .Pp Each message can have one of four types, specified by the .Va msg_style From owner-p4-projects@FreeBSD.ORG Mon Jul 21 15:36:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACB8F37B404; Mon, 21 Jul 2003 15: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 6759D37B401 for ; Mon, 21 Jul 2003 15:36:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FBFD43F3F for ; Mon, 21 Jul 2003 15: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.6/8.12.6) with ESMTP id h6LMZw0U074030 for ; Mon, 21 Jul 2003 15:35:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6LMZuRk074003 for perforce@freebsd.org; Mon, 21 Jul 2003 15:35:56 -0700 (PDT) Date: Mon, 21 Jul 2003 15:35:56 -0700 (PDT) Message-Id: <200307212235.h6LMZuRk074003@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 34794 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, 21 Jul 2003 22:36:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=34794 Change 34794 by peter@peter_daintree on 2003/07/21 15:35:05 IFC @34793 Affected files ... .. //depot/projects/hammer/MAINTAINERS#12 integrate .. //depot/projects/hammer/Makefile#11 integrate .. //depot/projects/hammer/bin/ed/Makefile#6 integrate .. //depot/projects/hammer/bin/ed/re.c#2 integrate .. //depot/projects/hammer/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h.fixed#2 delete .. //depot/projects/hammer/contrib/openpam/include/security/pam_types.h#6 integrate .. //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.c#2 integrate .. //depot/projects/hammer/contrib/top/commands.c#2 integrate .. //depot/projects/hammer/contrib/top/machine.h#2 integrate .. //depot/projects/hammer/contrib/top/top.c#2 integrate .. //depot/projects/hammer/crypto/telnet/arpa/telnet.h#3 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/auth-proto.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/auth.c#3 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/auth.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/enc-proto.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/enc_des.c#4 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/encrypt.c#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/encrypt.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/genget.c#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/getent.c#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/kerberos.c#3 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/kerberos5.c#3 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/key-proto.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/krb4encpwd.c#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/misc-proto.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/misc.c#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/misc.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/pk.c#3 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/pk.h#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/read_password.c#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/rsaencpwd.c#2 delete .. //depot/projects/hammer/crypto/telnet/libtelnet/sra.c#2 delete .. //depot/projects/hammer/crypto/telnet/telnet/authenc.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnet/commands.c#7 delete .. //depot/projects/hammer/crypto/telnet/telnet/defines.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnet/externs.h#3 delete .. //depot/projects/hammer/crypto/telnet/telnet/fdset.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnet/general.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnet/main.c#5 delete .. //depot/projects/hammer/crypto/telnet/telnet/network.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnet/ring.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnet/ring.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnet/sys_bsd.c#4 delete .. //depot/projects/hammer/crypto/telnet/telnet/telnet.1#2 delete .. //depot/projects/hammer/crypto/telnet/telnet/telnet.c#5 delete .. //depot/projects/hammer/crypto/telnet/telnet/terminal.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnet/types.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnet/utilities.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnetd/authenc.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnetd/defs.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnetd/ext.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnetd/global.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnetd/pathnames.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnetd/slc.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnetd/state.c#4 delete .. //depot/projects/hammer/crypto/telnet/telnetd/sys_term.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnetd/telnetd.8#2 delete .. //depot/projects/hammer/crypto/telnet/telnetd/telnetd.c#6 delete .. //depot/projects/hammer/crypto/telnet/telnetd/telnetd.h#2 delete .. //depot/projects/hammer/crypto/telnet/telnetd/termstat.c#3 delete .. //depot/projects/hammer/crypto/telnet/telnetd/utility.c#3 delete .. //depot/projects/hammer/etc/defaults/pccard.conf#8 integrate .. //depot/projects/hammer/kerberos5/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/Makefile.inc#7 integrate .. //depot/projects/hammer/kerberos5/lib/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/lib/libasn1/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/lib/libgssapi/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/lib/libhdb/Makefile#6 integrate .. //depot/projects/hammer/kerberos5/lib/libkadm5clnt/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/lib/libkadm5srv/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/lib/libkrb5/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/lib/libroken/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/lib/libsl/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/lib/libtelnet/Makefile#3 delete .. //depot/projects/hammer/kerberos5/lib/libvers/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/libexec/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/libexec/hprop/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/libexec/hpropd/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/libexec/ipropd-master/Makefile#6 integrate .. //depot/projects/hammer/kerberos5/libexec/ipropd-slave/Makefile#6 integrate .. //depot/projects/hammer/kerberos5/libexec/kadmind/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/libexec/kdc/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/libexec/kpasswdd/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/libexec/telnetd/Makefile#4 delete .. //depot/projects/hammer/kerberos5/usr.bin/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/usr.bin/kadmin/Makefile#5 integrate .. //depot/projects/hammer/kerberos5/usr.bin/kdestroy/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/usr.bin/kinit/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/usr.bin/klist/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/usr.bin/kpasswd/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/usr.bin/krb5-config/Makefile#6 integrate .. //depot/projects/hammer/kerberos5/usr.bin/ksu/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/usr.bin/telnet/Makefile#4 delete .. //depot/projects/hammer/kerberos5/usr.sbin/kstash/Makefile#4 integrate .. //depot/projects/hammer/kerberos5/usr.sbin/ktutil/Makefile#5 integrate .. //depot/projects/hammer/lib/Makefile#21 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#10 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/makecontext.c#3 branch .. //depot/projects/hammer/lib/libc/amd64/gen/signalcontext.c#3 branch .. //depot/projects/hammer/lib/libc/gen/getpwent.c#8 integrate .. //depot/projects/hammer/lib/libc/gen/raise.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/time.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/time.c#2 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_radius/pam_radius.c#5 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#11 integrate .. //depot/projects/hammer/lib/libpthread/arch/amd64/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/context.S#1 branch .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/enter_uts.S#1 branch .. //depot/projects/hammer/lib/libpthread/arch/amd64/include/atomic_ops.h#1 branch .. //depot/projects/hammer/lib/libpthread/arch/amd64/include/ksd.h#1 branch .. //depot/projects/hammer/lib/libpthread/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libpthread/arch/i386/include/ksd.h#4 integrate .. //depot/projects/hammer/lib/libpthread/pthread.map#3 integrate .. //depot/projects/hammer/lib/libpthread/test/sigsuspend_d.c#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_init.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#10 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_concurrency.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#12 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#9 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_find_thread.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#11 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#17 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_nanosleep.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#13 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_raise.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#15 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigmask.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigpending.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#8 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#8 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_yield.c#5 integrate .. //depot/projects/hammer/lib/libtelnet/Makefile#2 integrate .. //depot/projects/hammer/lib/libtelnet/genget.c#2 delete .. //depot/projects/hammer/lib/libtelnet/getent.c#2 delete .. //depot/projects/hammer/lib/libtelnet/misc-proto.h#2 delete .. //depot/projects/hammer/lib/libtelnet/misc.c#2 delete .. //depot/projects/hammer/lib/libtelnet/misc.h#2 delete .. //depot/projects/hammer/lib/libthr/arch/alpha/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libthr/arch/alpha/alpha/_curthread.c#1 branch .. //depot/projects/hammer/libexec/Makefile#18 integrate .. //depot/projects/hammer/libexec/getty/main.c#4 integrate .. //depot/projects/hammer/libexec/telnetd/Makefile#2 integrate .. //depot/projects/hammer/libexec/telnetd/defs.h#2 delete .. //depot/projects/hammer/libexec/telnetd/ext.h#2 delete .. //depot/projects/hammer/libexec/telnetd/global.c#3 delete .. //depot/projects/hammer/libexec/telnetd/pathnames.h#2 delete .. //depot/projects/hammer/libexec/telnetd/slc.c#3 delete .. //depot/projects/hammer/libexec/telnetd/state.c#4 delete .. //depot/projects/hammer/libexec/telnetd/sys_term.c#3 delete .. //depot/projects/hammer/libexec/telnetd/telnetd.8#2 delete .. //depot/projects/hammer/libexec/telnetd/telnetd.c#5 delete .. //depot/projects/hammer/libexec/telnetd/telnetd.h#2 delete .. //depot/projects/hammer/libexec/telnetd/termstat.c#3 delete .. //depot/projects/hammer/libexec/telnetd/utility.c#3 delete .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#35 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#10 integrate .. //depot/projects/hammer/rescue/librescue/Makefile#3 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#4 integrate .. //depot/projects/hammer/sbin/atm/ilmid/ilmid.c#7 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#13 integrate .. //depot/projects/hammer/sbin/mount/mount.c#6 integrate .. //depot/projects/hammer/sbin/ping6/ping6.c#4 integrate .. //depot/projects/hammer/sbin/umount/umount.8#5 integrate .. //depot/projects/hammer/sbin/umount/umount.c#6 integrate .. //depot/projects/hammer/secure/Makefile#3 integrate .. //depot/projects/hammer/secure/Makefile.inc#2 integrate .. //depot/projects/hammer/secure/lib/Makefile#7 integrate .. //depot/projects/hammer/secure/lib/libtelnet/Makefile#3 delete .. //depot/projects/hammer/secure/libexec/Makefile#5 integrate .. //depot/projects/hammer/secure/libexec/telnetd/Makefile#2 delete .. //depot/projects/hammer/secure/usr.bin/Makefile#6 integrate .. //depot/projects/hammer/secure/usr.bin/telnet/Makefile#2 delete .. //depot/projects/hammer/share/man/man4/Makefile#18 integrate .. //depot/projects/hammer/share/man/man4/an.4#3 integrate .. //depot/projects/hammer/share/man/man4/ath.4#5 integrate .. //depot/projects/hammer/share/man/man4/ath_hal.4#2 integrate .. //depot/projects/hammer/share/man/man4/fxp.4#5 integrate .. //depot/projects/hammer/share/man/man4/harp.4#1 branch .. //depot/projects/hammer/share/man/man4/patm.4#2 integrate .. //depot/projects/hammer/share/man/man4/sbp.4#4 integrate .. //depot/projects/hammer/share/man/man4/twe.4#2 integrate .. //depot/projects/hammer/share/man/man4/wi.4#13 integrate .. //depot/projects/hammer/share/man/man4/wlan.4#2 integrate .. //depot/projects/hammer/share/man/man9/Makefile#15 integrate .. //depot/projects/hammer/share/man/man9/mtx_pool.9#2 integrate .. //depot/projects/hammer/share/man/man9/zone.9#5 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#11 integrate .. //depot/projects/hammer/sys/alpha/conf/NOTES#4 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#2 integrate .. //depot/projects/hammer/sys/boot/ia64/skiload/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/ia64/skiload/ldscript.ia64#2 integrate .. //depot/projects/hammer/sys/boot/ia64/skiload/main.c#4 integrate .. //depot/projects/hammer/sys/boot/ia64/skiload/start.S#1 branch .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#16 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/hammer/sys/conf/NOTES#23 integrate .. //depot/projects/hammer/sys/conf/files#24 integrate .. //depot/projects/hammer/sys/conf/files.alpha#8 integrate .. //depot/projects/hammer/sys/conf/options#20 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_isab.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#10 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#7 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#12 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#6 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_eisa.c#3 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_mca.c#3 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/ep/if_epreg.h#2 integrate .. //depot/projects/hammer/sys/dev/ep/if_epvar.h#3 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#16 integrate .. //depot/projects/hammer/sys/dev/firewire/fwdma.c#4 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#13 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#7 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#18 integrate .. //depot/projects/hammer/sys/dev/harp/if_harp.c#1 branch .. //depot/projects/hammer/sys/dev/hatm/if_hatm.c#4 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#13 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#13 integrate .. //depot/projects/hammer/sys/dev/safe/safe.c#1 branch .. //depot/projects/hammer/sys/dev/safe/safereg.h#1 branch .. //depot/projects/hammer/sys/dev/safe/safevar.h#1 branch .. //depot/projects/hammer/sys/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/hammer/sys/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/hammer/sys/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/hammer/sys/dev/syscons/warp/warp_saver.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.c#4 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#15 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#14 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/wi/if_wivar.h#7 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#10 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#17 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#12 integrate .. //depot/projects/hammer/sys/i386/isa/vesa.c#5 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#6 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#15 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#15 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#9 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#11 integrate .. //depot/projects/hammer/sys/modules/Makefile#23 integrate .. //depot/projects/hammer/sys/modules/harp/Makefile#1 branch .. //depot/projects/hammer/sys/modules/safe/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.c#8 integrate .. //depot/projects/hammer/sys/net/if_atm.h#7 integrate .. //depot/projects/hammer/sys/net/if_media.h#6 integrate .. //depot/projects/hammer/sys/net/route.h#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/hammer/sys/netatm/atm_subr.c#5 integrate .. //depot/projects/hammer/sys/netatm/uni/unisig_msg.c#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#14 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/hammer/sys/pc98/pc98/pc98gdc.c#5 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#17 integrate .. //depot/projects/hammer/sys/pci/if_dcreg.h#10 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#16 integrate .. //depot/projects/hammer/sys/sparc64/include/cache.h#4 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#8 integrate .. //depot/projects/hammer/sys/sys/kse.h#12 integrate .. //depot/projects/hammer/sys/sys/mutex.h#6 integrate .. //depot/projects/hammer/sys/sys/proc.h#29 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#6 integrate .. //depot/projects/hammer/sys/sys/syscall.h#15 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#15 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#15 integrate .. //depot/projects/hammer/sys/sys/systm.h#6 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#12 integrate .. //depot/projects/hammer/sys/vm/swap_pager.h#7 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#14 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#17 integrate .. //depot/projects/hammer/sys/vm/vm_swap.c#7 delete .. //depot/projects/hammer/tools/tools/tinderbox/www/index.cgi#3 integrate .. //depot/projects/hammer/usr.bin/Makefile#16 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#10 integrate .. //depot/projects/hammer/usr.bin/getconf/getconf.c#4 integrate .. //depot/projects/hammer/usr.bin/sockstat/sockstat.c#5 integrate .. //depot/projects/hammer/usr.bin/telnet/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/telnet/README#2 delete .. //depot/projects/hammer/usr.bin/telnet/commands.c#6 delete .. //depot/projects/hammer/usr.bin/telnet/defines.h#2 delete .. //depot/projects/hammer/usr.bin/telnet/externs.h#3 delete .. //depot/projects/hammer/usr.bin/telnet/fdset.h#2 delete .. //depot/projects/hammer/usr.bin/telnet/general.h#2 delete .. //depot/projects/hammer/usr.bin/telnet/main.c#4 delete .. //depot/projects/hammer/usr.bin/telnet/network.c#4 delete .. //depot/projects/hammer/usr.bin/telnet/ring.c#3 delete .. //depot/projects/hammer/usr.bin/telnet/ring.h#2 delete .. //depot/projects/hammer/usr.bin/telnet/sys_bsd.c#4 delete .. //depot/projects/hammer/usr.bin/telnet/telnet.1#3 delete .. //depot/projects/hammer/usr.bin/telnet/telnet.c#6 delete .. //depot/projects/hammer/usr.bin/telnet/terminal.c#4 delete .. //depot/projects/hammer/usr.bin/telnet/types.h#2 delete .. //depot/projects/hammer/usr.bin/telnet/utilities.c#4 delete .. //depot/projects/hammer/usr.bin/top/machine.c#5 integrate .. //depot/projects/hammer/usr.bin/top/top.local.1#2 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.8#3 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.c#4 integrate .. //depot/projects/hammer/usr.sbin/lpr/lpr/printcap.5#3 integrate .. //depot/projects/hammer/usr.sbin/mountd/mountd.c#5 integrate .. //depot/projects/hammer/usr.sbin/pccard/pccardc/enabler.c#2 integrate .. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.c#4 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#12 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.74 2003/07/15 16:52:08 dwmalone Exp $ +$FreeBSD: src/MAINTAINERS,v 1.75 2003/07/19 00:17:36 markm Exp $ subsystem login notes ----------------------------- @@ -13,9 +13,8 @@ NEWCARD imp Pre-commit review requested. OLDCARD imp Pre-commit review requested. wi imp Pre-commit review requested. -telnet markm commits _must_ be made to src/crypto/telnet - first, only then to "base" telnet via "make - unifdef". The "base" commit _must_ be made. +telnet markm please ensure that a security-aware person + sanity-checks your work. secure/* markm please ensure that a security-aware person sanity-checks your work. kerberos5/* markm please ensure that a security-aware person ==== //depot/projects/hammer/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.284 2003/07/04 17:35:26 ru Exp $ +# $FreeBSD: src/Makefile,v 1.286 2003/07/20 12:38:29 ru Exp $ # # The user-driven targets are: # @@ -65,7 +65,7 @@ hierarchy install installcheck installkernel installkernel.debug\ reinstallkernel reinstallkernel.debug installmost installworld \ libraries lint maninstall \ - mk most obj objlink regress rerelease tags update \ + most obj objlink regress rerelease tags update \ _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend @@ -143,7 +143,7 @@ # upgrade_checks: @if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \ - PATH=${PATH} ${MAKE} >/dev/null 2>&1); \ + PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ (cd ${.CURDIR} && make make); \ fi ==== //depot/projects/hammer/bin/ed/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.26 2003/06/29 10:03:35 ru Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.28 2003/07/20 12:26:24 ru Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c @@ -8,7 +8,7 @@ .if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) DISTRIBUTION=crypto CFLAGS+=-DDES -WARNS= 2 +WARNS?= 2 DPADD= ${LIBCRYPTO} LDADD= -lcrypto .endif ==== //depot/projects/hammer/bin/ed/re.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ed/re.c,v 1.19 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/re.c,v 1.20 2003/07/20 10:24:09 ru Exp $"); #include "ed.h" @@ -41,10 +41,10 @@ pattern_t * get_compiled_pattern(void) { - static pattern_t *exp = NULL; + static pattern_t *expr = NULL; static char error[1024]; - char *exps; + char *exprs; char delimiter; int n; @@ -52,27 +52,27 @@ errmsg = "invalid pattern delimiter"; return NULL; } else if (delimiter == '\n' || *++ibufp == '\n' || *ibufp == delimiter) { - if (!exp) + if (!expr) errmsg = "no previous pattern"; - return exp; - } else if ((exps = extract_pattern(delimiter)) == NULL) + return expr; + } else if ((exprs = extract_pattern(delimiter)) == NULL) return NULL; /* buffer alloc'd && not reserved */ - if (exp && !patlock) - regfree(exp); - else if ((exp = (pattern_t *) malloc(sizeof(pattern_t))) == NULL) { + if (expr && !patlock) + regfree(expr); + else if ((expr = (pattern_t *) malloc(sizeof(pattern_t))) == NULL) { fprintf(stderr, "%s\n", strerror(errno)); errmsg = "out of memory"; return NULL; } patlock = 0; - if ((n = regcomp(exp, exps, 0))) { - regerror(n, exp, error, sizeof error); + if ((n = regcomp(expr, exprs, 0))) { + regerror(n, expr, error, sizeof error); errmsg = error; - free(exp); - return exp = NULL; + free(expr); + return expr = NULL; } - return exp; + return expr; } ==== //depot/projects/hammer/bin/setfacl/setfacl.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.7 2002/12/30 15:36:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.8 2003/07/18 16:00:26 rwatson Exp $"); #include #include @@ -153,7 +153,7 @@ entry = zmalloc(sizeof(struct sf_entry)); entry->acl = acl_from_text(optarg); if (entry->acl == NULL) - err(1, "acl_from_text() failed"); + err(1, "%s", optarg); entry->op = OP_MERGE_ACL; TAILQ_INSERT_TAIL(&entrylist, entry, next); break; @@ -164,7 +164,7 @@ entry = zmalloc(sizeof(struct sf_entry)); entry->acl = acl_from_text(optarg); if (entry->acl == NULL) - err(1, "acl_from_text() failed"); + err(1, "%s", optarg); entry->op = OP_REMOVE_ACL; TAILQ_INSERT_TAIL(&entrylist, entry, next); break; ==== //depot/projects/hammer/contrib/openpam/include/security/pam_types.h#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_types.h#12 $ + * $P4: //depot/projects/openpam/include/security/pam_types.h#13 $ */ #ifndef _PAM_TYPES_H_INCLUDED @@ -47,22 +47,22 @@ * XSSO 5.1.1 */ struct pam_message { - int msg_style; - const char *msg; + int msg_style; + char *msg; }; struct pam_response { - char *resp; - int resp_retcode; + char *resp; + int resp_retcode; }; /* * XSSO 5.1.2 */ struct pam_conv { - int (*conv)(int, const struct pam_message **, - struct pam_response **, void *); - void *appdata_ptr; + int (*conv)(int, const struct pam_message **, + struct pam_response **, void *); + void *appdata_ptr; }; /* @@ -75,9 +75,9 @@ * Solaris 9 */ typedef struct pam_repository { - char *type; - void *scope; - size_t scope_len; + char *type; + void *scope; + size_t scope_len; } pam_repository_t; #ifdef __cplusplus ==== //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.c#2 (text+ko) ==== @@ -30,6 +30,7 @@ * SUCH DAMAGE. * * $Id: mount_smbfs.c,v 1.17 2002/04/10 04:17:51 bp Exp $ + * $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.c,v 1.2 2003/07/20 11:27:54 tjr Exp $ */ #include #include @@ -75,7 +76,7 @@ extern void dropsuid(); extern int loadsmbvfs(); #else - struct vfsconf vfc; + struct xvfsconf vfc; #endif /* APPLE */ char *next; int opt, error, mntflags, caseopt; ==== //depot/projects/hammer/contrib/top/commands.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/commands.c,v 1.5 2002/01/24 17:52:26 dwmalone Exp $ + * $FreeBSD: src/contrib/top/commands.c,v 1.6 2003/07/17 23:56:40 julian Exp $ */ /* @@ -71,6 +71,7 @@ d - change number of displays to show\n\ e - list errors generated by last \"kill\" or \"renice\" command\n\ i - toggle the displaying of idle processes\n\ +H - toggle the displaying of threads\n\ I - same as 'i'\n\ k - kill processes; send a signal to a list of processes\n\ n or # - change number of processes to display\n", stdout); ==== //depot/projects/hammer/contrib/top/machine.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.5 2002/01/24 17:58:42 dwmalone Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.6 2003/07/17 23:56:40 julian Exp $ */ /* @@ -59,6 +59,7 @@ int idle; /* show idle processes */ int self; /* show self */ int system; /* show system processes */ + int thread; /* show threads */ int uid; /* only this uid (unless uid == -1) */ char *command; /* only this command (unless == NULL) */ }; ==== //depot/projects/hammer/contrib/top/top.c#2 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.9 2002/01/24 17:55:40 dwmalone Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.10 2003/07/17 23:56:40 julian Exp $ */ /* @@ -192,9 +192,9 @@ fd_set readfds; #ifdef ORDER - static char command_chars[] = "\f qh?en#sdkriIuto"; + static char command_chars[] = "\f qh?en#sdkriIutHo"; #else - static char command_chars[] = "\f qh?en#sdkriIut"; + static char command_chars[] = "\f qh?en#sdkriIutH"; #endif /* these defines enumerate the "strchr"s of the commands in command_chars */ #define CMD_redraw 0 @@ -214,8 +214,9 @@ #define CMD_idletog2 13 #define CMD_user 14 #define CMD_selftog 15 +#define CMD_thrtog 16 #ifdef ORDER -#define CMD_order 16 +#define CMD_order 17 #endif /* set the buffer for stdout */ @@ -245,6 +246,7 @@ ps.self = -1; ps.system = No; ps.uid = -1; + ps.thread = No; ps.command = NULL; /* get preset options from the environment */ @@ -270,7 +272,7 @@ optind = 1; } - while ((i = getopt(ac, av, "SIbinquvs:d:U:o:t")) != EOF) + while ((i = getopt(ac, av, "SIHbinquvs:d:U:o:t")) != EOF) { switch(i) { @@ -365,10 +367,14 @@ ps.self = (ps.self == -1) ? getpid() : -1; break; + case 'H': + ps.thread = !ps.thread; + break; + default: fprintf(stderr, "\ Top version %s\n\ -Usage: %s [-ISbinqut] [-d x] [-s x] [-o field] [-U username] [number]\n", +Usage: %s [-HISbinqut] [-d x] [-s x] [-o field] [-U username] [number]\n", version_string(), myname); exit(1); } @@ -955,6 +961,13 @@ } break; + case CMD_thrtog: + ps.thread = !ps.thread; + new_message(MT_standout | MT_delayed, + " %sisplaying threads.", + ps.thread ? "D" : "Not d"); + putchar('\r'); + break; #ifdef ORDER case CMD_order: new_message(MT_standout, ==== //depot/projects/hammer/etc/defaults/pccard.conf#8 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.260 2003/04/10 17:16:01 shiba Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.261 2003/07/19 05:40:06 imp Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -544,6 +544,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# D-Link DFE-670 Fast Ethernet Card +card "D-Link" "DFE-670TXD" + config auto "ed" ? 0x80010 + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # D-Link DME-560T LAN/FAX/MODEM Card (as Ethernet) card "D-Link" "DME560T" config default "ed" ? ==== //depot/projects/hammer/kerberos5/Makefile#5 (text+ko) ==== @@ -1,9 +1,10 @@ -# $FreeBSD: src/kerberos5/Makefile,v 1.14 2003/05/05 07:58:42 markm Exp $ +# $FreeBSD: src/kerberos5/Makefile,v 1.15 2003/07/16 20:59:13 markm Exp $ SUBDIR= doc lib libexec usr.bin usr.sbin # These are the programs which depend on Kerberos. -KPROGS= lib/libpam secure/lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd +KPROGS= lib/libpam \ + secure/lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd # This target is used to rebuild these programs WITH Kerberos. kerberize: ==== //depot/projects/hammer/kerberos5/Makefile.inc#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/Makefile.inc,v 1.17 2003/07/02 23:46:37 ru Exp $ +# $FreeBSD: src/kerberos5/Makefile.inc,v 1.19 2003/07/18 13:21:55 markm Exp $ DISTRIBUTION?= crypto NOLINT= true @@ -7,7 +7,6 @@ KRB5DIR= ${.CURDIR}/../../../crypto/heimdal ROKENDIR= ${.CURDIR}/../../lib/libroken -TELNETDIR= ${.CURDIR}/../../../crypto/telnet CFLAGS+=-I${INCLUDEOBJDIR} -DHAVE_CONFIG_H @@ -62,59 +61,53 @@ LIBSL= ${.CURDIR}/../../lib/libsl/libsl.a .endif -.if exists(${.OBJDIR}/../../lib/libtelnet) -LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a -.else -LIBTELNET= ${.CURDIR}/../../lib/libtelnet/libtelnet.a -.endif - COMPILE_ET= compile_et -.ORDER: asn1_err.c asn1_err.h -asn1_err.c asn1_err.h: ${KRB5DIR}/lib/asn1/asn1_err.et +.ORDER: asn1_err.c ${.OBJDIR}/asn1_err.h +asn1_err.c ${.OBJDIR}/asn1_err.h: ${KRB5DIR}/lib/asn1/asn1_err.et test -e ${.OBJDIR}/asn1_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} asn1_err.et CLEANFILES+=asn1_err.h asn1_err.c asn1_err.et -.ORDER: hdb_err.c hdb_err.h -hdb_err.c hdb_err.h: ${KRB5DIR}/lib/hdb/hdb_err.et +.ORDER: hdb_err.c ${.OBJDIR}/hdb_err.h +hdb_err.c ${.OBJDIR}/hdb_err.h: ${KRB5DIR}/lib/hdb/hdb_err.et test -e ${.OBJDIR}/hdb_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} hdb_err.et CLEANFILES+=hdb_err.h hdb_err.c hdb_err.et -.ORDER: heim_err.c heim_err.h -heim_err.c heim_err.h: ${KRB5DIR}/lib/krb5/heim_err.et +.ORDER: heim_err.c ${.OBJDIR}/heim_err.h +heim_err.c ${.OBJDIR}/heim_err.h: ${KRB5DIR}/lib/krb5/heim_err.et test -e ${.OBJDIR}/heim_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} heim_err.et CLEANFILES+=heim_err.h heim_err.c heim_err.et -.ORDER: krb5_err.c krb5_err.h -krb5_err.c krb5_err.h: ${KRB5DIR}/lib/krb5/krb5_err.et +.ORDER: krb5_err.c ${.OBJDIR}/krb5_err.h +krb5_err.c ${.OBJDIR}/krb5_err.h: ${KRB5DIR}/lib/krb5/krb5_err.et test -e ${.OBJDIR}/krb5_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} krb5_err.et CLEANFILES+=krb5_err.h krb5_err.c krb5_err.et -.ORDER: kadm5_err.c kadm5_err.h -kadm5_err.c kadm5_err.h: \ +.ORDER: kadm5_err.c ${.OBJDIR}/kadm5_err.h +kadm5_err.c ${.OBJDIR}/kadm5_err.h: \ ${KRB5DIR}/lib/kadm5/kadm5_err.et test -e ${.OBJDIR}/kadm5_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} kadm5_err.et CLEANFILES+=kadm5_err.h kadm5_err.c kadm5_err.et -.ORDER: k524_err.c k524_err.h -k524_err.c k524_err.h: \ +.ORDER: k524_err.c ${.OBJDIR}/k524_err.h +k524_err.c ${.OBJDIR}/k524_err.h: \ ${KRB5DIR}/lib/krb5/k524_err.et test -e ${.OBJDIR}/k524_err.et || ln -sf ${.ALLSRC} ${COMPILE_ET} k524_err.et CLEANFILES+=k524_err.h k524_err.c k524_err.et -roken.h: make-roken +${.OBJDIR}/roken.h: make-roken ./make-roken > tmp.h ;\ if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \ else rm -f roken.h; mv tmp.h roken.h; fi ==== //depot/projects/hammer/kerberos5/lib/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/kerberos5/lib/Makefile,v 1.7 2003/03/09 21:56:50 markm Exp $ +# $FreeBSD: src/kerberos5/lib/Makefile,v 1.8 2003/07/16 20:59:13 markm Exp $ -SUBDIR= libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi libtelnet +SUBDIR= libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi .include ==== //depot/projects/hammer/kerberos5/lib/libasn1/Makefile#5 (text+ko) ==== @@ -1,14 +1,25 @@ -# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.18 2003/04/05 20:30:29 imp Exp $ +# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.19 2003/07/18 13:21:55 markm Exp $ LIB= asn1 -CFLAGS+=-I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I${INCLUDEOBJDIR} \ + +SRCS= \ + der_get.c \ + der_put.c \ + der_free.c \ + der_length.c \ + der_copy.c \ + timegm.c \ + asn1_err.c \ + ${.OBJDIR}/asn1_err.h \ + ${.OBJDIR}/krb5_asn1.h \ + ${.OBJDIR}/roken.h \ + ${GEN:S/.x/.c/g} + +CFLAGS+=-I${KRB5DIR}/include \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/roken \ + -I${INCLUDEOBJDIR} \ -I${.OBJDIR} -SRCS= der_get.c der_put.c der_free.c der_length.c der_copy.c \ - timegm.c asn1_err.c asn1_err.h krb5_asn1.h roken.h \ - ${GEN:S/.x/.c/g} GEN= \ asn1_APOptions.x \ @@ -63,7 +74,7 @@ asn1_TransitedEncoding.x \ asn1_UNSIGNED.x -INCS= krb5_asn1.h asn1_err.h +INCS= ${.OBJDIR}/krb5_asn1.h ${.OBJDIR}/asn1_err.h .include @@ -71,7 +82,7 @@ .PATH: ${KRB5DIR}/lib/vers .PATH: ${KRB5DIR}/lib/roken -beforedepend all: roken.h +beforedepend all: ${.OBJDIR}/roken.h .for I in ${GEN} ${I:S/.x/.c/}: ${I} @@ -80,7 +91,7 @@ CLEANFILES+= ${GEN:S/.x/.c/g} krb5_asn1.h asn1_files -${GEN} krb5_asn1.h: asn1_compile k5.asn1 +${GEN} ${.OBJDIR}/krb5_asn1.h: asn1_compile k5.asn1 ./asn1_compile ${KRB5DIR}/lib/asn1/k5.asn1 krb5_asn1 build-tools: make-print-version make-roken asn1_compile @@ -101,25 +112,26 @@ symbol.c \ getarg.c \ warnerr.c \ - print_version.o \ + ${.OBJDIR}/print_version.o \ get_window_size.c \ strupr.c ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.OODATE} ${LDADD} -parse.o: parse.c roken.h +${.OBJDIR}/parse.o: ${.OBJDIR}/parse.c ${.OBJDIR}/roken.h -.ORDER: parse.c parse.h -parse.h parse.c: parse.y +.ORDER: ${.OBJDIR}/parse.c ${.OBJDIR}/parse.h +${.OBJDIR}/parse.h ${.OBJDIR}/parse.c: parse.y ${YACC} -d ${.OODATE} cp y.tab.c parse.c cp y.tab.h parse.h -lex.o: lex.l parse.h roken.h +lex.o: lex.l ${.OBJDIR}/parse.h ${.OBJDIR}/roken.h -print_version.o: print_version.h print_version.c roken.h +${.OBJDIR}/print_version.o: ${.OBJDIR}/print_version.h print_version.c \ + ${.OBJDIR}/roken.h ${CC} ${CFLAGS} -c -o ${.TARGET} ${KRB5DIR}/lib/vers/print_version.c -print_version.h: make-print-version +${.OBJDIR}/print_version.h: make-print-version ./make-print-version print_version.h make-print-version: make-print-version.c ==== //depot/projects/hammer/kerberos5/lib/libgssapi/Makefile#2 (text+ko) ==== @@ -1,56 +1,63 @@ -# $FreeBSD: src/kerberos5/lib/libgssapi/Makefile,v 1.4 2002/05/12 16:00:49 ru Exp $ +# $FreeBSD: src/kerberos5/lib/libgssapi/Makefile,v 1.5 2003/07/18 13:21:55 markm Exp $ LIB= gssapi -CFLAGS+=-I${KRB5DIR}/lib/gssapi \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/des \ - -I${KRB5DIR}/include \ - -I${ASN1OBJDIR} \ + +SRCS= \ + 8003.c \ + accept_sec_context.c \ + acquire_cred.c \ + add_oid_set_member.c \ + canonicalize_name.c \ + compare_name.c \ + context_time.c \ + copy_ccache.c \ + create_emtpy_oid_set.c \ + decapsulate.c \ + delete_sec_context.c \ + display_name.c \ + display_status.c \ + duplicate_name.c \ + encapsulate.c \ + export_sec_context.c \ + export_name.c \ + external.c \ + get_mic.c \ + gssapi.h \ + gssapi_locl.h \ + import_name.c \ + import_sec_context.c \ + indicate_mechs.c \ + init.c \ + init_sec_context.c \ + inquire_context.c \ + inquire_cred.c \ + release_buffer.c \ + release_cred.c \ + release_name.c \ + release_oid_set.c \ + test_oid_set_member.c \ + unwrap.c \ + v1.c \ + verify_mic.c \ + wrap.c \ + address_to_krb5addr.c \ + ${.OBJDIR}/heim_err.h \ + ${.OBJDIR}/krb5_err.h \ + ${.OBJDIR}/k524_err.h + +CFLAGS+=-I${KRB5DIR}/lib/gssapi \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/des \ + -I${KRB5DIR}/include \ + -I${ASN1OBJDIR} \ -I${.OBJDIR} -SRCS= \ - 8003.c \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 21 17:32:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7240737B404; Mon, 21 Jul 2003 17:32:29 -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 0DB7337B401 for ; Mon, 21 Jul 2003 17:32:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8EC4A43FA3 for ; Mon, 21 Jul 2003 17:32:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M0WS0U023141 for ; Mon, 21 Jul 2003 17:32:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M0WSSJ023138 for perforce@freebsd.org; Mon, 21 Jul 2003 17:32:28 -0700 (PDT) Date: Mon, 21 Jul 2003 17:32:28 -0700 (PDT) Message-Id: <200307220032.h6M0WSSJ023138@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 34799 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, 22 Jul 2003 00:32:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=34799 Change 34799 by peter@peter_hammer on 2003/07/21 17:31:45 initial shot at fleshing out SSE support in the fp*() API Affected files ... .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#2 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/ieeefp.h#2 (text+ko) ==== @@ -90,6 +90,13 @@ #define FP_RND_FLD 0xc00 /* round control field */ #define FP_STKY_FLD 0x3f /* sticky flags field */ +#define SSE_STKY_FLD 0x3f /* exception flags */ +#define SSE_DAZ_FLD 0x40 /* Denormals are zero */ +#define SSE_MSKS_FLD 0x1f80 /* exception masks field */ +#define SSE_RND_FLD 0x6000 /* rounding control */ +#define SSE_FZ_FLD 0x8000 /* flush to zero on underflow */ + + /* * FP register bit field offsets */ @@ -98,84 +105,164 @@ #define FP_RND_OFF 10 /* round control offset */ #define FP_STKY_OFF 0 /* sticky flags offset */ +#define SSE_STKY_OFF 0 /* exception flags offset */ +#define SSE_DAZ_OFF 6 /* DAZ exception mask offset */ +#define SSE_MSKS_OFF 7 /* other exception masks offset */ +#define SSE_RND_OFF 13 /* rounding control offset */ +#define SSE_FZ_OFF 15 /* flush to zero offset */ + #ifdef __GNUC__ #define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr))) #define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr))) +#define __fldcw(addr) __asm __volatile("fldcw %0" : "=m" (*(addr))) #define __fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr))) #define __fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) +#define __ldmxcsr(addr) __asm __volatile("ldmxcsr %0" : "=m" (*(addr))) +#define __stmxcsr(addr) __asm __volatile("stmxcsr %0" : "=m" (*(addr))) /* - * return the contents of a FP register + * General notes about conflicting SSE vs FP status bits. + * This code assumes that software will not fiddle with the control + * bits of the SSE and x87 in such a way to get them out of sync and + * still expect this to work. Break this at your peril. + * Because I based this on the i386 port, the x87 state is used for + * the fpget*() functions, and is shadowed into the SSE state for + * the fpset*() functions. For dual source fpget*() functions, I + * merge the two together. I think. + */ + +/* Set rounding control */ +static __inline__ fp_rnd_t +fpgetround(void) +{ + unsigned short _cw; + + __fnstcw(&_cw); + return ((_cw & FP_RND_FLD) >> FP_RND_OFF); +} + +static __inline__ fp_rnd_t +fpsetround(fp_rnd_t _m) +{ + unsigned short _cw; + unsigned int _mxcsr; + fp_rnd_t _p; + + __fnstcw(&_cw); + _p = (_cw & FP_RND_FLD) >> FP_RND_OFF; + _cw &= ~FP_RND_FLD; + _cw |= (_m << FP_RND_OFF) & FP_RND_FLD; + __fldcw(&_cw); + __stmxcsr(&_mxcsr); + _mxcsr &= ~SSE_RND_FLD; + _mxcsr |= (_m << SSE_RND_OFF) & SSE_RND_FLD; + __ldmxcsr(&_mxcsr); + return (_p); +} + +/* + * Set precision for fadd/fsub/fsqrt etc x87 instructions + * There is no equivalent SSE mode or control. It always runs + * in 64 bit precision mode for SSE2 calculations. */ -static __inline__ int -__fpgetreg(int _reg) +static __inline__ fp_prec_t +fpgetprec(void) +{ + unsigned short _cw; + + __fnstcw(&_cw); + return ((_cw & FP_PRC_FLD) >> FP_PRC_OFF); +} + +static __inline__ fp_rnd_t +fpsetprec(fp_rnd_t _m) { - unsigned short _mem; + unsigned short _cw; + fp_prec_t _p; - /*- - * This is more efficient than it looks. The switch gets optimized - * away if _reg is constant. - * - * The default case only supports _reg == 0. We could handle more - * registers (e.g., tags) using fnstenv, but the interface doesn't - * support more. - */ - switch(_reg) { - default: - __fnstcw(&_mem); - break; - case FP_STKY_REG: - __fnstsw(&_mem); - break; - } - return _mem; + __fnstcw(&_cw); + _p = (_cw & FP_PRC_FLD) >> FP_PRC_OFF; + _cw &= ~FP_PRC_FLD; + _cw |= (_m << FP_PRC_OFF) & FP_PRC_FLD; + __fldcw(&_cw); + return (_p); } /* - * set a FP mode; return previous mode + * Look at the exception masks + * Note that x87 masks are inverse of the fp*() functions + * API. ie: mask = 1 means disable for x87 and SSE, but + * for the fp*() api, mask = 1 means enabled. */ -static __inline__ int -__fpsetreg(int _m, int _reg, int _fld, int _off) +static __inline__ fp_except_t +fpgetmask(void) +{ + unsigned short _cw; + + __fnstcw(&_cw); + return ((~_cw) & FP_MSKS_FLD); +} + +static __inline__ fp_except_t +fpsetmask(fp_except_t _m) +{ + unsigned short _cw; + unsigned int _mxcsr; + fp_except_t _p; + + __fnstcw(&_cw); + _p = (~_cw) & FP_MSKS_FLD; + _cw ~= ~FP_MSKS_FLD; + _cw |= (~_m) & FP_MSKS_FLD; + __fldcw(&_cw); + __stmxcsr(&_mxcxr); + /* XXX should clear non-ieee SSE_DAZ_FLD and SSE_FZ_FLD */ + _mxcsr &= ~SSE_MSKS_FLD; + _mxcsr |= ((~_m) << SSE_MSKS_OFF) & SSE_MSKS_FLD); + __ldmxcsr(&_mxcsr); + return (_p); +} + +/* See which sticky exceptions are pending, and reset them */ +static __inline__ fp_except_t +fpgetsticky(void) +{ + unsigned short _sw; + unsigned int _mxcsr; + fp_except_t _ex; + + __fnstsw(&_sw); + _ex = _sw & FP_STKY_FLD; + __stmxcsr(&_mxcsr); + _ex |= _mxcsr & SSE_STKY_FLD; + return (_ex); +} + +static __inline__ fp_except_t +fpresetsticky(fp_except_t _m) { unsigned _env[7]; - unsigned _p; + unsigned int _mxcsr; + fp_except_t _p; - /* - * _reg == 0 could be handled better using fnstcw/fldcw. - */ __fnstenv(_env); - _p = (_env[_reg] & _fld) >> _off; - _env[_reg] = (_env[_reg] & ~_fld) | (_m << _off & _fld); + _p = _env[FP_STKY_REG] & _m; + __stmxcsr(&_mxcsr); + _p |= _mxcsr & SSE_STKY_FLD; + _env[FP_STKY_REG] &= ~_m; __fldenv(_env); - return _p; + _mxcsr &= ~_m; + __ldmxcsr(&_mxcsr); + return (_p); } -#endif /* __GNUC__ */ - -/* - * SysV/386 FP control interface - */ -#define fpgetround() ((fp_rnd_t) \ - ((__fpgetreg(FP_RND_REG) & FP_RND_FLD) >> FP_RND_OFF)) -#define fpsetround(m) ((fp_rnd_t) \ - __fpsetreg((m), FP_RND_REG, FP_RND_FLD, FP_RND_OFF)) -#define fpgetprec() ((fp_prec_t) \ - ((__fpgetreg(FP_PRC_REG) & FP_PRC_FLD) >> FP_PRC_OFF)) -#define fpsetprec(m) ((fp_prec_t) \ - __fpsetreg((m), FP_PRC_REG, FP_PRC_FLD, FP_PRC_OFF)) -#define fpgetmask() ((fp_except_t) \ - ((~__fpgetreg(FP_MSKS_REG) & FP_MSKS_FLD) >> FP_MSKS_OFF)) -#define fpsetmask(m) ((fp_except_t) \ - (~__fpsetreg(~(m), FP_MSKS_REG, FP_MSKS_FLD, FP_MSKS_OFF)) & \ - (FP_MSKS_FLD >> FP_MSKS_OFF)) -#define fpgetsticky() ((fp_except_t) \ - ((__fpgetreg(FP_STKY_REG) & FP_STKY_FLD) >> FP_STKY_OFF)) -#define fpresetsticky(m) ((fp_except_t) \ - __fpsetreg(0, FP_STKY_REG, (m), FP_STKY_OFF)) +/* It is called fpsetsticky(), but is really a reset function */ #define fpsetsticky(m) fpresetsticky(m) /* Suppress prototypes in the MI header. */ #define _IEEEFP_INLINED_ 1 +#endif /* __GNUC__ */ + #endif /* !_MACHINE_IEEEFP_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Jul 21 17:54:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B4D137B401; Mon, 21 Jul 2003 17:54:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB65D37B404 for ; Mon, 21 Jul 2003 17:54:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F41F43F3F for ; Mon, 21 Jul 2003 17:54:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M0sv0U023947 for ; Mon, 21 Jul 2003 17:54:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M0suHi023944 for perforce@freebsd.org; Mon, 21 Jul 2003 17:54:56 -0700 (PDT) Date: Mon, 21 Jul 2003 17:54:56 -0700 (PDT) Message-Id: <200307220054.h6M0suHi023944@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 34801 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, 22 Jul 2003 00:54:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=34801 Change 34801 by peter@peter_hammer on 2003/07/21 17:54:05 make this actually compile. it seems to actually work too. bonus! Affected files ... .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#3 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/ieeefp.h#3 (text+ko) ==== @@ -213,13 +213,13 @@ __fnstcw(&_cw); _p = (~_cw) & FP_MSKS_FLD; - _cw ~= ~FP_MSKS_FLD; + _cw &= ~FP_MSKS_FLD; _cw |= (~_m) & FP_MSKS_FLD; __fldcw(&_cw); - __stmxcsr(&_mxcxr); + __stmxcsr(&_mxcsr); /* XXX should clear non-ieee SSE_DAZ_FLD and SSE_FZ_FLD */ _mxcsr &= ~SSE_MSKS_FLD; - _mxcsr |= ((~_m) << SSE_MSKS_OFF) & SSE_MSKS_FLD); + _mxcsr |= ((~_m) << SSE_MSKS_OFF) & SSE_MSKS_FLD; __ldmxcsr(&_mxcsr); return (_p); } From owner-p4-projects@FreeBSD.ORG Mon Jul 21 18:38:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFD3237B404; Mon, 21 Jul 2003 18:38: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 705F537B401 for ; Mon, 21 Jul 2003 18:38:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5BD443F93 for ; Mon, 21 Jul 2003 18:38:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M1cp0U026488 for ; Mon, 21 Jul 2003 18:38:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M1cp1j026485 for perforce@freebsd.org; Mon, 21 Jul 2003 18:38:51 -0700 (PDT) Date: Mon, 21 Jul 2003 18:38:51 -0700 (PDT) Message-Id: <200307220138.h6M1cp1j026485@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 34803 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, 22 Jul 2003 01:38:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=34803 Change 34803 by peter@peter_hammer on 2003/07/21 18:38:45 OK, c++ sucks. Affected files ... .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#4 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/ieeefp.h#4 (text+ko) ==== @@ -111,7 +111,7 @@ #define SSE_RND_OFF 13 /* rounding control offset */ #define SSE_FZ_OFF 15 /* flush to zero offset */ -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__cplusplus) #define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr))) #define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr))) @@ -175,7 +175,7 @@ return ((_cw & FP_PRC_FLD) >> FP_PRC_OFF); } -static __inline__ fp_rnd_t +static __inline__ fp_prec_t fpsetprec(fp_rnd_t _m) { unsigned short _cw; @@ -263,6 +263,14 @@ /* Suppress prototypes in the MI header. */ #define _IEEEFP_INLINED_ 1 -#endif /* __GNUC__ */ +#else /* __GNUC__ && !__cplusplus */ + +/* Augment the userland declarations */ +__BEGIN_DECLS +extern fp_prec_t fpgetprec(void); +extern fp_prec_t fpsetprec(fp_prec_t); +__END_DECLS + +#endif /* __GNUC__ && !__cplusplus */ #endif /* !_MACHINE_IEEEFP_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Jul 21 18:50:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADD7A37B401; Mon, 21 Jul 2003 18:50:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6133737B405 for ; Mon, 21 Jul 2003 18:50:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE77F43FB1 for ; Mon, 21 Jul 2003 18:50:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M1o50U026927 for ; Mon, 21 Jul 2003 18:50:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M1o5sp026924 for perforce@freebsd.org; Mon, 21 Jul 2003 18:50:05 -0700 (PDT) Date: Mon, 21 Jul 2003 18:50:05 -0700 (PDT) Message-Id: <200307220150.h6M1o5sp026924@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 34804 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, 22 Jul 2003 01:50:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=34804 Change 34804 by peter@peter_hammer on 2003/07/21 18:50:02 Stand C++ up in front of the firing squad please. Affected files ... .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#5 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/ieeefp.h#5 (text+ko) ==== @@ -111,7 +111,7 @@ #define SSE_RND_OFF 13 /* rounding control offset */ #define SSE_FZ_OFF 15 /* flush to zero offset */ -#if defined(__GNUC__) && !defined(__cplusplus) +#ifdef __GNUC__ #define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr))) #define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr))) @@ -139,7 +139,20 @@ unsigned short _cw; __fnstcw(&_cw); +#ifndef __cplusplus return ((_cw & FP_RND_FLD) >> FP_RND_OFF); +#else + switch ((_cw & FP_RND_FLD) >> FP_RND_OFF) { + case FP_RN: + return FP_RN; + case FP_RM: + return FP_RM; + case FP_RP: + return FP_RP; + case FP_RZ: + return FP_RZ; + } +#endif } static __inline__ fp_rnd_t @@ -150,7 +163,24 @@ fp_rnd_t _p; __fnstcw(&_cw); +#ifndef __cplusplus _p = (_cw & FP_RND_FLD) >> FP_RND_OFF; +#else + switch ((_cw & FP_RND_FLD) >> FP_RND_OFF) { + case FP_RN: + _p = FP_RN; + break; + case FP_RM: + _p = FP_RM; + break; + case FP_RP: + _p = FP_RP; + break; + case FP_RZ: + _p = FP_RZ; + break; + } +#endif _cw &= ~FP_RND_FLD; _cw |= (_m << FP_RND_OFF) & FP_RND_FLD; __fldcw(&_cw); @@ -172,7 +202,20 @@ unsigned short _cw; __fnstcw(&_cw); +#ifndef __cplusplus return ((_cw & FP_PRC_FLD) >> FP_PRC_OFF); +#else + switch ((_cw & FP_PRC_FLD) >> FP_PRC_OFF) { + case FP_PS: + return FP_PS; + case FP_PRS: + return FP_PRS; + case FP_PD: + return FP_PD; + case FP_PE: + return FP_PE; + } +#endif } static __inline__ fp_prec_t @@ -182,7 +225,24 @@ fp_prec_t _p; __fnstcw(&_cw); +#ifndef __cplusplus _p = (_cw & FP_PRC_FLD) >> FP_PRC_OFF; +#else + switch ((_cw & FP_PRC_FLD) >> FP_PRC_OFF) { + case FP_PS: + _p = FP_PS; + break; + case FP_PRS: + _p = FP_PRS; + break; + case FP_PD: + _p = FP_PD; + break; + case FP_PE: + _p = FP_PE; + break; + } +#endif _cw &= ~FP_PRC_FLD; _cw |= (_m << FP_PRC_OFF) & FP_PRC_FLD; __fldcw(&_cw); @@ -263,7 +323,7 @@ /* Suppress prototypes in the MI header. */ #define _IEEEFP_INLINED_ 1 -#else /* __GNUC__ && !__cplusplus */ +#else /* __GNUC__ */ /* Augment the userland declarations */ __BEGIN_DECLS @@ -271,6 +331,6 @@ extern fp_prec_t fpsetprec(fp_prec_t); __END_DECLS -#endif /* __GNUC__ && !__cplusplus */ +#endif /* __GNUC__ */ #endif /* !_MACHINE_IEEEFP_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Jul 21 19:08:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39AD337B401; Mon, 21 Jul 2003 19:08: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 C17F437B401 for ; Mon, 21 Jul 2003 19:08:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5744843F85 for ; Mon, 21 Jul 2003 19:08:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M28T0U028572 for ; Mon, 21 Jul 2003 19:08:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M28SxW028569 for perforce@freebsd.org; Mon, 21 Jul 2003 19:08:28 -0700 (PDT) Date: Mon, 21 Jul 2003 19:08:28 -0700 (PDT) Message-Id: <200307220208.h6M28SxW028569@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 34806 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, 22 Jul 2003 02:08:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=34806 Change 34806 by peter@peter_daintree on 2003/07/21 19:08:04 Set NO_QUAD=1 for amd64 as well Affected files ... .. //depot/projects/hammer/lib/libc/amd64/Makefile.inc#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 21 19:31:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00BC037B404; Mon, 21 Jul 2003 19:31:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E8D237B401 for ; Mon, 21 Jul 2003 19:31:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3458E43F93 for ; Mon, 21 Jul 2003 19:31:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M2Vw0U029534 for ; Mon, 21 Jul 2003 19:31:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M2VvI0029531 for perforce@freebsd.org; Mon, 21 Jul 2003 19:31:57 -0700 (PDT) Date: Mon, 21 Jul 2003 19:31:57 -0700 (PDT) Message-Id: <200307220231.h6M2VvI0029531@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 34807 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, 22 Jul 2003 02:32:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=34807 Change 34807 by peter@peter_daintree on 2003/07/21 19:31:08 Use the defaults for FPU precision. Also, drop support 80287 coprocessors. Affected files ... .. //depot/projects/hammer/sys/amd64/include/npx.h#8 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/npx.h#8 (text+ko) ==== @@ -85,16 +85,17 @@ * 64-bit precision * all exceptions masked. * - * We modify the affine mode bit and precision bits in this to give: + * FreeBSD/i386 uses 53 bit precision for things like fadd/fsub/fsqrt etc + * because of the difference between memory and fpu register stack arguments. + * If its using an intermediate fpu register, it has 80/64 bits to work + * with. If it uses memory, it has 64/53 bits to work with. However, + * gcc is aware of this and goes to a fair bit of trouble to make the + * best use of it. * - * affine mode for 287's (if they work at all) (1 in bitfield 1<<12) - * 53-bit precision (2 in bitfield 3<<8) - * - * 64-bit precision often gives bad results with high level languages - * because it makes the results of calculations depend on whether - * intermediate values are stored in memory or in FPU registers. + * This is mostly academic for AMD64, because the ABI prefers the use + * SSE2 based math. For FreeBSD/amd64, we go with the default settings. */ -#define __INITIAL_NPXCW__ 0x127F +#define __INITIAL_NPXCW__ 0x037F #define __INITIAL_MXCSR__ 0x1F80 #define __INITIAL_MXCSR_MASK__ 0xFFBF From owner-p4-projects@FreeBSD.ORG Mon Jul 21 20:04:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 608CD37B404; Mon, 21 Jul 2003 20:04: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 F370237B401 for ; Mon, 21 Jul 2003 20:04:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 849A143F85 for ; Mon, 21 Jul 2003 20:04:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M34d0U031640 for ; Mon, 21 Jul 2003 20:04:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M34cZf031637 for perforce@freebsd.org; Mon, 21 Jul 2003 20:04:38 -0700 (PDT) Date: Mon, 21 Jul 2003 20:04:38 -0700 (PDT) Message-Id: <200307220304.h6M34cZf031637@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 34809 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, 22 Jul 2003 03:04:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=34809 Change 34809 by peter@peter_hammer on 2003/07/21 20:03:40 flip-flop again. Dont give into the C++ evilness. Instead, instantiate the fp*() functions in libc and have C++ call it there. This also makes it more easily available to non-gcc apps. Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#11 edit .. //depot/projects/hammer/lib/libc/amd64/gen/fpgetmask.c#1 add .. //depot/projects/hammer/lib/libc/amd64/gen/fpgetprec.c#1 add .. //depot/projects/hammer/lib/libc/amd64/gen/fpgetround.c#1 add .. //depot/projects/hammer/lib/libc/amd64/gen/fpgetsticky.c#1 add .. //depot/projects/hammer/lib/libc/amd64/gen/fpsetmask.c#1 add .. //depot/projects/hammer/lib/libc/amd64/gen/fpsetprec.c#1 add .. //depot/projects/hammer/lib/libc/amd64/gen/fpsetround.c#1 add .. //depot/projects/hammer/lib/libc/amd64/gen/fpsetsticky.c#1 add .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#6 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#11 (text+ko) ==== @@ -4,4 +4,7 @@ SRCS+= _setjmp.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ frexp.c infinity.c isinf.c ldexp.c \ - makecontext.c signalcontext.c + makecontext.c signalcontext.c \ + fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \ + fpgetround.c fpsetround.c fpgetsticky.c fpsetsticky.c + ==== //depot/projects/hammer/sys/amd64/include/ieeefp.h#6 (text+ko) ==== @@ -111,7 +111,7 @@ #define SSE_RND_OFF 13 /* rounding control offset */ #define SSE_FZ_OFF 15 /* flush to zero offset */ -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__cplusplus) #define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr))) #define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr))) @@ -134,53 +134,23 @@ /* Set rounding control */ static __inline__ fp_rnd_t -fpgetround(void) +__fpgetround(void) { unsigned short _cw; __fnstcw(&_cw); -#ifndef __cplusplus return ((_cw & FP_RND_FLD) >> FP_RND_OFF); -#else - switch ((_cw & FP_RND_FLD) >> FP_RND_OFF) { - case FP_RN: - return FP_RN; - case FP_RM: - return FP_RM; - case FP_RP: - return FP_RP; - case FP_RZ: - return FP_RZ; - } -#endif } static __inline__ fp_rnd_t -fpsetround(fp_rnd_t _m) +__fpsetround(fp_rnd_t _m) { unsigned short _cw; unsigned int _mxcsr; fp_rnd_t _p; __fnstcw(&_cw); -#ifndef __cplusplus _p = (_cw & FP_RND_FLD) >> FP_RND_OFF; -#else - switch ((_cw & FP_RND_FLD) >> FP_RND_OFF) { - case FP_RN: - _p = FP_RN; - break; - case FP_RM: - _p = FP_RM; - break; - case FP_RP: - _p = FP_RP; - break; - case FP_RZ: - _p = FP_RZ; - break; - } -#endif _cw &= ~FP_RND_FLD; _cw |= (_m << FP_RND_OFF) & FP_RND_FLD; __fldcw(&_cw); @@ -197,52 +167,22 @@ * in 64 bit precision mode for SSE2 calculations. */ static __inline__ fp_prec_t -fpgetprec(void) +__fpgetprec(void) { unsigned short _cw; __fnstcw(&_cw); -#ifndef __cplusplus return ((_cw & FP_PRC_FLD) >> FP_PRC_OFF); -#else - switch ((_cw & FP_PRC_FLD) >> FP_PRC_OFF) { - case FP_PS: - return FP_PS; - case FP_PRS: - return FP_PRS; - case FP_PD: - return FP_PD; - case FP_PE: - return FP_PE; - } -#endif } static __inline__ fp_prec_t -fpsetprec(fp_rnd_t _m) +__fpsetprec(fp_rnd_t _m) { unsigned short _cw; fp_prec_t _p; __fnstcw(&_cw); -#ifndef __cplusplus _p = (_cw & FP_PRC_FLD) >> FP_PRC_OFF; -#else - switch ((_cw & FP_PRC_FLD) >> FP_PRC_OFF) { - case FP_PS: - _p = FP_PS; - break; - case FP_PRS: - _p = FP_PRS; - break; - case FP_PD: - _p = FP_PD; - break; - case FP_PE: - _p = FP_PE; - break; - } -#endif _cw &= ~FP_PRC_FLD; _cw |= (_m << FP_PRC_OFF) & FP_PRC_FLD; __fldcw(&_cw); @@ -256,7 +196,7 @@ * for the fp*() api, mask = 1 means enabled. */ static __inline__ fp_except_t -fpgetmask(void) +__fpgetmask(void) { unsigned short _cw; @@ -265,7 +205,7 @@ } static __inline__ fp_except_t -fpsetmask(fp_except_t _m) +__fpsetmask(fp_except_t _m) { unsigned short _cw; unsigned int _mxcsr; @@ -286,7 +226,7 @@ /* See which sticky exceptions are pending, and reset them */ static __inline__ fp_except_t -fpgetsticky(void) +__fpgetsticky(void) { unsigned short _sw; unsigned int _mxcsr; @@ -299,8 +239,9 @@ return (_ex); } +/* Note that this should really be called fpresetsticky() */ static __inline__ fp_except_t -fpresetsticky(fp_except_t _m) +__fpsetsticky(fp_except_t _m) { unsigned _env[7]; unsigned int _mxcsr; @@ -317,13 +258,23 @@ return (_p); } -/* It is called fpsetsticky(), but is really a reset function */ -#define fpsetsticky(m) fpresetsticky(m) +#endif /* __GNUC__ && !__cplusplus */ + +#if !defined(__IEEEFP_NOINLINES__) && !defined(__cplusplus) + +#define fpsetround() __fpsetround() +#define fpgetround(_m) __fpgetround(_m) +#define fpgetprec() __fpgetprec() +#define fpsetprec(_m) __fpsetprec(_m) +#define fpgetmask() __fpgetmask() +#define fpsetmask(_m) __fpsetmask(_m) +#define fpgetsticky() __fpgetsticky() +#define fpsetsticky(_m) __fpsetsticky(_m) /* Suppress prototypes in the MI header. */ #define _IEEEFP_INLINED_ 1 -#else /* __GNUC__ */ +#else /* !__IEEEFP_NOINLINES__ && !__cplusplus */ /* Augment the userland declarations */ __BEGIN_DECLS @@ -331,6 +282,6 @@ extern fp_prec_t fpsetprec(fp_prec_t); __END_DECLS -#endif /* __GNUC__ */ +#endif /* !__IEEEFP_NOINLINES__ && !__cplusplus */ #endif /* !_MACHINE_IEEEFP_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Jul 21 20:05:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 901D437B404; Mon, 21 Jul 2003 20:05:42 -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 2F48537B401 for ; Mon, 21 Jul 2003 20:05:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C516D43F85 for ; Mon, 21 Jul 2003 20:05:41 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M35f0U031746 for ; Mon, 21 Jul 2003 20:05:41 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M35eoc031743 for perforce@freebsd.org; Mon, 21 Jul 2003 20:05:40 -0700 (PDT) Date: Mon, 21 Jul 2003 20:05:40 -0700 (PDT) Message-Id: <200307220305.h6M35eoc031743@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 34810 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, 22 Jul 2003 03:05:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=34810 Change 34810 by peter@peter_hammer on 2003/07/21 20:04:57 prepare for commit Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/fpgetmask.c#2 edit .. //depot/projects/hammer/lib/libc/amd64/gen/fpgetprec.c#2 edit .. //depot/projects/hammer/lib/libc/amd64/gen/fpgetround.c#2 edit .. //depot/projects/hammer/lib/libc/amd64/gen/fpgetsticky.c#2 edit .. //depot/projects/hammer/lib/libc/amd64/gen/fpsetmask.c#2 edit .. //depot/projects/hammer/lib/libc/amd64/gen/fpsetprec.c#2 edit .. //depot/projects/hammer/lib/libc/amd64/gen/fpsetround.c#2 edit .. //depot/projects/hammer/lib/libc/amd64/gen/fpsetsticky.c#2 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/fpgetmask.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ #define __IEEEFP_NOINLINES__ 1 #include ==== //depot/projects/hammer/lib/libc/amd64/gen/fpgetprec.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ #define __IEEEFP_NOINLINES__ 1 #include ==== //depot/projects/hammer/lib/libc/amd64/gen/fpgetround.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ #define __IEEEFP_NOINLINES__ 1 #include ==== //depot/projects/hammer/lib/libc/amd64/gen/fpgetsticky.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ #define __IEEEFP_NOINLINES__ 1 #include ==== //depot/projects/hammer/lib/libc/amd64/gen/fpsetmask.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ #define __IEEEFP_NOINLINES__ 1 #include ==== //depot/projects/hammer/lib/libc/amd64/gen/fpsetprec.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ #define __IEEEFP_NOINLINES__ 1 #include ==== //depot/projects/hammer/lib/libc/amd64/gen/fpsetround.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ #define __IEEEFP_NOINLINES__ 1 #include ==== //depot/projects/hammer/lib/libc/amd64/gen/fpsetsticky.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ #define __IEEEFP_NOINLINES__ 1 #include From owner-p4-projects@FreeBSD.ORG Mon Jul 21 20:09:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8055B37B404; Mon, 21 Jul 2003 20:09: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 1ECCA37B401 for ; Mon, 21 Jul 2003 20:09:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C27843F85 for ; Mon, 21 Jul 2003 20:09:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M39l0U031844 for ; Mon, 21 Jul 2003 20:09:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M39k4b031841 for perforce@freebsd.org; Mon, 21 Jul 2003 20:09:46 -0700 (PDT) Date: Mon, 21 Jul 2003 20:09:46 -0700 (PDT) Message-Id: <200307220309.h6M39k4b031841@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 34811 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, 22 Jul 2003 03:09:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=34811 Change 34811 by peter@peter_daintree on 2003/07/21 20:09:07 IFC @34810 Affected files ... .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#36 integrate .. //depot/projects/hammer/share/man/man4/Makefile#19 integrate .. //depot/projects/hammer/share/man/man4/safe.4#1 branch .. //depot/projects/hammer/sys/dev/wi/if_wi.c#16 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#12 integrate .. //depot/projects/hammer/sys/pci/if_sisreg.h#3 integrate .. //depot/projects/hammer/sys/sys/systm.h#7 integrate .. //depot/projects/hammer/tools/tools/crypto/Makefile#3 integrate .. //depot/projects/hammer/tools/tools/crypto/safestats.c#1 branch .. //depot/projects/hammer/usr.sbin/crunch/crunchide/exec_elf32.c#7 integrate Differences ... ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#36 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.594 2003/07/21 20:31:13 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.595 2003/07/21 22:07:40 hrs Exp $ 2000 @@ -145,6 +145,13 @@ has been fixed. kbdcontrol -k /dev/kbd1 is no longer needed when only a USB keyboard is connected. &merged; + + The &man.safe.4; driver has been added + to support SafeNet 1141, 1741-based crypto accelerators. + + + The public key support is not implemented. + ==== //depot/projects/hammer/share/man/man4/Makefile#19 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.216 2003/07/21 13:56:22 harti Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.217 2003/07/21 21:52:48 sam Exp $ MAN= aac.4 \ acpi.4 \ @@ -201,6 +201,7 @@ rp.4 \ rue.4 \ sa.4 \ + safe.4 \ sbc.4 \ sbp.4 \ sbsh.4 \ ==== //depot/projects/hammer/sys/dev/wi/if_wi.c#16 (text+ko) ==== @@ -62,7 +62,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.148 2003/07/20 21:37:32 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.149 2003/07/21 23:20:40 sam Exp $"); #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -367,8 +367,10 @@ #endif if (sc->sc_sta_firmware_ver >= 60000) sc->sc_flags |= WI_FLAGS_HAS_MOR; - if (sc->sc_sta_firmware_ver >= 60006) + if (sc->sc_sta_firmware_ver >= 60006) { ic->ic_caps |= IEEE80211_C_IBSS; + ic->ic_caps |= IEEE80211_C_MONITOR; + } sc->sc_ibss_port = htole16(1); break; @@ -379,8 +381,10 @@ sc->sc_flags |= WI_FLAGS_HAS_SYSSCALE; if (sc->sc_sta_firmware_ver > 10101) sc->sc_flags |= WI_FLAGS_HAS_DBMADJUST; - if (sc->sc_sta_firmware_ver >= 800) + if (sc->sc_sta_firmware_ver >= 800) { ic->ic_caps |= IEEE80211_C_IBSS; + ic->ic_caps |= IEEE80211_C_MONITOR; + } /* * version 0.8.3 and newer are the only ones that are known * to currently work. Earlier versions can be made to work, @@ -622,6 +626,11 @@ case IEEE80211_M_HOSTAP: wi_write_val(sc, WI_RID_PORTTYPE, WI_PORTTYPE_HOSTAP); break; + case IEEE80211_M_MONITOR: + if (sc->sc_firmware_type == WI_LUCENT) + wi_write_val(sc, WI_RID_PORTTYPE, WI_PORTTYPE_ADHOC); + wi_cmd(sc, WI_CMD_DEBUG | (WI_TEST_MONITOR << 8), 0, 0, 0); + break; } /* Intersil interprets this RID as joining ESS even in IBSS mode */ @@ -717,6 +726,7 @@ ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; if (ic->ic_opmode == IEEE80211_M_AHDEMO || + ic->ic_opmode == IEEE80211_M_MONITOR || ic->ic_opmode == IEEE80211_M_HOSTAP) ieee80211_new_state(ic, IEEE80211_S_RUN, -1); @@ -1224,6 +1234,9 @@ case IEEE80211_M_HOSTAP: imr->ifm_active |= IFM_IEEE80211_HOSTAP; break; + case IEEE80211_M_MONITOR: + imr->ifm_active |= IFM_IEEE80211_MONITOR; + break; } } @@ -1387,6 +1400,20 @@ len = le16toh(frmhdr.wi_dat_len); off = ALIGN(sizeof(struct ieee80211_frame)); + /* + * Sometimes the PRISM2.x returns bogusly large frames. Except + * in monitor mode, just throw them away. + */ + if (off + len > MCLBYTES) { + if (ic->ic_opmode != IEEE80211_M_MONITOR) { + CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX); + ifp->if_ierrors++; + DPRINTF(("wi_rx_intr: oversized packet\n")); + return; + } else + len = 0; + } + MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) { CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX); ==== //depot/projects/hammer/sys/pci/if_sis.c#12 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_sis.c,v 1.78 2003/07/03 21:39:53 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_sis.c,v 1.79 2003/07/22 01:35:09 cognet Exp $"); #include #include @@ -1739,6 +1739,7 @@ sc = xsc; SIS_LOCK(sc); + sc->in_tick = 1; ifp = &sc->arpcom.ac_if; mii = device_get_softc(sc->sis_miibus); @@ -1751,6 +1752,8 @@ sis_start(ifp); } + sc->sis_stat_ch = timeout(sis_tick, sc, hz); + sc->in_tick = 0; SIS_UNLOCK(sc); return; @@ -2187,7 +2190,8 @@ ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; - sc->sis_stat_ch = timeout(sis_tick, sc, hz); + if (!sc->in_tick) + sc->sis_stat_ch = timeout(sis_tick, sc, hz); SIS_UNLOCK(sc); ==== //depot/projects/hammer/sys/pci/if_sisreg.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_sisreg.h,v 1.21 2003/01/29 21:56:10 mux Exp $ + * $FreeBSD: src/sys/pci/if_sisreg.h,v 1.22 2003/07/22 01:35:09 cognet Exp $ */ /* @@ -463,6 +463,7 @@ #ifdef DEVICE_POLLING int rxcycles; #endif + int in_tick; struct mtx sis_mtx; }; ==== //depot/projects/hammer/sys/sys/systm.h#7 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sys/sys/systm.h,v 1.195 2003/07/21 18:35:51 phk Exp $ + * $FreeBSD: src/sys/sys/systm.h,v 1.196 2003/07/22 00:17:11 silby Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -165,7 +165,7 @@ int sscanf(const char *, char const *, ...) __nonnull(1) __nonnull(2); int vsscanf(const char *, char const *, __va_list) __nonnull(1) __nonnull(2); long strtol(const char *, char **, int) __nonnull(1) __nonnull(2); -u_long strtoul(const char *, char **, int) __nonnull(1), __nonnull(2); +u_long strtoul(const char *, char **, int) __nonnull(1) __nonnull(2); quad_t strtoq(const char *, char **, int) __nonnull(1); u_quad_t strtouq(const char *, char **, int) __nonnull(1); void tprintf(struct proc *p, int pri, const char *, ...) __printflike(3, 4); ==== //depot/projects/hammer/tools/tools/crypto/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/tools/tools/crypto/Makefile,v 1.4 2003/03/19 01:53:55 sam Exp $ +# $FreeBSD: src/tools/tools/crypto/Makefile,v 1.5 2003/07/21 21:58:04 sam Exp $ # # Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting # All rights reserved. @@ -26,7 +26,7 @@ # ALL= cryptotest cryptokeytest cryptostats \ - ubsecstats hifnstats ipsecstats + ubsecstats hifnstats ipsecstats safestats all: ${ALL} @@ -50,6 +50,10 @@ hifnstats: hifnstats.c ${CC} -o hifnstats hifnstats.c +# program to print statistics kept by the SafeNet driver +safestats: safestats.c + ${CC} -o safestats safestats.c + # program to print statistics kept by fast ipsec ipsecstats: ipsecstats.c ${CC} -o ipsecstats ipsecstats.c ==== //depot/projects/hammer/usr.sbin/crunch/crunchide/exec_elf32.c#7 (text+ko) ==== @@ -34,7 +34,7 @@ __RCSID("$NetBSD: exec_elf32.c,v 1.4 1997/08/12 06:07:24 mikel Exp $"); #endif #endif -__FBSDID("$FreeBSD: src/usr.sbin/crunch/crunchide/exec_elf32.c,v 1.11 2003/06/03 01:37:32 peter Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/crunch/crunchide/exec_elf32.c,v 1.12 2003/07/22 00:19:40 obrien Exp $"); #ifndef ELFSIZE #define ELFSIZE 32 @@ -160,6 +160,10 @@ #define EM_IA_64 50 #endif case EM_IA_64: break; +#ifndef EM_PPC +#define EM_PPC 20 +#endif + case EM_PPC: break; #ifndef EM_SPARCV9 #define EM_SPARCV9 43 #endif From owner-p4-projects@FreeBSD.ORG Mon Jul 21 20:38:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1F6C37B404; Mon, 21 Jul 2003 20:38:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6255637B401 for ; Mon, 21 Jul 2003 20:38:24 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E239443F75 for ; Mon, 21 Jul 2003 20:38:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M3cN0U032918 for ; Mon, 21 Jul 2003 20:38:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M3cNTm032915 for perforce@freebsd.org; Mon, 21 Jul 2003 20:38:23 -0700 (PDT) Date: Mon, 21 Jul 2003 20:38:23 -0700 (PDT) Message-Id: <200307220338.h6M3cNTm032915@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 34813 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, 22 Jul 2003 03:38:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=34813 Change 34813 by peter@peter_hammer on 2003/07/21 20:37:57 *kick* dillon. Define inlined functions before using them. Affected files ... .. //depot/projects/hammer/sys/vm/swap_pager.c#13 edit Differences ... ==== //depot/projects/hammer/sys/vm/swap_pager.c#13 (text+ko) ==== @@ -290,6 +290,35 @@ } /* + * SWP_PAGER_HASH() - hash swap meta data + * + * This is an inline helper function which hashes the swapblk given + * the object and page index. It returns a pointer to a pointer + * to the object, or a pointer to a NULL pointer if it could not + * find a swapblk. + * + * This routine must be called at splvm(). + */ +static __inline struct swblock ** +swp_pager_hash(vm_object_t object, vm_pindex_t index) +{ + struct swblock **pswap; + struct swblock *swap; + + index &= ~(vm_pindex_t)SWAP_META_MASK; + pswap = &swhash[(index ^ (int)(intptr_t)object) & swhash_mask]; + while ((swap = *pswap) != NULL) { + if (swap->swb_object == object && + swap->swb_index == index + ) { + break; + } + pswap = &swap->swb_hnext; + } + return (pswap); +} + +/* * SWAP_PAGER_INIT() - initialize the swap pager! * * Expected to be started from system init. NOTE: This code is run @@ -1860,34 +1889,6 @@ * appropriate tracking counters. */ -/* - * SWP_PAGER_HASH() - hash swap meta data - * - * This is an inline helper function which hashes the swapblk given - * the object and page index. It returns a pointer to a pointer - * to the object, or a pointer to a NULL pointer if it could not - * find a swapblk. - * - * This routine must be called at splvm(). - */ -static __inline struct swblock ** -swp_pager_hash(vm_object_t object, vm_pindex_t index) -{ - struct swblock **pswap; - struct swblock *swap; - - index &= ~(vm_pindex_t)SWAP_META_MASK; - pswap = &swhash[(index ^ (int)(intptr_t)object) & swhash_mask]; - while ((swap = *pswap) != NULL) { - if (swap->swb_object == object && - swap->swb_index == index - ) { - break; - } - pswap = &swap->swb_hnext; - } - return (pswap); -} /* * SWP_PAGER_META_BUILD() - add swap block to swap meta data for object From owner-p4-projects@FreeBSD.ORG Mon Jul 21 20:47:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EACB37B404; Mon, 21 Jul 2003 20:47: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 B567437B401 for ; Mon, 21 Jul 2003 20:47:36 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5EE5E43F93 for ; Mon, 21 Jul 2003 20:47:36 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M3la0U038687 for ; Mon, 21 Jul 2003 20:47:36 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M3lZea038684 for perforce@freebsd.org; Mon, 21 Jul 2003 20:47:35 -0700 (PDT) Date: Mon, 21 Jul 2003 20:47:35 -0700 (PDT) Message-Id: <200307220347.h6M3lZea038684@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 34815 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, 22 Jul 2003 03:47:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=34815 Change 34815 by peter@peter_hammer on 2003/07/21 20:47:23 mb_alloc and mb_free are way too big to inline Affected files ... .. //depot/projects/hammer/sys/kern/subr_mbuf.c#14 edit Differences ... ==== //depot/projects/hammer/sys/kern/subr_mbuf.c#14 (text+ko) ==== @@ -607,8 +607,7 @@ * the general container is empty, and we've run out of address space * in our map; then we try to block if we're willing to (M_TRYWAIT). */ -static __inline -void * +static void * mb_alloc(struct mb_lstmngr *mb_list, int how, short type, short persist, int *pers_list) { @@ -854,8 +853,7 @@ * waiting for the lock; our bucket is in the general container; * our bucket is empty. */ -static __inline -void +static void mb_free(struct mb_lstmngr *mb_list, void *m, short type, short persist, int *pers_list) { From owner-p4-projects@FreeBSD.ORG Mon Jul 21 20:48:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 157C337B404; Mon, 21 Jul 2003 20:48:39 -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 C143237B401 for ; Mon, 21 Jul 2003 20:48:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55AA743F93 for ; Mon, 21 Jul 2003 20:48:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M3mc0U038708 for ; Mon, 21 Jul 2003 20:48:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M3mb0q038705 for perforce@freebsd.org; Mon, 21 Jul 2003 20:48:37 -0700 (PDT) Date: Mon, 21 Jul 2003 20:48:37 -0700 (PDT) Message-Id: <200307220348.h6M3mb0q038705@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 34816 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, 22 Jul 2003 03:48:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=34816 Change 34816 by peter@peter_hammer on 2003/07/21 20:48:05 fix a gcc warning. I cant convince myself that the warning is harmless, so initialize it for safety. Affected files ... .. //depot/projects/hammer/sys/kern/kern_umtx.c#7 edit Differences ... ==== //depot/projects/hammer/sys/kern/kern_umtx.c#7 (text+ko) ==== @@ -251,6 +251,7 @@ intptr_t old; umtx = uap->umtx; + blocked = NULL; /* shut up gcc */ /* * Make sure we own this mtx. From owner-p4-projects@FreeBSD.ORG Mon Jul 21 20:48:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3633837B404; Mon, 21 Jul 2003 20:48: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 36FC237B411 for ; Mon, 21 Jul 2003 20:48:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D16AA43F93 for ; Mon, 21 Jul 2003 20:48:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M3mc0U038714 for ; Mon, 21 Jul 2003 20:48:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M3mcxA038711 for perforce@freebsd.org; Mon, 21 Jul 2003 20:48:38 -0700 (PDT) Date: Mon, 21 Jul 2003 20:48:38 -0700 (PDT) Message-Id: <200307220348.h6M3mcxA038711@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 34817 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, 22 Jul 2003 03:48:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=34817 Change 34817 by peter@peter_hammer on 2003/07/21 20:48:27 our strto*() functions do allow a null arg2. Affected files ... .. //depot/projects/hammer/sys/sys/systm.h#8 edit Differences ... ==== //depot/projects/hammer/sys/sys/systm.h#8 (text+ko) ==== @@ -164,8 +164,8 @@ int ttyprintf(struct tty *, const char *, ...) __printflike(2, 3); int sscanf(const char *, char const *, ...) __nonnull(1) __nonnull(2); int vsscanf(const char *, char const *, __va_list) __nonnull(1) __nonnull(2); -long strtol(const char *, char **, int) __nonnull(1) __nonnull(2); -u_long strtoul(const char *, char **, int) __nonnull(1) __nonnull(2); +long strtol(const char *, char **, int) __nonnull(1); +u_long strtoul(const char *, char **, int) __nonnull(1); quad_t strtoq(const char *, char **, int) __nonnull(1); u_quad_t strtouq(const char *, char **, int) __nonnull(1); void tprintf(struct proc *p, int pri, const char *, ...) __printflike(3, 4); From owner-p4-projects@FreeBSD.ORG Mon Jul 21 20:49:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F04437B401; Mon, 21 Jul 2003 20:49: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 1DA6537B401 for ; Mon, 21 Jul 2003 20:49:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAD4C43FE3 for ; Mon, 21 Jul 2003 20:49:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M3ne0U038785 for ; Mon, 21 Jul 2003 20:49:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M3neRK038782 for perforce@freebsd.org; Mon, 21 Jul 2003 20:49:40 -0700 (PDT) Date: Mon, 21 Jul 2003 20:49:40 -0700 (PDT) Message-Id: <200307220349.h6M3neRK038782@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 34818 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, 22 Jul 2003 03:49:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=34818 Change 34818 by peter@peter_hammer on 2003/07/21 20:48:40 make 64 bit clean. Affected files ... .. //depot/projects/hammer/sys/dev/usb/usb_mem.c#3 edit Differences ... ==== //depot/projects/hammer/sys/dev/usb/usb_mem.c#3 (text+ko) ==== @@ -259,7 +259,7 @@ /* XXX - override the tag, ok since we never free it */ b->tag = tag; KASSERT(sizeof *f <= USB_MEM_SMALL, ("USB_MEM_SMALL(%d) is too small for struct usb_frag_dma(%d)\n", - USB_MEM_SMALL, sizeof *f)); + USB_MEM_SMALL, (int)sizeof *f)); for (i = 0; i < USB_MEM_BLOCK; i += USB_MEM_SMALL) { f = (struct usb_frag_dma *)((char *)b->kaddr + i); f->block = b; From owner-p4-projects@FreeBSD.ORG Mon Jul 21 20:50:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C454E37B404; Mon, 21 Jul 2003 20:50: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 4C00D37B401 for ; Mon, 21 Jul 2003 20:50:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E61FA43F93 for ; Mon, 21 Jul 2003 20:50:42 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6M3og0U038929 for ; Mon, 21 Jul 2003 20:50:42 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6M3ogwE038926 for perforce@freebsd.org; Mon, 21 Jul 2003 20:50:42 -0700 (PDT) Date: Mon, 21 Jul 2003 20:50:42 -0700 (PDT) Message-Id: <200307220350.h6M3ogwE038926@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 34819 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, 22 Jul 2003 03:50:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=34819 Change 34819 by peter@peter_hammer on 2003/07/21 20:50:05 ok, I'm tired of the warnings. Affected files ... .. //depot/projects/hammer/sys/conf/kern.pre.mk#10 edit .. //depot/projects/hammer/sys/conf/kmod.mk#6 edit Differences ... ==== //depot/projects/hammer/sys/conf/kern.pre.mk#10 (text+ko) ==== @@ -52,7 +52,8 @@ .endif .endif DEFINED_PROF= ${PROF} -# WERROR?= -Werror +WERROR?= -Werror +CFLAGS+= --param max-inline-insns-single=2400 # Put configuration-specific C flags last (except for ${PROF}) so that they # can override the others. ==== //depot/projects/hammer/sys/conf/kmod.mk#6 (text+ko) ==== @@ -99,6 +99,8 @@ CFLAGS+= -I@/../include -I${DESTDIR}/usr/include .endif # @ +CFLAGS+= --param max-inline-insns-single=2400 + # Disallow common variables, and if we end up with commons from # somewhere unexpected, allocate storage for them in the module itself. CFLAGS+= -fno-common From owner-p4-projects@FreeBSD.ORG Tue Jul 22 06:27:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF5B637B404; Tue, 22 Jul 2003 06:27: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 5CEBA37B401; Tue, 22 Jul 2003 06:27:46 -0700 (PDT) Received: from godel.mtl.distributel.net (nat.MTL.distributel.NET [66.38.181.24]) by mx1.FreeBSD.org (Postfix) with ESMTP id 902A243FD7; Tue, 22 Jul 2003 06:27:45 -0700 (PDT) (envelope-from bmilekic@technokratis.com) Received: from godel.mtl.distributel.net (localhost [127.0.0.1]) h6M9VpEH058317; Tue, 22 Jul 2003 09:31:51 GMT (envelope-from bmilekic@technokratis.com) Received: (from bmilekic@localhost) by godel.mtl.distributel.net (8.12.9/8.12.9/Submit) id h6M9Vp2A058316; Tue, 22 Jul 2003 09:31:51 GMT X-Authentication-Warning: godel.mtl.distributel.net: bmilekic set sender to bmilekic@technokratis.com using -f Date: Tue, 22 Jul 2003 09:31:51 +0000 From: Bosko Milekic To: Peter Wemm Message-ID: <20030722093151.GC58118@technokratis.com> References: <200307220347.h6M3lZea038684@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200307220347.h6M3lZea038684@repoman.freebsd.org> User-Agent: Mutt/1.4.1i cc: Perforce Change Reviews Subject: Re: PERFORCE change 34815 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, 22 Jul 2003 13:27:47 -0000 On Mon, Jul 21, 2003 at 08:47:35PM -0700, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=34815 > > Change 34815 by peter@peter_hammer on 2003/07/21 20:47:23 > > mb_alloc and mb_free are way too big to inline They're only inlined in some local routines. Some care was taken to keep the local routines' size not too bad by only inlining them in there once or twice at worse. In retrospect, though, this could have been done better, but out-of-lining them is not the best solution. P.S.: How expensive, relatively, is a function call on the hammer? I seem to recall the alpha had a relatively higher cost (when compared to i386) for typical function calls. -- Bosko Milekic * bmilekic@technokratis.com * bmilekic@FreeBSD.org TECHNOkRATIS Consulting Services * http://www.technokratis.com/ From owner-p4-projects@FreeBSD.ORG Tue Jul 22 18:29:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89DE937B404; Tue, 22 Jul 2003 18:29: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 04F7C37B401 for ; Tue, 22 Jul 2003 18:29:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F038043F75 for ; Tue, 22 Jul 2003 18:29:50 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6N1To0U039419 for ; Tue, 22 Jul 2003 18:29:50 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6N1Tn3J039416 for perforce@freebsd.org; Tue, 22 Jul 2003 18:29:50 -0700 (PDT) Date: Tue, 22 Jul 2003 18:29:50 -0700 (PDT) Message-Id: <200307230129.h6N1Tn3J039416@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 34865 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, 23 Jul 2003 01:29:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=34865 Change 34865 by sam@sam_ebb on 2003/07/22 18:29:19 populate branch Affected files ... .. //depot/projects/netperf/sys/Makefile#1 branch .. //depot/projects/netperf/sys/alpha/Makefile#1 branch .. //depot/projects/netperf/sys/alpha/alpha/alpha-gdbstub.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/api_up1000.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/atomic.s#1 branch .. //depot/projects/netperf/sys/alpha/alpha/autoconf.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/busdma_machdep.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/busspace.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/clock.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/clock_if.m#1 branch .. //depot/projects/netperf/sys/alpha/alpha/cpuconf.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/critical.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/db_disasm.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/db_instruction.h#1 branch .. //depot/projects/netperf/sys/alpha/alpha/db_interface.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/db_trace.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/dec_1000a.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/dec_2100_a50.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/dec_2100_a500.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/dec_3000_300.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/dec_3000_500.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/dec_axppci_33.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/dec_eb164.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/dec_eb64plus.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/dec_kn20aa.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/dec_kn300.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/dec_kn8ae.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/dec_st550.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/dec_st6600.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/divrem.m4#1 branch .. //depot/projects/netperf/sys/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/elf_machdep.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/exception.s#1 branch .. //depot/projects/netperf/sys/alpha/alpha/fp_emulate.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/genassym.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/ieee_float.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/ieee_float.h#1 branch .. //depot/projects/netperf/sys/alpha/alpha/in_cksum.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/interrupt.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/locore.s#1 branch .. //depot/projects/netperf/sys/alpha/alpha/machdep.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/mem.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/mp_machdep.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/pal.s#1 branch .. //depot/projects/netperf/sys/alpha/alpha/pmap.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/prom.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/prom_disp.s#1 branch .. //depot/projects/netperf/sys/alpha/alpha/promcons.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/sgmap.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/support.s#1 branch .. //depot/projects/netperf/sys/alpha/alpha/swtch.s#1 branch .. //depot/projects/netperf/sys/alpha/alpha/sys_machdep.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/timerreg.h#1 branch .. //depot/projects/netperf/sys/alpha/alpha/trap.c#1 branch .. //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#1 branch .. //depot/projects/netperf/sys/alpha/compile/.cvsignore#1 branch .. //depot/projects/netperf/sys/alpha/conf/GENERIC#1 branch .. //depot/projects/netperf/sys/alpha/conf/GENERIC.hints#1 branch .. //depot/projects/netperf/sys/alpha/conf/Makefile#1 branch .. //depot/projects/netperf/sys/alpha/conf/NOTES#1 branch .. //depot/projects/netperf/sys/alpha/conf/gethints.awk#1 branch .. //depot/projects/netperf/sys/alpha/include/_inttypes.h#1 branch .. //depot/projects/netperf/sys/alpha/include/_limits.h#1 branch .. //depot/projects/netperf/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/netperf/sys/alpha/include/_types.h#1 branch .. //depot/projects/netperf/sys/alpha/include/alpha_cpu.h#1 branch .. //depot/projects/netperf/sys/alpha/include/asm.h#1 branch .. //depot/projects/netperf/sys/alpha/include/atomic.h#1 branch .. //depot/projects/netperf/sys/alpha/include/bootinfo.h#1 branch .. //depot/projects/netperf/sys/alpha/include/bus.h#1 branch .. //depot/projects/netperf/sys/alpha/include/bus_memio.h#1 branch .. //depot/projects/netperf/sys/alpha/include/bus_pio.h#1 branch .. //depot/projects/netperf/sys/alpha/include/bwx.h#1 branch .. //depot/projects/netperf/sys/alpha/include/chipset.h#1 branch .. //depot/projects/netperf/sys/alpha/include/clock.h#1 branch .. //depot/projects/netperf/sys/alpha/include/clockvar.h#1 branch .. //depot/projects/netperf/sys/alpha/include/cpu.h#1 branch .. //depot/projects/netperf/sys/alpha/include/cpuconf.h#1 branch .. //depot/projects/netperf/sys/alpha/include/cpufunc.h#1 branch .. //depot/projects/netperf/sys/alpha/include/critical.h#1 branch .. //depot/projects/netperf/sys/alpha/include/db_machdep.h#1 branch .. //depot/projects/netperf/sys/alpha/include/elf.h#1 branch .. //depot/projects/netperf/sys/alpha/include/endian.h#1 branch .. //depot/projects/netperf/sys/alpha/include/exec.h#1 branch .. //depot/projects/netperf/sys/alpha/include/float.h#1 branch .. //depot/projects/netperf/sys/alpha/include/floatingpoint.h#1 branch .. //depot/projects/netperf/sys/alpha/include/fpu.h#1 branch .. //depot/projects/netperf/sys/alpha/include/frame.h#1 branch .. //depot/projects/netperf/sys/alpha/include/ieee.h#1 branch .. //depot/projects/netperf/sys/alpha/include/ieeefp.h#1 branch .. //depot/projects/netperf/sys/alpha/include/in_cksum.h#1 branch .. //depot/projects/netperf/sys/alpha/include/inst.h#1 branch .. //depot/projects/netperf/sys/alpha/include/intr.h#1 branch .. //depot/projects/netperf/sys/alpha/include/intrcnt.h#1 branch .. //depot/projects/netperf/sys/alpha/include/ioctl_bt848.h#1 branch .. //depot/projects/netperf/sys/alpha/include/ioctl_meteor.h#1 branch .. //depot/projects/netperf/sys/alpha/include/kse.h#1 branch .. //depot/projects/netperf/sys/alpha/include/limits.h#1 branch .. //depot/projects/netperf/sys/alpha/include/md_var.h#1 branch .. //depot/projects/netperf/sys/alpha/include/mutex.h#1 branch .. //depot/projects/netperf/sys/alpha/include/pal.h#1 branch .. //depot/projects/netperf/sys/alpha/include/param.h#1 branch .. //depot/projects/netperf/sys/alpha/include/pc/bios.h#1 branch .. //depot/projects/netperf/sys/alpha/include/pc/display.h#1 branch .. //depot/projects/netperf/sys/alpha/include/pc/msdos.h#1 branch .. //depot/projects/netperf/sys/alpha/include/pc/vesa.h#1 branch .. //depot/projects/netperf/sys/alpha/include/pcb.h#1 branch .. //depot/projects/netperf/sys/alpha/include/pcpu.h#1 branch .. //depot/projects/netperf/sys/alpha/include/pmap.h#1 branch .. //depot/projects/netperf/sys/alpha/include/proc.h#1 branch .. //depot/projects/netperf/sys/alpha/include/profile.h#1 branch .. //depot/projects/netperf/sys/alpha/include/prom.h#1 branch .. //depot/projects/netperf/sys/alpha/include/pte.h#1 branch .. //depot/projects/netperf/sys/alpha/include/ptrace.h#1 branch .. //depot/projects/netperf/sys/alpha/include/reg.h#1 branch .. //depot/projects/netperf/sys/alpha/include/reloc.h#1 branch .. //depot/projects/netperf/sys/alpha/include/resource.h#1 branch .. //depot/projects/netperf/sys/alpha/include/rpb.h#1 branch .. //depot/projects/netperf/sys/alpha/include/runq.h#1 branch .. //depot/projects/netperf/sys/alpha/include/setjmp.h#1 branch .. //depot/projects/netperf/sys/alpha/include/sgmap.h#1 branch .. //depot/projects/netperf/sys/alpha/include/sigframe.h#1 branch .. //depot/projects/netperf/sys/alpha/include/signal.h#1 branch .. //depot/projects/netperf/sys/alpha/include/smp.h#1 branch .. //depot/projects/netperf/sys/alpha/include/stdarg.h#1 branch .. //depot/projects/netperf/sys/alpha/include/swiz.h#1 branch .. //depot/projects/netperf/sys/alpha/include/sysarch.h#1 branch .. //depot/projects/netperf/sys/alpha/include/ucontext.h#1 branch .. //depot/projects/netperf/sys/alpha/include/varargs.h#1 branch .. //depot/projects/netperf/sys/alpha/include/vmparam.h#1 branch .. //depot/projects/netperf/sys/alpha/isa/isa.c#1 branch .. //depot/projects/netperf/sys/alpha/isa/isa_dma.c#1 branch .. //depot/projects/netperf/sys/alpha/isa/isavar.h#1 branch .. //depot/projects/netperf/sys/alpha/isa/mcclock_isa.c#1 branch .. //depot/projects/netperf/sys/alpha/linux/Makefile#1 branch .. //depot/projects/netperf/sys/alpha/linux/linux.h#1 branch .. //depot/projects/netperf/sys/alpha/linux/linux_dummy.c#1 branch .. //depot/projects/netperf/sys/alpha/linux/linux_genassym.c#1 branch .. //depot/projects/netperf/sys/alpha/linux/linux_ipc64.h#1 branch .. //depot/projects/netperf/sys/alpha/linux/linux_locore.s#1 branch .. //depot/projects/netperf/sys/alpha/linux/linux_machdep.c#1 branch .. //depot/projects/netperf/sys/alpha/linux/linux_proto.h#1 branch .. //depot/projects/netperf/sys/alpha/linux/linux_syscall.h#1 branch .. //depot/projects/netperf/sys/alpha/linux/linux_sysent.c#1 branch .. //depot/projects/netperf/sys/alpha/linux/linux_sysvec.c#1 branch .. //depot/projects/netperf/sys/alpha/linux/syscalls.conf#1 branch .. //depot/projects/netperf/sys/alpha/linux/syscalls.master#1 branch .. //depot/projects/netperf/sys/alpha/mcbus/mcbus.c#1 branch .. //depot/projects/netperf/sys/alpha/mcbus/mcbusreg.h#1 branch .. //depot/projects/netperf/sys/alpha/mcbus/mcbusvar.h#1 branch .. //depot/projects/netperf/sys/alpha/mcbus/mcmem.c#1 branch .. //depot/projects/netperf/sys/alpha/mcbus/mcpcia.c#1 branch .. //depot/projects/netperf/sys/alpha/mcbus/mcpciareg.h#1 branch .. //depot/projects/netperf/sys/alpha/mcbus/mcpciavar.h#1 branch .. //depot/projects/netperf/sys/alpha/osf1/Makefile#1 branch .. //depot/projects/netperf/sys/alpha/osf1/README.mach-traps#1 branch .. //depot/projects/netperf/sys/alpha/osf1/exec_ecoff.h#1 branch .. //depot/projects/netperf/sys/alpha/osf1/imgact_osf1.c#1 branch .. //depot/projects/netperf/sys/alpha/osf1/osf1.h#1 branch .. //depot/projects/netperf/sys/alpha/osf1/osf1_ioctl.c#1 branch .. //depot/projects/netperf/sys/alpha/osf1/osf1_misc.c#1 branch .. //depot/projects/netperf/sys/alpha/osf1/osf1_mount.c#1 branch .. //depot/projects/netperf/sys/alpha/osf1/osf1_proto.h#1 branch .. //depot/projects/netperf/sys/alpha/osf1/osf1_signal.c#1 branch .. //depot/projects/netperf/sys/alpha/osf1/osf1_signal.h#1 branch .. //depot/projects/netperf/sys/alpha/osf1/osf1_syscall.h#1 branch .. //depot/projects/netperf/sys/alpha/osf1/osf1_sysent.c#1 branch .. //depot/projects/netperf/sys/alpha/osf1/osf1_sysvec.c#1 branch .. //depot/projects/netperf/sys/alpha/osf1/osf1_util.h#1 branch .. //depot/projects/netperf/sys/alpha/osf1/syscalls.conf#1 branch .. //depot/projects/netperf/sys/alpha/osf1/syscalls.master#1 branch .. //depot/projects/netperf/sys/alpha/pci/alphapci_if.m#1 branch .. //depot/projects/netperf/sys/alpha/pci/apecs.c#1 branch .. //depot/projects/netperf/sys/alpha/pci/apecs_pci.c#1 branch .. //depot/projects/netperf/sys/alpha/pci/apecsreg.h#1 branch .. //depot/projects/netperf/sys/alpha/pci/apecsvar.h#1 branch .. //depot/projects/netperf/sys/alpha/pci/bwx.c#1 branch .. //depot/projects/netperf/sys/alpha/pci/cia.c#1 branch .. //depot/projects/netperf/sys/alpha/pci/cia_pci.c#1 branch .. //depot/projects/netperf/sys/alpha/pci/ciareg.h#1 branch .. //depot/projects/netperf/sys/alpha/pci/ciavar.h#1 branch .. //depot/projects/netperf/sys/alpha/pci/irongate.c#1 branch .. //depot/projects/netperf/sys/alpha/pci/irongate_pci.c#1 branch .. //depot/projects/netperf/sys/alpha/pci/irongatereg.h#1 branch .. //depot/projects/netperf/sys/alpha/pci/irongatevar.h#1 branch .. //depot/projects/netperf/sys/alpha/pci/lca.c#1 branch .. //depot/projects/netperf/sys/alpha/pci/lca_pci.c#1 branch .. //depot/projects/netperf/sys/alpha/pci/lcareg.h#1 branch .. //depot/projects/netperf/sys/alpha/pci/lcavar.h#1 branch .. //depot/projects/netperf/sys/alpha/pci/pci_eb164_intr.s#1 branch .. //depot/projects/netperf/sys/alpha/pci/pci_eb64plus_intr.s#1 branch .. //depot/projects/netperf/sys/alpha/pci/pcibus.c#1 branch .. //depot/projects/netperf/sys/alpha/pci/pcibus.h#1 branch .. //depot/projects/netperf/sys/alpha/pci/swiz.c#1 branch .. //depot/projects/netperf/sys/alpha/pci/t2.c#1 branch .. //depot/projects/netperf/sys/alpha/pci/t2_pci.c#1 branch .. //depot/projects/netperf/sys/alpha/pci/t2reg.h#1 branch .. //depot/projects/netperf/sys/alpha/pci/t2var.h#1 branch .. //depot/projects/netperf/sys/alpha/pci/tsunami.c#1 branch .. //depot/projects/netperf/sys/alpha/pci/tsunami_pci.c#1 branch .. //depot/projects/netperf/sys/alpha/pci/tsunamireg.h#1 branch .. //depot/projects/netperf/sys/alpha/pci/tsunamivar.h#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/dwlpx.c#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/dwlpxreg.h#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/dwlpxvar.h#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/gbus.c#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/gbusreg.h#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/gbusvar.h#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/kftxx.c#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/kftxxreg.h#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/kftxxvar.h#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/mcclock_tlsb.c#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/tlsb.c#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/tlsbcpu.c#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/tlsbmem.c#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/tlsbreg.h#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/tlsbvar.h#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/zs_tlsb.c#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/zsreg.h#1 branch .. //depot/projects/netperf/sys/alpha/tlsb/zsvar.h#1 branch .. //depot/projects/netperf/sys/amd64/Makefile#1 branch .. //depot/projects/netperf/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/netperf/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/netperf/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/amd64-gdbstub.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/netperf/sys/amd64/amd64/critical.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/netperf/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/netperf/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/netperf/sys/amd64/amd64/support.S#1 branch .. //depot/projects/netperf/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/netperf/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/netperf/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/netperf/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/netperf/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/netperf/sys/amd64/conf/Makefile#1 branch .. //depot/projects/netperf/sys/amd64/conf/gethints.awk#1 branch .. //depot/projects/netperf/sys/amd64/ia32/Makefile#1 branch .. //depot/projects/netperf/sys/amd64/ia32/ia32.h#1 branch .. //depot/projects/netperf/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/netperf/sys/amd64/ia32/ia32_genassym.c#1 branch .. //depot/projects/netperf/sys/amd64/ia32/ia32_misc.c#1 branch .. //depot/projects/netperf/sys/amd64/ia32/ia32_proto.h#1 branch .. //depot/projects/netperf/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/netperf/sys/amd64/ia32/ia32_signal.h#1 branch .. //depot/projects/netperf/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/netperf/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/netperf/sys/amd64/ia32/ia32_syscall.h#1 branch .. //depot/projects/netperf/sys/amd64/ia32/ia32_syscalls.c#1 branch .. //depot/projects/netperf/sys/amd64/ia32/ia32_sysent.c#1 branch .. //depot/projects/netperf/sys/amd64/ia32/ia32_sysvec.c#1 branch .. //depot/projects/netperf/sys/amd64/ia32/ia32_util.h#1 branch .. //depot/projects/netperf/sys/amd64/ia32/syscalls.conf#1 branch .. //depot/projects/netperf/sys/amd64/ia32/syscalls.master#1 branch .. //depot/projects/netperf/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/netperf/sys/amd64/include/_limits.h#1 branch .. //depot/projects/netperf/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/netperf/sys/amd64/include/_types.h#1 branch .. //depot/projects/netperf/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/netperf/sys/amd64/include/asm.h#1 branch .. //depot/projects/netperf/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/netperf/sys/amd64/include/atomic.h#1 branch .. //depot/projects/netperf/sys/amd64/include/bus.h#1 branch .. //depot/projects/netperf/sys/amd64/include/bus_amd64.h#1 branch .. //depot/projects/netperf/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/netperf/sys/amd64/include/bus_memio.h#1 branch .. //depot/projects/netperf/sys/amd64/include/bus_pio.h#1 branch .. //depot/projects/netperf/sys/amd64/include/clock.h#1 branch .. //depot/projects/netperf/sys/amd64/include/cpu.h#1 branch .. //depot/projects/netperf/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/netperf/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/netperf/sys/amd64/include/critical.h#1 branch .. //depot/projects/netperf/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/netperf/sys/amd64/include/elf.h#1 branch .. //depot/projects/netperf/sys/amd64/include/endian.h#1 branch .. //depot/projects/netperf/sys/amd64/include/exec.h#1 branch .. //depot/projects/netperf/sys/amd64/include/float.h#1 branch .. //depot/projects/netperf/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/netperf/sys/amd64/include/frame.h#1 branch .. //depot/projects/netperf/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/netperf/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/netperf/sys/amd64/include/kse.h#1 branch .. //depot/projects/netperf/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/netperf/sys/amd64/include/limits.h#1 branch .. //depot/projects/netperf/sys/amd64/include/md_var.h#1 branch .. //depot/projects/netperf/sys/amd64/include/metadata.h#1 branch .. //depot/projects/netperf/sys/amd64/include/mutex.h#1 branch .. //depot/projects/netperf/sys/amd64/include/npx.h#1 branch .. //depot/projects/netperf/sys/amd64/include/param.h#1 branch .. //depot/projects/netperf/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/netperf/sys/amd64/include/pcb.h#1 branch .. //depot/projects/netperf/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/netperf/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/netperf/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/netperf/sys/amd64/include/pmap.h#1 branch .. //depot/projects/netperf/sys/amd64/include/proc.h#1 branch .. //depot/projects/netperf/sys/amd64/include/profile.h#1 branch .. //depot/projects/netperf/sys/amd64/include/psl.h#1 branch .. //depot/projects/netperf/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/netperf/sys/amd64/include/reg.h#1 branch .. //depot/projects/netperf/sys/amd64/include/reloc.h#1 branch .. //depot/projects/netperf/sys/amd64/include/resource.h#1 branch .. //depot/projects/netperf/sys/amd64/include/runq.h#1 branch .. //depot/projects/netperf/sys/amd64/include/segments.h#1 branch .. //depot/projects/netperf/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/netperf/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/netperf/sys/amd64/include/signal.h#1 branch .. //depot/projects/netperf/sys/amd64/include/smp.h#1 branch .. //depot/projects/netperf/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/netperf/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/netperf/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/netperf/sys/amd64/include/trap.h#1 branch .. //depot/projects/netperf/sys/amd64/include/tss.h#1 branch .. //depot/projects/netperf/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/netperf/sys/amd64/include/varargs.h#1 branch .. //depot/projects/netperf/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/netperf/sys/amd64/isa/clock.c#1 branch .. //depot/projects/netperf/sys/amd64/isa/icu.h#1 branch .. //depot/projects/netperf/sys/amd64/isa/icu_ipl.S#1 branch .. //depot/projects/netperf/sys/amd64/isa/icu_vector.S#1 branch .. //depot/projects/netperf/sys/amd64/isa/intr_machdep.c#1 branch .. //depot/projects/netperf/sys/amd64/isa/intr_machdep.h#1 branch .. //depot/projects/netperf/sys/amd64/isa/isa.c#1 branch .. //depot/projects/netperf/sys/amd64/isa/isa.h#1 branch .. //depot/projects/netperf/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/netperf/sys/amd64/isa/isa_dma.h#1 branch .. //depot/projects/netperf/sys/amd64/isa/ithread.c#1 branch .. //depot/projects/netperf/sys/amd64/isa/npx.c#1 branch .. //depot/projects/netperf/sys/amd64/isa/timerreg.h#1 branch .. //depot/projects/netperf/sys/amd64/isa/vector.S#1 branch .. //depot/projects/netperf/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/netperf/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/netperf/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/netperf/sys/arm/include/_limits.h#1 branch .. //depot/projects/netperf/sys/arm/include/_stdint.h#1 branch .. //depot/projects/netperf/sys/arm/include/_types.h#1 branch .. //depot/projects/netperf/sys/arm/include/elf.h#1 branch .. //depot/projects/netperf/sys/arm/include/endian.h#1 branch .. //depot/projects/netperf/sys/arm/include/exec.h#1 branch .. //depot/projects/netperf/sys/arm/include/limits.h#1 branch .. //depot/projects/netperf/sys/arm/include/param.h#1 branch .. //depot/projects/netperf/sys/arm/include/signal.h#1 branch .. //depot/projects/netperf/sys/arm/include/ucontext.h#1 branch .. //depot/projects/netperf/sys/boot/Makefile#1 branch .. //depot/projects/netperf/sys/boot/README#1 branch .. //depot/projects/netperf/sys/boot/alpha/Makefile#1 branch .. //depot/projects/netperf/sys/boot/alpha/Makefile.inc#1 branch .. //depot/projects/netperf/sys/boot/alpha/boot1/Makefile#1 branch .. //depot/projects/netperf/sys/boot/alpha/boot1/boot1.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/cdboot/Makefile#1 branch .. //depot/projects/netperf/sys/boot/alpha/cdboot/version#1 branch .. //depot/projects/netperf/sys/boot/alpha/common/Makefile.common#1 branch .. //depot/projects/netperf/sys/boot/alpha/common/conf.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/common/help.alpha#1 branch .. //depot/projects/netperf/sys/boot/alpha/common/main.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/Makefile#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/OSFpal.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/alpha_copy.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/alpha_module.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/bbinfo.h#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/bootinfo.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/common.h#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/delay.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/devicename.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/elf_freebsd.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/getsecs.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/libalpha.h#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/pal.S#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/prom.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/prom_disp.S#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/prom_swpal.S#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/reboot.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/srmdisk.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/srmnet.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/start.S#1 branch .. //depot/projects/netperf/sys/boot/alpha/libalpha/time.c#1 branch .. //depot/projects/netperf/sys/boot/alpha/loader/Makefile#1 branch .. //depot/projects/netperf/sys/boot/alpha/loader/version#1 branch .. //depot/projects/netperf/sys/boot/alpha/netboot/Makefile#1 branch .. //depot/projects/netperf/sys/boot/alpha/netboot/version#1 branch .. //depot/projects/netperf/sys/boot/arc/Makefile#1 branch .. //depot/projects/netperf/sys/boot/arc/Makefile.inc#1 branch .. //depot/projects/netperf/sys/boot/arc/include/arcfuncs.h#1 branch .. //depot/projects/netperf/sys/boot/arc/include/arctypes.h#1 branch .. //depot/projects/netperf/sys/boot/arc/include/libarc.h#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/Makefile#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/abort.c#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/arcconsole.c#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/arcdisk.c#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/arch/alpha/copy.c#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/arch/alpha/rpb.c#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/arch/alpha/setjmp.S#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/arch/alpha/start.S#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/bootinfo.c#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/delay.c#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/devicename.c#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/elf_freebsd.c#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/module.c#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/prom.c#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/setjmperr.c#1 branch .. //depot/projects/netperf/sys/boot/arc/lib/time.c#1 branch .. //depot/projects/netperf/sys/boot/arc/loader/Makefile#1 branch .. //depot/projects/netperf/sys/boot/arc/loader/conf.c#1 branch .. //depot/projects/netperf/sys/boot/arc/loader/help.alpha#1 branch .. //depot/projects/netperf/sys/boot/arc/loader/main.c#1 branch .. //depot/projects/netperf/sys/boot/arc/loader/version#1 branch .. //depot/projects/netperf/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/netperf/sys/boot/common/bcache.c#1 branch .. //depot/projects/netperf/sys/boot/common/boot.c#1 branch .. //depot/projects/netperf/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/netperf/sys/boot/common/commands.c#1 branch .. //depot/projects/netperf/sys/boot/common/console.c#1 branch .. //depot/projects/netperf/sys/boot/common/dev_net.c#1 branch .. //depot/projects/netperf/sys/boot/common/dev_net.h#1 branch .. //depot/projects/netperf/sys/boot/common/devopen.c#1 branch .. //depot/projects/netperf/sys/boot/common/help.common#1 branch .. //depot/projects/netperf/sys/boot/common/interp.c#1 branch .. //depot/projects/netperf/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/netperf/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/netperf/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/netperf/sys/boot/common/isapnp.c#1 branch .. //depot/projects/netperf/sys/boot/common/isapnp.h#1 branch .. //depot/projects/netperf/sys/boot/common/load.c#1 branch .. //depot/projects/netperf/sys/boot/common/load_elf.c#1 branch .. //depot/projects/netperf/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/netperf/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/netperf/sys/boot/common/loader.8#1 branch .. //depot/projects/netperf/sys/boot/common/ls.c#1 branch .. //depot/projects/netperf/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/netperf/sys/boot/common/misc.c#1 branch .. //depot/projects/netperf/sys/boot/common/module.c#1 branch .. //depot/projects/netperf/sys/boot/common/newvers.sh#1 branch .. //depot/projects/netperf/sys/boot/common/panic.c#1 branch .. //depot/projects/netperf/sys/boot/common/pnp.c#1 branch .. //depot/projects/netperf/sys/boot/common/pnpdata#1 branch .. //depot/projects/netperf/sys/boot/common/ufsread.c#1 branch .. //depot/projects/netperf/sys/boot/efi/Makefile#1 branch .. //depot/projects/netperf/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/netperf/sys/boot/efi/include/README#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/netperf/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/arch/ia64/start.S#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/copy.c#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/module.c#1 branch .. //depot/projects/netperf/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/netperf/sys/boot/efi/loader/Makefile#1 branch .. //depot/projects/netperf/sys/boot/efi/loader/conf.c#1 branch .. //depot/projects/netperf/sys/boot/efi/loader/main.c#1 branch .. //depot/projects/netperf/sys/boot/efi/loader/version#1 branch .. //depot/projects/netperf/sys/boot/ficl/Makefile#1 branch .. //depot/projects/netperf/sys/boot/ficl/alpha/sysdep.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/alpha/sysdep.h#1 branch .. //depot/projects/netperf/sys/boot/ficl/dict.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/netperf/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/float.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/netperf/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/netperf/sys/boot/ficl/loader.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/math64.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/math64.h#1 branch .. //depot/projects/netperf/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/search.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/netperf/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/netperf/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/netperf/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/netperf/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/netperf/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/netperf/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/netperf/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/netperf/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/netperf/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/netperf/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/netperf/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/netperf/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/netperf/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/netperf/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/netperf/sys/boot/ficl/stack.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/tools.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/unix.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/vm.c#1 branch .. //depot/projects/netperf/sys/boot/ficl/words.c#1 branch .. //depot/projects/netperf/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/netperf/sys/boot/forth/frames.4th#1 branch .. //depot/projects/netperf/sys/boot/forth/loader.4th#1 branch .. //depot/projects/netperf/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/netperf/sys/boot/forth/loader.conf#1 branch .. //depot/projects/netperf/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/netperf/sys/boot/forth/loader.rc#1 branch .. //depot/projects/netperf/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/netperf/sys/boot/forth/screen.4th#1 branch .. //depot/projects/netperf/sys/boot/forth/support.4th#1 branch .. //depot/projects/netperf/sys/boot/i386/Makefile#1 branch .. //depot/projects/netperf/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/netperf/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/netperf/sys/boot/i386/boot0/boot0.s#1 branch .. //depot/projects/netperf/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/netperf/sys/boot/i386/boot2/boot1.s#1 branch .. //depot/projects/netperf/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/netperf/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/netperf/sys/boot/i386/boot2/sio.s#1 branch .. //depot/projects/netperf/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/netperf/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/netperf/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/netperf/sys/boot/i386/btx/btx/btx.s#1 branch .. //depot/projects/netperf/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/netperf/sys/boot/i386/btx/btxldr/btxldr.s#1 branch .. //depot/projects/netperf/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/netperf/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/netperf/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/netperf/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/netperf/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/netperf/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/netperf/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/netperf/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/netperf/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/netperf/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/netperf/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/netperf/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/netperf/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/netperf/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/gatea20.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/netperf/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/netperf/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/netperf/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/netperf/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/netperf/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/netperf/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/netperf/sys/boot/i386/loader/version#1 branch .. //depot/projects/netperf/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/netperf/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/netperf/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/netperf/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/netperf/sys/boot/i386/pxeldr/pxeldr.s#1 branch .. //depot/projects/netperf/sys/boot/ia64/Makefile#1 branch .. //depot/projects/netperf/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/Makefile#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/acpi_stub.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/bootinfo.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/copy.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/delay.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/devicename.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/efi_stub.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/elf_freebsd.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/exit.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/libski.h#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/module.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/pal_stub.S#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/sal_stub.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/skiconsole.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/skifs.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/ssc.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/libski/time.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/skiload/Makefile#1 branch .. //depot/projects/netperf/sys/boot/ia64/skiload/conf.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/skiload/ldscript.ia64#1 branch .. //depot/projects/netperf/sys/boot/ia64/skiload/main.c#1 branch .. //depot/projects/netperf/sys/boot/ia64/skiload/skiload.cmd#1 branch .. //depot/projects/netperf/sys/boot/ia64/skiload/start.S#1 branch .. //depot/projects/netperf/sys/boot/ia64/skiload/version#1 branch .. //depot/projects/netperf/sys/boot/ofw/Makefile#1 branch .. //depot/projects/netperf/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/netperf/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/netperf/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/netperf/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/netperf/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/netperf/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/netperf/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/netperf/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/netperf/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/netperf/sys/boot/pc98/Makefile#1 branch .. //depot/projects/netperf/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/netperf/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/netperf/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/netperf/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/netperf/sys/boot/pc98/btx/btx/btx.s#1 branch .. //depot/projects/netperf/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/netperf/sys/boot/pc98/btx/btxldr/btxldr.s#1 branch .. //depot/projects/netperf/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/netperf/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/netperf/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/netperf/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/netperf/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/netperf/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/netperf/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/netperf/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/netperf/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/netperf/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/netperf/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/netperf/sys/boot/pc98/libpc98/gatea20.c#1 branch .. //depot/projects/netperf/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/netperf/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/netperf/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/netperf/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/netperf/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/netperf/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/netperf/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/netperf/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/netperf/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/netperf/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/netperf/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/netperf/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/netperf/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/netperf/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/netperf/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/netperf/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/netperf/sys/boot/sparc64/boot1/_start.S#1 branch .. //depot/projects/netperf/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/netperf/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/netperf/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/netperf/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/netperf/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/netperf/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/netperf/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/netperf/sys/cam/cam.c#1 branch .. //depot/projects/netperf/sys/cam/cam.h#1 branch .. //depot/projects/netperf/sys/cam/cam_ccb.h#1 branch .. //depot/projects/netperf/sys/cam/cam_debug.h#1 branch .. //depot/projects/netperf/sys/cam/cam_periph.c#1 branch .. //depot/projects/netperf/sys/cam/cam_periph.h#1 branch .. //depot/projects/netperf/sys/cam/cam_queue.c#1 branch .. //depot/projects/netperf/sys/cam/cam_queue.h#1 branch .. //depot/projects/netperf/sys/cam/cam_sim.c#1 branch .. //depot/projects/netperf/sys/cam/cam_sim.h#1 branch .. //depot/projects/netperf/sys/cam/cam_xpt.c#1 branch .. //depot/projects/netperf/sys/cam/cam_xpt.h#1 branch .. //depot/projects/netperf/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/netperf/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/netperf/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/netperf/sys/coda/00READ#1 branch .. //depot/projects/netperf/sys/coda/README#1 branch .. //depot/projects/netperf/sys/coda/TODO#1 branch .. //depot/projects/netperf/sys/coda/cnode.h#1 branch .. //depot/projects/netperf/sys/coda/coda.h#1 branch .. //depot/projects/netperf/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/netperf/sys/coda/coda_io.h#1 branch .. //depot/projects/netperf/sys/coda/coda_kernel.h#1 branch .. //depot/projects/netperf/sys/coda/coda_namecache.c#1 branch .. //depot/projects/netperf/sys/coda/coda_namecache.h#1 branch .. //depot/projects/netperf/sys/coda/coda_opstats.h#1 branch .. //depot/projects/netperf/sys/coda/coda_pioctl.h#1 branch .. //depot/projects/netperf/sys/coda/coda_psdev.c#1 branch .. //depot/projects/netperf/sys/coda/coda_psdev.h#1 branch .. //depot/projects/netperf/sys/coda/coda_subr.c#1 branch .. //depot/projects/netperf/sys/coda/coda_subr.h#1 branch .. //depot/projects/netperf/sys/coda/coda_venus.c#1 branch .. //depot/projects/netperf/sys/coda/coda_venus.h#1 branch .. //depot/projects/netperf/sys/coda/coda_vfsops.c#1 branch .. //depot/projects/netperf/sys/coda/coda_vfsops.h#1 branch .. //depot/projects/netperf/sys/coda/coda_vnops.c#1 branch .. //depot/projects/netperf/sys/coda/coda_vnops.h#1 branch .. //depot/projects/netperf/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/netperf/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/netperf/sys/compat/pecoff/imgact_pecoff.c#1 branch .. //depot/projects/netperf/sys/compat/pecoff/imgact_pecoff.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/Makefile#1 branch .. //depot/projects/netperf/sys/compat/svr4/imgact_svr4.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_acl.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_dirent.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_errno.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_exec.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_fcntl.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_fcntl.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_filio.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_filio.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_fuser.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_hrt.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_ioctl.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_ioctl.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_ipc.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_ipc.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_misc.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_mman.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_proto.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_resource.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_resource.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_siginfo.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_signal.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_signal.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_socket.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_socket.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_sockio.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_sockio.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_sockmod.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_stat.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_stat.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_statvfs.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_stream.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_stropts.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_syscall.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_syscallnames.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_sysconfig.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_sysent.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_systeminfo.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_sysvec.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_termios.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_termios.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_time.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_timod.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_ttold.c#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_ttold.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_types.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_ucontext.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_ulimit.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_ustat.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_util.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_utsname.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/svr4_wait.h#1 branch .. //depot/projects/netperf/sys/compat/svr4/syscalls.conf#1 branch .. //depot/projects/netperf/sys/compat/svr4/syscalls.master#1 branch .. //depot/projects/netperf/sys/conf/Makefile.alpha#1 branch .. //depot/projects/netperf/sys/conf/Makefile.amd64#1 branch .. //depot/projects/netperf/sys/conf/Makefile.i386#1 branch .. //depot/projects/netperf/sys/conf/Makefile.ia64#1 branch .. //depot/projects/netperf/sys/conf/Makefile.pc98#1 branch .. //depot/projects/netperf/sys/conf/Makefile.powerpc#1 branch .. //depot/projects/netperf/sys/conf/Makefile.sparc64#1 branch .. //depot/projects/netperf/sys/conf/NOTES#1 branch .. //depot/projects/netperf/sys/conf/defines#1 branch .. //depot/projects/netperf/sys/conf/files#1 branch .. //depot/projects/netperf/sys/conf/files.alpha#1 branch .. //depot/projects/netperf/sys/conf/files.amd64#1 branch .. //depot/projects/netperf/sys/conf/files.i386#1 branch .. //depot/projects/netperf/sys/conf/files.ia64#1 branch .. //depot/projects/netperf/sys/conf/files.pc98#1 branch .. //depot/projects/netperf/sys/conf/files.powerpc#1 branch .. //depot/projects/netperf/sys/conf/files.sparc64#1 branch .. //depot/projects/netperf/sys/conf/kern.mk#1 branch .. //depot/projects/netperf/sys/conf/kern.post.mk#1 branch .. //depot/projects/netperf/sys/conf/kern.pre.mk#1 branch .. //depot/projects/netperf/sys/conf/kmod.mk#1 branch .. //depot/projects/netperf/sys/conf/kmod_syms.awk#1 branch .. //depot/projects/netperf/sys/conf/ldscript.alpha#1 branch .. //depot/projects/netperf/sys/conf/ldscript.amd64#1 branch .. //depot/projects/netperf/sys/conf/ldscript.i386#1 branch .. //depot/projects/netperf/sys/conf/ldscript.ia64#1 branch .. //depot/projects/netperf/sys/conf/ldscript.powerpc#1 branch .. //depot/projects/netperf/sys/conf/ldscript.sparc64#1 branch .. //depot/projects/netperf/sys/conf/majors#1 branch .. //depot/projects/netperf/sys/conf/majors.awk#1 branch .. //depot/projects/netperf/sys/conf/makeLINT.mk#1 branch .. //depot/projects/netperf/sys/conf/makeLINT.sed#1 branch .. //depot/projects/netperf/sys/conf/newvers.sh#1 branch .. //depot/projects/netperf/sys/conf/options#1 branch .. //depot/projects/netperf/sys/conf/options.alpha#1 branch .. //depot/projects/netperf/sys/conf/options.amd64#1 branch .. //depot/projects/netperf/sys/conf/options.i386#1 branch .. //depot/projects/netperf/sys/conf/options.ia64#1 branch .. //depot/projects/netperf/sys/conf/options.pc98#1 branch .. //depot/projects/netperf/sys/conf/options.powerpc#1 branch .. //depot/projects/netperf/sys/conf/options.sparc64#1 branch .. //depot/projects/netperf/sys/conf/systags.sh#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/CHANGES.txt#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acapps.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acconfig.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acdebug.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acdisasm.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acdispat.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acefi.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acenv.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acevents.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acexcep.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acfreebsd.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acgcc.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acglobal.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/achware.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acinterp.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/aclocal.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acmacros.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acnamesp.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acobject.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acoutput.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acparser.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acpi.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acpica_prep.sh#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acpiosxf.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acpixf.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acresrc.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acstruct.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/actables.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/actbl.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/actbl1.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/actbl2.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/actypes.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/acutils.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/amlcode.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/amlresrc.h#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dbcmds.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dbdisply.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dbexec.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dbfileio.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dbhistry.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dbinput.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dbstats.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dbutils.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dbxface.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dmbuffer.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dmnames.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dmobject.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dmopcode.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dmresrc.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dmresrcl.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dmresrcs.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dmutils.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dmwalk.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dsfield.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dsinit.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dsmethod.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dsmthdat.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dsobject.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dsopcode.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dsutils.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dswexec.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dswload.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dswscope.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/dswstate.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/evevent.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/evgpe.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/evgpeblk.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/evmisc.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/evregion.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/evrgnini.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/evsci.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/evxface.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/evxfevnt.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/evxfregn.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/exconfig.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/exconvrt.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/excreate.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/exdump.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/exfield.c#1 branch .. //depot/projects/netperf/sys/contrib/dev/acpica/exfldio.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jul 22 18:40:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4157C37B404; Tue, 22 Jul 2003 18:40: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 E83AC37B401 for ; Tue, 22 Jul 2003 18:40:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEEE143F3F for ; Tue, 22 Jul 2003 18:40:03 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6N1e30U039769 for ; Tue, 22 Jul 2003 18:40:03 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6N1e3p2039766 for perforce@freebsd.org; Tue, 22 Jul 2003 18:40:03 -0700 (PDT) Date: Tue, 22 Jul 2003 18:40:03 -0700 (PDT) Message-Id: <200307230140.h6N1e3p2039766@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 34866 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, 23 Jul 2003 01:40:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=34866 Change 34866 by sam@sam_ebb on 2003/07/22 18:39:12 fast ipsec locking (needs revisiting) Affected files ... .. //depot/projects/netperf/sys/netipsec/ipsec.c#2 edit .. //depot/projects/netperf/sys/netipsec/ipsec.h#2 edit .. //depot/projects/netperf/sys/netipsec/ipsec_input.c#2 edit .. //depot/projects/netperf/sys/netipsec/ipsec_output.c#2 edit .. //depot/projects/netperf/sys/netipsec/key.c#2 edit .. //depot/projects/netperf/sys/netipsec/key.h#2 edit .. //depot/projects/netperf/sys/netipsec/keydb.h#2 edit .. //depot/projects/netperf/sys/netipsec/xform_ah.c#2 edit .. //depot/projects/netperf/sys/netipsec/xform_esp.c#2 edit .. //depot/projects/netperf/sys/netipsec/xform_ipcomp.c#2 edit Differences ... ==== //depot/projects/netperf/sys/netipsec/ipsec.c#2 (text+ko) ==== @@ -202,6 +202,8 @@ static void vshiftl __P((unsigned char *, int, int)); static size_t ipsec_hdrsiz __P((struct secpolicy *)); +MALLOC_DEFINE(M_IPSEC_INPCB, "inpcbpolicy", "inpcb-resident ipsec policy"); + /* * Return a held reference to the default SP. */ @@ -836,7 +838,7 @@ ipsec_delpcbpolicy(p) struct inpcbpolicy *p; { - free(p, M_SECA); + free(p, M_IPSEC_INPCB); } /* initialize policy in PCB */ @@ -852,7 +854,7 @@ panic("ipsec_init_policy: NULL pointer was passed.\n"); new = (struct inpcbpolicy *) malloc(sizeof(struct inpcbpolicy), - M_SECA, M_NOWAIT|M_ZERO); + M_IPSEC_INPCB, M_NOWAIT|M_ZERO); if (new == NULL) { ipseclog((LOG_DEBUG, "ipsec_init_policy: No more memory.\n")); return ENOBUFS; @@ -909,6 +911,24 @@ return 0; } +struct ipsecrequest * +ipsec_newisr(void) +{ + struct ipsecrequest *p; + + p = malloc(sizeof(struct ipsecrequest), M_IPSEC_SR, M_NOWAIT|M_ZERO); + if (p != NULL) + mtx_init(&p->lock, "ipsec request", NULL, MTX_DEF); + return p; +} + +void +ipsec_delisr(struct ipsecrequest *p) +{ + mtx_destroy(&p->lock); + free(p, M_IPSEC_SR); +} + /* deep-copy a policy in PCB */ static struct secpolicy * ipsec_deepcopy_policy(src) @@ -932,13 +952,9 @@ */ q = &newchain; for (p = src->req; p; p = p->next) { - *q = (struct ipsecrequest *)malloc(sizeof(struct ipsecrequest), - M_SECA, M_NOWAIT); + *q = ipsec_newisr(); if (*q == NULL) goto fail; - bzero(*q, sizeof(**q)); - (*q)->next = NULL; - (*q)->saidx.proto = p->saidx.proto; (*q)->saidx.mode = p->saidx.mode; (*q)->level = p->level; @@ -947,7 +963,6 @@ bcopy(&p->saidx.src, &(*q)->saidx.src, sizeof((*q)->saidx.src)); bcopy(&p->saidx.dst, &(*q)->saidx.dst, sizeof((*q)->saidx.dst)); - (*q)->sav = NULL; (*q)->sp = dst; q = &((*q)->next); @@ -963,7 +978,7 @@ fail: for (p = newchain; p; p = r) { r = p->next; - free(p, M_SECA); + ipsec_delisr(p); p = NULL; } return NULL; ==== //depot/projects/netperf/sys/netipsec/ipsec.h#2 (text+ko) ==== @@ -71,6 +71,7 @@ /* Security Policy Data Base */ struct secpolicy { LIST_ENTRY(secpolicy) chain; + struct mtx lock; u_int refcnt; /* reference count */ struct secpolicyindex spidx; /* selector */ @@ -108,6 +109,7 @@ struct secasvar *sav; /* place holder of SA for use */ struct secpolicy *sp; /* back pointer to SP */ + struct mtx lock; /* to interlock updates */ }; /* security policy in PCB */ @@ -322,6 +324,9 @@ /* for openbsd compatibility */ #define DPRINTF(x) do { if (ipsec_debug) printf x; } while (0) +extern struct ipsecrequest *ipsec_newisr(void); +extern void ipsec_delisr(struct ipsecrequest *); + struct tdb_ident; extern struct secpolicy *ipsec_getpolicy __P((struct tdb_ident*, u_int)); struct inpcb; ==== //depot/projects/netperf/sys/netipsec/ipsec_input.c#2 (text+ko) ==== @@ -108,7 +108,7 @@ union sockaddr_union dst_address; struct secasvar *sav; u_int32_t spi; - int s, error; + int error; IPSEC_ISTAT(sproto, espstat.esps_input, ahstat.ahs_input, ipcompstat.ipcomps_input); @@ -178,8 +178,6 @@ return EPFNOSUPPORT; } - s = splnet(); - /* NB: only pass dst since key_allocsa follows RFC2401 */ sav = KEY_ALLOCSA(&dst_address, sproto, spi); if (sav == NULL) { @@ -189,7 +187,6 @@ (u_long) ntohl(spi), sproto)); IPSEC_ISTAT(sproto, espstat.esps_notdb, ahstat.ahs_notdb, ipcompstat.ipcomps_notdb); - splx(s); m_freem(m); return ENOENT; } @@ -202,7 +199,6 @@ IPSEC_ISTAT(sproto, espstat.esps_noxform, ahstat.ahs_noxform, ipcompstat.ipcomps_noxform); KEY_FREESAV(&sav); - splx(s); m_freem(m); return ENXIO; } @@ -213,7 +209,6 @@ */ error = (*sav->tdb_xform->xf_input)(m, sav, skip, protoff); KEY_FREESAV(&sav); - splx(s); return error; } ==== //depot/projects/netperf/sys/netipsec/ipsec_output.c#2 (text+ko) ==== @@ -345,12 +345,12 @@ struct secasindex saidx; struct secasvar *sav; struct ip *ip; - int s, error, i, off; + int error, i, off; KASSERT(m != NULL, ("ipsec4_process_packet: null mbuf")); KASSERT(isr != NULL, ("ipsec4_process_packet: null isr")); - s = splnet(); /* insure SA contents don't change */ + mtx_lock(&isr->lock); /* insure SA contents don't change */ isr = ipsec_nextisr(m, isr, AF_INET, &saidx, &error); if (isr == NULL) @@ -469,10 +469,10 @@ } else { error = ipsec_process_done(m, isr); } - splx(s); + mtx_unlock(&isr->lock); return error; bad: - splx(s); + mtx_unlock(&isr->lock); if (m) m_freem(m); return error; ==== //depot/projects/netperf/sys/netipsec/key.c#2 (text+ko) ==== @@ -42,6 +42,8 @@ #include #include #include +#include +#include #include #include #include @@ -122,16 +124,18 @@ static int key_prefered_oldsa = 1; /* prefered old sa rather than new sa.*/ static u_int32_t acq_seq = 0; -static int key_tick_init_random = 0; static LIST_HEAD(_sptree, secpolicy) sptree[IPSEC_DIR_MAX]; /* SPD */ +static struct mtx sptree_lock; static LIST_HEAD(_sahtree, secashead) sahtree; /* SAD */ +static struct mtx sahtree_lock; + /* registed list */ static LIST_HEAD(_regtree, secreg) regtree[SADB_SATYPE_MAX + 1]; - /* registed list */ -#ifndef IPSEC_NONBLOCK_ACQUIRE +static struct mtx regtree_lock; static LIST_HEAD(_acqtree, secacq) acqtree; /* acquiring list */ -#endif +static struct mtx acq_lock; static LIST_HEAD(_spacqtree, secspacq) spacqtree; /* SP acquiring list */ +static struct mtx spacq_lock; /* search order for SAs */ static u_int saorder_state_valid[] = { @@ -286,28 +290,14 @@ } \ } while (0) -MALLOC_DEFINE(M_SECA, "key mgmt", "security associations, key management"); +MALLOC_DEFINE(M_IPSEC_SA, "secasvar", "ipsec security association"); +MALLOC_DEFINE(M_IPSEC_SAH, "sahead", "ipsec sa head"); +MALLOC_DEFINE(M_IPSEC_SP, "ipsecpolicy", "ipsec security policy"); +MALLOC_DEFINE(M_IPSEC_SR, "ipsecrequest", "ipsec security request"); +MALLOC_DEFINE(M_IPSEC_MISC, "ipsec-misc", "ipsec miscellaneous"); +MALLOC_DEFINE(M_IPSEC_SAQ, "ipsec-saq", "ipsec sa acquire"); +MALLOC_DEFINE(M_IPSEC_SAR, "ipsec-reg", "ipsec sa acquire"); -#if 1 -#define KMALLOC(p, t, n) \ - ((p) = (t) malloc((unsigned long)(n), M_SECA, M_NOWAIT)) -#define KFREE(p) \ - free((caddr_t)(p), M_SECA) -#else -#define KMALLOC(p, t, n) \ -do { \ - ((p) = (t)malloc((unsigned long)(n), M_SECA, M_NOWAIT)); \ - printf("%s %d: %p <- KMALLOC(%s, %d)\n", \ - __FILE__, __LINE__, (p), #t, n); \ -} while (0) - -#define KFREE(p) \ - do { \ - printf("%s %d: %p -> KFREE()\n", __FILE__, __LINE__, (p)); \ - free((caddr_t)(p), M_SECA); \ - } while (0) -#endif - /* * set parameters into secpolicyindex buffer. * Must allocate secpolicyindex buffer passed to this function. @@ -354,6 +344,7 @@ static struct secasvar *key_do_allocsa_policy __P((struct secashead *, u_int)); static void key_delsp __P((struct secpolicy *)); static struct secpolicy *key_getsp __P((struct secpolicyindex *)); +static void _key_delsp(struct secpolicy *sp); static struct secpolicy *key_getspbyid __P((u_int32_t)); static u_int32_t key_newreqid __P((void)); static struct mbuf *key_gather_mbuf __P((struct mbuf *, @@ -396,14 +387,10 @@ static struct mbuf *key_setsadbsa __P((struct secasvar *)); static struct mbuf *key_setsadbaddr __P((u_int16_t, const struct sockaddr *, u_int8_t, u_int16_t)); -#if 0 -static struct mbuf *key_setsadbident __P((u_int16_t, u_int16_t, caddr_t, - int, u_int64_t)); -#endif static struct mbuf *key_setsadbxsa2 __P((u_int8_t, u_int32_t, u_int32_t)); static struct mbuf *key_setsadbxpolicy __P((u_int16_t, u_int8_t, u_int32_t)); -static void *key_newbuf __P((const void *, u_int)); +static void *key_dup(const void *, u_int, struct malloc_type *); #ifdef INET6 static int key_ismyaddr6 __P((struct sockaddr_in6 *)); #endif @@ -422,7 +409,6 @@ __P((struct secpolicyindex *, struct secpolicyindex *)); static int key_sockaddrcmp __P((const struct sockaddr *, const struct sockaddr *, int)); static int key_bbcmp __P((const void *, const void *, u_int)); -static void key_srandom __P((void)); static u_int16_t key_satype2proto __P((u_int8_t)); static u_int8_t key_proto2satype __P((u_int16_t)); @@ -453,11 +439,9 @@ static struct mbuf *key_getprop __P((const struct secasindex *)); static int key_acquire __P((const struct secasindex *, struct secpolicy *)); -#ifndef IPSEC_NONBLOCK_ACQUIRE static struct secacq *key_newacq __P((const struct secasindex *)); static struct secacq *key_getacq __P((const struct secasindex *)); static struct secacq *key_getacqbyseq __P((u_int32_t)); -#endif static struct secspacq *key_newspacq __P((struct secpolicyindex *)); static struct secspacq *key_getspacq __P((struct secpolicyindex *)); static int key_acquire2 __P((struct socket *, struct mbuf *, @@ -526,7 +510,6 @@ key_allocsp(struct secpolicyindex *spidx, u_int dir, const char* where, int tag) { struct secpolicy *sp; - int s; KASSERT(spidx != NULL, ("key_allocsp: null spidx")); KASSERT(dir == IPSEC_DIR_INBOUND || dir == IPSEC_DIR_OUTBOUND, @@ -536,11 +519,11 @@ printf("DP key_allocsp from %s:%u\n", where, tag)); /* get a SP entry */ - s = splnet(); /*called from softclock()*/ KEYDEBUG(KEYDEBUG_IPSEC_DATA, printf("*** objects\n"); kdebug_secpolicyindex(spidx)); + mtx_lock(&sptree_lock); LIST_FOREACH(sp, &sptree[dir], chain) { KEYDEBUG(KEYDEBUG_IPSEC_DATA, printf("*** in SPD\n"); @@ -561,7 +544,7 @@ sp->lastused = time_second; SP_ADDREF(sp); } - splx(s); + mtx_unlock(&sptree_lock); KEYDEBUG(KEYDEBUG_IPSEC_STAMP, printf("DP key_allocsp return SP:%p (ID=%u) refcnt %u\n", @@ -583,7 +566,6 @@ const char* where, int tag) { struct secpolicy *sp; - int s; KASSERT(dst != NULL, ("key_allocsp2: null dst")); KASSERT(dir == IPSEC_DIR_INBOUND || dir == IPSEC_DIR_OUTBOUND, @@ -593,12 +575,12 @@ printf("DP key_allocsp2 from %s:%u\n", where, tag)); /* get a SP entry */ - s = splnet(); /*called from softclock()*/ KEYDEBUG(KEYDEBUG_IPSEC_DATA, printf("*** objects\n"); printf("spi %u proto %u dir %u\n", spi, proto, dir); kdebug_sockaddr(&dst->sa)); + mtx_lock(&sptree_lock); LIST_FOREACH(sp, &sptree[dir], chain) { KEYDEBUG(KEYDEBUG_IPSEC_DATA, printf("*** in SPD\n"); @@ -625,7 +607,7 @@ sp->lastused = time_second; SP_ADDREF(sp); } - splx(s); + mtx_unlock(&sptree_lock); KEYDEBUG(KEYDEBUG_IPSEC_STAMP, printf("DP key_allocsp2 return SP:%p (ID=%u) refcnt %u\n", @@ -646,7 +628,6 @@ { struct secpolicy *sp; const int dir = IPSEC_DIR_INBOUND; - int s; struct ipsecrequest *r1, *r2, *p; struct secpolicyindex spidx; @@ -660,7 +641,7 @@ goto done; } - s = splnet(); /*called from softclock()*/ + mtx_lock(&sptree_lock); LIST_FOREACH(sp, &sptree[dir], chain) { if (sp->state == IPSEC_SPSTATE_DEAD) continue; @@ -702,7 +683,7 @@ sp->lastused = time_second; SP_ADDREF(sp); } - splx(s); + mtx_unlock(&sptree_lock); done: KEYDEBUG(KEYDEBUG_IPSEC_STAMP, printf("DP key_gettunnel return SP:%p (ID=%u) refcnt %u\n", @@ -728,19 +709,17 @@ saidx->mode == IPSEC_MODE_TUNNEL, ("key_checkrequest: unexpected policy %u", saidx->mode)); - /* get current level */ - level = ipsec_get_reqlevel(isr); - /* * XXX guard against protocol callbacks from the crypto * thread as they reference ipsecrequest.sav which we * temporarily null out below. Need to rethink how we * handle bundled SA's in the callback thread. */ + mtx_assert(&isr->lock, MA_OWNED); + + /* get current level */ + level = ipsec_get_reqlevel(isr); #if 0 - SPLASSERT(net, "key_checkrequest"); -#endif -#if 0 /* * We do allocate new SA only if the state of SA in the holder is * SADB_SASTATE_DEAD. The SA for outbound must be the oldest. @@ -819,12 +798,16 @@ struct secasvar *sav; u_int stateidx, state; + mtx_lock(&sahtree_lock); LIST_FOREACH(sah, &sahtree, chain) { if (sah->state == SADB_SASTATE_DEAD) continue; - if (key_cmpsaidx(&sah->saidx, saidx, CMP_MODE_REQID)) + if (key_cmpsaidx(&sah->saidx, saidx, CMP_MODE_REQID)) { + mtx_unlock(&sahtree_lock); /* XXX??? */ goto found; + } } + mtx_unlock(&sahtree_lock); return NULL; @@ -860,6 +843,7 @@ /* initilize */ candidate = NULL; + mtx_lock(&sahtree_lock); for (sav = LIST_FIRST(&sah->savtree[state]); sav != NULL; sav = nextsav) { @@ -962,7 +946,6 @@ KEY_FREESAV(&d); } } - if (candidate) { SA_ADDREF(candidate); KEYDEBUG(KEYDEBUG_IPSEC_STAMP, @@ -970,6 +953,8 @@ "refcnt++:%d SA:%p\n", candidate->refcnt, candidate)); } + mtx_unlock(&sahtree_lock); + return candidate; } @@ -998,7 +983,6 @@ struct secashead *sah; struct secasvar *sav; u_int stateidx, state; - int s; KASSERT(dst != NULL, ("key_allocsa: null dst address")); @@ -1011,7 +995,7 @@ * IPsec tunnel packet is received. But ESP tunnel mode is * encrypted so we can't check internal IP header. */ - s = splnet(); /*called from softclock()*/ + mtx_lock(&sahtree_lock); LIST_FOREACH(sah, &sahtree, chain) { /* search valid state */ for (stateidx = 0; @@ -1044,7 +1028,7 @@ } sav = NULL; done: - splx(s); + mtx_unlock(&sahtree_lock); KEYDEBUG(KEYDEBUG_IPSEC_STAMP, printf("DP key_allocsa return SA:%p; refcnt %u\n", @@ -1063,6 +1047,7 @@ KASSERT(sp != NULL, ("key_freesp: null sp")); + mtx_lock(&sptree_lock); SP_DELREF(sp); KEYDEBUG(KEYDEBUG_IPSEC_STAMP, @@ -1073,6 +1058,7 @@ *spp = NULL; key_delsp(sp); } + mtx_unlock(&sptree_lock); } /* @@ -1174,9 +1160,10 @@ static void key_delsp(struct secpolicy *sp) { - int s; + struct ipsecrequest *isr, *nextisr; KASSERT(sp != NULL, ("key_delsp: null sp")); + mtx_assert(&sptree_lock, MA_OWNED); sp->state = IPSEC_SPSTATE_DEAD; @@ -1184,29 +1171,20 @@ ("key_delsp: SP with references deleted (refcnt %u)", sp->refcnt)); - s = splnet(); /*called from softclock()*/ /* remove from SP index */ if (__LIST_CHAINED(sp)) LIST_REMOVE(sp, chain); - { - struct ipsecrequest *isr = sp->req, *nextisr; - - while (isr != NULL) { + for (isr = sp->req; isr != NULL; isr = nextisr) { if (isr->sav != NULL) { KEY_FREESAV(&isr->sav); isr->sav = NULL; } nextisr = isr->next; - KFREE(isr); - isr = nextisr; + ipsec_delisr(isr); } - } - - KFREE(sp); - - splx(s); + _key_delsp(sp); } /* @@ -1221,16 +1199,18 @@ KASSERT(spidx != NULL, ("key_getsp: null spidx")); + mtx_lock(&sptree_lock); LIST_FOREACH(sp, &sptree[spidx->dir], chain) { if (sp->state == IPSEC_SPSTATE_DEAD) continue; if (key_cmpspidx_exactly(spidx, &sp->spidx)) { SP_ADDREF(sp); - return sp; + break; } } + mtx_unlock(&sptree_lock); - return NULL; + return sp; } /* @@ -1243,12 +1223,13 @@ { struct secpolicy *sp; + mtx_lock(&sptree_lock); LIST_FOREACH(sp, &sptree[IPSEC_DIR_INBOUND], chain) { if (sp->state == IPSEC_SPSTATE_DEAD) continue; if (sp->id == id) { SP_ADDREF(sp); - return sp; + goto done; } } @@ -1257,11 +1238,13 @@ continue; if (sp->id == id) { SP_ADDREF(sp); - return sp; + goto done; } } +done: + mtx_unlock(&sptree_lock); - return NULL; + return sp; } struct secpolicy * @@ -1270,8 +1253,9 @@ struct secpolicy *newsp = NULL; newsp = (struct secpolicy *) - malloc(sizeof(struct secpolicy), M_SECA, M_NOWAIT|M_ZERO); + malloc(sizeof(struct secpolicy), M_IPSEC_SP, M_NOWAIT|M_ZERO); if (newsp) { + mtx_init(&newsp->lock, "ipsec policy", NULL, MTX_DEF); newsp->refcnt = 1; newsp->req = NULL; } @@ -1282,6 +1266,13 @@ return newsp; } +static void +_key_delsp(struct secpolicy *sp) +{ + mtx_destroy(&sp->lock); + free(sp, M_IPSEC_SP); +} + /* * create secpolicy structure from sadb_x_policy structure. * NOTE: `state', `secpolicyindex' in secpolicy structure are not set, @@ -1352,7 +1343,8 @@ } /* allocate request buffer */ - KMALLOC(*p_isr, struct ipsecrequest *, sizeof(**p_isr)); + /* NB: data structure is zero'd */ + *p_isr = ipsec_newisr(); if ((*p_isr) == NULL) { ipseclog((LOG_DEBUG, "key_msg2sp: No more memory.\n")); @@ -1360,11 +1352,8 @@ *error = ENOBUFS; return NULL; } - bzero(*p_isr, sizeof(**p_isr)); /* set values */ - (*p_isr)->next = NULL; - switch (xisr->sadb_x_ipsecrequest_proto) { case IPPROTO_ESP: case IPPROTO_AH: @@ -1475,7 +1464,6 @@ paddr->sa_len); } - (*p_isr)->sav = NULL; (*p_isr)->sp = newsp; /* initialization for the next. */ @@ -1792,7 +1780,7 @@ } if ((newsp->id = key_getnewspid()) == 0) { - KFREE(newsp); + _key_delsp(newsp); return key_senderror(so, m, ENOBUFS); } @@ -1808,12 +1796,12 @@ /* sanity check on addr pair */ if (((struct sockaddr *)(src0 + 1))->sa_family != ((struct sockaddr *)(dst0+ 1))->sa_family) { - KFREE(newsp); + _key_delsp(newsp); return key_senderror(so, m, EINVAL); } if (((struct sockaddr *)(src0 + 1))->sa_len != ((struct sockaddr *)(dst0+ 1))->sa_len) { - KFREE(newsp); + _key_delsp(newsp); return key_senderror(so, m, EINVAL); } #if 1 @@ -1821,7 +1809,7 @@ struct sockaddr *sa; sa = (struct sockaddr *)(src0 + 1); if (sa->sa_family != newsp->req->saidx.src.sa.sa_family) { - KFREE(newsp); + _key_delsp(newsp); return key_senderror(so, m, EINVAL); } } @@ -1829,7 +1817,7 @@ struct sockaddr *sa; sa = (struct sockaddr *)(dst0 + 1); if (sa->sa_family != newsp->req->saidx.dst.sa.sa_family) { - KFREE(newsp); + _key_delsp(newsp); return key_senderror(so, m, EINVAL); } } @@ -1846,11 +1834,12 @@ /* delete the entry in spacqtree */ if (mhp->msg->sadb_msg_type == SADB_X_SPDUPDATE) { - struct secspacq *spacq; - if ((spacq = key_getspacq(&spidx)) != NULL) { + struct secspacq *spacq = key_getspacq(&spidx); + if (spacq != NULL) { /* reset counter in order to deletion by timehandler. */ spacq->created = time_second; spacq->count = 0; + mtx_unlock(&spacq_lock); } } @@ -2005,6 +1994,7 @@ xpl0->sadb_x_policy_id = sp->id; sp->state = IPSEC_SPSTATE_DEAD; + mtx_destroy(&sp->lock); KEY_FREESP(&sp); { @@ -2067,6 +2057,7 @@ } sp->state = IPSEC_SPSTATE_DEAD; + mtx_destroy(&sp->lock); KEY_FREESP(&sp); { @@ -2202,7 +2193,8 @@ panic("key_spdacquire: policy mismathed. IPsec is expected.\n"); /* Get an entry to check whether sent message or not. */ - if ((newspacq = key_getspacq(&sp->spidx)) != NULL) { + newspacq = key_getspacq(&sp->spidx); + if (newspacq != NULL) { if (key_blockacq_count < newspacq->count) { /* reset counter and do send message. */ newspacq->count = 0; @@ -2211,13 +2203,12 @@ newspacq->count++; return 0; } + mtx_unlock(&spacq_lock); } else { /* make new entry for blocking to send SADB_ACQUIRE. */ - if ((newspacq = key_newspacq(&sp->spidx)) == NULL) + newspacq = key_newspacq(&sp->spidx); + if (newspacq == NULL) return ENOBUFS; - - /* add to acqtree */ - LIST_INSERT_HEAD(&spacqtree, newspacq, chain); } /* create new sadb_msg to reply. */ @@ -2446,14 +2437,12 @@ key_spdexpire(sp) struct secpolicy *sp; { - int s; struct mbuf *result = NULL, *m; int len; int error = -1; struct sadb_lifetime *lt; /* XXX: Why do we lock ? */ - s = splnet(); /*called from softclock()*/ /* sanity check */ if (sp == NULL) @@ -2546,7 +2535,6 @@ fail: if (result) m_freem(result); - splx(s); return error; } @@ -2564,8 +2552,7 @@ KASSERT(saidx != NULL, ("key_newsaidx: null saidx")); - newsah = (struct secashead *) - malloc(sizeof(struct secashead), M_SECA, M_NOWAIT|M_ZERO); + newsah = malloc(sizeof(struct secashead), M_IPSEC_SAH, M_NOWAIT|M_ZERO); if (newsah != NULL) { int i; for (i = 0; i < sizeof(newsah->savtree)/sizeof(newsah->savtree[0]); i++) @@ -2574,7 +2561,10 @@ /* add to saidxtree */ newsah->state = SADB_SASTATE_MATURE; + + mtx_lock(&sahtree_lock); LIST_INSERT_HEAD(&sahtree, newsah, chain); + mtx_unlock(&sahtree_lock); } return(newsah); } @@ -2588,14 +2578,11 @@ { struct secasvar *sav, *nextsav; u_int stateidx, state; - int s; int zombie = 0; /* sanity check */ - if (sah == NULL) - panic("key_delsah: NULL pointer is passed.\n"); - - s = splnet(); /*called from softclock()*/ + KASSERT(sah != NULL, ("key_delsah: NULL sah")); + mtx_assert(&sahtree_lock, MA_OWNED); /* searching all SA registerd in the secindex. */ for (stateidx = 0; @@ -2619,26 +2606,20 @@ } } } + /* 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) { - splx(s); + if (zombie) return; - } if (sah->sa_route.ro_rt) { RTFREE(sah->sa_route.ro_rt); sah->sa_route.ro_rt = (struct rtentry *)NULL; } - /* remove from tree of SA index */ - if (__LIST_CHAINED(sah)) - LIST_REMOVE(sah, chain); - - KFREE(sah); - - splx(s); - return; + free(sah, M_IPSEC_SAH); } /* @@ -2669,13 +2650,12 @@ if (m == NULL || mhp == NULL || mhp->msg == NULL || sah == NULL) panic("key_newsa: NULL pointer is passed.\n"); - KMALLOC(newsav, struct secasvar *, sizeof(struct secasvar)); + newsav = malloc(sizeof(struct secasvar), M_IPSEC_SA, M_NOWAIT|M_ZERO); if (newsav == NULL) { ipseclog((LOG_DEBUG, "key_newsa: No more memory.\n")); *errp = ENOBUFS; goto done; } - bzero((caddr_t)newsav, sizeof(struct secasvar)); switch (mhp->msg->sadb_msg_type) { case SADB_GETSPI: @@ -2694,7 +2674,8 @@ case SADB_ADD: /* sanity check */ if (mhp->ext[SADB_EXT_SA] == NULL) { - KFREE(newsav), newsav = NULL; + free(newsav, M_IPSEC_SA); + newsav = NULL; ipseclog((LOG_DEBUG, "key_newsa: invalid message is passed.\n")); *errp = EINVAL; goto done; @@ -2704,20 +2685,25 @@ newsav->seq = mhp->msg->sadb_msg_seq; break; default: - KFREE(newsav), newsav = NULL; + free(newsav, M_IPSEC_SA); + newsav = NULL; *errp = EINVAL; goto done; } + /* copy sav values */ if (mhp->msg->sadb_msg_type != SADB_GETSPI) { *errp = key_setsaval(newsav, m, mhp); if (*errp) { - KFREE(newsav), newsav = NULL; + free(newsav, M_IPSEC_SA); + newsav = NULL; goto done; } } + mtx_init(&newsav->lock, "ipsec sa", NULL, MTX_DEF); + /* reset created */ newsav->created = time_second; newsav->pid = mhp->msg->sadb_msg_pid; @@ -2726,6 +2712,8 @@ newsav->sah = sah; newsav->refcnt = 1; newsav->state = SADB_SASTATE_LARVAL; + + /* XXX locking??? */ LIST_INSERT_TAIL(&sah->savtree[SADB_SASTATE_LARVAL], newsav, secasvar, chain); done: @@ -2740,17 +2728,8 @@ * free() SA variable entry. */ static void -key_delsav(sav) - struct secasvar *sav; +key_cleansav(struct secasvar *sav) { - KASSERT(sav != NULL, ("key_delsav: null sav")); - KASSERT(sav->refcnt == 0, - ("key_delsav: reference count %u > 0", sav->refcnt)); - - /* remove from SA header */ - if (__LIST_CHAINED(sav)) - LIST_REMOVE(sav, chain); - /* * Cleanup xform state. Note that zeroize'ing causes the * keys to be cleared; otherwise we must do it ourself. @@ -2765,42 +2744,57 @@ bzero(_KEYBUF(sav->key_enc), _KEYLEN(sav->key_enc)); } if (sav->key_auth != NULL) { - KFREE(sav->key_auth); + free(sav->key_auth, M_IPSEC_MISC); sav->key_auth = NULL; } if (sav->key_enc != NULL) { - KFREE(sav->key_enc); + free(sav->key_enc, M_IPSEC_MISC); sav->key_enc = NULL; } if (sav->sched) { bzero(sav->sched, sav->schedlen); - KFREE(sav->sched); + free(sav->sched, M_IPSEC_MISC); sav->sched = NULL; } if (sav->replay != NULL) { - KFREE(sav->replay); + free(sav->replay, M_IPSEC_MISC); sav->replay = NULL; } if (sav->lft_c != NULL) { - KFREE(sav->lft_c); + free(sav->lft_c, M_IPSEC_MISC); sav->lft_c = NULL; } if (sav->lft_h != NULL) { - KFREE(sav->lft_h); + free(sav->lft_h, M_IPSEC_MISC); sav->lft_h = NULL; } if (sav->lft_s != NULL) { - KFREE(sav->lft_s); + free(sav->lft_s, M_IPSEC_MISC); sav->lft_s = NULL; } if (sav->iv != NULL) { - KFREE(sav->iv); + free(sav->iv, M_IPSEC_MISC); sav->iv = NULL; } +} - KFREE(sav); +/* + * free() SA variable entry. + */ +static void +key_delsav(sav) + struct secasvar *sav; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 23 12:04:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E73837B404; Wed, 23 Jul 2003 12: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 E471D37B401 for ; Wed, 23 Jul 2003 12:03:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43BA843F75 for ; Wed, 23 Jul 2003 12:03:59 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6NJ3x0U020893 for ; Wed, 23 Jul 2003 12:03:59 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6NJ3wnG020890 for perforce@freebsd.org; Wed, 23 Jul 2003 12:03:58 -0700 (PDT) Date: Wed, 23 Jul 2003 12:03:58 -0700 (PDT) Message-Id: <200307231903.h6NJ3wnG020890@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 34889 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, 23 Jul 2003 19:04:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=34889 Change 34889 by sam@sam_ebb on 2003/07/23 12:03:44 lock and remove giant Affected files ... .. //depot/projects/netperf/sys/dev/em/if_em.c#2 edit .. //depot/projects/netperf/sys/dev/em/if_em.h#2 edit Differences ... ==== //depot/projects/netperf/sys/dev/em/if_em.c#2 (text+ko) ==== @@ -113,6 +113,7 @@ static int em_ioctl(struct ifnet *, u_long, caddr_t); static void em_watchdog(struct ifnet *); static void em_init(void *); +static void em_init_locked(struct adapter *); static void em_stop(void *); static void em_media_status(struct ifnet *, struct ifmediareq *); static int em_media_change(struct ifnet *); @@ -252,23 +253,22 @@ em_attach(device_t dev) { struct adapter * adapter; - int s; int tsize, rsize; int error = 0; INIT_DEBUGOUT("em_attach: begin"); - s = splimp(); /* Allocate, clear, and link in our adapter structure */ if (!(adapter = device_get_softc(dev))) { printf("em: adapter structure allocation failed\n"); - splx(s); return(ENOMEM); } bzero(adapter, sizeof(struct adapter )); adapter->dev = dev; adapter->osdep.dev = dev; adapter->unit = device_get_unit(dev); + mtx_init(&adapter->mtx, device_get_nameunit(dev), + MTX_NETWORK_LOCK, MTX_DEF); if (em_adapter_list != NULL) em_adapter_list->prev = adapter; @@ -300,8 +300,8 @@ (void *)adapter, 0, em_sysctl_stats, "I", "Statistics"); - callout_handle_init(&adapter->timer_handle); - callout_handle_init(&adapter->tx_fifo_timer_handle); + callout_init(&adapter->timer, CALLOUT_MPSAFE); + callout_init(&adapter->tx_fifo_timer, CALLOUT_MPSAFE); /* Determine hardware revision */ em_identify_hardware(adapter); @@ -429,7 +429,6 @@ printf("em%d: Speed:N/A Duplex:N/A\n", adapter->unit); INIT_DEBUGOUT("em_attach: end"); - splx(s); return(0); err_mac_addr: @@ -442,7 +441,6 @@ em_free_pci_resources(adapter); sysctl_ctx_free(&adapter->sysctl_ctx); err_sysctl: - splx(s); return(error); } @@ -462,13 +460,13 @@ { struct adapter * adapter = device_get_softc(dev); struct ifnet *ifp = &adapter->interface_data.ac_if; - int s; INIT_DEBUGOUT("em_detach: begin"); - s = splimp(); + EM_LOCK(adapter); em_stop(adapter); em_phy_hw_reset(&adapter->hw); + EM_UNLOCK(adapter); #if __FreeBSD_version < 500000 ether_ifdetach(&adapter->interface_data.ac_if, ETHER_BPF_SUPPORTED); #else @@ -499,7 +497,6 @@ ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); ifp->if_timer = 0; - splx(s); return(0); } @@ -513,7 +510,9 @@ em_shutdown(device_t dev) { struct adapter *adapter = device_get_softc(dev); + EM_LOCK(adapter); em_stop(adapter); + EM_UNLOCK(adapter); return(0); } @@ -529,16 +528,16 @@ **********************************************************************/ static void -em_start(struct ifnet *ifp) +em_start_locked(struct ifnet *ifp) { - int s; struct mbuf *m_head; struct adapter *adapter = ifp->if_softc; + mtx_assert(&adapter->mtx, MA_OWNED); + if (!adapter->link_active) return; - s = splimp(); while (ifp->if_snd.ifq_head != NULL) { IF_DEQUEUE(&ifp->if_snd, m_head); @@ -563,10 +562,20 @@ ifp->if_timer = EM_TX_TIMEOUT; } - splx(s); return; } +static void +em_start(struct ifnet *ifp) +{ + struct adapter *adapter = ifp->if_softc; + + EM_LOCK(adapter); + em_start_locked(ifp); + EM_UNLOCK(adapter); + return; +} + /********************************************************************* * Ioctl entry point * @@ -579,11 +588,10 @@ static int em_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { - int s, mask, error = 0; + int mask, error = 0; struct ifreq *ifr = (struct ifreq *) data; struct adapter * adapter = ifp->if_softc; - s = splimp(); switch (command) { case SIOCSIFADDR: case SIOCGIFADDR: @@ -595,17 +603,20 @@ if (ifr->ifr_mtu > MAX_JUMBO_FRAME_SIZE - ETHER_HDR_LEN) { error = EINVAL; } else { + EM_LOCK(adapter); ifp->if_mtu = ifr->ifr_mtu; adapter->hw.max_frame_size = ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; - em_init(adapter); + em_init_locked(adapter); + EM_UNLOCK(adapter); } break; case SIOCSIFFLAGS: IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFFLAGS (Set Interface Flags)"); + EM_LOCK(adapter); if (ifp->if_flags & IFF_UP) { if (!(ifp->if_flags & IFF_RUNNING)) - em_init(adapter); + em_init_locked(adapter); em_disable_promisc(adapter); em_set_promisc(adapter); @@ -614,11 +625,13 @@ em_stop(adapter); } } + EM_UNLOCK(adapter); break; case SIOCADDMULTI: case SIOCDELMULTI: IOCTL_DEBUGOUT("ioctl rcv'd: SIOC(ADD|DEL)MULTI"); if (ifp->if_flags & IFF_RUNNING) { + EM_LOCK(adapter); em_disable_intr(adapter); em_set_multi(adapter); if (adapter->hw.mac_type == em_82542_rev2_0) { @@ -628,6 +641,7 @@ if (!(ifp->if_ipending & IFF_POLLING)) #endif em_enable_intr(adapter); + EM_UNLOCK(adapter); } break; case SIOCSIFMEDIA: @@ -652,7 +666,6 @@ error = EINVAL; } - splx(s); return(error); } @@ -700,15 +713,13 @@ **********************************************************************/ static void -em_init(void *arg) +em_init_locked(struct adapter * adapter) { - int s; struct ifnet *ifp; - struct adapter * adapter = arg; INIT_DEBUGOUT("em_init: begin"); - s = splimp(); + mtx_assert(&adapter->mtx, MA_OWNED); em_stop(adapter); @@ -716,7 +727,6 @@ if (em_hardware_init(adapter)) { printf("em%d: Unable to initialize the hardware\n", adapter->unit); - splx(s); return; } @@ -727,7 +737,6 @@ printf("em%d: Could not setup transmit structures\n", adapter->unit); em_stop(adapter); - splx(s); return; } em_initialize_transmit_unit(adapter); @@ -740,7 +749,6 @@ printf("em%d: Could not setup receive structures\n", adapter->unit); em_stop(adapter); - splx(s); return; } em_initialize_receive_unit(adapter); @@ -756,7 +764,7 @@ ifp->if_hwassist = 0; } - adapter->timer_handle = timeout(em_local_timer, adapter, 2*hz); + callout_reset(&adapter->timer, 2*hz, em_local_timer, adapter); em_clear_hw_cntrs(&adapter->hw); #ifdef DEVICE_POLLING /* @@ -769,7 +777,17 @@ #endif /* DEVICE_POLLING */ em_enable_intr(adapter); - splx(s); + return; +} + +static void +em_init(void *arg) +{ + struct adapter * adapter = arg; + + EM_LOCK(adapter); + em_init_locked(adapter); + EM_UNLOCK(adapter); return; } @@ -778,11 +796,13 @@ static poll_handler_t em_poll; static void -em_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) +em_poll_locked(struct ifnet *ifp, enum poll_cmd cmd, int count) { struct adapter *adapter = ifp->if_softc; u_int32_t reg_icr; + mtx_assert(&adapter->mtx, MA_OWNED); + if (cmd == POLL_DEREGISTER) { /* final call, enable interrupts */ em_enable_intr(adapter); return; @@ -790,11 +810,11 @@ if (cmd == POLL_AND_CHECK_STATUS) { reg_icr = E1000_READ_REG(&adapter->hw, ICR); if (reg_icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) { - untimeout(em_local_timer, adapter, adapter->timer_handle); + callout_stop(&adapter->timer); adapter->hw.get_link_status = 1; em_check_for_link(&adapter->hw); em_print_link_status(adapter); - adapter->timer_handle = timeout(em_local_timer, adapter, 2*hz); + callout_reset(&adapter->timer, 2*hz, em_local_timer, adapter); } } if (ifp->if_flags & IFF_RUNNING) { @@ -803,7 +823,17 @@ } if (ifp->if_flags & IFF_RUNNING && ifp->if_snd.ifq_head != NULL) - em_start(ifp); + em_start_locked(ifp); +} + +static void +em_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) +{ + struct adapter *adapter = ifp->if_softc; + + EM_LOCK(adapter); + em_poll_locked(ifp, cmd, count); + EM_UNLOCK(adapter); } #endif /* DEVICE_POLLING */ @@ -820,33 +850,37 @@ struct ifnet *ifp; struct adapter *adapter = arg; + EM_LOCK(adapter); + ifp = &adapter->interface_data.ac_if; #ifdef DEVICE_POLLING - if (ifp->if_ipending & IFF_POLLING) + if (ifp->if_ipending & IFF_POLLING) { + EM_UNLOCK(adapter); return; + } if (ether_poll_register(em_poll, ifp)) { em_disable_intr(adapter); em_poll(ifp, 0, 1); + EM_UNLOCK(adapter); return; } #endif /* DEVICE_POLLING */ reg_icr = E1000_READ_REG(&adapter->hw, ICR); if (!reg_icr) { + EM_UNLOCK(adapter); return; } /* Link status change */ if (reg_icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) { - untimeout(em_local_timer, adapter, - adapter->timer_handle); + callout_stop(&adapter->timer); adapter->hw.get_link_status = 1; em_check_for_link(&adapter->hw); em_print_link_status(adapter); - adapter->timer_handle = - timeout(em_local_timer, adapter, 2*hz); + callout_reset(&adapter->timer, 2*hz, em_local_timer, adapter); } while (loop_cnt > 0) { @@ -858,8 +892,9 @@ } if (ifp->if_flags & IFF_RUNNING && ifp->if_snd.ifq_head != NULL) - em_start(ifp); + em_start_locked(ifp); + EM_UNLOCK(adapter); return; } @@ -1150,7 +1185,6 @@ static void em_82547_move_tail(void *arg) { - int s; struct adapter *adapter = arg; uint16_t hw_tdt; uint16_t sw_tdt; @@ -1158,7 +1192,7 @@ uint16_t length = 0; boolean_t eop = 0; - s = splimp(); + EM_LOCK(adapter); hw_tdt = E1000_READ_REG(&adapter->hw, TDT); sw_tdt = adapter->next_avail_tx_desc; @@ -1172,20 +1206,16 @@ if(eop) { if (em_82547_fifo_workaround(adapter, length)) { adapter->tx_fifo_wrk++; - adapter->tx_fifo_timer_handle = - timeout(em_82547_move_tail, - adapter, 1); - splx(s); - return; + callout_reset(&adapter->tx_fifo_timer, 1, + em_82547_move_tail, adapter); + break; } - else { - E1000_WRITE_REG(&adapter->hw, TDT, hw_tdt); - em_82547_update_fifo_head(adapter, length); - length = 0; - } + E1000_WRITE_REG(&adapter->hw, TDT, hw_tdt); + em_82547_update_fifo_head(adapter, length); + length = 0; } } - splx(s); + EM_UNLOCK(adapter); return; } @@ -1374,12 +1404,11 @@ static void em_local_timer(void *arg) { - int s; struct ifnet *ifp; struct adapter * adapter = arg; ifp = &adapter->interface_data.ac_if; - s = splimp(); + EM_LOCK(adapter); em_check_for_link(&adapter->hw); em_print_link_status(adapter); @@ -1389,9 +1418,9 @@ } em_smartspeed(adapter); - adapter->timer_handle = timeout(em_local_timer, adapter, 2*hz); + callout_reset(&adapter->timer, 2*hz, em_local_timer, adapter); - splx(s); + EM_UNLOCK(adapter); return; } @@ -1437,12 +1466,13 @@ struct adapter * adapter = arg; ifp = &adapter->interface_data.ac_if; + mtx_assert(&adapter->mtx, MA_OWNED); + INIT_DEBUGOUT("em_stop: begin\n"); em_disable_intr(adapter); em_reset_hw(&adapter->hw); - untimeout(em_local_timer, adapter, adapter->timer_handle); - untimeout(em_82547_move_tail, adapter, - adapter->tx_fifo_timer_handle); + callout_stop(&adapter->timer); + callout_stop(&adapter->tx_fifo_timer); em_free_transmit_structures(adapter); em_free_receive_structures(adapter); @@ -1545,7 +1575,8 @@ adapter->unit); return(ENXIO); } - if (bus_setup_intr(dev, adapter->res_interrupt, INTR_TYPE_NET, + if (bus_setup_intr(dev, adapter->res_interrupt, + INTR_TYPE_NET | INTR_MPSAFE, (void (*)(void *)) em_intr, adapter, &adapter->int_handler_tag)) { printf("em%d: Error registering interrupt handler!\n", @@ -2136,16 +2167,16 @@ static void em_clean_transmit_interrupts(struct adapter * adapter) { - int s; int i, num_avail; struct em_buffer *tx_buffer; struct em_tx_desc *tx_desc; struct ifnet *ifp = &adapter->interface_data.ac_if; + mtx_assert(&adapter->mtx, MA_OWNED); + if (adapter->num_tx_desc_avail == adapter->num_tx_desc) return; - s = splimp(); #ifdef DBG_STATS adapter->clean_tx_interrupts++; #endif @@ -2194,7 +2225,6 @@ ifp->if_timer = EM_TX_TIMEOUT; } adapter->num_tx_desc_avail = num_avail; - splx(s); return; } @@ -2495,6 +2525,8 @@ /* Pointer to the receive descriptor being examined. */ struct em_rx_desc *current_desc; + mtx_assert(&adapter->mtx, MA_OWNED); + ifp = &adapter->interface_data.ac_if; i = adapter->next_rx_desc_to_check; current_desc = &adapter->rx_desc_base[i]; @@ -2599,8 +2631,11 @@ E1000_RXD_SPC_VLAN_MASK), adapter->fmp = NULL); - if (adapter->fmp != NULL) + if (adapter->fmp != NULL) { + EM_UNLOCK(adapter); (*ifp->if_input)(ifp, adapter->fmp); + EM_LOCK(adapter); + } #endif adapter->fmp = NULL; adapter->lmp = NULL; ==== //depot/projects/netperf/sys/dev/em/if_em.h#2 (text+ko) ==== @@ -309,10 +309,11 @@ struct resource *res_interrupt; void *int_handler_tag; struct ifmedia media; - struct callout_handle timer_handle; - struct callout_handle tx_fifo_timer_handle; + struct callout timer; + struct callout tx_fifo_timer; int io_rid; u_int8_t unit; + struct mtx mtx; /* Info about the board itself */ u_int32_t part_num; @@ -390,4 +391,7 @@ struct em_hw_stats stats; }; +#define EM_LOCK(_sc) mtx_lock(&(_sc)->mtx) +#define EM_UNLOCK(_sc) mtx_unlock(&(_sc)->mtx) + #endif /* _EM_H_DEFINED_ */ From owner-p4-projects@FreeBSD.ORG Wed Jul 23 12:05:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51A1237B405; Wed, 23 Jul 2003 12:05: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 F114237B404 for ; Wed, 23 Jul 2003 12:05:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34CD643FB1 for ; Wed, 23 Jul 2003 12:05:01 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6NJ510U020965 for ; Wed, 23 Jul 2003 12:05:01 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6NJ50AM020952 for perforce@freebsd.org; Wed, 23 Jul 2003 12:05:00 -0700 (PDT) Date: Wed, 23 Jul 2003 12:05:00 -0700 (PDT) Message-Id: <200307231905.h6NJ50AM020952@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 34890 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, 23 Jul 2003 19:05:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=34890 Change 34890 by sam@sam_ebb on 2003/07/23 12:04:21 mark MPSAFE Affected files ... .. //depot/projects/netperf/sys/dev/fxp/if_fxp.c#2 edit Differences ... ==== //depot/projects/netperf/sys/dev/fxp/if_fxp.c#2 (text+ko) ==== @@ -811,11 +811,8 @@ /* * Hook our interrupt after all initialization is complete. - * XXX This driver has been tested with the INTR_MPSAFFE flag set - * however, ifp and its functions are not fully locked so MPSAFE - * should not be used unless you can handle potential data loss. */ - error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET /*|INTR_MPSAFE*/, + error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET | INTR_MPSAFE, fxp_intr, sc, &sc->ih); if (error) { device_printf(dev, "could not setup irq\n"); From owner-p4-projects@FreeBSD.ORG Wed Jul 23 15:58:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CE2F37B404; Wed, 23 Jul 2003 15:58: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 F344337B401 for ; Wed, 23 Jul 2003 15:58:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A93C143F75 for ; Wed, 23 Jul 2003 15:58:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6NMwp0U039312 for ; Wed, 23 Jul 2003 15:58:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6NMwouP039309 for perforce@freebsd.org; Wed, 23 Jul 2003 15:58:50 -0700 (PDT) Date: Wed, 23 Jul 2003 15:58:50 -0700 (PDT) Message-Id: <200307232258.h6NMwouP039309@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 34902 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, 23 Jul 2003 22:58:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=34902 Change 34902 by marcel@marcel_nfs on 2003/07/23 15:58:36 IFC @34901 Affected files ... .. //depot/projects/ia64/UPDATING#45 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_types.h#12 integrate .. //depot/projects/ia64/etc/defaults/pccard.conf#22 integrate .. //depot/projects/ia64/lib/libc/amd64/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/Makefile.inc#5 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/fpgetmask.c#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/fpgetprec.c#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/fpgetround.c#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/fpgetsticky.c#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/fpsetmask.c#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/fpsetprec.c#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/fpsetround.c#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/fpsetsticky.c#1 branch .. //depot/projects/ia64/lib/libc/sys/connect.2#5 integrate .. //depot/projects/ia64/lib/libfetch/Makefile#15 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_radius/pam_radius.c#10 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#11 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#15 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_detach.c#5 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#26 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_mutex.c#8 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#17 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_resume_np.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#18 integrate .. //depot/projects/ia64/lib/msun/Makefile#6 integrate .. //depot/projects/ia64/lib/msun/src/e_acos.c#3 integrate .. //depot/projects/ia64/lib/msun/src/e_asin.c#3 integrate .. //depot/projects/ia64/lib/msun/src/e_atan2.c#3 integrate .. //depot/projects/ia64/lib/msun/src/e_exp.c#3 integrate .. //depot/projects/ia64/lib/msun/src/e_fmod.c#3 integrate .. //depot/projects/ia64/lib/msun/src/e_log.c#3 integrate .. //depot/projects/ia64/lib/msun/src/e_log10.c#3 integrate .. //depot/projects/ia64/lib/msun/src/e_remainder.c#3 integrate .. //depot/projects/ia64/lib/msun/src/e_scalb.c#3 integrate .. //depot/projects/ia64/lib/msun/src/e_sqrt.c#3 integrate .. //depot/projects/ia64/lib/msun/src/get_hw_float.c#3 delete .. //depot/projects/ia64/lib/msun/src/math_private.h#7 integrate .. //depot/projects/ia64/lib/msun/src/s_atan.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_ceil.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_copysign.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_copysignf.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_cos.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_finite.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_floor.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_ilogb.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_logb.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_rint.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_scalbn.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_significand.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_sin.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_tan.c#3 integrate .. //depot/projects/ia64/release/Makefile#58 integrate .. //depot/projects/ia64/release/amd64/dokern.sh#2 delete .. //depot/projects/ia64/release/amd64/fixit_crunch.conf#2 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#107 integrate .. //depot/projects/ia64/release/i386/mkisoimages.sh#4 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#25 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#24 integrate .. //depot/projects/ia64/sbin/ping6/ping6.c#9 integrate .. //depot/projects/ia64/share/man/man4/Makefile#54 integrate .. //depot/projects/ia64/share/man/man4/ath_hal.4#3 integrate .. //depot/projects/ia64/share/man/man4/harp.4#1 branch .. //depot/projects/ia64/share/man/man4/man4.i386/npx.4#4 integrate .. //depot/projects/ia64/share/man/man4/patm.4#2 integrate .. //depot/projects/ia64/share/man/man4/safe.4#1 branch .. //depot/projects/ia64/share/man/man7/Makefile#9 integrate .. //depot/projects/ia64/share/man/man7/release.7#22 integrate .. //depot/projects/ia64/share/man/man7/rescue.7#1 branch .. //depot/projects/ia64/share/man/man9/Makefile#29 integrate .. //depot/projects/ia64/share/man/man9/zone.9#10 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC#24 integrate .. //depot/projects/ia64/sys/alpha/conf/NOTES#5 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/ia64/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/ia64/sys/amd64/include/npx.h#3 integrate .. //depot/projects/ia64/sys/conf/NOTES#58 integrate .. //depot/projects/ia64/sys/conf/files#90 integrate .. //depot/projects/ia64/sys/conf/files.alpha#20 integrate .. //depot/projects/ia64/sys/conf/files.i386#39 integrate .. //depot/projects/ia64/sys/conf/files.pc98#33 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#35 integrate .. //depot/projects/ia64/sys/conf/kern.pre.mk#20 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#23 integrate .. //depot/projects/ia64/sys/conf/newvers.sh#7 integrate .. //depot/projects/ia64/sys/conf/options#58 integrate .. //depot/projects/ia64/sys/conf/options.i386#20 integrate .. //depot/projects/ia64/sys/conf/options.pc98#21 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#39 integrate .. //depot/projects/ia64/sys/dev/harp/if_harp.c#1 branch .. //depot/projects/ia64/sys/dev/ie/if_ie.c#7 integrate .. //depot/projects/ia64/sys/dev/lnc/if_lnc.c#8 integrate .. //depot/projects/ia64/sys/dev/patm/if_patm_tx.c#2 integrate .. //depot/projects/ia64/sys/dev/rp/rp.c#9 integrate .. //depot/projects/ia64/sys/dev/safe/safe.c#1 branch .. //depot/projects/ia64/sys/dev/safe/safereg.h#1 branch .. //depot/projects/ia64/sys/dev/safe/safevar.h#1 branch .. //depot/projects/ia64/sys/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/ia64/sys/dev/syscons/fire/fire_saver.c#3 integrate .. //depot/projects/ia64/sys/dev/syscons/logo/logo_saver.c#4 integrate .. //depot/projects/ia64/sys/dev/syscons/warp/warp_saver.c#4 integrate .. //depot/projects/ia64/sys/dev/usb/usb_mem.c#3 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#45 integrate .. //depot/projects/ia64/sys/gnu/i386/fpemul/Changelog#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/README#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/control_w.h#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/div_small.s#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/errors.c#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/exception.h#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/fpu_arith.c#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/fpu_asm.h#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/fpu_aux.c#3 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/fpu_emu.h#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/fpu_entry.c#4 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/fpu_etc.c#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/fpu_proto.h#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/fpu_system.h#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/fpu_trig.c#3 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/get_address.c#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/load_store.c#3 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/math_emu.h#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/poly_2xm1.c#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/poly_atan.c#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/poly_div.s#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/poly_l2.c#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/poly_mul64.s#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/poly_sin.c#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/poly_tan.c#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/polynomial.s#3 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/reg_add_sub.c#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/reg_compare.c#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/reg_constant.c#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/reg_constant.h#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/reg_div.s#3 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/reg_ld_str.c#3 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/reg_mul.c#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/reg_norm.s#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/reg_round.s#3 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/reg_u_add.s#3 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/reg_u_div.s#3 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/reg_u_mul.s#3 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/reg_u_sub.s#3 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/status_w.h#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/version.h#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/wm_shrx.s#2 delete .. //depot/projects/ia64/sys/gnu/i386/fpemul/wm_sqrt.s#3 delete .. //depot/projects/ia64/sys/i386/acpica/acpi_wakeup.c#17 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#43 integrate .. //depot/projects/ia64/sys/i386/i386/math_emu.h#2 delete .. //depot/projects/ia64/sys/i386/i386/math_emulate.c#7 delete .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#26 integrate .. //depot/projects/ia64/sys/i386/i386/mpapic.c#10 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#51 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#34 integrate .. //depot/projects/ia64/sys/i386/include/apic.h#6 integrate .. //depot/projects/ia64/sys/i386/include/asm.h#5 integrate .. //depot/projects/ia64/sys/i386/include/cpufunc.h#14 integrate .. //depot/projects/ia64/sys/i386/include/frame.h#3 integrate .. //depot/projects/ia64/sys/i386/isa/npx.c#17 integrate .. //depot/projects/ia64/sys/i4b/capi/iavc/iavc.h#2 integrate .. //depot/projects/ia64/sys/i4b/capi/iavc/iavc_lli.c#6 integrate .. //depot/projects/ia64/sys/ia64/include/_regset.h#7 integrate .. //depot/projects/ia64/sys/kern/init_main.c#35 integrate .. //depot/projects/ia64/sys/kern/kern_malloc.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/ia64/sys/kern/md5c.c#5 integrate .. //depot/projects/ia64/sys/kern/subr_autoconf.c#4 integrate .. //depot/projects/ia64/sys/kern/subr_mbuf.c#30 integrate .. //depot/projects/ia64/sys/kern/subr_prf.c#28 integrate .. //depot/projects/ia64/sys/kern/tty_subr.c#7 integrate .. //depot/projects/ia64/sys/kern/vfs_cluster.c#24 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#52 integrate .. //depot/projects/ia64/sys/modules/Makefile#57 integrate .. //depot/projects/ia64/sys/modules/fpu/Makefile#3 delete .. //depot/projects/ia64/sys/modules/gnufpu/Makefile#3 delete .. //depot/projects/ia64/sys/modules/harp/Makefile#1 branch .. //depot/projects/ia64/sys/modules/safe/Makefile#1 branch .. //depot/projects/ia64/sys/netatm/atm_cm.c#14 integrate .. //depot/projects/ia64/sys/netatm/atm_device.c#10 integrate .. //depot/projects/ia64/sys/netatm/atm_if.c#12 integrate .. //depot/projects/ia64/sys/netatm/atm_if.h#8 integrate .. //depot/projects/ia64/sys/netatm/atm_socket.c#10 integrate .. //depot/projects/ia64/sys/netatm/atm_subr.c#14 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_if.c#9 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_load.c#6 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_vcm.c#7 integrate .. //depot/projects/ia64/sys/netatm/sigpvc/sigpvc_if.c#6 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_arp.c#8 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_cls.c#8 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_if.c#6 integrate .. //depot/projects/ia64/sys/netatm/uni/sscf_uni.c#7 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop.c#7 integrate .. //depot/projects/ia64/sys/netatm/uni/uniarp.c#8 integrate .. //depot/projects/ia64/sys/netatm/uni/uniarp_cache.c#7 integrate .. //depot/projects/ia64/sys/netatm/uni/uniarp_vcm.c#6 integrate .. //depot/projects/ia64/sys/netatm/uni/uniip.c#9 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_decode.c#9 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_if.c#6 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_subr.c#7 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_vc_state.c#8 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#32 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#34 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#9 integrate .. //depot/projects/ia64/sys/pc98/pc98/pc98gdc.c#6 integrate .. //depot/projects/ia64/sys/pci/if_sis.c#25 integrate .. //depot/projects/ia64/sys/pci/if_sisreg.h#9 integrate .. //depot/projects/ia64/sys/sys/cdefs.h#16 integrate .. //depot/projects/ia64/sys/sys/systm.h#28 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#33 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#62 integrate .. //depot/projects/ia64/tools/tools/crypto/Makefile#5 integrate .. //depot/projects/ia64/tools/tools/crypto/safestats.c#1 branch .. //depot/projects/ia64/tools/tools/tinderbox/Makefile#5 integrate .. //depot/projects/ia64/tools/tools/tinderbox/ada.rc#1 branch .. //depot/projects/ia64/tools/tools/tinderbox/current.rc#1 branch .. //depot/projects/ia64/tools/tools/tinderbox/default.rc#1 branch .. //depot/projects/ia64/tools/tools/tinderbox/dsa.rc#1 branch .. //depot/projects/ia64/tools/tools/tinderbox/dwp.rc#1 branch .. //depot/projects/ia64/tools/tools/tinderbox/releng_4.rc#1 branch .. //depot/projects/ia64/tools/tools/tinderbox/stanley.rc#1 branch .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.1#3 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#15 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tinderbox.1#3 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#35 integrate .. //depot/projects/ia64/usr.bin/fetch/Makefile#8 integrate .. //depot/projects/ia64/usr.bin/getconf/getconf.c#6 integrate .. //depot/projects/ia64/usr.bin/sed/TEST/sed.test#2 integrate .. //depot/projects/ia64/usr.bin/sed/sed.1#8 integrate .. //depot/projects/ia64/usr.sbin/crunch/crunchide/exec_elf32.c#10 integrate .. //depot/projects/ia64/usr.sbin/traceroute6/traceroute6.c#4 integrate Differences ... ==== //depot/projects/ia64/UPDATING#45 (text+ko) ==== @@ -17,6 +17,18 @@ developers choose to disable these features on build machines to maximize performance. +20030722: + FPU-less support has been removed from FreeBSD. Chances are you won't + notice. 386+387 support should still work after this change, but + it is now a minimum requirement for the i386 port that you have real + FPU hardware. + +20030714: + Some people are having problems with changes related to /rescue. + If you are building -j N, you will need to define NO_RESCUE. Others + will need to define it if /rescue has issues with their environment. + People should report those issues to current@. + 20030711: gcc was upgraded to 3.3. You are advised to not build -DNOCLEAN across this point. Further, it might be a good idea to remove @@ -1314,4 +1326,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.258 2003/07/12 01:16:54 ceri Exp $ +$FreeBSD: src/UPDATING,v 1.259 2003/07/22 11:08:41 imp Exp $ ==== //depot/projects/ia64/contrib/openpam/include/security/pam_types.h#12 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_types.h#12 $ + * $P4: //depot/projects/openpam/include/security/pam_types.h#13 $ */ #ifndef _PAM_TYPES_H_INCLUDED @@ -47,22 +47,22 @@ * XSSO 5.1.1 */ struct pam_message { - int msg_style; - const char *msg; + int msg_style; + char *msg; }; struct pam_response { - char *resp; - int resp_retcode; + char *resp; + int resp_retcode; }; /* * XSSO 5.1.2 */ struct pam_conv { - int (*conv)(int, const struct pam_message **, - struct pam_response **, void *); - void *appdata_ptr; + int (*conv)(int, const struct pam_message **, + struct pam_response **, void *); + void *appdata_ptr; }; /* @@ -75,9 +75,9 @@ * Solaris 9 */ typedef struct pam_repository { - char *type; - void *scope; - size_t scope_len; + char *type; + void *scope; + size_t scope_len; } pam_repository_t; #ifdef __cplusplus ==== //depot/projects/ia64/etc/defaults/pccard.conf#22 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.261 2003/07/19 05:40:06 imp Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.262 2003/07/22 21:23:01 dds Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -609,7 +609,7 @@ # card version string. They should be distinguished by # other info. (such as additional information or OEM-ID/product-ID). -# Note: There are several revisions of the cardon the market. +# Note: There are several revisions of the card on the market. # Type A needs no "ether" line. # Type B needs "ether 0x110" line. # Type C needs "ether 0xff0" line. @@ -952,6 +952,13 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Billionton LM5LT-10N +# Works as an Ethernet card +card "PCMCIA 10+56Combo" "LM5LT-10N" + config auto "ed" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # EXPsys PCMCIA Ethernet Combo, Relia PCMCIA Ethernet card "PCMCIA LAN" "Ethernet" config auto "ed" ? ==== //depot/projects/ia64/lib/libc/amd64/gen/Makefile.inc#5 (text+ko) ==== @@ -1,7 +1,9 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.22 2003/07/19 04:41:08 deischen Exp $ +# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.23 2003/07/22 06:46:17 peter Exp $ SRCS+= _setjmp.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ frexp.c infinity.c isinf.c ldexp.c \ - makecontext.c signalcontext.c + makecontext.c signalcontext.c \ + fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \ + fpgetround.c fpsetround.c fpgetsticky.c fpsetsticky.c ==== //depot/projects/ia64/lib/libc/sys/connect.2#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)connect.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/connect.2,v 1.23 2003/04/01 20:25:46 ceri Exp $ +.\" $FreeBSD: src/lib/libc/sys/connect.2,v 1.24 2003/07/23 22:00:08 dds Exp $ .\" .Dd June 4, 1993 .Dt CONNECT 2 @@ -121,6 +121,12 @@ The socket is non-blocking and a previous connection attempt has not yet been completed. +.It Bq Er EACCES +An attempt is made to connect to a broadcast address (obtained through the +.Dv INADDR_BROADCAST +constant or the +.Dv INADDR_NONE +return value) through a socket that does not provide broadcast functionality. .El .Pp The following errors are specific to connecting names in the UNIX domain. ==== //depot/projects/ia64/lib/libfetch/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libfetch/Makefile,v 1.41 2003/05/19 15:51:59 des Exp $ +# $FreeBSD: src/lib/libfetch/Makefile,v 1.42 2003/07/22 13:54:31 ru Exp $ LIB= fetch CFLAGS+= -I. @@ -10,6 +10,7 @@ CLEANFILES= ftperr.h httperr.h .if !defined(NOCRYPT) && !defined(NO_OPENSSL) +DISTRIBUTION= crypto CFLAGS+= -DWITH_SSL DPADD= ${LIBSSL} ${LIBCRYPTO} LDADD= -lssl -lcrypto ==== //depot/projects/ia64/lib/libpam/modules/pam_radius/pam_radius.c#10 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.16 2003/07/15 14:36:36 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.17 2003/07/21 19:56:28 des Exp $"); #include #include @@ -203,7 +203,7 @@ free(resp[num_msgs-1].resp); free(resp); while (num_msgs > 0) - free(__DECONST(char *, msgs[--num_msgs].msg)); + free(msgs[--num_msgs].msg); return (PAM_SUCCESS); } ==== //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#11 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.25 2003/07/17 23:02:29 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.26 2003/07/23 02:11:07 deischen Exp $ */ #include #include @@ -20,6 +20,7 @@ { struct pthread *curthread = _get_curthread(); struct pthread *joinee = NULL; + struct kse_mailbox *kmbx = NULL; int ret; if ((ret = _thr_ref_add(curthread, pthread, /*include dead*/0)) == 0) { @@ -65,7 +66,7 @@ /* Interrupt and resume: */ pthread->interrupted = 1; pthread->cancelflags |= THR_CANCELLING; - _thr_setrunnable_unlocked(pthread); + kmbx = _thr_setrunnable_unlocked(pthread); break; case PS_JOIN: @@ -73,7 +74,7 @@ joinee = pthread->join_status.thread; pthread->join_status.thread = NULL; pthread->cancelflags |= THR_CANCELLING; - _thr_setrunnable_unlocked(pthread); + kmbx = _thr_setrunnable_unlocked(pthread); if ((joinee != NULL) && (pthread->kseg == joinee->kseg)) { /* Remove the joiner from the joinee. */ @@ -97,7 +98,7 @@ */ pthread->interrupted = 1; pthread->cancelflags |= THR_CANCEL_NEEDED; - _thr_setrunnable_unlocked(pthread); + kmbx = _thr_setrunnable_unlocked(pthread); pthread->continuation = finish_cancellation; break; @@ -120,6 +121,8 @@ */ THR_SCHED_UNLOCK(curthread, pthread); _thr_ref_delete(curthread, pthread); + if (kmbx != NULL) + kse_wakeup(kmbx); if ((joinee != NULL) && (_thr_ref_add(curthread, joinee, /* include dead */1) == 0)) { ==== //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#15 (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/libpthread/thread/thr_cond.c,v 1.47 2003/07/18 02:46:30 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.48 2003/07/23 02:11:07 deischen Exp $ */ #include #include @@ -584,6 +584,7 @@ { struct pthread *curthread = _get_curthread(); struct pthread *pthread; + struct kse_mailbox *kmbx; int rval = 0; THR_ASSERT(curthread->locklevel == 0, @@ -619,8 +620,10 @@ (pthread->active_priority > curthread->active_priority)) curthread->critical_yield = 1; - _thr_setrunnable_unlocked(pthread); + kmbx = _thr_setrunnable_unlocked(pthread); THR_SCHED_UNLOCK(curthread, pthread); + if (kmbx != NULL) + kse_wakeup(kmbx); } /* Check for no more waiters: */ if (TAILQ_FIRST(&(*cond)->c_queue) == NULL) @@ -649,6 +652,7 @@ { struct pthread *curthread = _get_curthread(); struct pthread *pthread; + struct kse_mailbox *kmbx; int rval = 0; THR_ASSERT(curthread->locklevel == 0, @@ -682,8 +686,10 @@ (pthread->active_priority > curthread->active_priority)) curthread->critical_yield = 1; - _thr_setrunnable_unlocked(pthread); + kmbx = _thr_setrunnable_unlocked(pthread); THR_SCHED_UNLOCK(curthread, pthread); + if (kmbx != NULL) + kse_wakeup(kmbx); } /* There are no more waiting threads: */ ==== //depot/projects/ia64/lib/libpthread/thread/thr_detach.c#5 (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/libpthread/thread/thr_detach.c,v 1.22 2003/05/24 02:29:25 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_detach.c,v 1.23 2003/07/23 02:11:07 deischen Exp $ */ #include #include @@ -43,6 +43,7 @@ _pthread_detach(pthread_t pthread) { struct pthread *curthread = _get_curthread(); + struct kse_mailbox *kmbx = NULL; struct pthread *joiner; int rval = 0; @@ -83,12 +84,11 @@ joiner->join_status.ret = NULL; joiner->join_status.thread = NULL; - _thr_setrunnable_unlocked(joiner); + kmbx = _thr_setrunnable_unlocked(joiner); } joiner = NULL; } THR_SCHED_UNLOCK(curthread, pthread); - /* See if there is a thread waiting in pthread_join(): */ if ((joiner != NULL) && (_thr_ref_add(curthread, joiner, 0) == 0)) { @@ -102,12 +102,14 @@ joiner->join_status.ret = NULL; joiner->join_status.thread = NULL; - _thr_setrunnable_unlocked(joiner); + kmbx = _thr_setrunnable_unlocked(joiner); } THR_SCHED_UNLOCK(curthread, joiner); _thr_ref_delete(curthread, joiner); } _thr_ref_delete(curthread, pthread); + if (kmbx != NULL) + kse_wakeup(kmbx); } /* Return the completion status: */ ==== //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#26 (text+ko) ==== @@ -33,7 +33,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.79 2003/07/18 02:46:55 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.80 2003/07/23 02:11:07 deischen Exp $"); #include #include @@ -142,7 +142,7 @@ static void kseg_reinit(struct kse_group *kseg); static void kse_waitq_insert(struct pthread *thread); static void kse_wakeup_multi(struct kse *curkse); -static void kse_wakeup_one(struct pthread *thread); +static struct kse_mailbox *kse_wakeup_one(struct pthread *thread); static void thr_cleanup(struct kse *kse, struct pthread *curthread); static void thr_link(struct pthread *thread); static void thr_resume_wrapper(int sig, siginfo_t *, ucontext_t *); @@ -341,7 +341,7 @@ #else if (__isthreaded) _thr_signal_deinit(); - _ksd_readandclear_tmbx(); + _ksd_set_tmbx(NULL); __isthreaded = 0; active_threads = 0; #endif @@ -505,10 +505,9 @@ struct pthread *curthread = (struct pthread *)lu->lu_private; do { - THR_SCHED_LOCK(curthread, curthread); + THR_LOCK_SWITCH(curthread); THR_SET_STATE(curthread, PS_LOCKWAIT); - THR_SCHED_UNLOCK(curthread, curthread); - _thr_sched_switch(curthread); + _thr_sched_switch_unlocked(curthread); } while (!_LCK_GRANTED(lu)); } @@ -517,14 +516,17 @@ { struct pthread *thread; struct pthread *curthread; + struct kse_mailbox *kmbx; curthread = _get_curthread(); thread = (struct pthread *)_LCK_GET_PRIVATE(lu); THR_SCHED_LOCK(curthread, thread); _lock_grant(lock, lu); - _thr_setrunnable_unlocked(thread); + kmbx = _thr_setrunnable_unlocked(thread); THR_SCHED_UNLOCK(curthread, thread); + if (kmbx != NULL) + kse_wakeup(kmbx); } kse_critical_t @@ -532,7 +534,8 @@ { kse_critical_t crit; - crit = _ksd_readandclear_tmbx(); + crit = _ksd_get_tmbx(); + _ksd_set_tmbx(NULL); return (crit); } @@ -841,8 +844,8 @@ if (SIGISMEMBER(curthread->sigmask, i)) continue; if (SIGISMEMBER(curthread->sigpend, i)) - _thr_sig_add(curthread, i, - &curthread->siginfo[i-1]); + (void)_thr_sig_add(curthread, i, + &curthread->siginfo[i-1]); } __sys_sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); @@ -1142,6 +1145,7 @@ thr_cleanup(struct kse *curkse, struct pthread *thread) { struct pthread *joiner; + struct kse_mailbox *kmbx = NULL; int sys_scope; if ((joiner = thread->joiner) != NULL) { @@ -1150,7 +1154,7 @@ if (joiner->join_status.thread == thread) { joiner->join_status.thread = NULL; joiner->join_status.ret = thread->ret; - _thr_setrunnable_unlocked(joiner); + (void)_thr_setrunnable_unlocked(joiner); } } else { KSE_SCHED_UNLOCK(curkse, curkse->k_kseg); @@ -1160,10 +1164,12 @@ if (joiner->join_status.thread == thread) { joiner->join_status.thread = NULL; joiner->join_status.ret = thread->ret; - _thr_setrunnable_unlocked(joiner); + kmbx = _thr_setrunnable_unlocked(joiner); } KSE_SCHED_UNLOCK(curkse, joiner->kseg); _thr_ref_delete(thread, joiner); + if (kmbx != NULL) + kse_wakeup(kmbx); } KSE_SCHED_LOCK(curkse, curkse->k_kseg); } @@ -1436,7 +1442,8 @@ if (SIGISMEMBER(thread->sigmask, sig)) SIGADDSET(thread->sigpend, sig); else - _thr_sig_add(thread, sig, &thread->tmbx.tm_syncsig); + (void)_thr_sig_add(thread, sig, + &thread->tmbx.tm_syncsig); thread->tmbx.tm_syncsig.si_signo = 0; } completed = completed->tm_next; @@ -1653,10 +1660,11 @@ if (SIGISMEMBER(thread->sigmask, i)) continue; if (SIGISMEMBER(thread->sigpend, i)) - _thr_sig_add(thread, i, &thread->siginfo[i-1]); + (void)_thr_sig_add(thread, i, + &thread->siginfo[i-1]); else if (SIGISMEMBER(_thr_proc_sigpending, i) && _thr_getprocsig_unlocked(i, &siginfo)) { - _thr_sig_add(thread, i, &siginfo); + (void)_thr_sig_add(thread, i, &siginfo); } } KSE_LOCK_RELEASE(kse, &_thread_signal_lock); @@ -1823,23 +1831,31 @@ _thr_setrunnable(struct pthread *curthread, struct pthread *thread) { kse_critical_t crit; + struct kse_mailbox *kmbx; crit = _kse_critical_enter(); KSE_SCHED_LOCK(curthread->kse, thread->kseg); - _thr_setrunnable_unlocked(thread); + kmbx = _thr_setrunnable_unlocked(thread); KSE_SCHED_UNLOCK(curthread->kse, thread->kseg); _kse_critical_leave(crit); + if (kmbx != NULL) + kse_wakeup(kmbx); } -void +struct kse_mailbox * _thr_setrunnable_unlocked(struct pthread *thread) { + struct kse_mailbox *kmbx = NULL; + if ((thread->kseg->kg_flags & KGF_SINGLE_THREAD) != 0) { /* No silly queues for these threads. */ if ((thread->flags & THR_FLAGS_SUSPENDED) != 0) THR_SET_STATE(thread, PS_SUSPENDED); - else + else { THR_SET_STATE(thread, PS_RUNNING); + kmbx = kse_wakeup_one(thread); + } + } else if (thread->state != PS_RUNNING) { if ((thread->flags & THR_FLAGS_IN_WAITQ) != 0) KSE_WAITQ_REMOVE(thread->kse, thread); @@ -1850,25 +1866,31 @@ if ((thread->blocked == 0) && (thread->active == 0) && (thread->flags & THR_FLAGS_IN_RUNQ) == 0) THR_RUNQ_INSERT_TAIL(thread); + /* + * XXX - Threads are not yet assigned to specific + * KSEs; they are assigned to the KSEG. So + * the fact that a thread's KSE is waiting + * doesn't necessarily mean that it will be + * the KSE that runs the thread after the + * lock is granted. But we don't know if the + * other KSEs within the same KSEG are also + * in a waiting state or not so we err on the + * side of caution and wakeup the thread's + * last known KSE. We ensure that the + * threads KSE doesn't change while it's + * scheduling lock is held so it is safe to + * reference it (the KSE). If the KSE wakes + * up and doesn't find any more work it will + * again go back to waiting so no harm is + * done. + */ + kmbx = kse_wakeup_one(thread); } } - /* - * XXX - Threads are not yet assigned to specific KSEs; they are - * assigned to the KSEG. So the fact that a thread's KSE is - * waiting doesn't necessarily mean that it will be the KSE - * that runs the thread after the lock is granted. But we - * don't know if the other KSEs within the same KSEG are - * also in a waiting state or not so we err on the side of - * caution and wakeup the thread's last known KSE. We - * ensure that the threads KSE doesn't change while it's - * scheduling lock is held so it is safe to reference it - * (the KSE). If the KSE wakes up and doesn't find any more - * work it will again go back to waiting so no harm is done. - */ - kse_wakeup_one(thread); + return (kmbx); } -static void +static struct kse_mailbox * kse_wakeup_one(struct pthread *thread) { struct kse *ke; @@ -1876,17 +1898,17 @@ if (KSE_IS_IDLE(thread->kse)) { KSE_CLEAR_IDLE(thread->kse); thread->kseg->kg_idle_kses--; - KSE_WAKEUP(thread->kse); + return (&thread->kse->k_mbx); } else { TAILQ_FOREACH(ke, &thread->kseg->kg_kseq, k_kgqe) { if (KSE_IS_IDLE(ke)) { KSE_CLEAR_IDLE(ke); ke->k_kseg->kg_idle_kses--; - KSE_WAKEUP(ke); - return; + return (&ke->k_mbx); } } } + return (NULL); } static void ==== //depot/projects/ia64/lib/libpthread/thread/thr_mutex.c#8 (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/libpthread/thread/thr_mutex.c,v 1.38 2003/07/18 02:46:29 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_mutex.c,v 1.39 2003/07/23 02:11:07 deischen Exp $ */ #include #include @@ -67,7 +67,8 @@ /* * Prototypes */ -static void mutex_handoff(struct pthread *, struct pthread_mutex *); +static struct kse_mailbox *mutex_handoff(struct pthread *, + struct pthread_mutex *); static inline int mutex_self_trylock(struct pthread *, pthread_mutex_t); static inline int mutex_self_lock(struct pthread *, pthread_mutex_t); static int mutex_unlock_common(pthread_mutex_t *, int); @@ -860,6 +861,7 @@ mutex_unlock_common(pthread_mutex_t *m, int add_reference) { struct pthread *curthread = _get_curthread(); + struct kse_mailbox *kmbx = NULL; int ret = 0; if (m == NULL || *m == NULL) @@ -904,7 +906,7 @@ * Hand off the mutex to the next waiting * thread: */ - mutex_handoff(curthread, *m); + kmbx = mutex_handoff(curthread, *m); } break; @@ -961,7 +963,7 @@ * Hand off the mutex to the next waiting * thread: */ - mutex_handoff(curthread, *m); + kmbx = mutex_handoff(curthread, *m); } break; @@ -1017,7 +1019,7 @@ * Hand off the mutex to the next waiting * thread: */ - mutex_handoff(curthread, *m); + kmbx = mutex_handoff(curthread, *m); } break; @@ -1034,6 +1036,8 @@ /* Unlock the mutex structure: */ THR_LOCK_RELEASE(curthread, &(*m)->m_lock); + if (kmbx != NULL) + kse_wakeup(kmbx); } /* Return the completion status: */ @@ -1460,9 +1464,10 @@ * is necessary to lock the thread's scheduling queue while also * holding the mutex lock. */ -static void +static struct kse_mailbox * mutex_handoff(struct pthread *curthread, struct pthread_mutex *mutex) { + struct kse_mailbox *kmbx = NULL; struct pthread *pthread; /* Keep dequeueing until we find a valid thread: */ @@ -1564,7 +1569,7 @@ } /* Make the thread runnable and unlock the scheduling queue: */ - _thr_setrunnable_unlocked(pthread); + kmbx = _thr_setrunnable_unlocked(pthread); /* Add a preemption point. */ if ((curthread->kseg == pthread->kseg) && @@ -1583,6 +1588,7 @@ if ((pthread == NULL) && (mutex->m_protocol == PTHREAD_PRIO_INHERIT)) /* This mutex has no priority: */ mutex->m_prio = 0; + return (kmbx); } /* ==== //depot/projects/ia64/lib/libpthread/thread/thr_private.h#17 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.93 2003/07/18 02:46:55 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.94 2003/07/23 02:11:07 deischen Exp $ */ #ifndef _THR_PRIVATE_H @@ -1106,8 +1106,8 @@ int _thr_schedule_add(struct pthread *, struct pthread *); void _thr_schedule_remove(struct pthread *, struct pthread *); void _thr_setrunnable(struct pthread *curthread, struct pthread *thread); -void _thr_setrunnable_unlocked(struct pthread *thread); -void _thr_sig_add(struct pthread *, int, siginfo_t *); +struct kse_mailbox *_thr_setrunnable_unlocked(struct pthread *thread); +struct kse_mailbox *_thr_sig_add(struct pthread *, int, siginfo_t *); void _thr_sig_dispatch(struct kse *, int, siginfo_t *); int _thr_stack_alloc(struct pthread_attr *); void _thr_stack_free(struct pthread_attr *); ==== //depot/projects/ia64/lib/libpthread/thread/thr_resume_np.c#4 (text+ko) ==== @@ -29,13 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_resume_np.c,v 1.17 2003/05/04 16:17:01 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_resume_np.c,v 1.18 2003/07/23 02:11:07 deischen Exp $ */ #include #include #include "thr_private.h" -static void resume_common(struct pthread *); +static struct kse_mailbox *resume_common(struct pthread *); __weak_reference(_pthread_resume_np, pthread_resume_np); __weak_reference(_pthread_resume_all_np, pthread_resume_all_np); @@ -46,15 +46,18 @@ _pthread_resume_np(pthread_t thread) { struct pthread *curthread = _get_curthread(); + struct kse_mailbox *kmbx; int ret; /* Add a reference to the thread: */ if ((ret = _thr_ref_add(curthread, thread, /*include dead*/0)) == 0) { /* Lock the threads scheduling queue: */ THR_SCHED_LOCK(curthread, thread); - resume_common(thread); + kmbx = resume_common(thread); THR_SCHED_UNLOCK(curthread, thread); _thr_ref_delete(curthread, thread); + if (kmbx != NULL) + kse_wakeup(kmbx); } return (ret); } @@ -64,6 +67,7 @@ { struct pthread *curthread = _get_curthread(); struct pthread *thread; + struct kse_mailbox *kmbx; kse_critical_t crit; /* Take the thread list lock: */ @@ -73,8 +77,10 @@ TAILQ_FOREACH(thread, &_thread_list, tle) { if (thread != curthread) { THR_SCHED_LOCK(curthread, thread); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 23 16:04:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFADD37B404; Wed, 23 Jul 2003 16: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 783A537B401 for ; Wed, 23 Jul 2003 16:04:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CADF43F93 for ; Wed, 23 Jul 2003 16:03:59 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6NN3x0U042218 for ; Wed, 23 Jul 2003 16:03:59 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6NN3wV5042215 for perforce@freebsd.org; Wed, 23 Jul 2003 16:03:58 -0700 (PDT) Date: Wed, 23 Jul 2003 16:03:58 -0700 (PDT) Message-Id: <200307232303.h6NN3wV5042215@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 34903 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, 23 Jul 2003 23:04:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=34903 Change 34903 by marcel@marcel_nfs on 2003/07/23 16:03:27 IFC @34901 Affected files ... .. //depot/projects/uart/alpha/conf/GENERIC#2 integrate .. //depot/projects/uart/alpha/conf/NOTES#2 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#6 integrate .. //depot/projects/uart/amd64/include/ieeefp.h#2 integrate .. //depot/projects/uart/amd64/include/npx.h#2 integrate .. //depot/projects/uart/conf/NOTES#4 integrate .. //depot/projects/uart/conf/files#10 integrate .. //depot/projects/uart/conf/files.alpha#3 integrate .. //depot/projects/uart/conf/files.i386#3 integrate .. //depot/projects/uart/conf/files.pc98#2 integrate .. //depot/projects/uart/conf/kern.post.mk#2 integrate .. //depot/projects/uart/conf/kern.pre.mk#3 integrate .. //depot/projects/uart/conf/kmod.mk#2 integrate .. //depot/projects/uart/conf/newvers.sh#2 integrate .. //depot/projects/uart/conf/options#4 integrate .. //depot/projects/uart/conf/options.i386#3 integrate .. //depot/projects/uart/conf/options.pc98#3 integrate .. //depot/projects/uart/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/uart/dev/harp/if_harp.c#1 branch .. //depot/projects/uart/dev/ie/if_ie.c#2 integrate .. //depot/projects/uart/dev/lnc/if_lnc.c#2 integrate .. //depot/projects/uart/dev/patm/if_patm_tx.c#2 integrate .. //depot/projects/uart/dev/rp/rp.c#2 integrate .. //depot/projects/uart/dev/safe/safe.c#1 branch .. //depot/projects/uart/dev/safe/safereg.h#1 branch .. //depot/projects/uart/dev/safe/safevar.h#1 branch .. //depot/projects/uart/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/uart/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/uart/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/uart/dev/syscons/warp/warp_saver.c#2 integrate .. //depot/projects/uart/dev/usb/usb_mem.c#3 integrate .. //depot/projects/uart/dev/wi/if_wi.c#6 integrate .. //depot/projects/uart/gnu/i386/fpemul/Changelog#2 delete .. //depot/projects/uart/gnu/i386/fpemul/README#2 delete .. //depot/projects/uart/gnu/i386/fpemul/control_w.h#2 delete .. //depot/projects/uart/gnu/i386/fpemul/div_small.s#2 delete .. //depot/projects/uart/gnu/i386/fpemul/errors.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/exception.h#2 delete .. //depot/projects/uart/gnu/i386/fpemul/fpu_arith.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/fpu_asm.h#2 delete .. //depot/projects/uart/gnu/i386/fpemul/fpu_aux.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/fpu_emu.h#2 delete .. //depot/projects/uart/gnu/i386/fpemul/fpu_entry.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/fpu_etc.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/fpu_proto.h#2 delete .. //depot/projects/uart/gnu/i386/fpemul/fpu_system.h#2 delete .. //depot/projects/uart/gnu/i386/fpemul/fpu_trig.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/get_address.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/load_store.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/math_emu.h#2 delete .. //depot/projects/uart/gnu/i386/fpemul/poly_2xm1.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/poly_atan.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/poly_div.s#2 delete .. //depot/projects/uart/gnu/i386/fpemul/poly_l2.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/poly_mul64.s#2 delete .. //depot/projects/uart/gnu/i386/fpemul/poly_sin.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/poly_tan.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/polynomial.s#2 delete .. //depot/projects/uart/gnu/i386/fpemul/reg_add_sub.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/reg_compare.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/reg_constant.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/reg_constant.h#2 delete .. //depot/projects/uart/gnu/i386/fpemul/reg_div.s#2 delete .. //depot/projects/uart/gnu/i386/fpemul/reg_ld_str.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/reg_mul.c#2 delete .. //depot/projects/uart/gnu/i386/fpemul/reg_norm.s#2 delete .. //depot/projects/uart/gnu/i386/fpemul/reg_round.s#2 delete .. //depot/projects/uart/gnu/i386/fpemul/reg_u_add.s#2 delete .. //depot/projects/uart/gnu/i386/fpemul/reg_u_div.s#2 delete .. //depot/projects/uart/gnu/i386/fpemul/reg_u_mul.s#2 delete .. //depot/projects/uart/gnu/i386/fpemul/reg_u_sub.s#2 delete .. //depot/projects/uart/gnu/i386/fpemul/status_w.h#2 delete .. //depot/projects/uart/gnu/i386/fpemul/version.h#2 delete .. //depot/projects/uart/gnu/i386/fpemul/wm_shrx.s#2 delete .. //depot/projects/uart/gnu/i386/fpemul/wm_sqrt.s#2 delete .. //depot/projects/uart/i386/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/uart/i386/conf/NOTES#2 integrate .. //depot/projects/uart/i386/i386/math_emu.h#2 delete .. //depot/projects/uart/i386/i386/math_emulate.c#2 delete .. //depot/projects/uart/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/uart/i386/i386/mpapic.c#2 integrate .. //depot/projects/uart/i386/i386/pmap.c#6 integrate .. //depot/projects/uart/i386/i386/trap.c#2 integrate .. //depot/projects/uart/i386/include/apic.h#2 integrate .. //depot/projects/uart/i386/include/asm.h#2 integrate .. //depot/projects/uart/i386/include/cpufunc.h#2 integrate .. //depot/projects/uart/i386/include/frame.h#2 integrate .. //depot/projects/uart/i386/isa/npx.c#2 integrate .. //depot/projects/uart/i4b/capi/iavc/iavc.h#2 integrate .. //depot/projects/uart/i4b/capi/iavc/iavc_lli.c#2 integrate .. //depot/projects/uart/ia64/include/_regset.h#2 integrate .. //depot/projects/uart/kern/init_main.c#2 integrate .. //depot/projects/uart/kern/kern_malloc.c#3 integrate .. //depot/projects/uart/kern/kern_umtx.c#4 integrate .. //depot/projects/uart/kern/md5c.c#2 integrate .. //depot/projects/uart/kern/subr_autoconf.c#2 integrate .. //depot/projects/uart/kern/subr_mbuf.c#2 integrate .. //depot/projects/uart/kern/subr_prf.c#2 integrate .. //depot/projects/uart/kern/tty_subr.c#2 integrate .. //depot/projects/uart/kern/vfs_cluster.c#2 integrate .. //depot/projects/uart/kern/vfs_subr.c#2 integrate .. //depot/projects/uart/modules/Makefile#3 integrate .. //depot/projects/uart/modules/fpu/Makefile#2 delete .. //depot/projects/uart/modules/gnufpu/Makefile#2 delete .. //depot/projects/uart/modules/harp/Makefile#1 branch .. //depot/projects/uart/modules/safe/Makefile#1 branch .. //depot/projects/uart/netatm/atm_cm.c#2 integrate .. //depot/projects/uart/netatm/atm_device.c#2 integrate .. //depot/projects/uart/netatm/atm_if.c#2 integrate .. //depot/projects/uart/netatm/atm_if.h#2 integrate .. //depot/projects/uart/netatm/atm_socket.c#2 integrate .. //depot/projects/uart/netatm/atm_subr.c#3 integrate .. //depot/projects/uart/netatm/ipatm/ipatm_if.c#2 integrate .. //depot/projects/uart/netatm/ipatm/ipatm_load.c#2 integrate .. //depot/projects/uart/netatm/ipatm/ipatm_vcm.c#2 integrate .. //depot/projects/uart/netatm/sigpvc/sigpvc_if.c#2 integrate .. //depot/projects/uart/netatm/spans/spans_arp.c#2 integrate .. //depot/projects/uart/netatm/spans/spans_cls.c#2 integrate .. //depot/projects/uart/netatm/spans/spans_if.c#2 integrate .. //depot/projects/uart/netatm/uni/sscf_uni.c#2 integrate .. //depot/projects/uart/netatm/uni/sscop.c#2 integrate .. //depot/projects/uart/netatm/uni/uniarp.c#2 integrate .. //depot/projects/uart/netatm/uni/uniarp_cache.c#2 integrate .. //depot/projects/uart/netatm/uni/uniarp_vcm.c#2 integrate .. //depot/projects/uart/netatm/uni/uniip.c#2 integrate .. //depot/projects/uart/netatm/uni/unisig_decode.c#2 integrate .. //depot/projects/uart/netatm/uni/unisig_if.c#2 integrate .. //depot/projects/uart/netatm/uni/unisig_subr.c#2 integrate .. //depot/projects/uart/netatm/uni/unisig_vc_state.c#2 integrate .. //depot/projects/uart/netinet/ip_input.c#2 integrate .. //depot/projects/uart/pc98/conf/GENERIC#2 integrate .. //depot/projects/uart/pc98/conf/NOTES#2 integrate .. //depot/projects/uart/pc98/pc98/pc98gdc.c#2 integrate .. //depot/projects/uart/pci/if_sis.c#4 integrate .. //depot/projects/uart/pci/if_sisreg.h#2 integrate .. //depot/projects/uart/sys/cdefs.h#2 integrate .. //depot/projects/uart/sys/systm.h#3 integrate .. //depot/projects/uart/vm/swap_pager.c#3 integrate .. //depot/projects/uart/vm/vm_object.c#2 integrate Differences ... ==== //depot/projects/uart/alpha/conf/GENERIC#2 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.161 2003/06/08 02:03:01 jmallett Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.162 2003/07/21 19:15:25 ticso Exp $ machine alpha cpu EV4 @@ -80,6 +80,7 @@ # Standard busses device isa +device eisa device pci # Floppy drives ==== //depot/projects/uart/alpha/conf/NOTES#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.151 2003/04/15 20:21:56 jhb Exp $ +# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.152 2003/07/21 19:15:25 ticso Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. @@ -45,6 +45,7 @@ # HARDWARE BUS CONFIGURATION device isa +device eisa device pci ==== //depot/projects/uart/amd64/amd64/pmap.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.423 2003/07/09 22:59:45 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.424 2003/07/23 19:49:32 alc Exp $ */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. @@ -206,7 +206,8 @@ static PMAP_INLINE void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); static void amd64_protection_init(void); -static __inline void pmap_changebit(vm_page_t m, int bit, boolean_t setem); +static void pmap_changebit(vm_page_t m, int bit, boolean_t setem) + __always_inline; static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva); static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); ==== //depot/projects/uart/amd64/include/ieeefp.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#) ieeefp.h 1.0 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.8 2003/01/19 06:01:33 marcel Exp $ + * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.9 2003/07/22 06:44:54 peter Exp $ */ /* @@ -91,6 +91,15 @@ #define FP_STKY_FLD 0x3f /* sticky flags field */ /* + * SSE mxcsr register bit field masks + */ +#define SSE_STKY_FLD 0x3f /* exception flags */ +#define SSE_DAZ_FLD 0x40 /* Denormals are zero */ +#define SSE_MSKS_FLD 0x1f80 /* exception masks field */ +#define SSE_RND_FLD 0x6000 /* rounding control */ +#define SSE_FZ_FLD 0x8000 /* flush to zero on underflow */ + +/* * FP register bit field offsets */ #define FP_MSKS_OFF 0 /* exception masks offset */ @@ -98,84 +107,185 @@ #define FP_RND_OFF 10 /* round control offset */ #define FP_STKY_OFF 0 /* sticky flags offset */ -#ifdef __GNUC__ +/* + * SSE mxcsr register bit field offsets + */ +#define SSE_STKY_OFF 0 /* exception flags offset */ +#define SSE_DAZ_OFF 6 /* DAZ exception mask offset */ +#define SSE_MSKS_OFF 7 /* other exception masks offset */ +#define SSE_RND_OFF 13 /* rounding control offset */ +#define SSE_FZ_OFF 15 /* flush to zero offset */ + +#if defined(__GNUC__) && !defined(__cplusplus) #define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr))) #define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr))) +#define __fldcw(addr) __asm __volatile("fldcw %0" : "=m" (*(addr))) #define __fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr))) #define __fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) +#define __ldmxcsr(addr) __asm __volatile("ldmxcsr %0" : "=m" (*(addr))) +#define __stmxcsr(addr) __asm __volatile("stmxcsr %0" : "=m" (*(addr))) + +/* + * General notes about conflicting SSE vs FP status bits. + * This code assumes that software will not fiddle with the control + * bits of the SSE and x87 in such a way to get them out of sync and + * still expect this to work. Break this at your peril. + * Because I based this on the i386 port, the x87 state is used for + * the fpget*() functions, and is shadowed into the SSE state for + * the fpset*() functions. For dual source fpget*() functions, I + * merge the two together. I think. + */ + +/* Set rounding control */ +static __inline__ fp_rnd_t +__fpgetround(void) +{ + unsigned short _cw; + + __fnstcw(&_cw); + return ((_cw & FP_RND_FLD) >> FP_RND_OFF); +} + +static __inline__ fp_rnd_t +__fpsetround(fp_rnd_t _m) +{ + unsigned short _cw; + unsigned int _mxcsr; + fp_rnd_t _p; + + __fnstcw(&_cw); + _p = (_cw & FP_RND_FLD) >> FP_RND_OFF; + _cw &= ~FP_RND_FLD; + _cw |= (_m << FP_RND_OFF) & FP_RND_FLD; + __fldcw(&_cw); + __stmxcsr(&_mxcsr); + _mxcsr &= ~SSE_RND_FLD; + _mxcsr |= (_m << SSE_RND_OFF) & SSE_RND_FLD; + __ldmxcsr(&_mxcsr); + return (_p); +} /* - * return the contents of a FP register + * Set precision for fadd/fsub/fsqrt etc x87 instructions + * There is no equivalent SSE mode or control. */ -static __inline__ int -__fpgetreg(int _reg) +static __inline__ fp_prec_t +__fpgetprec(void) +{ + unsigned short _cw; + + __fnstcw(&_cw); + return ((_cw & FP_PRC_FLD) >> FP_PRC_OFF); +} + +static __inline__ fp_prec_t +__fpsetprec(fp_rnd_t _m) { - unsigned short _mem; + unsigned short _cw; + fp_prec_t _p; - /*- - * This is more efficient than it looks. The switch gets optimized - * away if _reg is constant. - * - * The default case only supports _reg == 0. We could handle more - * registers (e.g., tags) using fnstenv, but the interface doesn't - * support more. - */ - switch(_reg) { - default: - __fnstcw(&_mem); - break; - case FP_STKY_REG: - __fnstsw(&_mem); - break; - } - return _mem; + __fnstcw(&_cw); + _p = (_cw & FP_PRC_FLD) >> FP_PRC_OFF; + _cw &= ~FP_PRC_FLD; + _cw |= (_m << FP_PRC_OFF) & FP_PRC_FLD; + __fldcw(&_cw); + return (_p); } /* - * set a FP mode; return previous mode + * Look at the exception masks + * Note that x87 masks are inverse of the fp*() functions + * API. ie: mask = 1 means disable for x87 and SSE, but + * for the fp*() api, mask = 1 means enabled. */ -static __inline__ int -__fpsetreg(int _m, int _reg, int _fld, int _off) +static __inline__ fp_except_t +__fpgetmask(void) +{ + unsigned short _cw; + + __fnstcw(&_cw); + return ((~_cw) & FP_MSKS_FLD); +} + +static __inline__ fp_except_t +__fpsetmask(fp_except_t _m) +{ + unsigned short _cw; + unsigned int _mxcsr; + fp_except_t _p; + + __fnstcw(&_cw); + _p = (~_cw) & FP_MSKS_FLD; + _cw &= ~FP_MSKS_FLD; + _cw |= (~_m) & FP_MSKS_FLD; + __fldcw(&_cw); + __stmxcsr(&_mxcsr); + /* XXX should we clear non-ieee SSE_DAZ_FLD and SSE_FZ_FLD ? */ + _mxcsr &= ~SSE_MSKS_FLD; + _mxcsr |= ((~_m) << SSE_MSKS_OFF) & SSE_MSKS_FLD; + __ldmxcsr(&_mxcsr); + return (_p); +} + +/* See which sticky exceptions are pending, and reset them */ +static __inline__ fp_except_t +__fpgetsticky(void) +{ + unsigned short _sw; + unsigned int _mxcsr; + fp_except_t _ex; + + __fnstsw(&_sw); + _ex = _sw & FP_STKY_FLD; + __stmxcsr(&_mxcsr); + _ex |= _mxcsr & SSE_STKY_FLD; + return (_ex); +} + +/* Note that this should really be called fpresetsticky() */ +static __inline__ fp_except_t +__fpsetsticky(fp_except_t _m) { unsigned _env[7]; - unsigned _p; + unsigned int _mxcsr; + fp_except_t _p; - /* - * _reg == 0 could be handled better using fnstcw/fldcw. - */ __fnstenv(_env); - _p = (_env[_reg] & _fld) >> _off; - _env[_reg] = (_env[_reg] & ~_fld) | (_m << _off & _fld); + _p = _env[FP_STKY_REG] & _m; + __stmxcsr(&_mxcsr); + _p |= _mxcsr & SSE_STKY_FLD; + _env[FP_STKY_REG] &= ~_m; __fldenv(_env); - return _p; + _mxcsr &= ~_m; + __ldmxcsr(&_mxcsr); + return (_p); } -#endif /* __GNUC__ */ +#endif /* __GNUC__ && !__cplusplus */ + +#if !defined(__IEEEFP_NOINLINES__) && !defined(__cplusplus) && defined(__GNUC__) -/* - * SysV/386 FP control interface - */ -#define fpgetround() ((fp_rnd_t) \ - ((__fpgetreg(FP_RND_REG) & FP_RND_FLD) >> FP_RND_OFF)) -#define fpsetround(m) ((fp_rnd_t) \ - __fpsetreg((m), FP_RND_REG, FP_RND_FLD, FP_RND_OFF)) -#define fpgetprec() ((fp_prec_t) \ - ((__fpgetreg(FP_PRC_REG) & FP_PRC_FLD) >> FP_PRC_OFF)) -#define fpsetprec(m) ((fp_prec_t) \ - __fpsetreg((m), FP_PRC_REG, FP_PRC_FLD, FP_PRC_OFF)) -#define fpgetmask() ((fp_except_t) \ - ((~__fpgetreg(FP_MSKS_REG) & FP_MSKS_FLD) >> FP_MSKS_OFF)) -#define fpsetmask(m) ((fp_except_t) \ - (~__fpsetreg(~(m), FP_MSKS_REG, FP_MSKS_FLD, FP_MSKS_OFF)) & \ - (FP_MSKS_FLD >> FP_MSKS_OFF)) -#define fpgetsticky() ((fp_except_t) \ - ((__fpgetreg(FP_STKY_REG) & FP_STKY_FLD) >> FP_STKY_OFF)) -#define fpresetsticky(m) ((fp_except_t) \ - __fpsetreg(0, FP_STKY_REG, (m), FP_STKY_OFF)) -#define fpsetsticky(m) fpresetsticky(m) +#define fpsetround() __fpsetround() +#define fpgetround(_m) __fpgetround(_m) +#define fpgetprec() __fpgetprec() +#define fpsetprec(_m) __fpsetprec(_m) +#define fpgetmask() __fpgetmask() +#define fpsetmask(_m) __fpsetmask(_m) +#define fpgetsticky() __fpgetsticky() +#define fpsetsticky(_m) __fpsetsticky(_m) /* Suppress prototypes in the MI header. */ #define _IEEEFP_INLINED_ 1 +#else /* !__IEEEFP_NOINLINES__ && !__cplusplus && __GNUC__ */ + +/* Augment the userland declarations */ +__BEGIN_DECLS +extern fp_prec_t fpgetprec(void); +extern fp_prec_t fpsetprec(fp_prec_t); +__END_DECLS + +#endif /* !__IEEEFP_NOINLINES__ && !__cplusplus && __GNUC__ */ + #endif /* !_MACHINE_IEEEFP_H_ */ ==== //depot/projects/uart/amd64/include/npx.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/npx.h,v 1.28 2003/05/09 18:28:05 peter Exp $ + * $FreeBSD: src/sys/amd64/include/npx.h,v 1.29 2003/07/22 06:50:34 peter Exp $ */ /* @@ -85,16 +85,17 @@ * 64-bit precision * all exceptions masked. * - * We modify the affine mode bit and precision bits in this to give: + * FreeBSD/i386 uses 53 bit precision for things like fadd/fsub/fsqrt etc + * because of the difference between memory and fpu register stack arguments. + * If its using an intermediate fpu register, it has 80/64 bits to work + * with. If it uses memory, it has 64/53 bits to work with. However, + * gcc is aware of this and goes to a fair bit of trouble to make the + * best use of it. * - * affine mode for 287's (if they work at all) (1 in bitfield 1<<12) - * 53-bit precision (2 in bitfield 3<<8) - * - * 64-bit precision often gives bad results with high level languages - * because it makes the results of calculations depend on whether - * intermediate values are stored in memory or in FPU registers. + * This is mostly academic for AMD64, because the ABI prefers the use + * SSE2 based math. For FreeBSD/amd64, we go with the default settings. */ -#define __INITIAL_NPXCW__ 0x127F +#define __INITIAL_NPXCW__ 0x037F #define __INITIAL_MXCSR__ 0x1F80 #define __INITIAL_MXCSR_MASK__ 0xFFBF ==== //depot/projects/uart/conf/NOTES#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1163 2003/07/15 11:57:23 harti Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1164 2003/07/21 13:56:21 harti Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -645,6 +645,8 @@ # The `hfa' driver provides support for the FORE Systems, Inc. # PCA-200E ATM PCI Adapter. # +# The `harp' pseudo-driver makes all NATM interface drivers available to HARP. +# options ATM_CORE #core ATM protocol family options ATM_IP #IP over ATM support options ATM_SIGPVC #SIGPVC signalling manager @@ -653,6 +655,7 @@ device hea #Efficient ENI-155p ATM PCI device hfa #FORE PCA-200E ATM PCI +device harp #Pseudo-interface for NATM ##################################################################### ==== //depot/projects/uart/conf/files#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.808 2003/07/18 10:02:43 phk Exp $ +# $FreeBSD: src/sys/conf/files,v 1.811 2003/07/22 11:41:15 ticso Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -383,6 +383,7 @@ dev/ed/if_ed_pccard.c optional ed card dev/ed/if_ed_pccard.c optional ed pccard dev/ed/if_ed_pci.c optional ed pci +dev/eisa/eisaconf.c optional eisa dev/em/if_em.c optional em dev/em/if_em_hw.c optional em dev/en/midway.c optional en @@ -415,6 +416,7 @@ dev/gem/if_gem.c optional gem dev/gem/if_gem_pci.c optional gem pci dev/gx/if_gx.c optional gx +dev/harp/if_harp.c optional harp pci dev/hatm/if_hatm.c optional hatm pci dev/hatm/if_hatm_intr.c optional hatm pci dev/hatm/if_hatm_ioctl.c optional hatm pci @@ -666,6 +668,7 @@ dev/rp/rp_isa.c optional rp isa dev/rp/rp_pci.c optional rp pci dev/sab/sab.c optional sab ebus +dev/safe/safe.c optional safe dev/sbsh/if_sbsh.c optional sbsh dev/scd/scd.c optional scd isa dev/scd/scd_isa.c optional scd isa ==== //depot/projects/uart/conf/files.alpha#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.101 2003/04/17 07:39:03 phk Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.103 2003/07/22 11:41:15 ticso Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/uart/conf/files.i386#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.446 2003/06/25 14:51:20 sam Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.448 2003/07/22 11:41:15 ticso Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -120,7 +120,6 @@ dev/cm/if_cm_isa.c optional cm isa dev/dgb/dgb.c count dgb dev/ed/if_ed_isa.c optional ed isa -dev/eisa/eisaconf.c optional eisa dev/fb/fb.c optional fb dev/fb/fb.c optional vga dev/fb/splash.c optional splash @@ -157,38 +156,6 @@ geom/geom_bsd_enc.c standard geom/geom_mbr.c standard geom/geom_mbr_enc.c standard -gnu/i386/fpemul/div_small.s optional gpl_math_emulate \ - warning "kernel contains GPL contaminated math emulator" -gnu/i386/fpemul/errors.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_arith.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_aux.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_entry.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_etc.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_trig.c optional gpl_math_emulate -gnu/i386/fpemul/get_address.c optional gpl_math_emulate -gnu/i386/fpemul/load_store.c optional gpl_math_emulate -gnu/i386/fpemul/poly_2xm1.c optional gpl_math_emulate -gnu/i386/fpemul/poly_atan.c optional gpl_math_emulate -gnu/i386/fpemul/poly_div.s optional gpl_math_emulate -gnu/i386/fpemul/poly_l2.c optional gpl_math_emulate -gnu/i386/fpemul/poly_mul64.s optional gpl_math_emulate -gnu/i386/fpemul/poly_sin.c optional gpl_math_emulate -gnu/i386/fpemul/poly_tan.c optional gpl_math_emulate -gnu/i386/fpemul/polynomial.s optional gpl_math_emulate -gnu/i386/fpemul/reg_add_sub.c optional gpl_math_emulate -gnu/i386/fpemul/reg_compare.c optional gpl_math_emulate -gnu/i386/fpemul/reg_constant.c optional gpl_math_emulate -gnu/i386/fpemul/reg_div.s optional gpl_math_emulate -gnu/i386/fpemul/reg_ld_str.c optional gpl_math_emulate -gnu/i386/fpemul/reg_mul.c optional gpl_math_emulate -gnu/i386/fpemul/reg_norm.s optional gpl_math_emulate -gnu/i386/fpemul/reg_round.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_add.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_div.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_mul.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_sub.s optional gpl_math_emulate -gnu/i386/fpemul/wm_shrx.s optional gpl_math_emulate -gnu/i386/fpemul/wm_sqrt.s optional gpl_math_emulate i386/acpica/OsdEnvironment.c optional acpi i386/acpica/acpi_machdep.c optional acpi i386/acpica/acpi_wakeup.c optional acpi @@ -227,7 +194,6 @@ i386/i386/legacy.c standard i386/i386/locore.s standard no-obj i386/i386/machdep.c standard -i386/i386/math_emulate.c optional math_emulate i386/i386/mem.c standard i386/i386/mp_clock.c optional smp i386/i386/mp_machdep.c optional smp ==== //depot/projects/uart/conf/files.pc98#2 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.272 2003/06/25 15:19:04 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.273 2003/07/22 08:11:12 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -133,38 +133,6 @@ geom/geom_bsd_enc.c standard geom/geom_pc98.c standard geom/geom_pc98_enc.c standard -gnu/i386/fpemul/div_small.s optional gpl_math_emulate \ - warning "kernel contains GPL contaminated math emulator" -gnu/i386/fpemul/errors.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_arith.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_aux.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_entry.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_etc.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_trig.c optional gpl_math_emulate -gnu/i386/fpemul/get_address.c optional gpl_math_emulate -gnu/i386/fpemul/load_store.c optional gpl_math_emulate -gnu/i386/fpemul/poly_2xm1.c optional gpl_math_emulate -gnu/i386/fpemul/poly_atan.c optional gpl_math_emulate -gnu/i386/fpemul/poly_div.s optional gpl_math_emulate -gnu/i386/fpemul/poly_l2.c optional gpl_math_emulate -gnu/i386/fpemul/poly_mul64.s optional gpl_math_emulate -gnu/i386/fpemul/poly_sin.c optional gpl_math_emulate -gnu/i386/fpemul/poly_tan.c optional gpl_math_emulate -gnu/i386/fpemul/polynomial.s optional gpl_math_emulate -gnu/i386/fpemul/reg_add_sub.c optional gpl_math_emulate -gnu/i386/fpemul/reg_compare.c optional gpl_math_emulate -gnu/i386/fpemul/reg_constant.c optional gpl_math_emulate -gnu/i386/fpemul/reg_div.s optional gpl_math_emulate -gnu/i386/fpemul/reg_ld_str.c optional gpl_math_emulate -gnu/i386/fpemul/reg_mul.c optional gpl_math_emulate -gnu/i386/fpemul/reg_norm.s optional gpl_math_emulate -gnu/i386/fpemul/reg_round.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_add.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_div.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_mul.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_sub.s optional gpl_math_emulate -gnu/i386/fpemul/wm_shrx.s optional gpl_math_emulate -gnu/i386/fpemul/wm_sqrt.s optional gpl_math_emulate i386/bios/apm.c optional apm i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" @@ -187,7 +155,6 @@ i386/i386/k6_mem.c standard i386/i386/legacy.c standard i386/i386/locore.s standard no-obj -i386/i386/math_emulate.c optional math_emulate i386/i386/mem.c standard i386/i386/mp_clock.c optional smp i386/i386/mp_machdep.c optional smp ==== //depot/projects/uart/conf/kern.post.mk#2 (text+ko) ==== @@ -6,7 +6,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.47 2003/06/22 17:57:56 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.48 2003/07/22 09:02:21 phk Exp $ # # In case the config had a makeoptions DESTDIR... @@ -115,7 +115,7 @@ # XXX used to force -elf after CFLAGS to work around breakage of cc -aout # (genassym.sh makes some assumptions and cc stopped satisfying them). genassym.o: $S/$M/$M/genassym.c - ${CC} -c ${CFLAGS:N-fno-common} $S/$M/$M/genassym.c + ${CC} -c ${CFLAGS:N-fno-common} -Wno-inline $S/$M/$M/genassym.c ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h ==== //depot/projects/uart/conf/kern.pre.mk#3 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kernels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.27 2003/07/11 07:13:42 kan Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.30 2003/07/23 22:02:30 peter Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -52,7 +52,10 @@ .endif .endif DEFINED_PROF= ${PROF} -# WERROR?= -Werror +#WERROR?= -Werror +INLINE_LIMIT?= 2500 +CFLAGS+= --param max-inline-insns-single=${INLINE_LIMIT} + # Put configuration-specific C flags last (except for ${PROF}) so that they # can override the others. ==== //depot/projects/uart/conf/kmod.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.137 2003/03/03 22:51:22 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.138 2003/07/23 20:03:42 peter Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -99,6 +99,9 @@ CFLAGS+= -I@/../include -I${DESTDIR}/usr/include .endif # @ +INLINE_LIMIT?= 2500 +CFLAGS+= --param max-inline-insns-single=${INLINE_LIMIT} + # Disallow common variables, and if we end up with commons from # somewhere unexpected, allocate storage for them in the module itself. CFLAGS+= -fno-common ==== //depot/projects/uart/conf/newvers.sh#2 (text+ko) ==== @@ -32,7 +32,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.53 2003/06/09 18:19:32 jmallett Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.55 2003/07/23 20:07:49 peter Exp $ TYPE="FreeBSD" REVISION="5.1" ==== //depot/projects/uart/conf/options#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.402 2003/07/15 08:59:37 harti Exp $ +# $FreeBSD: src/sys/conf/options,v 1.404 2003/07/22 11:42:45 ticso Exp $ # # On the handling of kernel options # @@ -596,6 +596,8 @@ DEV_BPF opt_bpf.h DEV_SPLASH opt_splash.h +EISA_SLOTS opt_eisa.h + # ed driver ED_NO_MIIBUS opt_ed.h @@ -615,6 +617,11 @@ HIFN_RNDTEST opt_hifn.h HIFN_NO_RNG opt_hifn.h +# options for safenet driver +SAFE_DEBUG opt_safe.h +SAFE_NO_RNG opt_safe.h +SAFE_RNDTEST opt_safe.h + # syscons options MAXCONS opt_syscons.h SC_ALT_MOUSE_IMAGE opt_syscons.h ==== //depot/projects/uart/conf/options.i386#3 (text+ko) ==== @@ -1,8 +1,6 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.194 2003/07/10 01:02:58 peter Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.196 2003/07/22 11:42:45 ticso Exp $ # Options specific to the i386 platform kernels -MATH_EMULATE opt_math_emulate.h -GPL_MATH_EMULATE opt_math_emulate.h DISABLE_PSE opt_pmap.h PMAP_SHPGPERPROC opt_pmap.h DISABLE_PG_G opt_pmap.h @@ -93,8 +91,6 @@ ATKBD_DFLT_KEYMAP opt_atkbd.h -EISA_SLOTS opt_eisa.h - # pcvt(4) has a bunch of options FAT_CURSOR opt_pcvt.h XSERVER opt_pcvt.h ==== //depot/projects/uart/conf/options.pc98#3 (text+ko) ==== @@ -1,8 +1,6 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.166 2003/07/10 01:02:58 peter Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.167 2003/07/22 08:11:12 peter Exp $ # Options specific to the pc98 platform kernels -MATH_EMULATE opt_math_emulate.h -GPL_MATH_EMULATE opt_math_emulate.h DISABLE_PSE opt_pmap.h PMAP_SHPGPERPROC opt_pmap.h DISABLE_PG_G opt_pmap.h ==== //depot/projects/uart/dev/fxp/if_fxp.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.187 2003/07/11 20:49:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.188 2003/07/22 15:50:54 mux Exp $"); #include #include @@ -230,9 +230,9 @@ int low, int high); static int sysctl_hw_fxp_bundle_max(SYSCTL_HANDLER_ARGS); static int sysctl_hw_fxp_int_delay(SYSCTL_HANDLER_ARGS); -static __inline void fxp_scb_wait(struct fxp_softc *sc); -static __inline void fxp_scb_cmd(struct fxp_softc *sc, int cmd); -static __inline void fxp_dma_wait(struct fxp_softc *sc, +static void fxp_scb_wait(struct fxp_softc *sc); +static void fxp_scb_cmd(struct fxp_softc *sc, int cmd); +static void fxp_dma_wait(struct fxp_softc *sc, volatile u_int16_t *status, bus_dma_tag_t dmat, bus_dmamap_t map); @@ -275,7 +275,7 @@ * Wait for the previous command to be accepted (but not necessarily * completed). */ -static __inline void +static void fxp_scb_wait(struct fxp_softc *sc) { int i = 10000; @@ -290,7 +290,7 @@ CSR_READ_2(sc, FXP_CSR_FLOWCONTROL)); } -static __inline void +static void fxp_scb_cmd(struct fxp_softc *sc, int cmd) { @@ -301,7 +301,7 @@ CSR_WRITE_1(sc, FXP_CSR_SCB_COMMAND, cmd); } -static __inline void +static void fxp_dma_wait(struct fxp_softc *sc, volatile u_int16_t *status, bus_dma_tag_t dmat, bus_dmamap_t map) { @@ -317,7 +317,7 @@ } /* - * Return identification string if this is device is ours. + * Return identification string if this device is ours. */ static int fxp_probe(device_t dev) @@ -2307,16 +2307,16 @@ m->m_data += sc->rfa_size; rfa->size = htole16(MCLBYTES - sc->rfa_size - RFA_ALIGNMENT_FUDGE); - /* - * Initialize the rest of the RFA. Note that since the RFA - * is misaligned, we cannot store values directly. Instead, - * we use an optimized, inline copy. - */ - rfa->rfa_status = 0; rfa->rfa_control = htole16(FXP_RFA_CONTROL_EL); rfa->actual_size = 0; + /* + * Initialize the rest of the RFA. Note that since the RFA + * is misaligned, we cannot store values directly. We're thus + * using the le32enc() function which handles endianness and + * is also alignment-safe. + */ le32enc(&rfa->link_addr, 0xffffffff); le32enc(&rfa->rbd_addr, 0xffffffff); ==== //depot/projects/uart/dev/ie/if_ie.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ie/if_ie.c,v 1.94 2003/03/29 13:36:40 mdodd Exp $ + * $FreeBSD: src/sys/dev/ie/if_ie.c,v 1.95 2003/07/22 09:35:45 phk Exp $ * * MAINTAINER: Matthew N. Dodd */ @@ -326,6 +326,14 @@ return (0); } +static __inline void +ie_ack(struct ie_softc *sc, u_int mask) +{ + + sc->scb->ie_command = sc->scb->ie_status & mask; + (*sc->ie_chan_attn) (sc); +} + /* * What to do upon receipt of an interrupt. */ @@ -1220,14 +1228,6 @@ addr[i] = inb(PORT(sc) + i); } -static __inline void -ie_ack(struct ie_softc *sc, u_int mask) -{ - - sc->scb->ie_command = sc->scb->ie_status & mask; - (*sc->ie_chan_attn) (sc); -} - static void iereset(struct ie_softc *sc) { ==== //depot/projects/uart/dev/lnc/if_lnc.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.95 2003/02/19 05:47:07 imp Exp $ + * $FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.96 2003/07/22 09:22:00 phk Exp $ */ /* @@ -126,8 +126,8 @@ static __inline struct mbuf *mbuf_packet(struct lnc_softc *sc, int start_of_packet, int pkt_len); -static __inline void lnc_rint(struct lnc_softc *sc); -static __inline void lnc_tint(struct lnc_softc *sc); +static void lnc_rint(struct lnc_softc *sc); +static void lnc_tint(struct lnc_softc *sc); static void lnc_init(void *); static __inline int mbuf_to_buffer(struct mbuf *m, char *buffer); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 23 18:31:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D00337B404; Wed, 23 Jul 2003 18:31:01 -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 CACFE37B401 for ; Wed, 23 Jul 2003 18:31:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8235443F75 for ; Wed, 23 Jul 2003 18:30:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6O1Ux0U054877 for ; Wed, 23 Jul 2003 18:30:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6O1UwrN054874 for perforce@freebsd.org; Wed, 23 Jul 2003 18:30:58 -0700 (PDT) Date: Wed, 23 Jul 2003 18:30:58 -0700 (PDT) Message-Id: <200307240130.h6O1UwrN054874@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 34907 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, 24 Jul 2003 01:31:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=34907 Change 34907 by peter@peter_daintree on 2003/07/23 18:30:32 IFC @34906 Affected files ... .. //depot/projects/hammer/UPDATING#14 integrate .. //depot/projects/hammer/contrib/tar/src/tar.c#2 integrate .. //depot/projects/hammer/etc/defaults/pccard.conf#9 integrate .. //depot/projects/hammer/lib/libc/amd64/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#12 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/fpgetmask.c#3 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/fpgetprec.c#3 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/fpgetround.c#3 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/fpgetsticky.c#3 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/fpsetmask.c#3 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/fpsetprec.c#3 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/fpsetround.c#3 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/fpsetsticky.c#3 integrate .. //depot/projects/hammer/lib/libc/sys/connect.2#4 integrate .. //depot/projects/hammer/lib/libfetch/Makefile#8 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#11 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#13 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_detach.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#18 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#8 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#14 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_resume_np.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#16 integrate .. //depot/projects/hammer/lib/msun/Makefile#4 integrate .. //depot/projects/hammer/lib/msun/src/e_acos.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_asin.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_atan2.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_exp.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_fmod.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_log.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_log10.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_remainder.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_scalb.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_sqrt.c#2 integrate .. //depot/projects/hammer/lib/msun/src/get_hw_float.c#2 delete .. //depot/projects/hammer/lib/msun/src/math_private.h#4 integrate .. //depot/projects/hammer/lib/msun/src/s_atan.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_ceil.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_copysign.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_copysignf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_cos.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_finite.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_floor.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_ilogb.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_logb.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_rint.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_scalbn.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_significand.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_sin.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_tan.c#2 integrate .. //depot/projects/hammer/release/Makefile#33 integrate .. //depot/projects/hammer/release/amd64/dokern.sh#3 delete .. //depot/projects/hammer/release/amd64/fixit_crunch.conf#3 delete .. //depot/projects/hammer/release/i386/mkisoimages.sh#2 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#6 integrate .. //depot/projects/hammer/sbin/devd/token.l#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#11 integrate .. //depot/projects/hammer/share/man/man4/ath_hal.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/npx.4#2 integrate .. //depot/projects/hammer/share/man/man7/Makefile#4 integrate .. //depot/projects/hammer/share/man/man7/release.7#10 integrate .. //depot/projects/hammer/share/man/man7/rescue.7#1 branch .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#46 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#28 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#8 integrate .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/npx.h#9 integrate .. //depot/projects/hammer/sys/conf/files#25 integrate .. //depot/projects/hammer/sys/conf/files.alpha#9 integrate .. //depot/projects/hammer/sys/conf/files.i386#15 integrate .. //depot/projects/hammer/sys/conf/files.pc98#16 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#11 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#11 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#7 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#6 integrate .. //depot/projects/hammer/sys/conf/options#21 integrate .. //depot/projects/hammer/sys/conf/options.i386#12 integrate .. //depot/projects/hammer/sys/conf/options.pc98#12 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#22 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie.c#6 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#5 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_tx.c#2 integrate .. //depot/projects/hammer/sys/dev/rp/rp.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/usb_mem.c#4 integrate .. //depot/projects/hammer/sys/gnu/i386/fpemul/Changelog#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/README#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/control_w.h#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/div_small.s#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/errors.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/exception.h#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/fpu_arith.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/fpu_asm.h#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/fpu_aux.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/fpu_emu.h#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/fpu_entry.c#3 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/fpu_etc.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/fpu_proto.h#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/fpu_system.h#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/fpu_trig.c#3 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/get_address.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/load_store.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/math_emu.h#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/poly_2xm1.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/poly_atan.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/poly_div.s#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/poly_l2.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/poly_mul64.s#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/poly_sin.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/poly_tan.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/polynomial.s#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/reg_add_sub.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/reg_compare.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/reg_constant.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/reg_constant.h#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/reg_div.s#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/reg_ld_str.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/reg_mul.c#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/reg_norm.s#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/reg_round.s#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/reg_u_add.s#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/reg_u_div.s#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/reg_u_mul.s#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/reg_u_sub.s#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/status_w.h#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/version.h#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/wm_shrx.s#2 delete .. //depot/projects/hammer/sys/gnu/i386/fpemul/wm_sqrt.s#2 delete .. //depot/projects/hammer/sys/i386/conf/NOTES#18 integrate .. //depot/projects/hammer/sys/i386/i386/math_emu.h#2 delete .. //depot/projects/hammer/sys/i386/i386/math_emulate.c#4 delete .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/mpapic.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#15 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#16 integrate .. //depot/projects/hammer/sys/i386/include/apic.h#5 integrate .. //depot/projects/hammer/sys/i386/include/asm.h#5 integrate .. //depot/projects/hammer/sys/i386/include/cpufunc.h#5 integrate .. //depot/projects/hammer/sys/i386/include/frame.h#2 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#11 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc.h#2 integrate .. //depot/projects/hammer/sys/i4b/capi/iavc/iavc_lli.c#4 integrate .. //depot/projects/hammer/sys/ia64/include/_regset.h#3 integrate .. //depot/projects/hammer/sys/kern/init_main.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#8 integrate .. //depot/projects/hammer/sys/kern/md5c.c#4 integrate .. //depot/projects/hammer/sys/kern/subr_autoconf.c#3 integrate .. //depot/projects/hammer/sys/kern/subr_mbuf.c#15 integrate .. //depot/projects/hammer/sys/kern/subr_prf.c#12 integrate .. //depot/projects/hammer/sys/kern/tty_subr.c#4 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#11 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#21 integrate .. //depot/projects/hammer/sys/modules/Makefile#24 integrate .. //depot/projects/hammer/sys/modules/fpu/Makefile#2 delete .. //depot/projects/hammer/sys/modules/gnufpu/Makefile#2 delete .. //depot/projects/hammer/sys/netatm/atm_cm.c#6 integrate .. //depot/projects/hammer/sys/netatm/atm_device.c#5 integrate .. //depot/projects/hammer/sys/netatm/atm_if.c#6 integrate .. //depot/projects/hammer/sys/netatm/atm_if.h#4 integrate .. //depot/projects/hammer/sys/netatm/atm_socket.c#4 integrate .. //depot/projects/hammer/sys/netatm/atm_subr.c#6 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_if.c#5 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_load.c#4 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_vcm.c#4 integrate .. //depot/projects/hammer/sys/netatm/sigpvc/sigpvc_if.c#3 integrate .. //depot/projects/hammer/sys/netatm/spans/spans_arp.c#4 integrate .. //depot/projects/hammer/sys/netatm/spans/spans_cls.c#4 integrate .. //depot/projects/hammer/sys/netatm/spans/spans_if.c#3 integrate .. //depot/projects/hammer/sys/netatm/uni/sscf_uni.c#4 integrate .. //depot/projects/hammer/sys/netatm/uni/sscop.c#4 integrate .. //depot/projects/hammer/sys/netatm/uni/uniarp.c#4 integrate .. //depot/projects/hammer/sys/netatm/uni/uniarp_cache.c#4 integrate .. //depot/projects/hammer/sys/netatm/uni/uniarp_vcm.c#4 integrate .. //depot/projects/hammer/sys/netatm/uni/uniip.c#5 integrate .. //depot/projects/hammer/sys/netatm/uni/unisig_decode.c#5 integrate .. //depot/projects/hammer/sys/netatm/uni/unisig_if.c#3 integrate .. //depot/projects/hammer/sys/netatm/uni/unisig_subr.c#4 integrate .. //depot/projects/hammer/sys/netatm/uni/unisig_vc_state.c#4 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#13 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#10 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#8 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#9 integrate .. //depot/projects/hammer/sys/sys/systm.h#9 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#14 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#25 integrate .. //depot/projects/hammer/tools/tools/tinderbox/Makefile#3 integrate .. //depot/projects/hammer/tools/tools/tinderbox/ada.rc#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/current.rc#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/default.rc#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/dsa.rc#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/dwp.rc#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/releng_4.rc#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/stanley.rc#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#3 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#10 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.1#3 integrate .. //depot/projects/hammer/usr.bin/fetch/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/sed/TEST/sed.test#2 integrate .. //depot/projects/hammer/usr.bin/sed/sed.1#3 integrate Differences ... ==== //depot/projects/hammer/UPDATING#14 (text+ko) ==== @@ -17,6 +17,18 @@ developers choose to disable these features on build machines to maximize performance. +20030722: + FPU-less support has been removed from FreeBSD. Chances are you won't + notice. 386+387 support should still work after this change, but + it is now a minimum requirement for the i386 port that you have real + FPU hardware. + +20030714: + Some people are having problems with changes related to /rescue. + If you are building -j N, you will need to define NO_RESCUE. Others + will need to define it if /rescue has issues with their environment. + People should report those issues to current@. + 20030711: gcc was upgraded to 3.3. You are advised to not build -DNOCLEAN across this point. Further, it might be a good idea to remove @@ -1314,4 +1326,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.258 2003/07/12 01:16:54 ceri Exp $ +$FreeBSD: src/UPDATING,v 1.259 2003/07/22 11:08:41 imp Exp $ ==== //depot/projects/hammer/contrib/tar/src/tar.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/tar/src/tar.c,v 1.2 2002/06/04 17:31:16 sobomax Exp $ */ +/* $FreeBSD: src/contrib/tar/src/tar.c,v 1.3 2003/07/24 00:04:01 peter Exp $ */ #include "system.h" @@ -549,7 +549,7 @@ /* Allocate a new argument array, and copy program name in it. */ new_argc = argc - 1 + strlen (argv[1]); - new_argv = xmalloc (new_argc * sizeof (char *)); + new_argv = xmalloc ((new_argc + 1) * sizeof (char *)); in = argv; out = new_argv; *out++ = *in++; @@ -577,6 +577,9 @@ while (in < argv + argc) *out++ = *in++; + /* And NULL terminate the argv[] array */ + *out++ = NULL; + /* Replace the old option list by the new one. */ argc = new_argc; ==== //depot/projects/hammer/etc/defaults/pccard.conf#9 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.261 2003/07/19 05:40:06 imp Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.262 2003/07/22 21:23:01 dds Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -609,7 +609,7 @@ # card version string. They should be distinguished by # other info. (such as additional information or OEM-ID/product-ID). -# Note: There are several revisions of the cardon the market. +# Note: There are several revisions of the card on the market. # Type A needs no "ether" line. # Type B needs "ether 0x110" line. # Type C needs "ether 0xff0" line. @@ -952,6 +952,13 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Billionton LM5LT-10N +# Works as an Ethernet card +card "PCMCIA 10+56Combo" "LM5LT-10N" + config auto "ed" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # EXPsys PCMCIA Ethernet Combo, Relia PCMCIA Ethernet card "PCMCIA LAN" "Ethernet" config auto "ed" ? ==== //depot/projects/hammer/lib/libc/amd64/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/lib/libc/amd64/Makefile.inc,v 1.1 2003/07/22 06:34:57 peter Exp $ # # Machine dependent definitions for the amd64 architecture. # ==== //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.22 2003/07/19 04:41:08 deischen Exp $ +# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.23 2003/07/22 06:46:17 peter Exp $ SRCS+= _setjmp.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ @@ -7,4 +7,3 @@ makecontext.c signalcontext.c \ fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \ fpgetround.c fpsetround.c fpgetsticky.c fpsetsticky.c - ==== //depot/projects/hammer/lib/libc/amd64/gen/fpgetmask.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $FreeBSD: src/lib/libc/amd64/gen/fpgetmask.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */ #define __IEEEFP_NOINLINES__ 1 #include ==== //depot/projects/hammer/lib/libc/amd64/gen/fpgetprec.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $FreeBSD: src/lib/libc/amd64/gen/fpgetprec.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */ #define __IEEEFP_NOINLINES__ 1 #include ==== //depot/projects/hammer/lib/libc/amd64/gen/fpgetround.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $FreeBSD: src/lib/libc/amd64/gen/fpgetround.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */ #define __IEEEFP_NOINLINES__ 1 #include ==== //depot/projects/hammer/lib/libc/amd64/gen/fpgetsticky.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $FreeBSD: src/lib/libc/amd64/gen/fpgetsticky.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */ #define __IEEEFP_NOINLINES__ 1 #include ==== //depot/projects/hammer/lib/libc/amd64/gen/fpsetmask.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $FreeBSD: src/lib/libc/amd64/gen/fpsetmask.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */ #define __IEEEFP_NOINLINES__ 1 #include ==== //depot/projects/hammer/lib/libc/amd64/gen/fpsetprec.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $FreeBSD: src/lib/libc/amd64/gen/fpsetprec.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */ #define __IEEEFP_NOINLINES__ 1 #include ==== //depot/projects/hammer/lib/libc/amd64/gen/fpsetround.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $FreeBSD: src/lib/libc/amd64/gen/fpsetround.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */ #define __IEEEFP_NOINLINES__ 1 #include ==== //depot/projects/hammer/lib/libc/amd64/gen/fpsetsticky.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $FreeBSD: src/lib/libc/amd64/gen/fpsetsticky.c,v 1.1 2003/07/22 06:46:17 peter Exp $ */ #define __IEEEFP_NOINLINES__ 1 #include ==== //depot/projects/hammer/lib/libc/sys/connect.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)connect.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/connect.2,v 1.23 2003/04/01 20:25:46 ceri Exp $ +.\" $FreeBSD: src/lib/libc/sys/connect.2,v 1.24 2003/07/23 22:00:08 dds Exp $ .\" .Dd June 4, 1993 .Dt CONNECT 2 @@ -121,6 +121,12 @@ The socket is non-blocking and a previous connection attempt has not yet been completed. +.It Bq Er EACCES +An attempt is made to connect to a broadcast address (obtained through the +.Dv INADDR_BROADCAST +constant or the +.Dv INADDR_NONE +return value) through a socket that does not provide broadcast functionality. .El .Pp The following errors are specific to connecting names in the UNIX domain. ==== //depot/projects/hammer/lib/libfetch/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libfetch/Makefile,v 1.41 2003/05/19 15:51:59 des Exp $ +# $FreeBSD: src/lib/libfetch/Makefile,v 1.42 2003/07/22 13:54:31 ru Exp $ LIB= fetch CFLAGS+= -I. @@ -10,6 +10,7 @@ CLEANFILES= ftperr.h httperr.h .if !defined(NOCRYPT) && !defined(NO_OPENSSL) +DISTRIBUTION= crypto CFLAGS+= -DWITH_SSL DPADD= ${LIBSSL} ${LIBCRYPTO} LDADD= -lssl -lcrypto ==== //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#11 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.25 2003/07/17 23:02:29 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.26 2003/07/23 02:11:07 deischen Exp $ */ #include #include @@ -20,6 +20,7 @@ { struct pthread *curthread = _get_curthread(); struct pthread *joinee = NULL; + struct kse_mailbox *kmbx = NULL; int ret; if ((ret = _thr_ref_add(curthread, pthread, /*include dead*/0)) == 0) { @@ -65,7 +66,7 @@ /* Interrupt and resume: */ pthread->interrupted = 1; pthread->cancelflags |= THR_CANCELLING; - _thr_setrunnable_unlocked(pthread); + kmbx = _thr_setrunnable_unlocked(pthread); break; case PS_JOIN: @@ -73,7 +74,7 @@ joinee = pthread->join_status.thread; pthread->join_status.thread = NULL; pthread->cancelflags |= THR_CANCELLING; - _thr_setrunnable_unlocked(pthread); + kmbx = _thr_setrunnable_unlocked(pthread); if ((joinee != NULL) && (pthread->kseg == joinee->kseg)) { /* Remove the joiner from the joinee. */ @@ -97,7 +98,7 @@ */ pthread->interrupted = 1; pthread->cancelflags |= THR_CANCEL_NEEDED; - _thr_setrunnable_unlocked(pthread); + kmbx = _thr_setrunnable_unlocked(pthread); pthread->continuation = finish_cancellation; break; @@ -120,6 +121,8 @@ */ THR_SCHED_UNLOCK(curthread, pthread); _thr_ref_delete(curthread, pthread); + if (kmbx != NULL) + kse_wakeup(kmbx); if ((joinee != NULL) && (_thr_ref_add(curthread, joinee, /* include dead */1) == 0)) { ==== //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#13 (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/libpthread/thread/thr_cond.c,v 1.47 2003/07/18 02:46:30 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.48 2003/07/23 02:11:07 deischen Exp $ */ #include #include @@ -584,6 +584,7 @@ { struct pthread *curthread = _get_curthread(); struct pthread *pthread; + struct kse_mailbox *kmbx; int rval = 0; THR_ASSERT(curthread->locklevel == 0, @@ -619,8 +620,10 @@ (pthread->active_priority > curthread->active_priority)) curthread->critical_yield = 1; - _thr_setrunnable_unlocked(pthread); + kmbx = _thr_setrunnable_unlocked(pthread); THR_SCHED_UNLOCK(curthread, pthread); + if (kmbx != NULL) + kse_wakeup(kmbx); } /* Check for no more waiters: */ if (TAILQ_FIRST(&(*cond)->c_queue) == NULL) @@ -649,6 +652,7 @@ { struct pthread *curthread = _get_curthread(); struct pthread *pthread; + struct kse_mailbox *kmbx; int rval = 0; THR_ASSERT(curthread->locklevel == 0, @@ -682,8 +686,10 @@ (pthread->active_priority > curthread->active_priority)) curthread->critical_yield = 1; - _thr_setrunnable_unlocked(pthread); + kmbx = _thr_setrunnable_unlocked(pthread); THR_SCHED_UNLOCK(curthread, pthread); + if (kmbx != NULL) + kse_wakeup(kmbx); } /* There are no more waiting threads: */ ==== //depot/projects/hammer/lib/libpthread/thread/thr_detach.c#5 (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/libpthread/thread/thr_detach.c,v 1.22 2003/05/24 02:29:25 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_detach.c,v 1.23 2003/07/23 02:11:07 deischen Exp $ */ #include #include @@ -43,6 +43,7 @@ _pthread_detach(pthread_t pthread) { struct pthread *curthread = _get_curthread(); + struct kse_mailbox *kmbx = NULL; struct pthread *joiner; int rval = 0; @@ -83,12 +84,11 @@ joiner->join_status.ret = NULL; joiner->join_status.thread = NULL; - _thr_setrunnable_unlocked(joiner); + kmbx = _thr_setrunnable_unlocked(joiner); } joiner = NULL; } THR_SCHED_UNLOCK(curthread, pthread); - /* See if there is a thread waiting in pthread_join(): */ if ((joiner != NULL) && (_thr_ref_add(curthread, joiner, 0) == 0)) { @@ -102,12 +102,14 @@ joiner->join_status.ret = NULL; joiner->join_status.thread = NULL; - _thr_setrunnable_unlocked(joiner); + kmbx = _thr_setrunnable_unlocked(joiner); } THR_SCHED_UNLOCK(curthread, joiner); _thr_ref_delete(curthread, joiner); } _thr_ref_delete(curthread, pthread); + if (kmbx != NULL) + kse_wakeup(kmbx); } /* Return the completion status: */ ==== //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#18 (text+ko) ==== @@ -33,7 +33,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.79 2003/07/18 02:46:55 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.80 2003/07/23 02:11:07 deischen Exp $"); #include #include @@ -142,7 +142,7 @@ static void kseg_reinit(struct kse_group *kseg); static void kse_waitq_insert(struct pthread *thread); static void kse_wakeup_multi(struct kse *curkse); -static void kse_wakeup_one(struct pthread *thread); +static struct kse_mailbox *kse_wakeup_one(struct pthread *thread); static void thr_cleanup(struct kse *kse, struct pthread *curthread); static void thr_link(struct pthread *thread); static void thr_resume_wrapper(int sig, siginfo_t *, ucontext_t *); @@ -341,7 +341,7 @@ #else if (__isthreaded) _thr_signal_deinit(); - _ksd_readandclear_tmbx(); + _ksd_set_tmbx(NULL); __isthreaded = 0; active_threads = 0; #endif @@ -505,10 +505,9 @@ struct pthread *curthread = (struct pthread *)lu->lu_private; do { - THR_SCHED_LOCK(curthread, curthread); + THR_LOCK_SWITCH(curthread); THR_SET_STATE(curthread, PS_LOCKWAIT); - THR_SCHED_UNLOCK(curthread, curthread); - _thr_sched_switch(curthread); + _thr_sched_switch_unlocked(curthread); } while (!_LCK_GRANTED(lu)); } @@ -517,14 +516,17 @@ { struct pthread *thread; struct pthread *curthread; + struct kse_mailbox *kmbx; curthread = _get_curthread(); thread = (struct pthread *)_LCK_GET_PRIVATE(lu); THR_SCHED_LOCK(curthread, thread); _lock_grant(lock, lu); - _thr_setrunnable_unlocked(thread); + kmbx = _thr_setrunnable_unlocked(thread); THR_SCHED_UNLOCK(curthread, thread); + if (kmbx != NULL) + kse_wakeup(kmbx); } kse_critical_t @@ -532,7 +534,8 @@ { kse_critical_t crit; - crit = _ksd_readandclear_tmbx(); + crit = _ksd_get_tmbx(); + _ksd_set_tmbx(NULL); return (crit); } @@ -841,8 +844,8 @@ if (SIGISMEMBER(curthread->sigmask, i)) continue; if (SIGISMEMBER(curthread->sigpend, i)) - _thr_sig_add(curthread, i, - &curthread->siginfo[i-1]); + (void)_thr_sig_add(curthread, i, + &curthread->siginfo[i-1]); } __sys_sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); @@ -1142,6 +1145,7 @@ thr_cleanup(struct kse *curkse, struct pthread *thread) { struct pthread *joiner; + struct kse_mailbox *kmbx = NULL; int sys_scope; if ((joiner = thread->joiner) != NULL) { @@ -1150,7 +1154,7 @@ if (joiner->join_status.thread == thread) { joiner->join_status.thread = NULL; joiner->join_status.ret = thread->ret; - _thr_setrunnable_unlocked(joiner); + (void)_thr_setrunnable_unlocked(joiner); } } else { KSE_SCHED_UNLOCK(curkse, curkse->k_kseg); @@ -1160,10 +1164,12 @@ if (joiner->join_status.thread == thread) { joiner->join_status.thread = NULL; joiner->join_status.ret = thread->ret; - _thr_setrunnable_unlocked(joiner); + kmbx = _thr_setrunnable_unlocked(joiner); } KSE_SCHED_UNLOCK(curkse, joiner->kseg); _thr_ref_delete(thread, joiner); + if (kmbx != NULL) + kse_wakeup(kmbx); } KSE_SCHED_LOCK(curkse, curkse->k_kseg); } @@ -1436,7 +1442,8 @@ if (SIGISMEMBER(thread->sigmask, sig)) SIGADDSET(thread->sigpend, sig); else - _thr_sig_add(thread, sig, &thread->tmbx.tm_syncsig); + (void)_thr_sig_add(thread, sig, + &thread->tmbx.tm_syncsig); thread->tmbx.tm_syncsig.si_signo = 0; } completed = completed->tm_next; @@ -1653,10 +1660,11 @@ if (SIGISMEMBER(thread->sigmask, i)) continue; if (SIGISMEMBER(thread->sigpend, i)) - _thr_sig_add(thread, i, &thread->siginfo[i-1]); + (void)_thr_sig_add(thread, i, + &thread->siginfo[i-1]); else if (SIGISMEMBER(_thr_proc_sigpending, i) && _thr_getprocsig_unlocked(i, &siginfo)) { - _thr_sig_add(thread, i, &siginfo); + (void)_thr_sig_add(thread, i, &siginfo); } } KSE_LOCK_RELEASE(kse, &_thread_signal_lock); @@ -1823,23 +1831,31 @@ _thr_setrunnable(struct pthread *curthread, struct pthread *thread) { kse_critical_t crit; + struct kse_mailbox *kmbx; crit = _kse_critical_enter(); KSE_SCHED_LOCK(curthread->kse, thread->kseg); - _thr_setrunnable_unlocked(thread); + kmbx = _thr_setrunnable_unlocked(thread); KSE_SCHED_UNLOCK(curthread->kse, thread->kseg); _kse_critical_leave(crit); + if (kmbx != NULL) + kse_wakeup(kmbx); } -void +struct kse_mailbox * _thr_setrunnable_unlocked(struct pthread *thread) { + struct kse_mailbox *kmbx = NULL; + if ((thread->kseg->kg_flags & KGF_SINGLE_THREAD) != 0) { /* No silly queues for these threads. */ if ((thread->flags & THR_FLAGS_SUSPENDED) != 0) THR_SET_STATE(thread, PS_SUSPENDED); - else + else { THR_SET_STATE(thread, PS_RUNNING); + kmbx = kse_wakeup_one(thread); + } + } else if (thread->state != PS_RUNNING) { if ((thread->flags & THR_FLAGS_IN_WAITQ) != 0) KSE_WAITQ_REMOVE(thread->kse, thread); @@ -1850,25 +1866,31 @@ if ((thread->blocked == 0) && (thread->active == 0) && (thread->flags & THR_FLAGS_IN_RUNQ) == 0) THR_RUNQ_INSERT_TAIL(thread); + /* + * XXX - Threads are not yet assigned to specific + * KSEs; they are assigned to the KSEG. So + * the fact that a thread's KSE is waiting + * doesn't necessarily mean that it will be + * the KSE that runs the thread after the + * lock is granted. But we don't know if the + * other KSEs within the same KSEG are also + * in a waiting state or not so we err on the + * side of caution and wakeup the thread's + * last known KSE. We ensure that the + * threads KSE doesn't change while it's + * scheduling lock is held so it is safe to + * reference it (the KSE). If the KSE wakes + * up and doesn't find any more work it will + * again go back to waiting so no harm is + * done. + */ + kmbx = kse_wakeup_one(thread); } } - /* - * XXX - Threads are not yet assigned to specific KSEs; they are - * assigned to the KSEG. So the fact that a thread's KSE is - * waiting doesn't necessarily mean that it will be the KSE - * that runs the thread after the lock is granted. But we - * don't know if the other KSEs within the same KSEG are - * also in a waiting state or not so we err on the side of - * caution and wakeup the thread's last known KSE. We - * ensure that the threads KSE doesn't change while it's - * scheduling lock is held so it is safe to reference it - * (the KSE). If the KSE wakes up and doesn't find any more - * work it will again go back to waiting so no harm is done. - */ - kse_wakeup_one(thread); + return (kmbx); } -static void +static struct kse_mailbox * kse_wakeup_one(struct pthread *thread) { struct kse *ke; @@ -1876,17 +1898,17 @@ if (KSE_IS_IDLE(thread->kse)) { KSE_CLEAR_IDLE(thread->kse); thread->kseg->kg_idle_kses--; - KSE_WAKEUP(thread->kse); + return (&thread->kse->k_mbx); } else { TAILQ_FOREACH(ke, &thread->kseg->kg_kseq, k_kgqe) { if (KSE_IS_IDLE(ke)) { KSE_CLEAR_IDLE(ke); ke->k_kseg->kg_idle_kses--; - KSE_WAKEUP(ke); - return; + return (&ke->k_mbx); } } } + return (NULL); } static void ==== //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#8 (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/libpthread/thread/thr_mutex.c,v 1.38 2003/07/18 02:46:29 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_mutex.c,v 1.39 2003/07/23 02:11:07 deischen Exp $ */ #include #include @@ -67,7 +67,8 @@ /* * Prototypes */ -static void mutex_handoff(struct pthread *, struct pthread_mutex *); +static struct kse_mailbox *mutex_handoff(struct pthread *, + struct pthread_mutex *); static inline int mutex_self_trylock(struct pthread *, pthread_mutex_t); static inline int mutex_self_lock(struct pthread *, pthread_mutex_t); static int mutex_unlock_common(pthread_mutex_t *, int); @@ -860,6 +861,7 @@ mutex_unlock_common(pthread_mutex_t *m, int add_reference) { struct pthread *curthread = _get_curthread(); + struct kse_mailbox *kmbx = NULL; int ret = 0; if (m == NULL || *m == NULL) @@ -904,7 +906,7 @@ * Hand off the mutex to the next waiting * thread: */ - mutex_handoff(curthread, *m); + kmbx = mutex_handoff(curthread, *m); } break; @@ -961,7 +963,7 @@ * Hand off the mutex to the next waiting * thread: */ - mutex_handoff(curthread, *m); + kmbx = mutex_handoff(curthread, *m); } break; @@ -1017,7 +1019,7 @@ * Hand off the mutex to the next waiting * thread: */ - mutex_handoff(curthread, *m); + kmbx = mutex_handoff(curthread, *m); } break; @@ -1034,6 +1036,8 @@ /* Unlock the mutex structure: */ THR_LOCK_RELEASE(curthread, &(*m)->m_lock); + if (kmbx != NULL) + kse_wakeup(kmbx); } /* Return the completion status: */ @@ -1460,9 +1464,10 @@ * is necessary to lock the thread's scheduling queue while also * holding the mutex lock. */ -static void +static struct kse_mailbox * mutex_handoff(struct pthread *curthread, struct pthread_mutex *mutex) { + struct kse_mailbox *kmbx = NULL; struct pthread *pthread; /* Keep dequeueing until we find a valid thread: */ @@ -1564,7 +1569,7 @@ } /* Make the thread runnable and unlock the scheduling queue: */ - _thr_setrunnable_unlocked(pthread); + kmbx = _thr_setrunnable_unlocked(pthread); /* Add a preemption point. */ if ((curthread->kseg == pthread->kseg) && @@ -1583,6 +1588,7 @@ if ((pthread == NULL) && (mutex->m_protocol == PTHREAD_PRIO_INHERIT)) /* This mutex has no priority: */ mutex->m_prio = 0; + return (kmbx); } /* ==== //depot/projects/hammer/lib/libpthread/thread/thr_private.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.93 2003/07/18 02:46:55 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.94 2003/07/23 02:11:07 deischen Exp $ */ #ifndef _THR_PRIVATE_H @@ -1106,8 +1106,8 @@ int _thr_schedule_add(struct pthread *, struct pthread *); void _thr_schedule_remove(struct pthread *, struct pthread *); void _thr_setrunnable(struct pthread *curthread, struct pthread *thread); -void _thr_setrunnable_unlocked(struct pthread *thread); -void _thr_sig_add(struct pthread *, int, siginfo_t *); +struct kse_mailbox *_thr_setrunnable_unlocked(struct pthread *thread); +struct kse_mailbox *_thr_sig_add(struct pthread *, int, siginfo_t *); void _thr_sig_dispatch(struct kse *, int, siginfo_t *); int _thr_stack_alloc(struct pthread_attr *); void _thr_stack_free(struct pthread_attr *); ==== //depot/projects/hammer/lib/libpthread/thread/thr_resume_np.c#4 (text+ko) ==== @@ -29,13 +29,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_resume_np.c,v 1.17 2003/05/04 16:17:01 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_resume_np.c,v 1.18 2003/07/23 02:11:07 deischen Exp $ */ #include #include #include "thr_private.h" -static void resume_common(struct pthread *); +static struct kse_mailbox *resume_common(struct pthread *); __weak_reference(_pthread_resume_np, pthread_resume_np); __weak_reference(_pthread_resume_all_np, pthread_resume_all_np); @@ -46,15 +46,18 @@ _pthread_resume_np(pthread_t thread) { struct pthread *curthread = _get_curthread(); + struct kse_mailbox *kmbx; int ret; /* Add a reference to the thread: */ if ((ret = _thr_ref_add(curthread, thread, /*include dead*/0)) == 0) { /* Lock the threads scheduling queue: */ THR_SCHED_LOCK(curthread, thread); - resume_common(thread); + kmbx = resume_common(thread); THR_SCHED_UNLOCK(curthread, thread); _thr_ref_delete(curthread, thread); + if (kmbx != NULL) + kse_wakeup(kmbx); } return (ret); } @@ -64,6 +67,7 @@ { struct pthread *curthread = _get_curthread(); struct pthread *thread; + struct kse_mailbox *kmbx; kse_critical_t crit; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 23 19:27:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B43A137B404; Wed, 23 Jul 2003 19:27: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 4F50637B401 for ; Wed, 23 Jul 2003 19:27:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3F3643F85 for ; Wed, 23 Jul 2003 19:27:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6O2R90U058168 for ; Wed, 23 Jul 2003 19:27:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6O2R9Xf058165 for perforce@freebsd.org; Wed, 23 Jul 2003 19:27:09 -0700 (PDT) Date: Wed, 23 Jul 2003 19:27:09 -0700 (PDT) Message-Id: <200307240227.h6O2R9Xf058165@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 34911 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, 24 Jul 2003 02:27:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=34911 Change 34911 by peter@peter_daintree on 2003/07/23 19:26:27 IFC @34910 Affected files ... .. //depot/projects/hammer/lib/Makefile#22 integrate .. //depot/projects/hammer/sbin/Makefile#14 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#6 integrate .. //depot/projects/hammer/sys/netncp/ncp_ncp.c#8 integrate .. //depot/projects/hammer/sys/netsmb/smb_usr.c#4 integrate .. //depot/projects/hammer/usr.bin/Makefile#17 integrate .. //depot/projects/hammer/usr.sbin/Makefile#25 integrate Differences ... ==== //depot/projects/hammer/lib/Makefile#22 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.164 2003/07/20 01:34:40 mtm Exp $ +# $FreeBSD: src/lib/Makefile,v 1.165 2003/07/24 02:05:48 peter Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -79,6 +79,11 @@ _compat= compat .endif +.if ${MACHINE_ARCH} == "amd64" +_libncp= libncp +_libsmb= libsmb +.endif + .if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "powerpc" .if !defined(NOLIBTHR) _libthr= libthr ==== //depot/projects/hammer/sbin/Makefile#14 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.123 2003/07/02 16:16:49 gordon Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.124 2003/07/24 01:42:49 peter Exp $ # XXX MISSING: icheck ncheck @@ -108,7 +108,8 @@ # XXX: should combine with i386 above .if ${MACHINE_ARCH} == "amd64" -SUBDIR+=fdisk +SUBDIR+=fdisk \ + gpt .endif .include ==== //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#6 (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_vfsops.c,v 1.19 2003/06/12 20:48:37 phk Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.20 2003/07/24 01:59:18 peter Exp $ */ #include "opt_netsmb.h" #ifndef NETSMB @@ -332,7 +332,8 @@ { #ifndef SMP int name[2]; - int olen, ncpu, plen, error; + int ncpu, error; + size_t olen, plen; name[0] = CTL_HW; name[1] = HW_NCPU; ==== //depot/projects/hammer/sys/netncp/ncp_ncp.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netncp/ncp_ncp.c,v 1.17 2003/06/11 05:30:35 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netncp/ncp_ncp.c,v 1.18 2003/07/24 01:59:17 peter Exp $"); #include #include @@ -206,7 +206,8 @@ ncp_renegotiate_connparam(struct ncp_conn *conn, int buffsize, u_int8_t in_options) { u_int8_t options; - int neg_buffsize, error, sl, ckslevel, ilen; + int neg_buffsize, error, sl, ckslevel; + size_t ilen; sl = conn->li.sig_level; if (sl >= 2) ==== //depot/projects/hammer/sys/netsmb/smb_usr.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netsmb/smb_usr.c,v 1.4 2003/06/11 05:32:09 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netsmb/smb_usr.c,v 1.5 2003/07/24 01:59:18 peter Exp $"); #include #include @@ -302,8 +302,7 @@ struct mdchain *mdp; int error, len; - if (dp->ioc_tparamcnt > 0xffff || dp->ioc_tdatacnt > 0xffff || - dp->ioc_setupcnt > 3) + if (dp->ioc_setupcnt > 3) return EINVAL; error = smb_t2_init(t2p, SSTOCP(ssp), dp->ioc_setup[0], scred); if (error) ==== //depot/projects/hammer/usr.bin/Makefile#17 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $FreeBSD: src/usr.bin/Makefile,v 1.243 2003/07/16 20:59:11 markm Exp $ +# $FreeBSD: src/usr.bin/Makefile,v 1.244 2003/07/24 02:09:19 peter Exp $ # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend @@ -242,6 +242,12 @@ SUBDIR+=uac .endif +.if ${MACHINE_ARCH} == "amd64" +SUBDIR+=ncplist \ + ncplogin \ + smbutil +.endif + .if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) SUBDIR+=chkey newkey .endif ==== //depot/projects/hammer/usr.sbin/Makefile#25 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.262 2003/07/14 16:36:40 njl Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.264 2003/07/24 02:07:14 peter Exp $ .if ${MACHINE_ARCH} != "powerpc" _sysinstall=sysinstall @@ -197,8 +197,20 @@ .endif .endif +# kgmon: builds, but no kernel profiling +# kgzip: builds, but missing support files +# mptable: broken (not 64 bit clean) +# pnpinfo: crashes (not really useful anyway) .if ${MACHINE_ARCH} == "amd64" -SUBDIR+= btxld +SUBDIR+=acpi \ + boot0cfg \ + btxld \ + lptcontrol \ + mount_nwfs \ + mount_smbfs \ + sicontrol \ + spkrtest \ + zzz .endif .if ${MACHINE} == "i386" From owner-p4-projects@FreeBSD.ORG Wed Jul 23 19:30:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0893937B405; Wed, 23 Jul 2003 19:30: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 9BF1D37B401 for ; Wed, 23 Jul 2003 19:30:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3CC4D43FA3 for ; Wed, 23 Jul 2003 19:30:14 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6O2UE0U058323 for ; Wed, 23 Jul 2003 19:30:14 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6O2UDRp058320 for perforce@freebsd.org; Wed, 23 Jul 2003 19:30:13 -0700 (PDT) Date: Wed, 23 Jul 2003 19:30:13 -0700 (PDT) Message-Id: <200307240230.h6O2UDRp058320@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 34912 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, 24 Jul 2003 02:30:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=34912 Change 34912 by peter@peter_hammer on 2003/07/23 19:29:21 make this stuff compile and work Affected files ... .. //depot/projects/hammer/contrib/smbfs/lib/smb/kiconv.c#2 edit .. //depot/projects/hammer/contrib/smbfs/lib/smb/rap.c#2 edit .. //depot/projects/hammer/lib/libncp/ncpl_conn.c#3 edit .. //depot/projects/hammer/lib/libncp/ncpl_subr.c#4 edit Differences ... ==== //depot/projects/hammer/contrib/smbfs/lib/smb/kiconv.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ { struct iconv_add_in din; struct iconv_add_out dout; - int olen; + size_t olen; if (strlen(from) > ICONV_CSNMAXLEN || strlen(to) > ICONV_CSNMAXLEN) return EINVAL; ==== //depot/projects/hammer/contrib/smbfs/lib/smb/rap.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include ==== //depot/projects/hammer/lib/libncp/ncpl_conn.c#3 (text+ko) ==== @@ -274,7 +274,8 @@ int ncp_conn_cnt(void) { - int error, cnt = 0, len = sizeof(cnt); + int error, cnt = 0; + size_t len = sizeof(cnt); error = sysctlbyname("net.ncp.conn_cnt", &cnt, &len, NULL, 0); if (error) cnt = 0; @@ -382,7 +383,8 @@ void * ncp_conn_list(void) { - int error, cnt = 0, len; + int error, cnt = 0; + size_t len; void *p; cnt = ncp_conn_cnt(); ==== //depot/projects/hammer/lib/libncp/ncpl_subr.c#4 (text+ko) ==== @@ -243,7 +243,8 @@ int ncp_initlib(void){ int error; - int kv, kvlen = sizeof(kv); + int kv; + size_t kvlen = sizeof(kv); static int ncp_initialized; if (ncp_initialized) From owner-p4-projects@FreeBSD.ORG Wed Jul 23 20:12:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B8C137B404; Wed, 23 Jul 2003 20:12:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB12637B401 for ; Wed, 23 Jul 2003 20:12:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EF0543F85 for ; Wed, 23 Jul 2003 20:12:05 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6O3C50U060785 for ; Wed, 23 Jul 2003 20:12:05 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6O3C4At060782 for perforce@freebsd.org; Wed, 23 Jul 2003 20:12:04 -0700 (PDT) Date: Wed, 23 Jul 2003 20:12:04 -0700 (PDT) Message-Id: <200307240312.h6O3C4At060782@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 34913 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, 24 Jul 2003 03:12:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=34913 Change 34913 by marcel@marcel_nfs on 2003/07/23 20:12:02 Copy the register definitions for the Z8530 from zs(4). This too is a dual channel SCC, but not will a nice seperate address space. Getting this to work is a good test for the general model followed. Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_z8530.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jul 23 20:26:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E47037B404; Wed, 23 Jul 2003 20:26:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D123F37B401 for ; Wed, 23 Jul 2003 20:26:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C6BE43F75 for ; Wed, 23 Jul 2003 20:26:23 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6O3QN0U061271 for ; Wed, 23 Jul 2003 20:26:23 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6O3QM2v061268 for perforce@freebsd.org; Wed, 23 Jul 2003 20:26:22 -0700 (PDT) Date: Wed, 23 Jul 2003 20:26:22 -0700 (PDT) Message-Id: <200307240326.h6O3QM2v061268@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 34914 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, 24 Jul 2003 03:26:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=34914 Change 34914 by marcel@marcel_nfs on 2003/07/23 20:26:07 Further improve on the ns8250 driver: o Don't use the IIR register to figure out the cause of an interrupt. Instead, use the LSR to get a bitmap of the things that need attention. This avoids that we lose pending interrupt conditions while we talk to the UART. This fixes the lost transmit interrupts. o Differentiate between flushing and draining. Flushing implies losing data. Draining means that we wait for all data to be processed. Do not yet add a drain method. o Implement the getsig method. Don't depend on the delta bits that the UART maintains. Do it ourselves. This is mostly alpha code. We also need a setsig method to set modem signals. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus.h#7 edit .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#8 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus.h#7 (text+ko) ==== @@ -32,9 +32,11 @@ #include #include -/* Flush targets. */ -#define UART_FLUSH_RECEIVER 0x0001 -#define UART_FLUSH_TRANSMITTER 0x0002 +/* Drain and flush targets. */ +#define UART_DRAIN_RECEIVER 0x0001 +#define UART_DRAIN_TRANSMITTER 0x0002 +#define UART_FLUSH_RECEIVER UART_DRAIN_RECEIVER +#define UART_FLUSH_TRANSMITTER UART_DRAIN_TRANSMITTER /* Interrupt sources (in priority order). See also uart_core.c */ #define UART_IPEND_OVERRUN 0x0001 ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#8 (text+ko) ==== @@ -83,13 +83,13 @@ } static int -ns8250_flush(struct uart_bas *bas, int what) +ns8250_drain(struct uart_bas *bas, int what) { int delay, limit; delay = ns8250_delay(bas); - if (what & UART_FLUSH_TRANSMITTER) { + if (what & UART_DRAIN_TRANSMITTER) { /* * Pick an arbitrary high limit to avoid getting stuck in * an infinite loop when the hardware is broken. Make the @@ -104,7 +104,7 @@ } } - if (what & UART_FLUSH_RECEIVER) { + if (what & UART_DRAIN_RECEIVER) { /* * Pick an arbitrary high limit to avoid getting stuck in * an infinite loop when the hardware is broken. Make the @@ -129,6 +129,24 @@ } /* + * We can only flush UARTs with FIFOs. UARTs without FIFOs should be + * drained. + */ +static void +ns8250_flush(struct uart_bas *bas, int what) +{ + uint8_t fcr; + + fcr = FCR_ENABLE; + if (what & UART_FLUSH_TRANSMITTER) + fcr |= FCR_XMT_RST; + if (what & UART_FLUSH_RECEIVER) + fcr |= FCR_RCV_RST; + uart_setreg(bas, REG_FCR, fcr); + uart_barrier(bas); +} + +/* * Low-level UART interface. */ static int ns8250_probe(struct uart_bas *bas); @@ -299,6 +317,8 @@ uint8_t fcr; uint8_t lcr; uint8_t mcr; + uint8_t signals; + uint8_t sigchg; }; static int ns8250_bus_attach(struct uart_softc *); @@ -345,6 +365,8 @@ uart_setreg(bas, REG_IER, IER_ERXRDY | IER_ETXRDY | IER_ERLS | IER_EMSC); uart_barrier(bas); + ns8250->signals = uart_getreg(bas, REG_MSR) >> 4; + ns8250->sigchg = 0; return (0); } @@ -359,40 +381,50 @@ ns8250_bus_flush(struct uart_softc *sc, int what) { - return (ns8250_flush(&sc->sc_bas, what)); + if (sc->sc_hasfifo) { + ns8250_flush(&sc->sc_bas, what); + return (0); + } + return (ns8250_drain(&sc->sc_bas, what)); } static int ns8250_bus_getsig(struct uart_softc *sc) { + struct ns8250_softc *ns8250 = (struct ns8250_softc*)sc; + struct uart_bas *bas; + uint8_t sig; - return (0); + bas = &sc->sc_bas; + sig = uart_getreg(bas, REG_MSR) >> 4; + ns8250->sigchg |= ns8250->signals ^ sig; + ns8250->signals = sig; + return ((ns8250->sigchg << 4) | ns8250->signals); } static int ns8250_bus_ipend(struct uart_softc *sc) { + struct ns8250_softc *ns8250 = (struct ns8250_softc*)sc; struct uart_bas *bas; int ipend; - uint8_t iir, lsr; + uint8_t lsr, sig; bas = &sc->sc_bas; ipend = 0; - iir = uart_getreg(bas, REG_IIR); - if (iir == IIR_RLS) { - lsr = uart_getreg(bas, REG_LSR); - if (lsr & LSR_OE) - ipend |= UART_IPEND_OVERRUN; - if (lsr & LSR_BI) - ipend |= UART_IPEND_BREAK; - uart_barrier(bas); - iir = uart_getreg(bas, REG_IIR); - } - if (iir == IIR_RXRDY || iir == IIR_RXTOUT) + lsr = uart_getreg(bas, REG_LSR); + if (lsr & LSR_OE) + ipend |= UART_IPEND_OVERRUN; + if (lsr & LSR_BI) + ipend |= UART_IPEND_BREAK; + if (lsr & LSR_RXRDY) ipend |= UART_IPEND_RXREADY; - if (iir == IIR_TXRDY) + if (lsr & LSR_TEMT) ipend |= UART_IPEND_TXIDLE; - if (iir == IIR_MLSC) + sig = uart_getreg(bas, REG_MSR) >> 4; + ns8250->sigchg |= ns8250->signals ^ sig; + ns8250->signals = sig; + if (ns8250->sigchg) ipend |= UART_IPEND_SIGCHG; return (ipend); } @@ -417,7 +449,7 @@ } else mcr |= MCR_DTR | MCR_RTS; - error = ns8250_flush(bas, UART_FLUSH_TRANSMITTER); + error = ns8250_drain(bas, UART_DRAIN_TRANSMITTER); if (error) return (error); @@ -458,8 +490,8 @@ count = 0; delay = ns8250_delay(bas); - /* We have FIFOs. Flush the transmitter and receiver. */ - error = ns8250_flush(bas, UART_FLUSH_RECEIVER|UART_FLUSH_TRANSMITTER); + /* We have FIFOs. Drain the transmitter and receiver. */ + error = ns8250_drain(bas, UART_DRAIN_RECEIVER|UART_DRAIN_TRANSMITTER); if (error) { uart_setreg(bas, REG_MCR, mcr); uart_setreg(bas, REG_FCR, 0); @@ -499,8 +531,7 @@ uart_setreg(bas, REG_MCR, mcr); /* Reset FIFOs. */ - uart_setreg(bas, REG_FCR, FCR_ENABLE | FCR_XMT_RST | FCR_RCV_RST); - uart_barrier(bas); + ns8250_flush(bas, UART_FLUSH_RECEIVER|UART_FLUSH_TRANSMITTER); describe: if (count >= 14 && count < 16) { @@ -530,7 +561,7 @@ ns8250_bus_receive(struct uart_softc *sc) { struct uart_bas *bas; - int ptr, xc; + int xc; uint8_t lsr; bas = &sc->sc_bas; From owner-p4-projects@FreeBSD.ORG Wed Jul 23 21:09:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1E5837B401; Wed, 23 Jul 2003 21:09: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 97B1537B405 for ; Wed, 23 Jul 2003 21:09:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54BD643FCB for ; Wed, 23 Jul 2003 21:09:17 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6O49H0U069013 for ; Wed, 23 Jul 2003 21:09:17 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6O49G5I069009 for perforce@freebsd.org; Wed, 23 Jul 2003 21:09:16 -0700 (PDT) Date: Wed, 23 Jul 2003 21:09:16 -0700 (PDT) Message-Id: <200307240409.h6O49G5I069009@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 34917 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, 24 Jul 2003 04:09:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=34917 Change 34917 by marcel@marcel_nfs on 2003/07/23 21:09:05 Add a skeleton driver for the Z8530 and hook it up to the build. Affected files ... .. //depot/projects/uart/conf/files#11 edit .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#1 add Differences ... ==== //depot/projects/uart/conf/files#11 (text+ko) ==== @@ -783,6 +783,7 @@ dev/uart/uart_if.m optional uart dev/uart/uart_dev_ns8250.c optional uart dev/uart/uart_dev_sab82532.c optional uart +dev/uart/uart_dev_z8530.c optional uart dev/uart/uart_bus_acpi.c optional uart acpi dev/uart/uart_bus_ebus.c optional uart ebus dev/uart/uart_bus_isa.c optional uart isa From owner-p4-projects@FreeBSD.ORG Thu Jul 24 08:21:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7445637B404; Thu, 24 Jul 2003 08: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 263C837B401 for ; Thu, 24 Jul 2003 08:21:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A246343F3F for ; Thu, 24 Jul 2003 08:21:12 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6OFLC0U016246 for ; Thu, 24 Jul 2003 08:21:12 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6OFLCPQ016243 for perforce@freebsd.org; Thu, 24 Jul 2003 08:21:12 -0700 (PDT) Date: Thu, 24 Jul 2003 08:21:12 -0700 (PDT) Message-Id: <200307241521.h6OFLCPQ016243@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 34941 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, 24 Jul 2003 15:21:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=34941 Change 34941 by sam@sam_ebb on 2003/07/24 08:20:12 lock domain table (when socket refs are properly handled we'll need this to be able to remove/unload domains) Affected files ... .. //depot/projects/netperf/sys/kern/subr_mbuf.c#2 edit .. //depot/projects/netperf/sys/kern/uipc_domain.c#2 edit .. //depot/projects/netperf/sys/kern/vfs_export.c#2 edit .. //depot/projects/netperf/sys/net/radix.c#2 edit .. //depot/projects/netperf/sys/net/route.c#2 edit .. //depot/projects/netperf/sys/sys/domain.h#2 edit Differences ... ==== //depot/projects/netperf/sys/kern/subr_mbuf.c#2 (text+ko) ==== @@ -1035,10 +1035,12 @@ mbstat.m_drain++; /* XXX: No consistency. */ + DOMAIN_LOCK(); for (dp = domains; dp != NULL; dp = dp->dom_next) for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_drain != NULL) (*pr->pr_drain)(); + DOMAIN_UNLOCK(); } /****************************************************************************** ==== //depot/projects/netperf/sys/kern/uipc_domain.c#2 (text+ko) ==== @@ -42,6 +42,8 @@ #include #include #include +#include +#include #include #include #include @@ -67,7 +69,8 @@ static void pffasttimo(void *); static void pfslowtimo(void *); -struct domain *domains; +struct domain *domains; /* registered protocol domains */ +struct mtx dom_mtx; /* domain list lock */ /* * Add a new protocol domain to the list of supported domains @@ -78,9 +81,7 @@ net_init_domain(struct domain *dp) { register struct protosw *pr; - int s; - s = splnet(); if (dp->dom_init) (*dp->dom_init)(); for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++){ @@ -94,9 +95,8 @@ /* * update global information about maximums */ - max_hdr = max_linkhdr + max_protohdr; + max_hdr = max_linkhdr + max_protohdr; /** XXX locking */ max_datalen = MHLEN - max_hdr; - splx(s); } /* @@ -107,14 +107,13 @@ void net_add_domain(void *data) { - int s; struct domain *dp; dp = (struct domain *)data; - s = splnet(); + DOMAIN_LOCK(); dp->dom_next = domains; domains = dp; - splx(s); + DOMAIN_UNLOCK(); net_init_domain(dp); } @@ -131,11 +130,13 @@ NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(socket_zone, maxsockets); + mtx_init(&dom_mtx, "domain list lock", NULL, MTX_DEF); + if (max_linkhdr < 16) /* XXX */ max_linkhdr = 16; - callout_init(&pffast_callout, 0); - callout_init(&pfslow_callout, 0); + callout_init(&pffast_callout, CALLOUT_MPSAFE); + callout_init(&pfslow_callout, CALLOUT_MPSAFE); callout_reset(&pffast_callout, 1, pffasttimo, NULL); callout_reset(&pfslow_callout, 1, pfslowtimo, NULL); @@ -150,11 +151,14 @@ register struct domain *dp; register struct protosw *pr; + DOMAIN_LOCK(); for (dp = domains; dp; dp = dp->dom_next) if (dp->dom_family == family) goto found; + DOMAIN_UNLOCK(); return (0); found: + DOMAIN_UNLOCK(); for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_type && pr->pr_type == type) return (pr); @@ -173,11 +177,14 @@ if (family == 0) return (0); + DOMAIN_LOCK(); for (dp = domains; dp; dp = dp->dom_next) if (dp->dom_family == family) goto found; + DOMAIN_UNLOCK(); return (0); found: + DOMAIN_UNLOCK(); for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) { if ((pr->pr_protocol == protocol) && (pr->pr_type == type)) return (pr); @@ -197,10 +204,12 @@ register struct domain *dp; register struct protosw *pr; + DOMAIN_LOCK(); for (dp = domains; dp; dp = dp->dom_next) for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_ctlinput) (*pr->pr_ctlinput)(cmd, sa, (void *)0); + DOMAIN_UNLOCK(); } void @@ -214,6 +223,7 @@ if (!sa) return; + DOMAIN_LOCK(); for (dp = domains; dp; dp = dp->dom_next) { /* * the check must be made by xx_ctlinput() anyways, to @@ -227,6 +237,7 @@ if (pr->pr_ctlinput) (*pr->pr_ctlinput)(cmd, sa, ctlparam); } + DOMAIN_UNLOCK(); } static void @@ -236,10 +247,13 @@ register struct domain *dp; register struct protosw *pr; + DOMAIN_LOCK(); for (dp = domains; dp; dp = dp->dom_next) for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_slowtimo) (*pr->pr_slowtimo)(); + DOMAIN_UNLOCK(); + callout_reset(&pfslow_callout, hz/2, pfslowtimo, NULL); } @@ -250,9 +264,12 @@ register struct domain *dp; register struct protosw *pr; + DOMAIN_LOCK(); for (dp = domains; dp; dp = dp->dom_next) for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_fasttimo) (*pr->pr_fasttimo)(); + DOMAIN_UNLOCK(); + callout_reset(&pffast_callout, hz/5, pffasttimo, NULL); } ==== //depot/projects/netperf/sys/kern/vfs_export.c#2 (text+ko) ==== @@ -144,12 +144,14 @@ * Seems silly to initialize every AF when most are not used, * do so on demand here */ + DOMAIN_LOCK(); for (dom = domains; dom; dom = dom->dom_next) if (dom->dom_family == i && dom->dom_rtattach) { dom->dom_rtattach((void **) &nep->ne_rtable[i], dom->dom_rtoffset); break; } + DOMAIN_UNLOCK(); if ((rnh = nep->ne_rtable[i]) == NULL) { error = ENOBUFS; goto out; ==== //depot/projects/netperf/sys/net/radix.c#2 (text+ko) ==== @@ -1059,9 +1059,11 @@ #ifdef _KERNEL struct domain *dom; + DOMAIN_LOCK(); for (dom = domains; dom; dom = dom->dom_next) if (dom->dom_maxrtkey > max_keylen) max_keylen = dom->dom_maxrtkey; + DOMAIN_UNLOCK(); #endif if (max_keylen == 0) { log(LOG_ERR, ==== //depot/projects/netperf/sys/net/route.c#2 (text+ko) ==== @@ -68,10 +68,12 @@ void **table; { struct domain *dom; + DOMAIN_LOCK(); for (dom = domains; dom; dom = dom->dom_next) if (dom->dom_rtattach) dom->dom_rtattach(&table[dom->dom_family], dom->dom_rtoffset); + DOMAIN_UNLOCK(); } void ==== //depot/projects/netperf/sys/sys/domain.h#2 (text+ko) ==== @@ -67,6 +67,10 @@ extern struct domain *domains; extern struct domain localdomain; extern void net_add_domain(void *); +extern struct mtx dom_mtx; + +#define DOMAIN_LOCK() mtx_lock(&dom_mtx) +#define DOMAIN_UNLOCK() mtx_unlock(&dom_mtx) #define DOMAIN_SET(name) \ SYSINIT(domain_ ## name, SI_SUB_PROTO_DOMAIN, SI_ORDER_SECOND, net_add_domain, & name ## domain) From owner-p4-projects@FreeBSD.ORG Thu Jul 24 10:12:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA6F737B405; Thu, 24 Jul 2003 10:12: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 7A99537B401 for ; Thu, 24 Jul 2003 10:12:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B300943FA3 for ; Thu, 24 Jul 2003 10:12:30 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6OHCU0U027888 for ; Thu, 24 Jul 2003 10:12:30 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6OHCUpR027885 for perforce@freebsd.org; Thu, 24 Jul 2003 10:12:30 -0700 (PDT) Date: Thu, 24 Jul 2003 10:12:30 -0700 (PDT) Message-Id: <200307241712.h6OHCUpR027885@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 34947 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, 24 Jul 2003 17:12:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=34947 Change 34947 by cvance@cvance_osx_laptop on 2003/07/24 10:11:30 A bunch of small changes to get closer to having the Darwin kernel build and boot with the basic TrustedBSD framework in place. - Add support for strsep - Fix up condition variables by removing unsupported API calls wait_queue_empty() and wait_queue_is_queue() - Get sbuf support to compile: replace _KERNEL with KERNEL in ifdefs, fix up include file paths, change malloc macros, add M_SBUF to malloc types - Install _label.h with the rest of the system headers - Temporarily remove mbuf security labels, since it has binary compatibility issues Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/conf/files#5 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_condvar.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/subr_sbuf.c#2 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/libkern/strsep.c#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/libkern.h#1 add .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/malloc.h#4 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/mbuf.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/conf/files#5 (text+ko) ==== @@ -124,6 +124,7 @@ bsd/libkern/skpc.c standard bsd/libkern/inet_ntoa.c standard bsd/libkern/bcd.c standard +bsd/libkern/strsep.c standard bsd/vfs/vfs_bio.c standard bsd/vfs/vfs_cache.c standard ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_condvar.c#3 (text+ko) ==== @@ -38,7 +38,6 @@ #include #include -#include void cv_init(struct cv *cvp, const char *desc) @@ -54,8 +53,14 @@ cv_destroy(struct cv *cvp) { +#if 0 + /* + * TBD/CDV this method is marked both + * __APPLE_API_PRIVATE and MACH_KERNEL_PRIVATE + */ if (!wait_queue_is_queue(cvp->cv_wait_queue)) panic("cv_destroy: !wait_queue_is_queue"); +#endif bzero(cvp, sizeof(*cvp)); } @@ -134,12 +139,19 @@ panic("cv_waitq_remove: not currently supported"); } +#if 0 int cv_waitq_empty(struct cv *cvp) { - return (queue_empty(cvp->cv_wait_queue)); + /* + * TBD/CDV wait_queue_empty() should probably be used, but + * it's marked both __APPLE_API_PRIVATE and MACH_KERNEL_PRIVATE + * + */ + return (wait_queue_empty(cvp->cv_wait_queue)); } +#endif const char * cv_wmesg(struct cv *cvp) ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/subr_sbuf.c#2 (text+ko) ==== @@ -30,33 +30,36 @@ #include -#ifdef _KERNEL -#include +#ifdef KERNEL +/* #include */ #include #include #include #include -#include -#else /* _KERNEL */ +#include +#include +#else /* KERNEL */ #include #include #include #include #include -#endif /* _KERNEL */ +#endif /* KERNEL */ #include -#ifdef _KERNEL -MALLOC_DEFINE(M_SBUF, "sbuf", "string buffers"); -#define SBMALLOC(size) malloc(size, M_SBUF, M_WAITOK) -#define SBFREE(buf) free(buf, M_SBUF) -#else /* _KERNEL */ +#ifdef KERNEL +/* MALLOC_DEFINE(M_SBUF, "sbuf", "string buffers"); */ +#define SBMALLOC(size) _MALLOC(size, M_SBUF, M_WAITOK) +#define SBFREE(buf) FREE(buf, M_SBUF) +#define va_copy(d,s) __builtin_va_copy((d),(s)) +#else /* KERNEL */ #define KASSERT(e, m) #define SBMALLOC(size) malloc(size) #define SBFREE(buf) free(buf) #define min(x,y) MIN(x,y) -#endif /* _KERNEL */ + +#endif /* KERNEL */ /* * Predicates @@ -82,7 +85,7 @@ /* * Debugging support */ -#if defined(_KERNEL) && defined(INVARIANTS) +#if defined(KERNEL) && defined(INVARIANTS) static void _assert_sbuf_integrity(const char *fun, struct sbuf *s) { @@ -103,10 +106,10 @@ } #define assert_sbuf_integrity(s) _assert_sbuf_integrity(__func__, (s)) #define assert_sbuf_state(s, i) _assert_sbuf_state(__func__, (s), (i)) -#else /* _KERNEL && INVARIANTS */ +#else /* KERNEL && INVARIANTS */ #define assert_sbuf_integrity(s) do { } while (0) #define assert_sbuf_state(s, i) do { } while (0) -#endif /* _KERNEL && INVARIANTS */ +#endif /* KERNEL && INVARIANTS */ static int sbuf_extendsize(int size) @@ -193,7 +196,7 @@ return (s); } -#ifdef _KERNEL +#ifdef KERNEL /* * Create an sbuf with uio data */ @@ -280,7 +283,7 @@ return (0); } -#ifdef _KERNEL +#ifdef KERNEL /* * Copy a byte string from userland into an sbuf. */ @@ -344,7 +347,7 @@ return (0); } -#ifdef _KERNEL +#ifdef KERNEL /* * Append a string from userland to an sbuf. */ ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/Makefile#4 (text+ko) ==== @@ -20,7 +20,7 @@ EXPINC_SUBDIRS_I386 = \ DATAFILES = \ - appleapiopts.h \ + _label.h appleapiopts.h \ 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 \ ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/malloc.h#4 (text+ko) ==== @@ -169,9 +169,9 @@ #define M_JNL_TR 92 /* Journaling: "struct transaction" */ #define M_MACPIPELABEL 93 #define M_MACTEMP 94 +#define M_SBUF 95 +#define M_LAST 96 /* Must be last type + 1 */ -#define M_LAST 95 /* Must be last type + 1 */ - /* Strings corresponding to types of memory */ /* Must be in synch with the #defines above */ #define INITKMEMNAMES { \ @@ -270,6 +270,7 @@ "Transaction", /* 92 M_JNL_TR */\ "macpipelabel", /* 93 M_MACPIPELABEL */\ "mactemp", /* 94 M_MACTEMP */\ + "sbuf", /* 95 M_SBUF */\ } struct kmemstats { ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/mbuf.h#3 (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 Thu Jul 24 10:12:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36B7137B41A; Thu, 24 Jul 2003 10:12: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 8C14737B404 for ; Thu, 24 Jul 2003 10:12:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3286343FAF for ; Thu, 24 Jul 2003 10:12:31 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6OHCV0U027894 for ; Thu, 24 Jul 2003 10:12:31 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6OHCUDt027891 for perforce@freebsd.org; Thu, 24 Jul 2003 10:12:30 -0700 (PDT) Date: Thu, 24 Jul 2003 10:12:30 -0700 (PDT) Message-Id: <200307241712.h6OHCUDt027891@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 34948 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, 24 Jul 2003 17:12:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=34948 Change 34948 by cvance@cvance_osx_laptop on 2003/07/24 10:12:19 Temporarily turn off MAC_DEBUG, since atomic int operations aren't yet supported Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/conf/MASTER#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/conf/MASTER#3 (text+ko) ==== @@ -94,7 +94,7 @@ options HW_FOOTPRINT # Cache footprint support # options MAC # Mandatory ACcess Control options MAC_ALWAYS_LABEL_MBUF -options MAC_DEBUG +#options MAC_DEBUG options MACH # Standard Mach features # options MACH_ASSERT # Compile in assertions # options MACH_COMPAT # Vendor syscall compatibility # From owner-p4-projects@FreeBSD.ORG Thu Jul 24 10:14:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1335137B404; Thu, 24 Jul 2003 10:14: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 BA8CA37B401 for ; Thu, 24 Jul 2003 10:14:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6082343F3F for ; Thu, 24 Jul 2003 10:14:34 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6OHEY0U028027 for ; Thu, 24 Jul 2003 10:14:34 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6OHEXUB028024 for perforce@freebsd.org; Thu, 24 Jul 2003 10:14:33 -0700 (PDT) Date: Thu, 24 Jul 2003 10:14:33 -0700 (PDT) Message-Id: <200307241714.h6OHEXUB028024@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 34949 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, 24 Jul 2003 17:14:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=34949 Change 34949 by cvance@cvance_osx_laptop on 2003/07/24 10:13:51 Attempt to add a 'security' top-level sysctl. This doesn't quite work yet. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mib.c#2 edit .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/sysctl.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mib.c#2 (text+ko) ==== @@ -89,4 +89,6 @@ "machine dependent"); SYSCTL_NODE(, CTL_USER, user, CTLFLAG_RW, 0, "user-level"); +SYSCTL_NODE(, CTL_SECURITY, security, CTLFLAG_RW, 0, + "security"); ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/sysctl.h#3 (text+ko) ==== @@ -245,7 +245,8 @@ #define CTL_HW 6 /* generic cpu/io */ #define CTL_MACHDEP 7 /* machine dependent */ #define CTL_USER 8 /* user-level */ -#define CTL_MAXID 9 /* number of valid top-level ids */ +#define CTL_SECURITY 9 /* security information */ +#define CTL_MAXID 10 /* number of valid top-level ids */ #define CTL_NAMES { \ { 0, 0 }, \ @@ -257,6 +258,7 @@ { "hw", CTLTYPE_NODE }, \ { "machdep", CTLTYPE_NODE }, \ { "user", CTLTYPE_NODE }, \ + { "security", CTLTYPE_NODE }, \ } /* @@ -605,6 +607,7 @@ SYSCTL_DECL(_hw); SYSCTL_DECL(_machdep); SYSCTL_DECL(_user); +SYSCTL_DECL(_security); #ifdef DEBUG From owner-p4-projects@FreeBSD.ORG Thu Jul 24 10:16:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7920637B404; Thu, 24 Jul 2003 10:16: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 3C63037B401 for ; Thu, 24 Jul 2003 10:16:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8857943F93 for ; Thu, 24 Jul 2003 10:16:37 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6OHGb0U028170 for ; Thu, 24 Jul 2003 10:16:37 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6OHGbrT028167 for perforce@freebsd.org; Thu, 24 Jul 2003 10:16:37 -0700 (PDT) Date: Thu, 24 Jul 2003 10:16:37 -0700 (PDT) Message-Id: <200307241716.h6OHGbrT028167@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 34950 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, 24 Jul 2003 17:16:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=34950 Change 34950 by cvance@cvance_osx_laptop on 2003/07/24 10:15:50 Add just a bit more support for the security top-level sysctl (sorry, still broken) Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/sysctl_init.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/sysctl_init.c#2 (text+ko) ==== @@ -258,6 +258,7 @@ extern struct sysctl_oid sysctl__net; extern struct sysctl_oid sysctl__debug; extern struct sysctl_oid sysctl__vfs; +extern struct sysctl_oid sysctl__security; extern struct sysctl_oid sysctl__sysctl; #if INET6 @@ -359,6 +360,7 @@ &sysctl__net, &sysctl__debug, &sysctl__vfs, + &sysctl__security, &sysctl__sysctl, &sysctl__debug_bpf_bufsize, &sysctl__debug_bpf_maxbufsize From owner-p4-projects@FreeBSD.ORG Fri Jul 25 08:55:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D514037B404; Fri, 25 Jul 2003 08:55:42 -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 8F42337B401 for ; Fri, 25 Jul 2003 08:55:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC26643F75 for ; Fri, 25 Jul 2003 08:55:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6PFtd0U031498 for ; Fri, 25 Jul 2003 08:55:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6PFtOre031289 for perforce@freebsd.org; Fri, 25 Jul 2003 08:55:24 -0700 (PDT) Date: Fri, 25 Jul 2003 08:55:24 -0700 (PDT) Message-Id: <200307251555.h6PFtOre031289@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 34988 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, 25 Jul 2003 15:55:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=34988 Change 34988 by rwatson@rwatson_tislabs on 2003/07/25 08:54:54 Integrate the trustedbsd_mac tree; don't integrate a few files that are in conflict (such as the MAC section of the dev handbook). Affected files ... .. //depot/projects/trustedbsd/doc/Makefile#5 integrate .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/Makefile#1 branch .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/trustedbsd/doc/da_DK.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/faq/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/faq/book.sgml#9 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/Makefile#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#9 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/book.sgml#7 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#9 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#9 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/sound/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/1.png#2 delete .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/10.png#2 delete .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/2.png#2 delete .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/3.png#2 delete .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/4.png#2 delete .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/5.png#2 delete .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/6.png#2 delete .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/7.png#2 delete .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/8.png#2 delete .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/9.png#2 delete .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/catalog#3 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#7 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/teams.ent#5 integrate .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/Makefile#4 integrate .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#1 branch .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#1 branch .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#4 integrate .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/share/sgml/teams.ent#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/Makefile#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/checkpoint/networks.pic#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#14 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/console-server/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/console-server/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/console-server/tk0231-9-1.png#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributing/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#17 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/euro/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/fonts/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/fonts/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hats/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hubs/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hubs/article.sgml#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/java-tomcat/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/laptop/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/laptop/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/mh/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/mh/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/multi-os/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/new-users/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/new-users/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/Makefile#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/article.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/converse.c#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/su.c#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pxe/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pxe/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/Makefile#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/article.sgml#11 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/branches.pic#5 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/smp/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/smp/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/solid-state/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vinum/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vinum/ad0b4aft.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vinum/ad2b4aft.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vinum/arch.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vinum/article.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vm-design/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vm-design/fig1.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vm-design/fig2.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vm-design/fig3.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vm-design/fig4.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/bibliography/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/08-01.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/08-02.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/08-03.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/08-04.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/08-05.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/08-06.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/design-44bsd/fig1.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/design-44bsd/fig2.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/boot/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/jail/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/newbus/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/pccard/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/pci/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/layers.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/sain.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/sainfill.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/sainlsb.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/sainmsb.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/sainserv.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/serv.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/serv2.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/slayers.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/book.sgml#13 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/Makefile#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#14 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/natd.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/backups/Makefile#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/backups/chapter.sgml#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/book.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#13 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#15 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#9 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#14 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/adduser1.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/adduser2.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/adduser3.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/boot-mgr.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#14 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/console-saver1.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/console-saver2.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/console-saver3.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/console-saver4.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/desktop.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-auto.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-ed1.scr#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-ed2.scr#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-fs.scr#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-root1.scr#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-root2.scr#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-root3.scr#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/dist-set.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/dist-set2.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/docmenu1.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/ed0-conf.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/ed0-conf2.scr#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/edit-inetd-conf.scr#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.eps#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/fdisk-drive1.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/fdisk-drive2.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/fdisk-edit1.scr#4 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/fdisk-edit2.scr#4 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/ftp-anon1.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/ftp-anon2.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/hdwrconf.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/keymap.scr#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/main-doc.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/main-keymap.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/main-options.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/main-std.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/main1.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/mainexit.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/media.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/mouse1.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/mouse2.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/mouse3.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/mouse4.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/mouse5.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/mouse6.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/nfs-server-edit.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/options.scr#4 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/pkg-cat.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/pkg-confirm.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/pkg-install.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/pkg-sel.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/probstart.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/security.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/sysinstall-exit.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/timezone1.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/timezone2.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/timezone3.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/userconfig.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/userconfig2.scr#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/xf86setup.scr#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#11 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#9 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#11 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#16 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/README#4 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ache.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/adamw.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/addkey.sh#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/alex.key#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/anders.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/andreas.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/arved.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/asami.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ben.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/benno.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/billf.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/blackend.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/bmah.key#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/brian.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/brooks.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/brueffer.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/bsd.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ceri.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#12 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/cjc.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/cjh.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/clive.key#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/core-secretary.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/cshumway.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/daichi.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/dannyboy.key#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/das.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/dcs.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/dd.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/demon.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/des.key#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/dfr.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/dinoex.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/dougb.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/dwmalone.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/fanf.key#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/fjoe.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/foxfair.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ghelmer.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/gioria.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/gordon.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/green.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/gshapiro.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/gsutter.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/guido.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/harti.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/hrs.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ijliao.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/imp.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jdp.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jedgar.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jesper.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jhay.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jim.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jkh.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jkoshy.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jmb.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jmg.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/joe.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/joerg.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jon.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ken.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/keramida.key#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/keyring.pl#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/knu.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/kris.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/kuriyama.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/leeym.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/lioux.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/luoqi.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/maho.key/diff#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/maho.key/doc/en_US.ISO8859-1/articles/contributors/article.sgml#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/maho.key/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ache.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/maho.key/doc/en_US.ISO8859-1/books/handbook/pgpkeys/maho.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/maho.key/doc/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/maho.key/doc/en_US.ISO8859-1/share/sgml/authors.ent#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/maho.key/maho.patch#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/maho.key/out#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/maho.key/ports/astro/xearth/files/freebsd.committers.markers#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/maho.key/src/usr.bin/calendar/calendars/calendar.freebsd#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/maho.key/www/en/news/news.xml#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/marcel.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/marcus.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/markp.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/matusita.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/max.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/mbr.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/mi.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/mikeh.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/mp.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/mtm.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/murray.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/mux.key#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/nate.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/nectar.key#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/netchild.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/nik.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/nsouch.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/nyan.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/obraun.key#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/obrien.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/patrick.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/perky.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/petef.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/peter.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#12 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/phantom.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/phk.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/pirzyk.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/rich.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/roam.key#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/roberto.key#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ru.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/rushani.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/sanpei.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/schweikh.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/scop.key#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/scottl.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/seanc.key#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/security-officer.key#3 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/sheldonh.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/sobomax.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/thomas.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/tmm.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/tobez.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/trevor.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/trhodes.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ue.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/vanilla.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/wes.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/wilko.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/will.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/wollman.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/wosch.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/yoichi.key#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/policies/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#11 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/vinum-concat.pic#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/vinum-mirrored-vol.pic#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/vinum-raid10-vol.pic#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/vinum-raid5-org.pic#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/vinum-simple-vol.pic#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/vinum-striped-vol.pic#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/vinum-striped.pic#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#17 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/1.png#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/10.png#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/2.png#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/3.png#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/4.png#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/5.png#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/6.png#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/7.png#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/8.png#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/9.png#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/authors.ent#12 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/catalog#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/teams.ent#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/share/sgml/catalog#2 integrate .. //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#6 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/Makefile#7 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#6 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/man/man1/builtin.1#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/1.png#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/10.png#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/2.png#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/3.png#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/4.png#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/5.png#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/6.png#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/7.png#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/8.png#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/9.png#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/catalog#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#8 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#4 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/committers-guide/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/committers-guide/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/euro/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/multi-os/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/new-users/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/vm-design/Makefile#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/vm-design/article.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/isdn-bus.eps#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/isdn-twisted-pair.eps#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/natd.eps#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/book.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/chapters.ent#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/colophon.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/adduser1.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/adduser2.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/adduser3.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/boot-mgr.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/console-saver1.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/console-saver2.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/console-saver3.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/console-saver4.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/desktop.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/disk-layout.eps#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/disklabel-auto.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/disklabel-ed1.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/disklabel-ed2.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/disklabel-fs.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/disklabel-root1.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/disklabel-root2.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/disklabel-root3.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/dist-set.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/dist-set2.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/docmenu1.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/ed0-conf.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/ed0-conf2.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/edit-inetd-conf.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/example-dir1.eps#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/example-dir2.eps#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/example-dir3.eps#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/example-dir4.eps#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/example-dir5.eps#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/fdisk-drive1.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/fdisk-drive2.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/fdisk-edit1.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/fdisk-edit2.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/ftp-anon1.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/ftp-anon2.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/hdwrconf.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/keymap.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/main-doc.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/main-keymap.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/main-options.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/main-std.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/main1.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/mainexit.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/media.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/mouse1.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/mouse2.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/mouse3.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/mouse4.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/mouse5.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/mouse6.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/nfs-server-edit.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/options.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/pkg-cat.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/pkg-confirm.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/pkg-install.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/pkg-sel.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/probstart.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/security.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/sysinstall-exit.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/timezone1.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/timezone2.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/timezone3.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/userconfig.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/userconfig2.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/install/xf86setup.scr#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/preface/preface.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/txtfiles.ent#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/vinum/vinum-concat.pic#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/vinum/vinum-mirrored-vol.pic#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/vinum/vinum-raid10-vol.pic#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/vinum/vinum-raid5-org.pic#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/vinum/vinum-simple-vol.pic#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/vinum/vinum-striped-vol.pic#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/handbook/vinum/vinum-striped.pic#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/Makefile#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/book.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/chapters.ent#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/history/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/images/callouts/1.png#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/images/callouts/10.png#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/images/callouts/2.png#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/images/callouts/3.png#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/images/callouts/4.png#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/images/callouts/5.png#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/images/callouts/6.png#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/images/callouts/7.png#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/images/callouts/8.png#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/images/callouts/9.png#2 delete .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/sgml/catalog#3 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/sgml/freebsd.dsl#4 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/sgml/l10n.ent#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/sgml/legalnotice.sgml#3 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/sgml/trademarks.sgml#1 branch .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/sgml/translators.ent#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/contributing/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/contributors/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/contributors/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/dialup-firewall/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/diskless-x/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/fonts/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/fonts/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/ipsec-must/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/multi-os/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/multi-os/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/zip-drive/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/zip-drive/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/design-44bsd/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/design-44bsd/book.sgml#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/faq/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/fdp-primer/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/fdp-primer/overview/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/fdp-primer/see-also/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/book.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/introduction/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/pgpkeys/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/policies/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/porters-handbook/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/ppp-primer/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/Makefile#6 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/addftinfo.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/afmtodit.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/as.1#3 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/at.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/bdes.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/c99.1#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/catman.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chflags.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chgrp.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chio.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chpass.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cmp.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/colcrt.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cp.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/csplit.1#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ctags.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ctm_rmail.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cut.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/date.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/df.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dig.1#6 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dtmfdecode.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/echo.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ed.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ee.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/env.1#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/eqn.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fdread.1#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fetch.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/file.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/finger.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ftp.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gcc.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gdbserver.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/getconf.1#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/getfacl.1#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/getopt.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grn.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grodvi.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/groff.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grog.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grolbp.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grolj4.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grops.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grotty.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/hpftodit.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/indxbib.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/info.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/install-info.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ipcrm.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ipcs.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ipftest.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kdump.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kenv.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/killall.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ldd.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/leave.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lex.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lkbib.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/loadfont.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/locate.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lock.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/logger.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/login.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/look.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lookbib.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ls.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/m4.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mail.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mailq.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/make.1#7 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/makeinfo.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mesg.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mkdep.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mklocale.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mmroff.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mt.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/nawk.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/neqn.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/netstat.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/newgrp.1#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/nice.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/nroff.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/passwd.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/paste.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pathchk.1#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pax.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pfbtops.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pic.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_add.1#7 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_create.1#7 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_info.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_sign.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_version.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/printenv.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ps.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pwd.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/refer.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rm.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rs.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rtld.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ruptime.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/s2p.1#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/sdiff.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/send-pr.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/setfacl.1#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/sh.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/soelim.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-add.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-agent.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-keygen.1#6 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-keyscan.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/su.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/symorder.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/systat.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tabs.1#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/talk.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tbl.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tcopy.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tcpdump.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/texindex.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tfmtodit.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/time.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tip.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tput.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tr.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/troff.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tset.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ul.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uname.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/unifdef.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uniq.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uuencode.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vacation.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vgrind.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vidcontrol.1#6 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vt220keys.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/window.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/xargs.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/xstr.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/xten.1#4 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/_exit.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/accept.2#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/access.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/acct.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/adjtime.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/aio_cancel.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/aio_error.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/aio_read.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/aio_return.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/aio_suspend.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/aio_waitcomplete.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/aio_write.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/bind.2#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/brk.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/chdir.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/chflags.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/chmod.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/chown.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/chroot.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/clock_gettime.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/close.2#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/connect.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/creat.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/dup.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/execve.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/extattr_get_file.2#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/fcntl.2#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/fhopen.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/flock.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/fork.2#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/fsync.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getdirentries.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getdtablesize.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getfh.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getfsstat.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getgid.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getgroups.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getitimer.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getlogin.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getpeername.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getpgrp.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getpid.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getpriority.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getrlimit.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getrusage.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getsid.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getsockname.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getsockopt.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/gettimeofday.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/getuid.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/i386_get_ioperm.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/i386_get_ldt.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/i386_vm86.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/intro.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/ioctl.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/issetugid.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/jail.2#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kenv.2#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kill.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/killpg.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kldfind.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kldfirstmod.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kldload.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kldnext.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kldstat.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kldsym.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kldunload.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kqueue.2#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/ktrace.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/link.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/lio_listio.2#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/listen.2#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/lseek.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/madvise.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mincore.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/minherit.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mkdir.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mkfifo.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mknod.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mlock.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mmap.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/modfind.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/modnext.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/modstat.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mount.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/mprotect.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/msync.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/munmap.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/nanosleep.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/nfssvc.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/ntp_adjtime.2#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/ntp_gettime.2#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/open.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/pathconf.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/pipe.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/poll.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/profil.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/ptrace.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/quotactl.2#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/read.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/readlink.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/reboot.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/recv.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/rename.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/revoke.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/rfork.2#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/rmdir.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/rtprio.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sched_get_priority_max.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sched_setparam.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sched_setscheduler.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sched_yield.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/select.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/semctl.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/semget.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/semop.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/send.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sendfile.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/setgroups.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/setpgid.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/setregid.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/setresuid.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/setreuid.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/setsid.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/setuid.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/shmat.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/shmctl.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/shmget.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/shutdown.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigaction.2#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigaltstack.2#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigpause.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigpending.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigprocmask.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigreturn.2#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigsetmask.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigstack.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigsuspend.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sigvec.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/socket.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/socketpair.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/stat.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/statfs.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/swapon.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/symlink.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sync.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/sysarch.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/syscall.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/truncate.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/umask.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/undelete.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/unlink.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/utimes.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/uuidgen.2#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/vfork.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/wait.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/write.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/Makefile#7 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/aliases.5#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/ar.5#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/crontab.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/devfs.5#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dhclient.conf.5#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dhclient.leases.5#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dhcp-options.5#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/disklabel.5#4 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 25 09:20:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96B4B37B404; Fri, 25 Jul 2003 09: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 512A537B401 for ; Fri, 25 Jul 2003 09:20:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00D9943FAF for ; Fri, 25 Jul 2003 09:20:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6PGKA0U042128 for ; Fri, 25 Jul 2003 09:20:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6PGKACT042111 for perforce@freebsd.org; Fri, 25 Jul 2003 09:20:10 -0700 (PDT) Date: Fri, 25 Jul 2003 09:20:10 -0700 (PDT) Message-Id: <200307251620.h6PGKACT042111@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 34990 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, 25 Jul 2003 16:20:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=34990 Change 34990 by rwatson@rwatson_tislabs on 2003/07/25 09:19:45 Integrate the three remaining (conflicting) files in the trustedbsd_doc branch. It looks like all the changes left in these files were whitespace, or were integrated into the FreeBSD.org version in similar but not identical ways. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac.ent#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#31 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#15 integrate Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac.ent#5 (text+ko) ==== @@ -1,3 +1,5 @@ + + @@ -16,9 +18,7 @@ struct label *label char *element_name - char *element_data - size_t size - size_t *len + struct sbuf *sb int *claimed '> @@ -35,19 +35,9 @@ - element_data - Buffer; to be filled in with text representation of label - - - - size - Size of element_data - - - - len - To be filled in with the length of the string representing the - label data. + sb + String buffer to be filled with a text representation of + label @@ -65,7 +55,7 @@ user. Currently, all policies' externalize entry points will be called, so the implementation should check the contents of element_name before attempting to fill in - element_data. If + sb. If element_name does not match the name of your policy, simply return 0. Only return nonzero if an error occurs while externalizing the label data. Once the policy ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#31 (text+ko) ==== @@ -29,7 +29,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD$ + $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml,v 1.27 2003/04/20 23:10:35 rwatson Exp $ --> @@ -112,10 +112,17 @@ Synopsis - MAC, or Mandatory Access Control, is a feature introduced by - the TrustedBSD Project to supplement the existing standard DAC - (Discretionary Access Control) policies of BSD Unix systems. - + FreeBSD includes experimental support for several + mandatory access control policies, as well as a framework + for kernel security extensibility, the TrustedBSD MAC + Framework. The MAC Framework provides a pluggable access + control framework, permitting new security policies to + be easily linked into the kernel, loaded at boot, or loaded + dynamically at run-time. The framework provides a variety + of features to make it easier to implement new policies, + including the ability to easily tag security labels (such as + confidentiality information) onto system objects. + This chapter introduces the MAC policy framework and provides documentation for a sample MAC policy module. @@ -128,94 +135,310 @@ the compile-time or run-time extension of the kernel access control model. New system policies may be implemented as kernel modules and linked to the kernel; if multiple policy - modules are present, their results will be composed. While the - framework is intended to support a variety of access control - models, its design was derived from the requirements of a set - of specific access control models required for the TrustedBSD - and CBOSS Projects. This includes support for fixed and - floating label Biba integrity policies, the MLS - confidentiality policy, the Type Enforcement rule-based access - control policy, and the ability to support layering of the NSA - FLASK framework above the TrustedBSD MAC framework. This - document describes the rough architecture of the framework, - with the understanding that this is a work-in-progress and may - change subtantially as requirements evolve. + modules are present, their results will be composed. The + MAC Framework provides a variety of access control infrastructure + services to assist policy writers, including support for + transient and persistent policy-agnostic object security + labels. This support is currently considered experimental. - - - Kernel Architecture - - The TrustedBSD MAC framework provides the opportunity for - policy modules to be augment system access control decisions. - Policies are permitted the opportunity to restrict the set of - rights available for processes at a variety of relevant points - in the kernel. In addition, they are provided the opportunity - to tag processes and various kernel objects with labels storing - access control information. Policy modules may register - interest in a subset of the total available events or objects, - and are not required to implement events or objects that are not - relevant to the policy. Multiple modules may be loaded at once, - and the results of the modules are composed as necessary to - build an over-all system policy. Policy modules may be - implemented such that they can be loaded on-demand at run-time, - or such that they may only be loaded early in the boot process. - This permits policies requiring pervasive labeling of all - objects to prevent improper use. + + + Policy Background + + Mandatory Access Control (MAC), refers to a set of + access control policies that are mandatorily enforced on + users by the operating system. MAC policies may be contrasted + with Discretionary Access Control (DAC) protections, by which + non-administrative users may (at their discretion) protect + objects. In traditional UNIX systems, DAC protections include + file permissions and access control lists; MAC protections include + process controls preventing inter-user debugging and firewalls. + A variety of MAC policies have been formulated by operating system + designers and security researches, including the Multi-Level + Security (MLS) confidentiality policy, the Biba integrity policy, + Role-Based Access Control (RBAC), and Type Enforcement (TE). Each + model bases decisions on a variety of factors, including user + identity, role, and security clearance, as well as security labels + on objects representing concepts such as data sensitivity and + integrity. + + The TrustedBSD MAC Framework is capable of supporting policy + modules that implement all of these policies, as well as a broad + class of system hardening policies. In addition, despite the + name, the MAC Framework can also be used to implement purely + discretionary policies, as policy modules are given substantial + flexibility in how they authorize protections. - - Userland Architecture + + MAC Framework Kernel Architecture - ... + The TrustedBSD MAC Framework permits kernel modules to + extend the operating system security policy, as well as + providing infrastructure functionality required by many + access control modules. If multiple policies are + simultaneously loaded, the MAC Framework will usefully (for + some definition of useful) compose the results of the + policies. + + + Kernel Elements + + The MAC Framework contains a number of kernel elements: + + + Framework management interfaces + Concurrency and synchronization + primitives. + Policy registration + Extensible security label for kernel + objects + Policy entry point composition + operators + Label management primitives + Entry point API invoked by kernel + services + Entry point API to policy modules + Entry points implementations (policy life cycle, + object life cycle/label management, access control + checks). + Policy-agnostic label-management system + calls + mac_syscall() multiplex + system call + Various security policies implemented as MAC + policy modules + + + + + Management Interfaces + + The TrustedBSD MAC Framework may be directly managed using + sysctls, loader tunables, and system calls. + + In most cases, sysctls and loader tunables modify the same + parameters, and control behavior such as enforcement of + protections relating to various kernel subsystems. In addition, + if MAC debugging support is compiled into the kernel, a variety + of counters will be maintained tracking label allocation. In + most cases, it is advised that per-subsystem enforcement + controls not be used to control policy behavior in production + environments, as they broadly impact the operation of all + active policies. Instead, per-policy controls should be + preferred to ensure proper policy operation. + + Loading and unloading of policy modules is performed + using the system module management system calls and other + system interfaces, including loader variables. + + + + Concurrency and Synchronization + + As the set of active policies may change at run-time, + and the invocation of entry points is non-atomic, + synchronization is required to prevent unloading or + loading of new policies while an entry point invocation + is progress, freezing the list of policies for the + duration. This is accomplished by means of a Framework + busy count. Whenever an entry point is entered, the + busy count is incremented; whenever it is exited, the + busy count is decremented. While the busy count is + elevated, policy list changes are not permitted, and + threads attempting to modify the policy list will sleep + until the list is not busy. The busy count is protected + by a mutex, and a condition variable is used to wake up + sleepers waiting on policy list modifications. + + Various optimizations are used to reduce the overhead + of the busy count, including avoiding the full cost of + incrementing and decrementing if the list is empty or + contains only static entries (policies that are loaded + before the system starts, and cannot be unloaded). + + + + Policy Registration + + The MAC Framework maintains two lists of active + policies: a static list, and a dynamic list. The lists + differ only with regards to their locking semantics: an + elevated reference count is not required to make use of + the static list. When kernel modules containing MAC + Framework policies are loaded, the policy module will + use SYSINIT to invoke a registration + function; when a policy module is unloaded, + SYSINIT will likewise invoke a + de-registration function. Registration may fail if a + policy module is loaded more than once, if insufficient + resources are available for the registration (for + example, the policy might require labeling and + insufficient labeling state might be available), or + other policy prerequisites might not be met (some + policies may only be loaded prior to boot). Likewise, + de-registration may fail if a policy refuses an + unload. + + + + Entry Points + + Kernel services interact with the MAC Framework in two ways: + they invoke a series of APIs to notify the framework of relevant + events, and they a policy-agnostic label structure in + security-relevant objects. This label structure is maintained by + the MAC Framework via label management entry points, and permits + the Framework to offer a labeling service to policy modules + through relatively non-invasive changes to the kernel subsystem + maintaining the object. For example, label structures have been + added to processes, process credentials, sockets, pipes, vnodes, + Mbufs, network interfaces, IP reassembly queues, and a variety + of other security-relevant structures. Kernel services also + invoke the MAC Framework when they perform important security + decisions, permitting policy modules to augment those decisions + based on their own criteria (possibly including data stored in + security labels). + + + + Policy Composition + + When more than one policy module is loaded into the kernel + at a time, the results of the policy modules will be composed + by the framework using a composition operator. This operator + is currently hard-coded, and requires that all active policies + must approve a request for it to occur. As policies may + return a variety of error conditions (success, access denied, + object doesn't exist, ...), a precedence operator selects the + resulting error from the set of errors returned by policies. + While it is not guaranteed that the resulting composition will + be useful or secure, we've found that it is for many useful + selections of policies. + + + + Labeling Support + + As many interesting access control extensions rely on + security labels on objects, the MAC Framework provides a set + of policy-agnostic label management system calls covering + a variety of user-exposed objects. Common label types + include partition identifiers, sensitivity labels, integrity + labels, compartments, domains, roles, and types. Policy + modules participate in the internalization and externalization + of string-based labels provides by user applications, and can + expose multiple label elements to applications if desired. + + In-memory labels are stored in struct + label, which consists of a fixed-length array + of unions, each holding a void * pointer + and a long. Policies registering for + label storage will be assigned a "slot" identifier, which + may be used to dereference the label storage. The semantics + of the storage are left entirely up to the policy module: + modules are provided with a variety of entry points + associated with the kernel object life cycle, including + initialization, association/creation, and destruction. Using + these interfaces, it is possible to implement reference + counting and other storage mechanisms. Direct access to + the kernel object is generally not required by policy + modules to retrieve a label, as the MAC Framework generally + passes both a pointer to the object and a direct pointer + to the object's label into entry points. + + Initialization entry points frequently include a blocking + disposition flag indicating whether or not an initialization + is permitted to block; if blocking is not permitted, a failure + may be returned to cancel allocation of the label. This may + occur, for example, in the network stack during interrupt + handling, where blocking is not permitted. Due to the + performance cost of maintaining labels on in-flight network + packets (Mbufs), policies must specifically declare a + requirement that Mbuf labels be allocated. Dynamically + loaded policies making use of labels must be able to handle + the case where their init function has not been called on + an object, as objects may already exist when the policy is + loaded. + + In the case of file system labels, special support is + provided for the persistent storage of security labels in + extended attributes. Where available, EA transactions + are used to permit consistent compound updates of + security labels on vnodes. + + Currently, if a labeled policy permits dynamic + unloading, its state slot cannot be reclaimed. + + + + System Calls + + The MAC Framework implements a number of system calls: + most of these calls support the policy-agnostic label + retrieval and manipulation APIs exposed to user + applications. + + The label management calls accept a label description + structure, struct mac, which + contains a series of MAC label elements. Each element + contains a character string name, and character string + value. Each policy will be given the chance to claim a + particular element name, permitting policies to expose + multiple independent elements if desired. Policy modules + perform the internalization and externalization between + kernel labels and user-provided labels via entry points, + permitting a variety of semantics. Label management system + calls are generally wrapped by user library functions to + perform memory allocation and error handling. + + In addition, mac_syscall() + permits policy modules to create new system calls without + allocating system calls. mac_execve() + permits an atomic process credential label change when + executing a new image. + - - - Entry Point Framework - - Four classes of entry points are offered to policies - registered with the framework: entry points associated with - the registration and management of policies, entry points - denoting initialization, creation, destruction, and other life - cycle events for kernel objects, events assocated with access - control decisions that the policy module may influence, and - calls associated with the management of labels on objects. In - addition, a mac_syscall() entry point is - provided so that policies may extend the kernel interface - without registering new system calls. - - Policy module writers should be aware of the kernel - locking strategy, as well as what object locks are available - during which entry points. Writers should attempt to avoid - deadlock scenarios by avoiding grabbing non-leaf locks inside - of entry points, and also follow the locking protocol for - object access and modification. In particular, writers should - be aware that while necessary locks to access objects and - their labels are generally held, sufficient locks to modify an - object or its label may not be present for all entry points. - Locking information for arguments is documented in the MAC - framework entry point document. - - Policy entry points will pass a reference to the object - label along with the object itself. This permits labeled - policies to be unaware of the internals of the object yet - still make decisions based on the label. The exception to this - is the process credential, which is assumed to be understood - by policies as a first class security object in the kernel. - Policies that do not implement labels on kernel objects will - be passed NULL pointers for label arguments to entry - points. + + + MAC Policy Architecture + + Security policies are either linked directly into the kernel, + or compiled into loadable kernel modules that may be loaded at + boot, or dynamically using the module loading system calls at + runtime. Policy modules interact with the system through a + set of declared entry points, providing access to a stream of + system events and permitting the policy to influence access + control decisions. Each policy contains a number of elements: + + + Optional configuration parameters for + policy. + Centralized implementation of the policy + logic and parameters. + Optional implementation of policy life cycle + events, such as initialization and destruction. + Optional support for initializing, maintaining, and + destroying labels on selected kernel objects. + Optional support for user process inspection and + modification of labels on selected objects. + Implementation of selected access control + entry points that are of interest to the policy. + Declaration of policy identity, module entry + points, and policy properties. + + + + Policy Declaration - - General-Purpose Module Entry Points - Modules may be declared using the - MAC_POLICY_SET() macro, which names the - policy, provides a reference to the MAC entry point vector, - provides load-time flags determining how the policy framework - should handle the policy, and optionally requests the - allocation of label state by the framework. + MAC_POLICY_SET() macro, which names the + policy, provides a reference to the MAC entry point vector, + provides load-time flags determining how the policy framework + should handle the policy, and optionally requests the + allocation of label state by the framework. - static struct mac_policy_ops mac_policy_ops = + static struct mac_policy_ops mac_policy_ops = { .mpo_destroy = mac_policy_destroy, .mpo_init = mac_policy_init, @@ -228,66 +451,146 @@ }; The MAC policy entry point vector, - mac_policy_ops in this example, associates - functions defined in the module with specific entry points. A - complete listing of available entry points and their - prototypes may be found in the MAC entry point reference - section. Of specific interest during module registration are - the .mpo_destroy and .mpo_init - entry points. .mpo_init will be invoked once a - policy is successfully registered with the module framework - but prior to any other entry points becoming active. This - permits the policy to perform any policy-specific allocation - and initialization, such as initialization of any data or - locks. .mpo_destroy will be invoked when a - policy module is unloaded to permit releasing of any allocated - memory and destruction of locks. Currently, these two entry - points are invoked with the MAC policy list mutex held to - prevent any other entry points from being invoked: this will - be changed, but in the mean time, policies should be careful - about what kernel primitives they invoke so as to avoid lock - ordering or sleeping problems. + mac_policy_ops in this example, associates + functions defined in the module with specific entry points. A + complete listing of available entry points and their + prototypes may be found in the MAC entry point reference + section. Of specific interest during module registration are + the .mpo_destroy and .mpo_init + entry points. .mpo_init will be invoked once a + policy is successfully registered with the module framework + but prior to any other entry points becoming active. This + permits the policy to perform any policy-specific allocation + and initialization, such as initialization of any data or + locks. .mpo_destroy will be invoked when a + policy module is unloaded to permit releasing of any allocated + memory and destruction of locks. Currently, these two entry + points are invoked with the MAC policy list mutex held to + prevent any other entry points from being invoked: this will + be changed, but in the mean time, policies should be careful + about what kernel primitives they invoke so as to avoid lock + ordering or sleeping problems. The policy declaration's module name field exists so that - the module may be uniquely identified for the purposes of - module dependencies. An appropriate string should be selected. - The full string name of the policy is displayed to the user - via the kernel log during load and unload events, and also - exported when providing status information to userland - processes. + the module may be uniquely identified for the purposes of + module dependencies. An appropriate string should be selected. + The full string name of the policy is displayed to the user + via the kernel log during load and unload events, and also + exported when providing status information to userland + processes. + + + + Policy Flags - The policy flags field permits the module to provide the - framework with information about its loader-related - capabilities. Currently, two flags are defined: + The policy declaration flags field permits the module to + provide the framework with information about its capabilities at + the time the module is loaded. Currently, three flags are + defined: - - MPC_LOADTIME_FLAG_UNLOADOK - - - This flag indicates that the policy module may be - unloaded. If this flag is not provided, then the policy - framework will reject requests to unload the module. - This flag might be used by modules that allocate label - state and are unable to free that state at - runtime. - - + + MPC_LOADTIME_FLAG_UNLOADOK + + + This flag indicates that the policy module may be + unloaded. If this flag is not provided, then the policy + framework will reject requests to unload the module. + This flag might be used by modules that allocate label + state and are unable to free that state at + runtime. + + + + + MPC_LOADTIME_FLAG_NOTLATE - - MPC_LOADTIME_FLAG_NOTLATE - - This flag indicates that the policy module - must be loaded and initialized early in the boot - process. If the flag is specified, attempts to register - the module following boot will be rejected. The flag - may be used by policies that require pervasive labeling - of all system objects, and cannot handle objects that - have not been properly initialized by the policy. - - + + This flag indicates that the policy module + must be loaded and initialized early in the boot + process. If the flag is specified, attempts to register + the module following boot will be rejected. The flag + may be used by policies that require pervasive labeling + of all system objects, and cannot handle objects that + have not been properly initialized by the policy. + + + + + MPC_LOADTIME_FLAG_LABELMBUFS + + + This flag indicates that the policy module requires + labeling of Mbufs, and that memory should always be + allocated for the storage of Mbuf labels. By default, + the MAC Framework will not allocate label storage for + Mbufs unless at least one loaded policy has this flag + set. This measurably improves network performance when + policies do not require Mbuf labeling. A kernel option, + MAC_ALWAYS_LABEL_MBUF, exists to + force the MAC Framework to allocate Mbuf label storage + regardless of the setting of this flag, and may be + useful in some environments. + + + Policies using the + MPC_LOADTIME_FLAG_LABELMBUFS without the + MPC_LOADTIME_FLAG_NOTLATE flag set + must be able to correctly handle NULL + Mbuf label pointers passed into entry points. This is necessary + as in-flight Mbufs without label storage may persist after a + policy enabling Mbuf labeling has been loaded. If a policy + is loaded before the network subsystem is active (i.e., the + policy is not being loaded late), then all Mbufs are guaranteed + to have label storage. + + + + Policy Entry Points + + Four classes of entry points are offered to policies + registered with the framework: entry points associated with + the registration and management of policies, entry points + denoting initialization, creation, destruction, and other life + cycle events for kernel objects, events associated with access + control decisions that the policy module may influence, and + calls associated with the management of labels on objects. In + addition, a mac_syscall() entry point is + provided so that policies may extend the kernel interface + without registering new system calls. + + Policy module writers should be aware of the kernel + locking strategy, as well as what object locks are available + during which entry points. Writers should attempt to avoid + deadlock scenarios by avoiding grabbing non-leaf locks inside + of entry points, and also follow the locking protocol for + object access and modification. In particular, writers should + be aware that while necessary locks to access objects and + their labels are generally held, sufficient locks to modify an + object or its label may not be present for all entry points. + Locking information for arguments is documented in the MAC + framework entry point document. + + Policy entry points will pass a reference to the object + label along with the object itself. This permits labeled + policies to be unaware of the internals of the object yet + still make decisions based on the label. The exception to this + is the process credential, which is assumed to be understood + by policies as a first class security object in the kernel. + Policies that do not implement labels on kernel objects will + be passed NULL pointers for label arguments to entry + points. + + + + + MAC Policy Entry Point Reference + + + General-Purpose Module Entry Points + <function>&mac.mpo;_init</function @@ -453,8 +756,6 @@ void &mac.mpo;_init_bpfdesc_label - struct bpf_d - *bpf_d struct label *label @@ -466,11 +767,6 @@ - bpf_d - Object; bpf descriptor - - - label New label to apply @@ -520,8 +816,6 @@ void &mac.mpo;_init_devfsdirent_label - struct devfs_dirent - *devfs_dirent struct label *label @@ -533,11 +827,6 @@ - devfs_dirent - Object; devfs directory entry - - - label New label to apply @@ -557,8 +846,6 @@ void &mac.mpo;_init_ifnet_label - struct ifnet - *ifnet struct label *label @@ -570,11 +857,6 @@ - ifnet - Object; network interface - - - label New label to apply @@ -594,10 +876,9 @@ void &mac.mpo;_init_ipq_label - struct ipq - *ipq struct label *label + int flag @@ -607,20 +888,29 @@ - ipq - Object; IP reassembly queue + label + New label to apply - + - label - New label to apply + flag + Blocking/non-blocking &man.malloc.9;; see + below Initialize the label on a newly instantiated IP fragment - reassembly queue. + reassembly queue. The flag field may + be one of M_WAITOK and M_NOWAIT, + and should be employed to avoid performing a blocking + &man.malloc.9; during this initialization call. IP fragment + reassembly queue allocation frequently occurs in performance + sensitive environments, and the implementation should be careful + to avoid blocking or long-lived operations. This entry point + is permitted to fail resulting in the failure to allocate + the IP fragment reassembly queue. @@ -631,9 +921,7 @@ void &mac.mpo;_init_mbuf_label - struct mbuf - *mbuf - int how + int flag struct label *label @@ -645,12 +933,7 @@ - mbuf - Object; mbuf - - - - how + flag Blocking/non-blocking &man.malloc.9;; see below @@ -664,10 +947,10 @@ Initialize the label on a newly instantiated mbuf packet header (mbuf). The - how field may be one of + flag field may be one of M_WAITOK and M_NOWAIT, and should be employed to avoid performing a blocking - &man.malloc.9; during this initialization call. Mbuf + &man.malloc.9; during this initialization call. Mbuf allocation frequently occurs in performance sensitive environments, and the implementation should be careful to avoid blocking or long-lived operations. This entry point @@ -683,8 +966,6 @@ void &mac.mpo;_init_mount_label - struct mount - *mount struct label *mntlabel struct label @@ -699,11 +980,6 @@ - mount - Object; file system mount point - - - mntlabel Policy label to be initialized for the mount itself @@ -891,8 +1167,6 @@ void &mac.mpo;_init_vnode_label - struct vnode - *vp struct label *label @@ -904,11 +1178,6 @@ - vp - Object; file system object - - - label New label to initialize @@ -944,7 +1213,7 @@ - Destroy the label on a bpf descriptor. In this entry + Destroy the label on a BPF descriptor. In this entry point a policy should free any internal storage associated with label so that it may be destroyed. @@ -958,8 +1227,6 @@ void &mac.mpo;_destroy_cred_label - struct ucred - *cred struct label *label @@ -971,11 +1238,6 @@ - cred - Subject; user credential - - - label Label being destroyed @@ -998,8 +1260,6 @@ void &mac.mpo;_destroy_devfsdirent_label - struct devfs_dirent - *devfs_dirent struct label *label @@ -1011,11 +1271,6 @@ - devfs_dirent - Object; devfs directory entry - - - label Label being destroyed @@ -1025,7 +1280,7 @@ Destroy the label on a devfs entry. In this entry point, a policy module should free any internal storage - asociated with label so that it may + associated with label so that it may be destroyed. @@ -1165,8 +1420,6 @@ void &mac.mpo;_destroy_mount_label - struct mount - *mp struct label *mntlabel struct label @@ -1180,11 +1433,6 @@ - mp - Object; file system mount point - - - mntlabel Mount point label being destroyed @@ -1333,6 +1581,75 @@ destroyed. + + <function>&mac.mpo;_destroy_vnode_label</function> + + + + void + &mac.mpo;_destroy_vnode_label + struct label + *label + + + + + + &mac.thead; + + + + label + Process label + + + + + + Destroy the label on a vnode. In this entry point, a + policy module should free any internal storage associated + with label so that it may be + destroyed. + + + + <function>&mac.mpo;_copy_mbuf_label</function> + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 25 09:46:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C43937B404; Fri, 25 Jul 2003 09:46:44 -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 29DC137B401 for ; Fri, 25 Jul 2003 09:46:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C04B43FAF for ; Fri, 25 Jul 2003 09:46:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6PGkh0U043240 for ; Fri, 25 Jul 2003 09:46:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6PGkh2W043237 for perforce@freebsd.org; Fri, 25 Jul 2003 09:46:43 -0700 (PDT) Date: Fri, 25 Jul 2003 09:46:43 -0700 (PDT) Message-Id: <200307251646.h6PGkh2W043237@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 34991 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, 25 Jul 2003 16:46:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=34991 Change 34991 by rwatson@rwatson_paprika on 2003/07/25 09:46:14 Build machinery and hookup bits for FreeBSD Security Architecture. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#8 edit .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#9 edit .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#6 edit .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/secarch/chapter.sgml#1 add Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#8 (text+ko) ==== @@ -40,6 +40,7 @@ SRCS+= pci/chapter.sgml SRCS+= policies/chapter.sgml SRCS+= scsi/chapter.sgml +SRCS+= secarch/chapter.sgml SRCS+= secure/chapter.sgml SRCS+= sockets/chapter.sgml SRCS+= sound/chapter.sgml ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#9 (text+ko) ==== @@ -66,6 +66,13 @@ + + High-Level Architecture + + &chap.secarch; + + + Interprocess Communication ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#6 (text+ko) ==== @@ -16,11 +16,14 @@ - + + + + - + @@ -31,7 +34,7 @@ - + @@ -40,9 +43,9 @@ - + - + From owner-p4-projects@FreeBSD.ORG Fri Jul 25 09:48:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 912C037B404; Fri, 25 Jul 2003 09:48: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 5359E37B401 for ; Fri, 25 Jul 2003 09:48:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE60643FBF for ; Fri, 25 Jul 2003 09:48:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6PGmk0U043343 for ; Fri, 25 Jul 2003 09:48:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6PGmkRl043340 for perforce@freebsd.org; Fri, 25 Jul 2003 09:48:46 -0700 (PDT) Date: Fri, 25 Jul 2003 09:48:46 -0700 (PDT) Message-Id: <200307251648.h6PGmkRl043340@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 34992 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, 25 Jul 2003 16:48:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=34992 Change 34992 by rwatson@rwatson_paprika on 2003/07/25 09:47:47 First 45 pages of the secarch document; has been following me around on my notebook for a while, and it would be a good idea to get it in P4 so that when I drop my notebook, it's not lost. The kernel section is doing quite well (VFS and networking need work); userspace needs more fleshing out generally, especially relating to PAM, NSS, and crypto services. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/secarch/chapter.sgml#2 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/secarch/chapter.sgml#2 (text+ko) ==== @@ -1,0 +1,2808 @@ + + + + + + + Robert + Watson + + + TrustedBSD Project, Network Associates + Laboratories +
rwatson@FreeBSD.org
+ + + + + + FreeBSD Security Architecture + + + FreeBSD Security Architecture Copyright + + This software was developed for the FreeBSD Project by Network + Associates Laboratories, the Security Research Division of Network + Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + ("CBOSS"), as part of the DARPA CHATS research program. + + Redistribution and use in source (SGML DocBook) and + 'compiled' forms (SGML, HTML, PDF, PostScript, RTF and so forth) + with or without modification, are permitted provided that the + following conditions are met: + + + + Redistributions of source code (SGML DocBook) must + retain the above copyright notice, this list of conditions + and the following disclaimer as the first lines of this file + unmodified. + + + + Redistributions in compiled form (transformed to other + DTDs, converted to PDF, PostScript, RTF and other formats) + 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 DOCUMENTATION IS PROVIDED BY THE NETWORKS ASSOCIATES + TECHNOLOGY, INC "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 NETWORKS ASSOCIATES TECHNOLOGY, + INC 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 DOCUMENTATION, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + + + Synopsis + + The FreeBSD operating system contains a variety of security + elements intended to support secure and reliable system operation. + These elements include: + + + Segmented address space to protect kernel + operation from accidental or malicious user process + interference. + Inter-process memory protections to limit the + impact of buggy or malicious user applications on other + running applications. + Association of user credentials with processes, + including user identifiers, group list membership, jail virtual + system, and mandatory access control label, supporting a + multi-user environment. + Privilege model based on a privileged root user + (uid 0) + Inter-process controls to prevent improper + interference between processes belonging to different users, + as well as to protect processes that undergo privilege level + changes. + Discretionary file system protections based on + user/group ownership, file permission mask, and file flags. + Optionally, extended discretionary access control list support + on the UFS and UFS2 file systems. + Special file modes to support uid and gid transition on + execution. + Mapping of network credentials received via + NFS Remote Procedure Calls (RPCs) to local credentials. + Administrative limits, by network address, to NFS services. + + Discretionary protections on System V IPC + primitives (shared memory, message queues, and semaphores) + based on ownership and permissions. + Extensible kernel and user access control + through a pluggable MAC Framework, permitting kernel modules + to bind additional security label data to processes and + system objects, and to enforce discretionary or mandatory + policies, including Biba and LOMAC integrity, MLS + confidentiality, and other augmented system security + policies. + Pluggable Authentication Module (PAM) support + permitting administrators to require appropriate authentication + in a multi-user environment. + Modules support traditional passwords, one-time passwords, + distributed passwords and authentication services such as + KerberosIV and Kerberos5, and support a variety of hardware + authentication tokens. + In addition, modules authorize login access to the system, + provide for accounting, implement password changing, and + enforce password change policies such as password length + requirements. + Name Service Switch (NSS) support permitting + a variety of local and distributed directory services to + provide account and authentication data. + A variety of remote access and management + tools with cryptographic protection of network traffic. + + + + This revision of the FreeBSD Security Architecture + describes the architecture as found in FreeBSD 5.1, and may + not accurately describe other versions of the FreeBSD + operating system. + + + + Approach + + As a general-purpose, multi-user operating system, FreeBSD + includes a number of security elements intended to form the + foundation for a secure application environment. + This includes basic system integrity, confidentiality, and + availability services. + This approach is intended to resist attack in a variety of forms, + and against a variety of attack methodologies. + In the next section, basic security concepts and assumptions are + discussed, including the goals of integrity, confidentiality, and + availability as addressed by FreeBSD. + + In general, FreeBSD adopts the same stance as most other + operating systems based on the UNIX model: the kernel is isolated + from user processes, which represent a variety of programs in + execution in isolated address spaces. + Processes each carry a process credential, managed by the kernel, + describing user and group information for the process, which will + be used to authorized access to other kernel objects. + Based on the credential and various object properties, several + mandatory and discretionary protection models control the + interactions between processes, and access by the processes to + various system resources (including storage, network + communications, etc.) + + As installed, FreeBSD supports easy communication and + collaboration between users, while providing the primitives to + prevent inappropriate release or modification of data owned by + users. + Some users are granted special system administion privileges by + virtue of being members of specific groups (such as the "operator" + and "wheel" groups); in addition, a special administrative account, + "root", is used to manage the system. + However, the security primitives and configuration are frequently + adapted to support much stronger or fine-grained security + deployment requirements, including containment of mutually + untrusting processes. + + FreeBSD also contains a number of extensions permitting + greater flexibility and control, including a system + partitioning model widely used by ISPs (jail), support + for Mandatory Access Control, and extensible access control + policies through the MAC Framework. + These mechanisms permit administrators to control the flow of + information in systems in a variety of ways, including using the + MLS mandatory sensitivity policy, and the Biba integrity policy. + These capabilities are similar to those found in many commercial + trusted operating systems, and permit FreeBSD to be used + in environments less reminiscent of the time-sharing + systems from which the UNIX access control requirements are + derived. + Making use of these primitives permits the administrator to reduce + their level of trust in user accounts on the system, limiting the + consequences of compromise of individual user accounts or + services. + + In recognition of the importance of networks and network + infrastructure, FreeBSD provides a variety of remote login + services, as well as advanced cryptographic protocols used to + protect the integrity of these services. + + + + Security Architecture Concepts + + FreeBSD is a multi-tasking multi-user operating system, serving + in a variety of environments with a variety of security requirements. + Common deployment environments include single-user or multi-user + workstations, large-scale ISP environments, web or file server + clusters, and high-end embedded network appliances including + network-attached storage, routers, and firewalls. + The FreeBSD operating system combines many of the strongest elements + of traditional UNIX security, modern cryptographic services, and + trusted operating system elements to support the requirements of + these environments through flexibility and adaptability. + + + + Authorization + + Authorization refers to the process by which access control + decisions are made--typically, authorization may be performed + on the basis of an authenticated user identity, presentation + of a cryptographic token, an inherited or acquired capability, + explicit access control lists, or a variety of other policy + driven considerations. + Authorization checks occur in both the kernel and userspace + components of FreeBSD. + + + + + Authentication + + Authentication refers to the process by which a system + (in this case, operating system) determines and confirms + the identity of a user (or another system) it interacts + with. + Frequently in the context of FreeBSD, this refers to early + stages in the login process, in which a user presents a + username and password; however, it may also refer to + inter-host authentication using host SSH keys, IKE key + negotiation for IPsec, and a variety of other elements. + Authentication typically relies on testing the knowledge of + a third party in relation to secrets that only an + appropriate third party could know: for example, testing a + shared secret (such as a password), one time passwords, or + through use of a Public Key Infrastructure. + Typically, system authorization occurs in the context of + an authenticated user identity; however, authorization + decisions may be made prior to user authentication, or in + the case of network activity, without access to any + authenticated identity. + + + + + Availability + + Availability refers to the design requirement that + services offered by a system be, in as much as is possible, + uninterrupted despite unexpected or undesired circumstances. + In the context of FreeBSD, this concept frequently drives + the requirement for resource accounting, resource limits to + prevent unfair exhaustion of system resources, scheduler + behavior, access controls, and authentication. + Availability is expressed with regard to a subject: frequently, + to maintain availability for one user, it is necessary to + reduce or deny access to services for another user. + Availability is frequently considered in the context of a + malicious user attempting to deny service to other users. + + + + + + Integrity + + Integrity refers to the protection of system operation + and stored data from undesired modification by unauthorized + parties; the integrity of the operating system is required + to ensure proper operation. + The integrity of user data is then protected by the operating + system by means of authentication and authorization. + Integrity guarantees are often important to the notion of + system availability, as interference with system integrity + frequently has an impact on operation. + Cryptographic tools may also be used to measure the integrity + of the system. + + + + + Confidentiality + + Confidentiality refers to the protection of system and + stored data from undesired leakage to unauthorized + parties: confidentiality of system authentication data + is required to ensure successful authentication, protection + of entropy, etc. + Confidentiality of system and user data is protected by the + operating system by means of authentication and + authorization. + Cryptographic tools may also be used to maintain the secrecy + of data. + + + + + Cryptography + + Cryptography refers to the use of mathematical + algorithms and techniques used to provide guarantees for + the protection of data communications and processes. + Typically, cryptographic techniques are used in three + forms in FreeBSD: the protection of authentication data, + protection of data on storage arrays, and for the purposes + of secure network communications; cryptographic services + are also provided for the benefit of applications. + Guarantees of cryptographic algorithms and protocols often + include integrity, confidentiality, non-repudiation, and + freshness. + + + + + + + + Kernel Security Model + + + + + Kernel Address Space Separation + + FreeBSD, as is the case with most UNIX-derived operating + systems, executes the kernel in a supervisor hardware mode + that prevents direct process access to kernel memory and + hardware resources by user processes, providing integrity and + confidentiality protections for kernel data structures and code. + On all current hardware architectures, this is accomplished by + reserving a segment of the system address space for read/write + access only by appropriately authorized task descriptors; access + to privileged instructions, such as those used to configure + page tables, flush TLBs, and configure new tasks, is limited + to code executing kernel mode in the common case. + On the i386 platform, this is implemented using rings -- the + kernel operates in ring 0, and user processes operate in ring 3. + Processes are forced to communicate with the kernel through a + variety of more explicit traps, including exceptions generated by + arithmetic traps in the instruction stream, exceptional memory + accesses such as page faults, or system calls via call gates. + Kernel code interacting with user processes is written carefully + so as to provide only support only the desired interactions + between the kernel and user processes. + + Within the kernel, direct manipulation of user memory contents + is generally avoided, and instead abstracted through a series of + copy routines that enforce appropriate protections, preventing + (among other things) the kernel from derefencing user-provided + pointers to kernel address space. + In general, direct access to system hardware devices is prohibited + to user processes--they must make use of control kernel service + APIs to access disk storage, I/O busses, etc. + This rule is circumvented under special circumstances, such as the + creation of user process device drivers (most frequently, for the + X11 window system). + To bypass this protection, privilege is required, or must be + delegated. + + + + Direct Hardware and Kernel Memory Access + + Some bypass mechanisms are provided to permit privileged user + processes to monitor the kernel or interact with the hardware + through controlled abstractions, or in execptional cases, + to interact with the hardware in an unabstracted form. + + Most hardware devices are exposed to user applications + via the device file system (devfs), which presents these devices + as file-like objects. + Protection properties (such as access control lists) on the + pseudo-files are combined with direct authorization in the device + drivers to control access. + Two devices, /dev/mem and + /dev/kmem permit unrestricted access to system + memory and kernel memory, and are generally controlled so that only + highly privileged processes may use them. + The kmem interface was used extensively in earlier versions of + FreeBSD and other UNIX-derived systems as a means to monitor kernel + activities; in more recent versions of FreeBSD, the &man.sysctl.3; + API is used to monitor and manipulate a structure kernel MIB, + providing a more controlled interface with defined semantics. + The kmem interface may also be used for debugging purposes. + + On many hardware platforms, it is possible for the kernel to + authorize user processes to perform I/O directly; on the i386 + platform, opening the /dev/io device enables + direct I/O access. + Other platforms provide similar functionality. + Many platforms also offer hardware-specific via the + &man.sysarch.2; system call; some of the functions provided by the + system call are process-local, but others may provide privileged + services. + For example, the i386 sysarch() call implements a + I386_SET_IOPERM operation that also enables + direct hardware I/O. + Careful maintenance of the protections of these special devices + and interfaces is vital to the proper protection of the kernel + and user processes via address space protections. + + + + Kernel Extension via Kernel Modules + + FreeBSD permits the boot-time and run-time extension of the + operating system kernel through loadable kernel modules. + This facility is used to load device drivers supporting new + hardware devices on-demand, add support for new file systems, as + well as binary emulation layers and other services. + Run-time extension of the kernel involves loading of the module + from a file into the kernel address space, followed by dynamic + linking of that module into the execution environment, and + eventual execution of any events and services in the module. + As such, the system calls to cause loading or unloading of kernel + modules are carefully controlled operations, as loading new code + into the kernel could by used by attackers to bypass other + protections. + Modules may also be loaded as part of the boot process; file + system protections are used to protect the integrity of any files + involved in the boot process. + + Protection of the boot sequence is vital to the secure + operation of the system; this requires protection of any hardware + devices involved in the boot process, as well as any files (such + as the boot loader, kernel, modules, and configuration files) + from inappropriate access. + + + + + Process Protections + + Processes represent the high-level abstraction of a program + "in execution"; each process consists of a virtual memory address + space (including a mapping of executable code from a file), signal + delivery information, process credentials, one or more threads in + execution, pool of resources limits, and an array of file + descriptors holding references to a variety of I/O and system + objects. + Processes generally run "in isolation", communicating with other + processes only through explicit and intentional communication + channels (such as files, IPC primitives, etc). Shared memory is + permitted, but must be explicitly configured by the process. + + Programs, as executed in processes, are generally derived + from an executable image (file) that has been mapped into the + process address space. + While the kernel does not provide explicit support for it, most + applications on FreeBSD make use of dynamically linked libraries, + implemented via the memory mapping of library files into the + process address space. + In practice, most programs executing on FreeBSD systems + are composed from a variety of run-time linked libraries, and + frequently pluggable modules loaded as shared objects. + + The ability to directly modify process memory or other + operation parameters represents the ability to control the + execution of the process, and hence manipulate its operation. + By providing memory and other protections, the FreeBSD kernel + limits inappropriate interference between processes, preventing + accidental or intentional leakage of data, damage to data or + operational integrity, and leakage of system privilege. + System debugging interfaces break down these barries, and must + be carefully controlled. + + + Process Credentials + + FreeBSD assigns each process a credential, which holds + a variety of information relating to the privileges available + to the process. + The process credential contains several elements, including real, + saved, and effective user IDs, group IDs, resource limit + information for the user, a reference to a system jail, and an + extensible MAC label. + This data will be used to compute access control results + associated with most security-sensitive operations. + + Consistency and performance are provided in the + multi-threaded kernel by also assigning a credential to each + thread. + The thread credential is compared to the primary process + credential whenever the thread enters the kernel, and if it + differs from the process credential, it is updated to reflect + the latest snapshot of the process credential. + This ensures a consistent credential for the duration of the + system call, and most access control checks for thread + operations are performed against the thread credential (a + thread-local variable) as it does not require explicit locking. + During update operations, the process lock is held across a + check and update of the process credential to ensure consistency + and prevent races. + + The semantics of the various credential fields are + defined both by historical application requirements, and + in the POSIX specifications. + In general, the effective uid, effective gid, and additional + groups will be used to implement access control checks. + Processes may use the saved and real uid and gid to preserve + other credential elements for conditional use during execution: + for example, when a setuid application is executed, the saved + uid and gid are updated to the values of the effective uid + and gid prior to the execution. + This permits setud applications to swap between the original + and file-originated ids, permitting the privileges to be + blended in a controlled manner. + Real and saved uids and gids will also be used in controlling + inter-process access control, and will be used under some + circumstances to control resource limits. + + Credentials are also cached in a variety of other + kernel data structures, generally at the point at which + initial access to the object occurs. + This caching permits "time of open" UNIX security semantics to + be implemented for a several objects, including file descriptors + and mountpoints. + These credential references are then used to authorize + asynchronous write-behind, such as found in NFS. + + As credentials are frequently referenced throughout the + system, but rarely modified, credentials are stored as + copy-on-write. + This permits new read-only references to credential structures + to be created with minimal memory overhead. + When a credential must be modified, a new copy of the credential + is created, modified, and then the process reference is updated + to point to the new credential. + + A variety of hazards are associated with dynamic changes + in process credentials, as processes may be the object of + operations, not just the subject. + When a process runs with upgraded or downgraded privileges, risks + may exist. + For example, even if a process reduces its level of privilege, it + may have cached access to objects or memory that is not revoked + with the explicit credential change (such as keying material in + library-managed or free'd memory). + When a process receives upgraded privileges, such as on execution + of a setuid binary, the system must revoke access to debug + the process by other processes that may already have had + debugging sessions opon. + + These protections are introduced in three ways: first, + disallowing of operations that may upgrade of process credentials + if access to the process cannot be revoked. + Second, storage of a "credential change flag", named P_SUGID for + historical reasons, which will be used to modify the + inter-process access control policy by indicating a change has + happened in the process life time. + Third, the explicit revocation of existing access to the process. + Additional information about inter-process access control may be + found later in this chapter. + + In most situations, the user credential structure is + sufficient to encapsulate all the necessary subject information + required for an access control decision. + However, under some circumstances, additional process information + may also be used in the decision to exempt closely related + processes from certain protections--for example, participation in + the same sesion is sufficient to authorize delivery of the + "continue" signal between processes, regardless of credentials. + + + + + Root Privilege Model + + The uid 0, assigned to the root user, is given special + privilege to bypass system protections, including most + discretionary and mandatory protections on the local + system. + This privilege is referred to as the "superuser", and is used + for system processes, during the boot and shutdown processes, + and for management purposes. + Because of this concentration of privilege, required to + perform a number of system activities, system services + running with root privilege are popular targets for attack, + as gain access to uid 0 grants access to most other + privileges in the system. + + FreeBSD ships with the securelevel protection mechanism, + first distributed with BSD 4.4. + Securelevels limit the scope of root privilege based on a + monotonically increasing current securelevel. + As the securelevel increases, various privileges are removed, + including the privilege to directly access disk devices, to + change file system protection flags, and to modify the + firewall configuration. + This model does not provide comprehensive protection against + the compromise of root privilege, but if properly configured, + can be used to improve the safety of the recovery + process. + + The privileges of uid 0 are also bounded when used in + combination with the jail() security extension, described + later in this chapter. + + The TrustedBSD MAC Framework is also capability of + limiting certain root privileges, such as the cability to + read files based on system labels. + The MAC Framework and policies are described later in this + chapter. + + + + Process Resource Limits + + FreeBSD is fundamentally designed around a resource-sharing + model, in which the operating system controls access to a + set of real hardware resources and mediates access to ensure + consistent and appropriate use. + As UNIX-derived systems are frequently deployed in environments + in which users or processes contend for resources, a variety of + approaches are taken to preventing inappropriate exclusion of + other users or processes. + This includes scheduler behavior to provide for "fair" + distribution of CPU resources between independent processes + based on priorities, a file system quota mechanism to bound + maximum consumption of resources by user or group, and a set + of process resource limits bounding access to a variety of + resources at the granularity of uids globally, and process + hierarchies. + In multiuser environments, such as ISP shell servers, resource + limits are vitally important to successful long-term operation: + users have a number of unfortunate habits, including the + creation of programs that (intentionally or otherwise) attempt + to consume all available system resources. + + + System Scheduler Priorities + + FreeBSD 5.1 ships with two system schedulers, one of + which must be selected at kernel compile-time. + The 4.4BSD scheduler implements a time-sharing, floating + priority scheduler based on user-assigned process priorities, + with additional support for real-time and idle scheduling. + The ULE scheduler implements a similar scheduling policy, but + contains optimizations for threading, non-symmetric + CPU topologies, and scheduler structural optimizations for + MP environments. + + The UNIX priority scheme assigns fixed priorities to + kernel and user processes; lower priority values indicate + a higher precedence. + Kernel processes generally take priorities based on + compile-time configuration. + User processes inherit their priority from their parent + process, and priorities may be updated using the + setpriority() system call, which operates on a process, + process group, or all processes owned by a specified user. + In general, privilege is required to lower the priority (raise + the precedence) of a process. + Processes may perform operations to modify the scheduling + properties of another process; policies associated with + these operations are described in the Inter-Process + Authorization section. + Kernel locking primitives make use of priority propagation to + prevent priority inversions on contended kernel + resources. + + In addition to the UNIX process priority ranges, processes + may also operate with realtime or idle priority. + Real time processes preempt processes of lower priorities, and + when contending against equal priority processes, are executed + round-robin. + Idle priority processes operate only when no other processes + are able to execute. + Because both realtime and idle priority processes can result in + priority inversions, privilege is required to modify the + realtime or idle priorities of a process. + + + + Per-Uid Global Resource Measurement + + FreeBSD permits limits on the number of processes and + amount of socket buffer space, two particularly sensitive + system resources. + Measurements are taken globally on a per-uid basis. + The FreeBSD kernel maintains a global list of both consumed + and maximum resources per-uid in reference-counted uidinfo + structures. + References to the uidinfo structure for the effective and real + uids are cached in the user credential structure, and are + updated when the uid of a process changes. + + Process counts are maintained based on the number of + processes owned by a particular real uid. + Updates to the per-uid process count are performed when the + first process is created, whenever a process forks or exits, + and whenever a process changes its real uid. + Resource limits on process counts are checked only on process + fork; uid change operations will not fail by virtue of a + resource limit. + + Socket buffer sizes are maintained based on the sum of + the high watermark sizes of sockets allocated by a + particular effective uid. + Updates to the per-uid socket buffer count are performed when + a socket is allocated (via the socket() system call or as part + of a new incoming connection), or when data is sent or + received on the socket that may expand the high watermark. + Resource limits are checked only when new sockets are + created. + + + + Per-Process Limits + + Some resource limits, such as number of processes and + maximum socket buffer per uid, are measured globally across + the system. + Other resources, such as VM space consumption or stack size, + are measured locally to the process. + In both cases, the limits imposed are process-local in that + resource limits are a per-process property. + Each process has a reference to a per-process limit structure, + which consists of a set of limits associated with different + resources. + Each limit contains two elements: a soft (current) limit, and + a hard (maximum) limit which represents the greatest value the + current limit may be increased to without privilege. + Process limits are inheritted on fork(); internally, the + limits are stored copy-on-write. + Resource limits are tested on the allocation of the resource, + such as on the allocation of new memory, creation of a socket, + or forking of a process. + + Resources measured and controlled by the plimit structure + include CPU time, maximum file size, maximum address space + "data" size, maximum address space "stack" size, maximum + size of core file, maximum resident set size, maximum + memory pages that may be locked into physical memory, the + maximum number of processes for the real uid, maximum number + of open files, maximum size consumed by socket buffers for + the effective uid, and maximum virtual memory size (including + file mappings). + + + + + Inter-Process Authorization + + Processes interact explicitly through a variety of + communication channels, including the file system and IPC + services. + They may also directly interact through a series of inter-process + services. + These include signalling (which may act as IPC, modify + scheduling, or signal termination), a variety of monitoring + mechanisms such as those used to implement &man.ps.1;, scheduler + services to modify a process priority or schedule model, and a + set of debugging interfaces permitting a process to closely + monitor and modify the behavior of another process. + Inter-process operations permit the flow of information and + control between processes: signals may directly control the + operation and behavior of a process; visibility of process + command lines share information about what the process is doing, + scheduling services may prevent a process from running or cause it + to operate improperly; debugging often permits direct control of + the process and access to any resources accessible to the target + process. + + Protections associated with these services are important to + prevent serious security vulnerabilities: in most cases, the + protection model requires that, to modify the behavior of another + process via signalling, scheduling, or debugging, the subject + (initiating) process must have the identical or superset + privileges to the object (target) process. + Additional protects may be assigned to a process if the process + has modified or downgraded is privileges, as it may still have + local references to information or resources beyond those + normally available to its new privileges; these protections are + typically used to prevent attaching a debugger to a process that + has run as root, and is now executing as another uid during the + login process, or to protect setuid or setgid programs in + execution. + Vulnerabilities exploitable without these protections might + include access to password files or keying material still held + by the process. + + An important limitation to the safety of inter-process + operations is derived from the UNIX "process id" (pid) model. + Each process is assigned a numeric identifier, unique for the + lifetime of the process. + Operations targetted at processes generally specify the + target process by means of its pid: however, pids may (will) be + reused following the death of a process. + While FreeBSD can be operated in a mode in which pids are + randomly allocated, eventual reuse of a pid is guaranteed + with any reasonable uptime. + As a result, signals may be delivered to improper processes as + a result of races in pid use. + While inter-process access control prevents the malicious + delivery of signals to processes based on differing + credentials, it cannot prevent the accidental delivery of a + signal to an unintended process by an authorized process. + + + MAC Framework policy modules are permitted to augment + inter-process protections, and many do so. + + + + + File Descriptors, File Systems, and Storage Security + + + + + File Descriptors + + Each FreeBSD process has an associated array of references + to active I/O objects, known as file descriptors, which + refer to active object sessions. + For most processes, the file descriptor array will not be + shared; however, it is possible to create processes that share + file descriptors using the rfork() call--this behavior is + required to emulate Linux threading. + Each object session, described by a struct + file in the kernel, has an associated underlying + object, operation vector, cached credential from the time of + creation, access mode, and current offset. + + Object sessions are initially referred to by one file + descriptor, but references may be duplicated to additional file + descriptors, as well as inheritted across fork() operations, and + passed to other processes using UNIX Domain Socket ancillary right + transfer. + In FreeBSD 5.1, objects referenced by file descriptors are: IPC + pipes, IPC sockets, vnodes (files, directories, device nodes, + POSIX fifos, etc), kqueues (kernel event notification queues). + References to object sessions remain until the the descriptor is + explicitly closed via the close() or rfork() system calls, or + implicitly closed on process exec() or exit(). + File descriptor arrays may not be modified except by processes + that reference them--however, the active object sessions may be + modified, as may the underlying objects. + File descriptor properties, such as offset and active access + flags, may be explicitly modified using system calls such as + seek() or fcntl(), or implicitly as a result of operations making + use of the file descriptor, such as read() or write(). + + In most cases, accesses made using a file descriptor are + authorized using the cached file credential from the creation + of the file descriptor: for example, NFS read operations + initiated as a result of a read on the file descriptor will + be authorized using the credential that opened the file, + which may be different from the credential used to initiate + the read operation. + However, some accesses are authorized using the active + credential: typically, this includes meta-data and + administrative operations such as fchmod() on files, or ioctl() + on sockets. + Mandatory protections enforced by the MAC Framework may depend + on either the active or file credential. + For local file systems, protections are typically only enforced + with the open() operation, with the exception of + securelevel-related flags such as system immutable. + + + + File System Protection Model + + + File System Namespace Protections + + The FreeBSD virtual file system (VFS) consists of + a namespace constructed out of individual file system + mounts, and a set of objects (including directories and + files) that make up the namespace. + Processes look up objects relative to either the process + root directory, or process current working directory; in + general, objects cannot be accessed without passing + through the file system namespace; objects that cannot + be named by a process are, in most cases, inaccessible to + the process, although references to unnameable objects + outside a process's namespace may be passed via IPC. + + As a result of these properties, three common protections + are available to protect objects in the file system + namespace: chroot() or mountpoint covering may be used + to prevent the process from constructing a name to the + object; namespace protections, such as access control + lists on directories, can prevent a process from traversing + the namespace to an object; finally, protections on the + object itself can prevent inappropriate access to an + object--for example, file permissions may permit read of + an object, but not write. + Objects may appear more than once in the same namespace by + virtue of hard links and synthetic mountpoints: as a result, + caution must be applied when relying on namespace-based + protections to limit access to an object. + + Modifications to the namespace may be performed by + adding or removing file system mounts, attaching, overlaying, + or detaching parts of the namespace, or by modifying elements + in the namespace by perform operations on objects in the + namespace. + Mount and unmount operations require privilege in FreeBSD + by default; however, the system policy may be configured to + permit user mounts under limited circumstances. + Access to the mount primitives is generally limited because + the ability to directly access the underlying storage + mechanism connotes the ability to manipulate the file system + namespace and protections, bypassing OS limits on those + operations. + When user mounts are permitted, the underlying device must + be readable (and optionally writable) by the user performing + the mount operation; in addition, users may only mount + new file systems on top of objects (typically, directories) + that they own. + Modifications to elements in a file system namespace are + typically authorized in a file system-specific manner, based + on the mandatory and discretionary protections offered by + the file system. + + The MAC Framework permits file system operations to + be controlled across all file systems, with protections + implemented above the per-filesystem layer. + File systems may support multi-label operation, assigning + labels to each object in the file system in a file-system + specific manner, or single-label operation in which all + objects in the file system share the same label, requiring + no special support by the file system for MAC. + + + File System Objects and Operations + + The FreeBSD VFS defines several classes of objects, and + operations that apply to one or more of those objects. + The following operations may be supported on a virtual file + node: + + + + create() + + Create a new file system object; parent directory, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 25 10:23:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3A8C37B407; Fri, 25 Jul 2003 10:23: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 6F61A37B401 for ; Fri, 25 Jul 2003 10:23:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B58B43F85 for ; Fri, 25 Jul 2003 10:23:30 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6PHNU0U045771 for ; Fri, 25 Jul 2003 10:23:30 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6PHNTxi045768 for perforce@freebsd.org; Fri, 25 Jul 2003 10:23:29 -0700 (PDT) Date: Fri, 25 Jul 2003 10:23:29 -0700 (PDT) Message-Id: <200307251723.h6PHNTxi045768@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 34994 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, 25 Jul 2003 17:23:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=34994 Change 34994 by cvance@cvance_osx_laptop on 2003/07/25 10:22:57 Convince the TrustedBSD framework to at least build and boot under an OSX 10.2.6 userspace environment. This required crippling the framework a bit, and some user elements (airport cards) don't appear to work quite right. Broad changes include: - using the appropriate Darwin MALLOC/FREE macros - commenting out the new system calls - ifdef'ing out the use of mbuf labels (the labels break binary compatibility) - previous commits added new routines needed by the framework: strsep, condition variables, sbufs, etc. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#14 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#14 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -60,6 +61,7 @@ #include #include #include +#include #include @@ -89,8 +91,11 @@ #define mtx_assert(x, y) #define MA_OWNED #define PROC_LOCK_ASSERT(x, y) +#define M_ASSERTPKTHDR(x) -SYSCTL_DECL(_security); +#define ASSERT_VOP_LOCKED(vp,msg) \ + if (vp && !VOP_ISLOCKED(vp)) \ + Debugger("vnode lock violation.\n"); SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, "TrustedBSD MAC policy controls"); @@ -132,42 +137,42 @@ static int mac_labelmbufs = 0; #endif -static int mac_enforce_fs = 1; +static int mac_enforce_fs = 0; SYSCTL_INT(_security_mac, OID_AUTO, enforce_fs, CTLFLAG_RW, &mac_enforce_fs, 0, "Enforce MAC policy on file system objects"); TUNABLE_INT("security.mac.enforce_fs", &mac_enforce_fs); -static int mac_enforce_kld = 1; +static int mac_enforce_kld = 0; SYSCTL_INT(_security_mac, OID_AUTO, enforce_kld, CTLFLAG_RW, &mac_enforce_kld, 0, "Enforce MAC policy on kld operations"); TUNABLE_INT("security.mac.enforce_kld", &mac_enforce_kld); -static int mac_enforce_network = 1; +static int mac_enforce_network = 0; SYSCTL_INT(_security_mac, OID_AUTO, enforce_network, CTLFLAG_RW, &mac_enforce_network, 0, "Enforce MAC policy on network packets"); TUNABLE_INT("security.mac.enforce_network", &mac_enforce_network); -static int mac_enforce_pipe = 1; +static int mac_enforce_pipe = 0; SYSCTL_INT(_security_mac, OID_AUTO, enforce_pipe, CTLFLAG_RW, &mac_enforce_pipe, 0, "Enforce MAC policy on pipe operations"); TUNABLE_INT("security.mac.enforce_pipe", &mac_enforce_pipe); -static int mac_enforce_process = 1; +static int mac_enforce_process = 0; SYSCTL_INT(_security_mac, OID_AUTO, enforce_process, CTLFLAG_RW, &mac_enforce_process, 0, "Enforce MAC policy on inter-process operations"); TUNABLE_INT("security.mac.enforce_process", &mac_enforce_process); -static int mac_enforce_socket = 1; +static int mac_enforce_socket = 0; SYSCTL_INT(_security_mac, OID_AUTO, enforce_socket, CTLFLAG_RW, &mac_enforce_socket, 0, "Enforce MAC policy on socket operations"); TUNABLE_INT("security.mac.enforce_socket", &mac_enforce_socket); -static int mac_enforce_system = 1; +static int mac_enforce_system = 0; SYSCTL_INT(_security_mac, OID_AUTO, enforce_system, CTLFLAG_RW, &mac_enforce_system, 0, "Enforce MAC policy on system operations"); TUNABLE_INT("security.mac.enforce_system", &mac_enforce_system); -static int mac_enforce_vm = 1; +static int mac_enforce_vm = 0; SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); @@ -176,7 +181,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; +static int mac_mmap_revocation_via_cow = 0; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation_via_cow, CTLFLAG_RW, &mac_mmap_revocation_via_cow, 0, "Revoke mmap access to files via " "copy-on-write semantics, or by removing all write access"); @@ -751,8 +756,9 @@ tag = m_tag_find(mbuf, PACKET_TAG_MACLABEL, NULL); label = (struct label *)(tag+1); #endif +#ifdef NO_MBUF label = &mbuf->m_pkthdr.label; - +#endif return (label); } @@ -907,12 +913,14 @@ } #endif #else +#ifdef NO_MBUF mac_init_label(&m->m_pkthdr.label); MAC_CHECK(init_mbuf_label, &m->m_pkthdr.label, flag); if (error) { MAC_PERFORM(destroy_mbuf_label, &m->m_pkthdr.label); - mac_destroy(&m->m_pkthdr.label); + mac_destroy_label(&m->m_pkthdr.label); } +#endif /* NO_MBUF */ #ifdef MAC_DEBUG if (error == 0) atomic_add_int(&nmacmbufs, 1); @@ -951,7 +959,8 @@ { struct label *label; - label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK); + MALLOC(label, struct label *, + sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK); pipe->pipe_label = label; pipe->pipe_peer->pipe_label = label; mac_init_pipe_label(label); @@ -1115,8 +1124,10 @@ mac_destroy_mbuf(struct mbuf *m) { +#ifdef NO_MBUF MAC_PERFORM(destroy_mbuf_label, &m->m_pkthdr.label); mac_destroy_label(&m->m_pkthdr.label); +#endif /* NO_MBUF */ #ifdef MAC_DEBUG atomic_subtract_int(&nmacmbufs, 1); #endif @@ -1152,7 +1163,7 @@ { mac_destroy_pipe_label(pipe->pipe_label); - free(pipe->pipe_label, M_MACPIPELABEL); + FREE(pipe->pipe_label, M_MACPIPELABEL); } #endif @@ -1216,7 +1227,9 @@ mac_copy_mbuf(struct mbuf *src, struct mbuf *dst) { +#ifdef NO_MBUF MAC_PERFORM(copy_mbuf_label, &src->m_pkthdr.label, &dst->m_pkthdr.label); +#endif /* NO_MBUF */ } #if 0 @@ -1449,6 +1462,7 @@ &vp->v_label); } +#if 0 int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct vnode *dvp, struct vnode *vp, struct componentname *cnp) @@ -1519,7 +1533,6 @@ return (error); } -#if 0 int mac_execve_enter(struct image_params *imgp, struct mac *mac_p, struct label *execlabelstorage) @@ -1542,13 +1555,13 @@ buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL); if (error) { - free(buffer, M_MACTEMP); + FREE(buffer, M_MACTEMP); return (error); } mac_init_cred_label(execlabelstorage); error = mac_internalize_cred_label(execlabelstorage, buffer); - free(buffer, M_MACTEMP); + FREE(buffer, M_MACTEMP); if (error) { mac_destroy_cred_label(execlabelstorage); return (error); @@ -3085,21 +3098,21 @@ if (error) return (error); - elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); + MALLOC(elements, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL); if (error) { - free(elements, M_MACTEMP); + FREE(elements, M_MACTEMP); return (error); } - buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); + MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); error = mac_externalize_ifnet_label(&ifnet->if_label, elements, buffer, mac.m_buflen, M_WAITOK); if (error == 0) error = copyout(buffer, mac.m_string, strlen(buffer)+1); - free(buffer, M_MACTEMP); - free(elements, M_MACTEMP); + FREE(buffer, M_MACTEMP); + FREE(elements, M_MACTEMP); return (error); } @@ -3121,16 +3134,16 @@ if (error) return (error); - buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); + MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL); if (error) { - free(buffer, M_MACTEMP); + FREE(buffer, M_MACTEMP); return (error); } mac_init_ifnet_label(&intlabel); error = mac_internalize_ifnet_label(&intlabel, buffer); - free(buffer, M_MACTEMP); + FREE(buffer, M_MACTEMP); if (error) { mac_destroy_ifnet_label(&intlabel); return (error); @@ -3141,7 +3154,10 @@ * policies impose this check themselves if required by the * policy. Eventually, this should go away. */ - error = suser_cred(cred, 0); + /* + * Since it doesn't compile on Darwin... + * error = suser_cred(cred, 0); + */ if (error) { mac_destroy_ifnet_label(&intlabel); return (error); @@ -3201,16 +3217,16 @@ if (error) return (error); - buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK); + MALLOC(buffer, char *, mac->m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL); if (error) { - free(buffer, M_MACTEMP); + FREE(buffer, M_MACTEMP); return (error); } mac_init_socket_label(&intlabel, M_WAITOK); error = mac_internalize_socket_label(&intlabel, buffer); - free(buffer, M_MACTEMP); + FREE(buffer, M_MACTEMP); if (error) { mac_destroy_socket_label(&intlabel); return (error); @@ -3257,21 +3273,21 @@ if (error) return (error); - elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK); + MALLOC(elements, char *, mac->m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL); if (error) { - free(elements, M_MACTEMP); + FREE(elements, M_MACTEMP); return (error); } - buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); + MALLOC(buffer, char *, mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); error = mac_externalize_socket_label(&so->so_label, elements, buffer, mac->m_buflen, M_WAITOK); if (error == 0) error = copyout(buffer, mac->m_string, strlen(buffer)+1); - free(buffer, M_MACTEMP); - free(elements, M_MACTEMP); + FREE(buffer, M_MACTEMP); + FREE(elements, M_MACTEMP); return (error); } @@ -3287,25 +3303,26 @@ if (error) return (error); - elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK); + MALLOC(elements, char *, mac->m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL); if (error) { - free(elements, M_MACTEMP); + FREE(elements, M_MACTEMP); return (error); } - buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); + MALLOC(buffer, char *, mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); error = mac_externalize_socket_peer_label(&so->so_peerlabel, elements, buffer, mac->m_buflen, M_WAITOK); if (error == 0) error = copyout(buffer, mac->m_string, strlen(buffer)+1); - free(buffer, M_MACTEMP); - free(elements, M_MACTEMP); + FREE(buffer, M_MACTEMP); + FREE(elements, M_MACTEMP); return (error); } +#if 0 /* TBD/CDV */ /* * Implementation of VOP_SETLABEL() that relies on extended attributes * to store label data. Can be referenced by filesystems supporting @@ -3404,22 +3421,22 @@ if (error) return (error); - elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); + MALLOC(elements, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL); if (error) { - free(elements, M_MACTEMP); + FREE(elements, M_MACTEMP); crfree(tcred); return (error); } - buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); + MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); error = mac_externalize_cred_label(&tcred->cr_label, elements, buffer, mac.m_buflen, M_WAITOK); if (error == 0) error = copyout(buffer, mac.m_string, strlen(buffer)+1); - free(buffer, M_MACTEMP); - free(elements, M_MACTEMP); + FREE(buffer, M_MACTEMP); + FREE(elements, M_MACTEMP); crfree(tcred); return (error); } @@ -3442,21 +3459,21 @@ if (error) return (error); - elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); + MALLOC(elements, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL); if (error) { - free(elements, M_MACTEMP); + FREE(elements, M_MACTEMP); return (error); } - buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); + MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); error = mac_externalize_cred_label(&td->td_ucred->cr_label, elements, buffer, mac.m_buflen, M_WAITOK); if (error == 0) error = copyout(buffer, mac.m_string, strlen(buffer)+1); - free(buffer, M_MACTEMP); - free(elements, M_MACTEMP); + FREE(buffer, M_MACTEMP); + FREE(elements, M_MACTEMP); return (error); } @@ -3481,16 +3498,16 @@ if (error) return (error); - buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); + MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL); if (error) { - free(buffer, M_MACTEMP); + FREE(buffer, M_MACTEMP); return (error); } mac_init_cred_label(&intlabel); error = mac_internalize_cred_label(&intlabel, buffer); - free(buffer, M_MACTEMP); + FREE(buffer, M_MACTEMP); if (error) { mac_destroy_cred_label(&intlabel); return (error); @@ -3562,14 +3579,14 @@ if (error) return (error); - elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); + MALLOC(elements, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL); if (error) { - free(elements, M_MACTEMP); + FREE(elements, M_MACTEMP); return (error); } - buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); + MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); #if 0 mutex_lock(&Giant); /* VFS */ /* XXX FUNNEL? */ #endif @@ -3638,8 +3655,8 @@ #if 0 mutex_unlock(&Giant); /* VFS */ /* XXX FUNNEL? */ #endif - free(buffer, M_MACTEMP); - free(elements, M_MACTEMP); + FREE(buffer, M_MACTEMP); + FREE(elements, M_MACTEMP); return (error); } @@ -3664,14 +3681,14 @@ if (error) return (error); - elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); + MALLOC(elements, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL); if (error) { - free(elements, M_MACTEMP); + FREE(elements, M_MACTEMP); return (error); } - buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); + MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); #if 0 mutex_lock(&Giant); /* VFS */ /* XXX FUNNEL? */ #endif @@ -3697,8 +3714,8 @@ mutex_unlock(&Giant); /* VFS */ /* XXX FUNNEL? */ #endif - free(buffer, M_MACTEMP); - free(elements, M_MACTEMP); + FREE(buffer, M_MACTEMP); + FREE(elements, M_MACTEMP); return (error); } @@ -3723,14 +3740,14 @@ if (error) return (error); - elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); + MALLOC(elements, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL); if (error) { - free(elements, M_MACTEMP); + FREE(elements, M_MACTEMP); return (error); } - buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); + MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); #if 0 mutex_lock(&Giant); /* VFS */ /* XXX FUNNEL? */ #endif @@ -3755,8 +3772,8 @@ mutex_unlock(&Giant); /* VFS */ /* XXX FUNNEL? */ #endif - free(buffer, M_MACTEMP); - free(elements, M_MACTEMP); + FREE(buffer, M_MACTEMP); + FREE(elements, M_MACTEMP); return (error); } @@ -3786,10 +3803,10 @@ if (error) return (error); - buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); + MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL); if (error) { - free(buffer, M_MACTEMP); + FREE(buffer, M_MACTEMP); return (error); } @@ -3854,7 +3871,7 @@ mutex_unlock(&Giant); /* VFS */ /* XXX FUNNEL? */ #endif - free(buffer, M_MACTEMP); + FREE(buffer, M_MACTEMP); return (error); } @@ -3880,16 +3897,16 @@ if (error) return (error); - buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); + MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL); if (error) { - free(buffer, M_MACTEMP); + FREE(buffer, M_MACTEMP); return (error); } mac_init_vnode_label(&intlabel); error = mac_internalize_vnode_label(&intlabel, buffer); - free(buffer, M_MACTEMP); + FREE(buffer, M_MACTEMP); if (error) { mac_destroy_vnode_label(&intlabel); return (error); @@ -3940,16 +3957,16 @@ if (error) return (error); - buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); + MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL); if (error) { - free(buffer, M_MACTEMP); + FREE(buffer, M_MACTEMP); return (error); } mac_init_vnode_label(&intlabel); error = mac_internalize_vnode_label(&intlabel, buffer); - free(buffer, M_MACTEMP); + FREE(buffer, M_MACTEMP); if (error) { mac_destroy_vnode_label(&intlabel); return (error); @@ -4017,12 +4034,14 @@ out: return (error); } +#endif /* !0 TBD/CDV*/ SYSINIT(mac, SI_SUB_MAC, SI_ORDER_FIRST, mac_init, NULL); SYSINIT(mac_late, SI_SUB_MAC_LATE, SI_ORDER_FIRST, mac_late_init, NULL); #else /* !MAC */ +#if 0 /* TBD/CDV*/ int __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap) { @@ -4047,7 +4066,7 @@ int __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap) { - +> return (ENOSYS); } @@ -4092,5 +4111,6 @@ return (ENOSYS); } +#endif /* !0 TBD/CDV*/ #endif /* !MAC */ From owner-p4-projects@FreeBSD.ORG Fri Jul 25 11:37:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C13A37B404; Fri, 25 Jul 2003 11:37: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 D365337B401 for ; Fri, 25 Jul 2003 11:37:46 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7658B43F75 for ; Fri, 25 Jul 2003 11:37:46 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 5FD642A7EA; Fri, 25 Jul 2003 11:37:46 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Bosko Milekic In-Reply-To: <20030722093151.GC58118@technokratis.com> Date: Fri, 25 Jul 2003 11:37:46 -0700 From: Peter Wemm Message-Id: <20030725183746.5FD642A7EA@canning.wemm.org> cc: Perforce Change Reviews Subject: Re: PERFORCE change 34815 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, 25 Jul 2003 18:37:48 -0000 Bosko Milekic wrote: > > > On Mon, Jul 21, 2003 at 08:47:35PM -0700, Peter Wemm wrote: > > http://perforce.freebsd.org/chv.cgi?CH=34815 > > > > Change 34815 by peter@peter_hammer on 2003/07/21 20:47:23 > > > > mb_alloc and mb_free are way too big to inline > > They're only inlined in some local routines. Some care was taken to > keep the local routines' size not too bad by only inlining them in > there once or twice at worse. In retrospect, though, this could have > been done better, but out-of-lining them is not the best solution. > > P.S.: How expensive, relatively, is a function call on the hammer? I > seem to recall the alpha had a relatively higher cost (when compared > to i386) for typical function calls. Mixed. Function calls to small leaf functions are Really Fast(TM). The bigger the calling and called functions, the higher the cost, because of the way the context saves work. The register space is about 60% caller-saved. Sometimes you can get away with not having to save any registers at all across a function call, *if* the conditions are right. And because function args are passed in registers rather than on the memory stack, that speeds things up in the usual case. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 From owner-p4-projects@FreeBSD.ORG Fri Jul 25 12:13:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0798237B404; Fri, 25 Jul 2003 12:13:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8458D37B401 for ; Fri, 25 Jul 2003 12:13:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5040E43FB1 for ; Fri, 25 Jul 2003 12:13:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6PJDm0U052055 for ; Fri, 25 Jul 2003 12:13:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6PJDlhX052052 for perforce@freebsd.org; Fri, 25 Jul 2003 12:13:47 -0700 (PDT) Date: Fri, 25 Jul 2003 12:13:47 -0700 (PDT) Message-Id: <200307251913.h6PJDlhX052052@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 35000 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, 25 Jul 2003 19:13:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=35000 Change 35000 by peter@peter_daintree on 2003/07/25 12:13:16 IFC @34999 Affected files ... .. //depot/projects/hammer/Makefile.inc1#26 integrate .. //depot/projects/hammer/bin/ed/Makefile#7 integrate .. //depot/projects/hammer/etc/rc.subr#8 integrate .. //depot/projects/hammer/games/factor/Makefile#4 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#11 integrate .. //depot/projects/hammer/lib/Makefile#23 integrate .. //depot/projects/hammer/lib/libatm/Makefile#3 integrate .. //depot/projects/hammer/lib/libatm/ioctl_subr.c#3 integrate .. //depot/projects/hammer/lib/libatm/ip_addr.c#3 integrate .. //depot/projects/hammer/lib/libatm/ip_checksum.c#2 integrate .. //depot/projects/hammer/lib/libc/net/ip6opt.c#2 integrate .. //depot/projects/hammer/lib/libc/posix1e/acl_to_text.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_kqueue.c#1 branch .. //depot/projects/hammer/lib/libgeom/Makefile#4 integrate .. //depot/projects/hammer/lib/libtelnet/Makefile#3 integrate .. //depot/projects/hammer/lib/libthr/arch/alpha/alpha/_curthread.c#2 integrate .. //depot/projects/hammer/lib/libwrap/Makefile#5 integrate .. //depot/projects/hammer/libexec/telnetd/Makefile#3 integrate .. //depot/projects/hammer/release/Makefile#34 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#37 integrate .. //depot/projects/hammer/release/i386/drivers.conf#12 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#5 integrate .. //depot/projects/hammer/sbin/atm/fore_dnld/fore_dnld.c#2 integrate .. //depot/projects/hammer/sbin/atm/ilmid/Makefile#3 integrate .. //depot/projects/hammer/sbin/atm/ilmid/ilmid.c#8 integrate .. //depot/projects/hammer/share/man/man7/release.7#11 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#15 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#15 integrate .. //depot/projects/hammer/sys/alpha/alpha/support.s#4 integrate .. //depot/projects/hammer/sys/alpha/include/alpha_cpu.h#3 integrate .. //depot/projects/hammer/sys/alpha/include/ucontext.h#4 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#47 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#29 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#12 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#9 integrate .. //depot/projects/hammer/sys/ia64/conf/SKI#8 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#22 integrate .. //depot/projects/hammer/sys/ia64/ia64/mem.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#17 integrate .. //depot/projects/hammer/sys/ia64/ia64/trap.c#15 integrate .. //depot/projects/hammer/sys/ia64/include/_regset.h#4 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#23 integrate .. //depot/projects/hammer/sys/libkern/scanc.c#3 integrate .. //depot/projects/hammer/sys/netatm/atm_cm.c#7 integrate .. //depot/projects/hammer/sys/netatm/atm_device.c#6 integrate .. //depot/projects/hammer/sys/netatm/atm_if.c#7 integrate .. //depot/projects/hammer/sys/netatm/atm_ioctl.h#2 integrate .. //depot/projects/hammer/sys/netatm/atm_proto.c#3 integrate .. //depot/projects/hammer/sys/netatm/atm_socket.c#5 integrate .. //depot/projects/hammer/sys/netatm/atm_subr.c#7 integrate .. //depot/projects/hammer/sys/netatm/atm_var.h#4 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_input.c#5 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_load.c#5 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_output.c#3 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_usrreq.c#4 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_var.h#3 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_vcm.c#5 integrate .. //depot/projects/hammer/sys/netatm/spans/spans_cls.c#5 integrate .. //depot/projects/hammer/sys/netatm/spans/spans_proto.c#4 integrate .. //depot/projects/hammer/sys/netatm/spans/spans_var.h#2 integrate .. //depot/projects/hammer/sys/netatm/uni/sscf_uni.c#5 integrate .. //depot/projects/hammer/sys/netatm/uni/sscf_uni_lower.c#4 integrate .. //depot/projects/hammer/sys/netatm/uni/sscf_uni_var.h#3 integrate .. //depot/projects/hammer/sys/netatm/uni/sscop_pdu.c#4 integrate .. //depot/projects/hammer/sys/netatm/uni/sscop_var.h#3 integrate .. //depot/projects/hammer/sys/netatm/uni/uniarp.c#5 integrate .. //depot/projects/hammer/sys/netatm/uni/uniarp_input.c#3 integrate .. //depot/projects/hammer/sys/netatm/uni/uniip_var.h#2 integrate .. //depot/projects/hammer/sys/netatm/uni/unisig_msg.c#5 integrate .. //depot/projects/hammer/sys/netatm/uni/unisig_proto.c#3 integrate .. //depot/projects/hammer/sys/netatm/uni/unisig_var.h#3 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#10 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#10 integrate .. //depot/projects/hammer/tools/tools/tinderbox/current.rc#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/releng_4.rc#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#11 integrate .. //depot/projects/hammer/usr.bin/Makefile#18 integrate .. //depot/projects/hammer/usr.bin/find/find.1#4 integrate .. //depot/projects/hammer/usr.bin/telnet/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/Makefile#26 integrate .. //depot/projects/hammer/usr.sbin/ctm/ctm_rmail/ctm_rmail.1#3 integrate .. //depot/projects/hammer/usr.sbin/ppp/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/pppd/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/sendmail/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/tcpdchk/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/zzz/zzz.sh#2 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#26 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.381 2003/07/14 16:21:16 gordon Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.382 2003/07/24 18:14:29 markm Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -339,7 +339,8 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 4: building libraries" @echo "--------------------------------------------------------------" - cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG libraries + cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG -DNOLINT \ + libraries _depend: @echo @echo "--------------------------------------------------------------" ==== //depot/projects/hammer/bin/ed/Makefile#7 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.28 2003/07/20 12:26:24 ru Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.29 2003/07/24 18:30:24 markm Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DISTRIBUTION=crypto CFLAGS+=-DDES WARNS?= 2 ==== //depot/projects/hammer/etc/rc.subr#8 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.13 2003/06/09 17:31:06 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.14 2003/07/24 18:17:21 mtm Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -669,7 +669,7 @@ # if the precmd failed and force # isn't set, exit # - if [ -n $_precmd ]; then + if [ -n "$_precmd" ]; then eval $_precmd _return=$? [ $_return -ne 0 ] && [ -z "$rc_force" ] && ==== //depot/projects/hammer/games/factor/Makefile#4 (text+ko) ==== @@ -1,11 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/factor/Makefile,v 1.6 2003/05/19 15:52:50 des Exp $ +# $FreeBSD: src/games/factor/Makefile,v 1.7 2003/07/24 18:30:24 markm Exp $ PROG= factor SRCS= factor.c pr_tbl.c CFLAGS+=-I${.CURDIR}/../primes -.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) CFLAGS+=-DHAVE_OPENSSL LDADD+= -lcrypto DPADD+= ${LIBCRYPTO} ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#11 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.114 2003/07/14 22:22:56 mph Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.115 2003/07/25 11:14:03 mux Exp $ % -- Gifts for Children -- @@ -9550,10 +9550,6 @@ % Man is the only animal that can remain on friendly terms with the victims he intends to eat until he eats them. - -- Samuel Butler -% -Man is the only animal that can remain on friendly terms with the -victims he intends to eat until he eats them. -- Samuel Butler (1835-1902) % Man, n.: ==== //depot/projects/hammer/lib/Makefile#23 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.165 2003/07/24 02:05:48 peter Exp $ +# $FreeBSD: src/lib/Makefile,v 1.166 2003/07/24 18:30:24 markm Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -94,7 +94,7 @@ _libdisk= libdisk .endif -.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) _libmp= libmp .endif ==== //depot/projects/hammer/lib/libatm/Makefile#3 (text+ko) ==== @@ -23,7 +23,7 @@ # Copies of this Software may be made, however, the above copyright # notice must be reproduced on all copies. # -# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.6 2003/03/25 17:40:00 mdodd Exp $ +# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.7 2003/07/25 08:22:08 harti Exp $ # # @@ -33,6 +33,6 @@ LDADD+= -lmd DPADD+= ${LIBMD} -WARNS?= 3 +WARNS?= 6 .include ==== //depot/projects/hammer/lib/libatm/ioctl_subr.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libatm/ioctl_subr.c,v 1.8 2002/09/30 09:18:54 mdodd Exp $"); +__FBSDID("$FreeBSD: src/lib/libatm/ioctl_subr.c,v 1.9 2003/07/25 08:22:08 harti Exp $"); /* * User Space Library Functions @@ -172,7 +172,7 @@ /* * Return a pointer to the VCC info and its length */ - *vccp = (struct air_vcc_rsp *) air.air_buf_addr; + *vccp = (struct air_vcc_rsp *)(void *)air.air_buf_addr; return(buf_len); } @@ -226,7 +226,7 @@ /* * Give the answer back to the caller */ - ip_mask = (struct sockaddr_in *)&req.ifr_addr; + ip_mask = (struct sockaddr_in *)(void *)&req.ifr_addr; *mask = *ip_mask; mask->sin_family = AF_INET; @@ -392,7 +392,7 @@ /* * Return a pointer to the Config info and its length */ - *cfgp = (struct air_cfg_rsp *) air.air_buf_addr; + *cfgp = (struct air_cfg_rsp *)(void *)air.air_buf_addr; return ( buf_len ); } @@ -430,7 +430,7 @@ /* * Return a pointer to the Physical Interface info and its length */ - *intp = (struct air_int_rsp *) air.air_buf_addr; + *intp = (struct air_int_rsp *)(void *)air.air_buf_addr; return ( buf_len ); } ==== //depot/projects/hammer/lib/libatm/ip_addr.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libatm/ip_addr.c,v 1.8 2003/03/25 04:29:26 mdodd Exp $"); +__FBSDID("$FreeBSD: src/lib/libatm/ip_addr.c,v 1.9 2003/07/25 08:22:08 harti Exp $"); /* * User Space Library Functions @@ -96,7 +96,8 @@ ip_host->h_addrtype != AF_INET) { return((struct sockaddr_in *)0); } - s.sin_addr.s_addr = *(u_long *)ip_host->h_addr_list[0]; + memcpy(&s.sin_addr.s_addr, ip_host->h_addr_list[0], + sizeof(s.sin_addr.s_addr)); } return(&s); } ==== //depot/projects/hammer/lib/libatm/ip_checksum.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libatm/ip_checksum.c,v 1.7 2002/03/21 23:35:20 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libatm/ip_checksum.c,v 1.8 2003/07/25 08:22:08 harti Exp $"); /* * User Space Library Functions @@ -77,7 +77,7 @@ while( count > 1 ) { /* This is the inner loop */ - sum += ntohs(* (unsigned short *) addr); + sum += ntohs(* (unsigned short *)(void *)addr); addr += sizeof(unsigned short); count -= sizeof(unsigned short); } ==== //depot/projects/hammer/lib/libc/net/ip6opt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.3 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.4 2003/07/25 12:23:25 mux Exp $"); #include #include @@ -111,8 +111,6 @@ return(-1); if (plusy < 0 || plusy > 7) return(-1); - if (typep[0] > 255) - return(-1); /* * If this is the first option, allocate space for the ==== //depot/projects/hammer/lib/libc/posix1e/acl_to_text.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_to_text.c,v 1.10 2002/03/22 21:52:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_to_text.c,v 1.11 2003/07/24 23:33:25 rwatson Exp $"); #include #include "namespace.h" @@ -177,9 +177,10 @@ effective_perm_buf); if (error) goto error_label; - len = asprintf(&tmpbuf, "%sgroup::%s\t\t# " + len = asprintf(&tmpbuf, "%sgroup:%s:%s\t\t# " "effective: %s\n", - buf, perm_buf, effective_perm_buf); + buf, name_buf, perm_buf, + effective_perm_buf); } else { len = asprintf(&tmpbuf, "%sgroup:%s:%s\n", buf, name_buf, perm_buf); ==== //depot/projects/hammer/lib/libc_r/uthread/Makefile.inc#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.36 2003/04/20 01:53:12 jdp Exp $ +# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.37 2003/07/25 17:02:33 mp Exp $ # uthread sources .PATH: ${.CURDIR}/uthread @@ -77,6 +77,7 @@ uthread_join.c \ uthread_kern.c \ uthread_kevent.c \ + uthread_kqueue.c \ uthread_kill.c \ uthread_listen.c \ uthread_main_np.c \ ==== //depot/projects/hammer/lib/libgeom/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libgeom/Makefile,v 1.6 2003/05/17 19:05:17 ru Exp $ +# $FreeBSD: src/lib/libgeom/Makefile,v 1.7 2003/07/24 19:53:02 markm Exp $ LIB= geom SRCS+= geom_getxml.c @@ -7,7 +7,7 @@ SRCS+= geom_ctl.c INCS= libgeom.h -CFLAGS += -I${.CURDIR} -g +CFLAGS += -I${.CURDIR} WARNS?= 3 ==== //depot/projects/hammer/lib/libtelnet/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 12/15/93 -# $FreeBSD: src/lib/libtelnet/Makefile,v 1.16 2003/07/20 23:29:46 markm Exp $ +# $FreeBSD: src/lib/libtelnet/Makefile,v 1.18 2003/07/24 17:19:15 markm Exp $ TELNETDIR= ${.CURDIR}/../../contrib/telnet .PATH: ${TELNETDIR}/libtelnet @@ -13,7 +13,9 @@ WARNS?= 2 +.if !defined(RELEASE_CRUNCH) .if !defined(NOCRYPT) && !defined(NO_OPENSSL) +DISTRIBUTION= crypto SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA .if !defined(NO_KERBEROS) @@ -22,6 +24,7 @@ CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write .endif .endif +.endif INCS= ${TELNETDIR}/arpa/telnet.h INCSDIR= ${INCLUDEDIR}/arpa ==== //depot/projects/hammer/lib/libthr/arch/alpha/alpha/_curthread.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libthr/arch/alpha/alpha/_curthread.c,v 1.1.1.1 2003/07/19 15:57:52 mtm Exp $"); +__FBSDID("$FreeBSD: src/lib/libthr/arch/alpha/alpha/_curthread.c,v 1.2 2003/07/24 07:51:49 marcel Exp $"); #include #include @@ -35,13 +35,18 @@ void * _set_curthread(ucontext_t *uc, struct pthread *thread, int *err) { + *err = 0; + if (uc != NULL) + uc->uc_mcontext.mc_thrptr = (uint64_t)thread; + else + __builtin_set_thread_pointer(thread); return (NULL); } struct pthread * _get_curthread(void) { - return (NULL); + return (__builtin_thread_pointer()); } void ==== //depot/projects/hammer/lib/libwrap/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libwrap/Makefile,v 1.13 2003/06/04 16:01:37 markm Exp $ +# $FreeBSD: src/lib/libwrap/Makefile,v 1.14 2003/07/24 19:58:55 markm Exp $ # LIB= wrap @@ -16,7 +16,7 @@ -DREAL_DAEMON_DIR=\"/usr/libexec\" -DPROCESS_OPTIONS \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \ -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \ - -DSYS_ERRLIST_DEFINED -DALWAYS_HOSTNAME -DUSE_STRSEP + -DSYS_ERRLIST_DEFINED -DALWAYS_HOSTNAME -DUSE_STRSEP -DPROCESS_OPTIONS .if !defined(NOINET6) CFLAGS+=-DINET6 .endif ==== //depot/projects/hammer/libexec/telnetd/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/libexec/telnetd/Makefile,v 1.21 2003/07/20 23:29:46 markm Exp $ +# $FreeBSD: src/libexec/telnetd/Makefile,v 1.23 2003/07/24 17:19:15 markm Exp $ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. @@ -28,7 +28,9 @@ DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} LDADD= -lutil -ltermcap ${LIBTELNET} +.if !defined(RELEASE_CRUNCH) .if !defined(NOCRYPT) && !defined(NO_OPENSSL) +DISTRIBUTION= crypto SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM} @@ -39,5 +41,6 @@ LDADD+= -lkrb5 -lasn1 -lroken -lcom_err .endif .endif +.endif .include ==== //depot/projects/hammer/release/Makefile#34 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.793 2003/07/23 20:53:37 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.799 2003/07/25 13:39:11 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -29,6 +29,12 @@ # If this is a -stable snapshot, then set #RELEASETAG=RELENG_4 # +# To test a release with a source tree containing patches and +# other work. This tree will get copied instead of getting the +# src/ tree from a CVS checkout. For "rerelease", this will NOT +# be copied; cvs update will be used instead. +#EXTSRCDIR=/usr/src +# # To add other options to the CVS subcommands (co,up), set #CVSCMDARGS="-D '01/01/2002 00:00:00 UTC'" # @@ -38,6 +44,9 @@ # To prefix the cvs command #CVSPREFIX="/usr/bin/time" # +# Where the CVS repository is +#CVSROOT="/home/ncvs" +# # Non-zero if ${RELEASETAG} is in the form "RELENG_ver_RELEASE"; we # are building an official release. Otherwise, we are building for # a branch. @@ -232,14 +241,9 @@ # Things that need to be compiled without crypto support in releases .if !defined(FIXCRYPTO) -FIXCRYPTO!= cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS -FIXCRYPTO+= bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump \ - lib/libfetch usr.bin/fetch -.if !defined(NO_SENDMAIL) -FIXCRYPTO+= usr.sbin/sendmail +FIXCRYPTO!= cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS; \ + cd ${.CURDIR}/../secure; ${MAKE} -V SPROGS .endif -.endif - # Things which may get you into trouble if you change them MTREEFILES= ${.CURDIR}/../etc/mtree @@ -265,23 +269,16 @@ .if ${TARGET_ARCH} == "sparc64" CRUNCH_TARGETS= boot -FIXIT_TARGET= .elif ${TARGET_ARCH} == "ia64" CRUNCH_TARGETS= boot -FIXIT_TARGET= .elif ${TARGET} == "pc98" CRUNCH_TARGETS= boot fixit fixit-small .elif ${TARGET_ARCH} == "amd64" CRUNCH_TARGETS= boot -FIXIT_TARGET= .endif CRUNCH_TARGETS?=boot fixit -.if !defined(FIXIT_TARGET) -FIXIT_TARGET= release.10 -.endif - EXTRAS= ftp.1 .if !defined(NOCDROM) EXTRAS+= cdrom.1 @@ -492,7 +489,7 @@ env -i /usr/sbin/chroot ${CHROOTDIR} /mk clean: - rm -rf ${CRUNCH_TARGETS:S/$/_crunch/} release.[0-9] ${FIXIT_TARGET} \ + rm -rf ${CRUNCH_TARGETS:S/$/_crunch/} release.[0-9] release.10 \ ${EXTRAS} fetch-distfiles: @@ -526,13 +523,13 @@ mtree -deU -f ${MTREEFILES}/BSD.var.dist \ -p ${RD}/trees/$$i/var > /dev/null ; \ done - touch release.1 + touch ${.TARGET} # Install the system into the various distributions. release.2: cd ${.CURDIR}/../etc && make distrib-dirs DESTDIR=${RD}/trees/base cd ${.CURDIR}/.. && ${CROSSMAKE} distributeworld DISTDIR=${RD}/trees - touch release.2 + touch ${.TARGET} # Build and install crypto distributions. release.3: @@ -542,7 +539,7 @@ SUBDIR_OVERRIDE="${FIXCRYPTO}" \ buildworld distributeworld DISTDIR=${RD}/trees -chflags -R noschg ${RD}/trees - touch release.3 + touch ${.TARGET} # Make and install the generic kernel(s). release.4: @@ -561,7 +558,7 @@ ${CROSSMAKE} ${KERNEL_FLAGS} -DNO_MODULES \ reinstallkernel -DINSTALL_DEBUG \ DESTDIR=${RD}/trees/base - touch release.4 + touch ${.TARGET} # Make and install the three crunched binaries which live on the floppies. # You are not supposed to like this :-) @@ -583,7 +580,7 @@ ${WMAKEENV} strip -R .comment ${j}_crunch/${j}_crunch mv ${j}_crunch/${j}_crunch ${RD}/crunch/${j} .endfor - touch release.5 + touch ${.TARGET} # # --==## Fix up the distributions. ##==-- @@ -601,7 +598,7 @@ # Remove all the directories we don't need. -cd ${RD}/trees && \ find ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} -depth -type d -print | xargs rmdir - touch release.6 + touch ${.TARGET} # # --==## Package up the tarballs from assembled trees ##==-- @@ -618,7 +615,7 @@ echo "$${i} distribution is finished."; \ fi ; \ done - touch release.7 + touch ${.TARGET} # @@ -655,7 +652,7 @@ (cd ${RD}/dists/src; rm -f CHECKSUM.MD5; md5 * > CHECKSUM.MD5) @echo "src distribution is finished." .endif - touch release.8 + touch ${.TARGET} # Complete the bootfd # @@ -671,7 +668,6 @@ # release.9: -.if ${TARGET_ARCH} != "ia64" || ${TARGET_ARCH} == ${MACHINE_ARCH} cp ${RD}/trees/base/etc/disktab /etc rm -rf ${RD}/mfsfd mkdir ${RD}/mfsfd @@ -717,34 +713,40 @@ .if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64" @cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot .endif - @echo "Making the regular boot floppy." @tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \ tar xf - -C ${RD}/mfsfd/stand .if ${TARGET_ARCH} == "alpha" && !defined(NO_FLOPPIES) rm -rf ${RD}/mfsfd/stand/help/* .endif -.if defined(SMALLBOOTSIZE) && !defined(NO_FLOPPIES) + @mkdir -p ${RD}/mfsroot +.if defined(SMALLBOOTSIZE) .if exists(${.CURDIR}/${TARGET}/drivers-small.conf) - @rm -rf ${RD}/mfsfd/modules @mkdir -p ${RD}/mfsfd/modules @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \ ${.CURDIR}/${TARGET}/drivers-small.conf \ ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules .endif - sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ + sh -e ${DOFS_SH} mfsroot-small ${RD} ${MNT} \ ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} - @gzip -9vc mfsroot > mfsroot.gz - @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \ - ${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot.gz \ - ${BOOTINODE} ${SMALLBOOTLABEL} + @gzip -9vc mfsroot-small > ${RD}/mfsroot/mfsroot-small.gz + @rm -rf ${RD}/mfsfd/modules .endif .if exists(${.CURDIR}/${TARGET}/drivers.conf) - @rm -rf ${RD}/mfsfd/modules @mkdir -p ${RD}/mfsfd/modules @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \ ${.CURDIR}/${TARGET}/drivers.conf \ ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules +.endif + sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ + ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} + @gzip -9vc mfsroot > ${RD}/mfsroot/mfsroot.gz + @rm mfsroot mfsroot-small + touch ${.TARGET} + +release.10: .if !defined(NO_FLOPPIES) +.if exists(${.CURDIR}/${TARGET}/drivers.conf) + @echo "Making the drivers floppy." @rm -rf ${RD}/driversfd @mkdir ${RD}/driversfd @awk -f ${.CURDIR}/scripts/driver-copy2.awk 3 \ @@ -759,35 +761,25 @@ *.dsc >> ${RD}/floppies/DRIVERS.TXT; \ fi .endif -.endif - sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ - ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} - @gzip -9vc mfsroot > mfsroot.gz - @mkdir -p ${RD}/mfsroot - @cp mfsroot.gz ${RD}/mfsroot -.if !defined(NO_FLOPPIES) .if defined(BOOTSIZE) + @echo "Making the regular boot floppy." @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot.flp \ - ${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL} + ${RD} ${MNT} ${BOOTSIZE} ${RD}/mfsroot/mfsroot.gz \ + ${BOOTINODE} ${BOOTLABEL} @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern .endif .if defined(SMALLBOOTSIZE) + @echo "Making the small boot floppy." + @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \ + ${RD} ${MNT} ${SMALLBOOTSIZE} ${RD}/mfsroot/mfsroot-small.gz \ + ${BOOTINODE} ${SMALLBOOTLABEL} @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL .endif .if defined(BIGBOOTSIZE) + @echo "Making the big boot floppy." @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot FDSIZE=BIG .endif -.endif - @rm mfsroot mfsroot.gz - @echo "Regular and MFS boot floppies made." -.endif - touch release.9 - -# -# --==## Create a fixit floppy ##==-- -# -release.10: -.if !defined(NO_FLOPPIES) +.if defined(FIXITSIZE) || defined(SMALLFIXITSIZE) @echo "Making fixit floppy." @rm -rf ${RD}/fixitfd @mkdir ${RD}/fixitfd @@ -813,10 +805,13 @@ @rm -rf ${RD}/fixitfd/stand @mkdir ${RD}/fixitfd/stand .endif +.if defined(FIXITSIZE) @cd ${.CURDIR} && ${MAKE} installCRUNCH CRUNCH=fixit \ DIR=${RD}/fixitfd/stand ZIP=false @sh -e ${DOFS_SH} ${RD}/floppies/fixit.flp ${RD} \ ${MNT} ${FIXITSIZE} ${RD}/fixitfd ${FIXITINODE} ${FIXITLABEL} +.endif +.endif # Do our last minute floppies directory setup in a convenient place. .if !defined(NODOC) @cp ${RND}/${RELNOTES_LANG}/installation/${TARGET}/article.txt \ @@ -826,7 +821,7 @@ @(cd ${RD}/floppies; md5 *.flp > CHECKSUM.MD5) .endif .endif - touch release.10 + touch ${.TARGET} # # --==## Setup a suitable ftp-area ##==-- @@ -858,7 +853,7 @@ .if !defined(NOPORTS) @tar --exclude CVS -cBf - -C ${CD_DISC1} ports | tar -xBf - -C ${FD} .endif - touch ftp.1 + touch ${.TARGET} # # --==## Setup a suitable cdrom-area ##==-- @@ -919,7 +914,7 @@ cp ${.CURDIR}/scripts/ports-install.sh ${CD_DISC1}/ports/install.sh \ && (cd ${CD_DISC1}/ports; md5 * > CHECKSUM.MD5) .endif - touch cdrom.1 + touch ${.TARGET} iso.1: .if exists(${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh) @@ -937,7 +932,7 @@ ${CD_EXTRA_BITS} \ && false .endif - touch iso.1 + touch ${.TARGET} .else @echo "Do not know how to create an ISO for ${TARGET_ARCH}." .endif @@ -954,7 +949,7 @@ WITHOUT_PYTHON=yes FORCE_PKG_REGISTER=yes; \ done @cd /usr/doc && make all install 'FORMATS=html html-split txt' INSTALL_COMPRESSED='' DOCDIR=${RD}/trees/base/usr/share/doc - touch doc.1 + touch ${.TARGET} # # --==## RELNOTESng: Next-generation replacements for *.TXT files ##==-- @@ -962,7 +957,7 @@ doc.2: @echo "Making release documentation..." @cd ${.CURDIR}/doc && make all install clean 'FORMATS=html txt' INSTALL_COMPRESSED='' DOCDIR=${RND} - touch doc.2 + touch ${.TARGET} # Various "subroutine" and other supporting targets. @@ -1004,30 +999,16 @@ md5 * > CHECKSUM.MD5) \ ) -.if target(release.9.${TARGET_ARCH}) -RELEASE9=release.9.${TARGET_ARCH} -.else -RELEASE9=release.9 -.endif - doRELEASE: release.1 release.2 release.3 ${DOCREL} release.4 release.5 \ - release.6 release.7 release.8 ${RELEASE9} ${FIXIT_TARGET} + release.6 release.7 release.8 release.9 release.10 @cd ${.CURDIR} && ${MAKE} ${EXTRAS} @echo "Release done" floppies: - @cd ${.CURDIR} && ${MAKE} boot.flp - @cd ${.CURDIR} && ${MAKE} fixit.flp + @rm -f release.5 release.9 release.10 + @cd ${.CURDIR} && ${MAKE} release.5 release.9 release.10 @cd ${RD} && find floppies -print | cpio -dumpl ${FD} -boot.flp: - @rm -f release.5 release.9 - @cd ${.CURDIR} && ${MAKE} release.5 release.9 CRUNCH_TARGETS=boot - -fixit.flp: - @rm -f release.5 release.10 - @cd ${.CURDIR} && ${MAKE} release.5 release.10 CRUNCH_TARGETS=fixit - installCRUNCH: .if !defined(CRUNCH) @echo "CRUNCH undefined in installCRUNCH" && exit 1 @@ -1110,7 +1091,11 @@ @echo "echo Please insert MFS root floppy and press enter:" >> ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "read" >> ${RD}/image.${FSIMAGE}/boot/loader.rc .endif +.if defined(FDSIZE) && ${FDSIZE} == "SMALL" + @echo "load -t mfs_root /mfsroot-small" >> ${RD}/image.${FSIMAGE}/boot/loader.rc +.else @echo "load -t mfs_root /mfsroot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc +.endif .if ${TARGET_ARCH} != "ia64" @echo "set hint.acpi.0.disabled=1" >> ${RD}/image.${FSIMAGE}/boot/loader.rc .endif @@ -1126,7 +1111,7 @@ @gzip -9v ${RD}/image.${FSIMAGE}/kernel @rm -f ${RD}/floppies/${FSIMAGE}.flp .if defined(FDSIZE) && ${FDSIZE} == "BIG" - @cp mfsroot.gz ${RD}/image.${FSIMAGE} + @cp ${RD}/mfsroot/mfsroot.gz ${RD}/image.${FSIMAGE} sh -e ${DOFS_SH} ${RD}/floppies/${FSIMAGE}.flp \ ${RD} ${MNT} ${BIGBOOTSIZE} ${RD}/image.${FSIMAGE} \ ${BOOTINODE} ${BIGBOOTLABEL} ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#37 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.595 2003/07/21 22:07:40 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.596 2003/07/25 14:08:32 hrs Exp $ 2000 @@ -148,6 +148,7 @@ The &man.safe.4; driver has been added to support SafeNet 1141, 1741-based crypto accelerators. + &merged; The public key support is not implemented. @@ -170,6 +171,9 @@ support for 802.11a/b/g devices based on the AR5210, AR5211, and AR5212 chips. + &man.bge.4; now supports Broadcom 5705 based Gigabit Ethernet NICs. + &merged; + A bug in the &man.bge.4; driver that prevented it from working correctly at 10 Mbps has been fixed. @@ -323,7 +327,8 @@ the /stand directory installed by &man.sysinstall.8;, but it /rescue includes more functionality and is updated by as part of - buildworld/installworld operations. + buildworld/installworld operations. More details can be found in + &man.rescue.7;. Due to some cross-build interactions, ==== //depot/projects/hammer/release/i386/drivers.conf#12 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/i386/drivers.conf,v 1.28 2003/06/01 20:01:05 ru Exp $ +# $FreeBSD: src/release/i386/drivers.conf,v 1.29 2003/07/25 00:10:33 scottl Exp $ # # drv: driver name in kernel config file @@ -69,7 +69,6 @@ amr amr 3 disk "AMI MegaRAID" ips ips 3 disk "IBM ServeRAID" -mlx mlx 3 disk "Mylex DAC-family RAID" mly mly 3 disk "Mylex AcceleRAID/eXtremeRAID family" sbp sbp 3 disk "SBP-2 SCSI over FireWire" trm trm 3 disk "Tekram DC395X SCSI cards" ==== //depot/projects/hammer/rescue/rescue/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/rescue/rescue/Makefile,v 1.13 2003/07/21 02:47:04 obrien Exp $ +#$FreeBSD: src/rescue/rescue/Makefile,v 1.14 2003/07/24 07:42:42 gordon Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= rescue @@ -246,14 +246,15 @@ .endfor +.ORDER: $(OUTPUTS) objs $(OUTPUTS): $(CONF) MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -q -m $(OUTMK) -c $(OUTC) \ $(CONF) -$(PROG): $(OUTPUTS) +$(PROG): $(OUTPUTS) objs MAKEOBJDIRPREFIX=${CRUNCHOBJS} make -f $(OUTMK) -objs: +objs: $(OUTMK) MAKEOBJDIRPREFIX=${CRUNCHOBJS} make -f $(OUTMK) objs # Someone should replace the bin/csh and bin/sh build-tools with ==== //depot/projects/hammer/sbin/atm/fore_dnld/fore_dnld.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.9 2000/12/09 09:35:38 obrien Exp $ + * @(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.10 2003/07/25 12:40:03 harti Exp $ * */ @@ -64,7 +64,7 @@ #include #ifndef lint -__RCSID("@(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.9 2000/12/09 09:35:38 obrien Exp $"); +__RCSID("@(#) $FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.c,v 1.10 2003/07/25 12:40:03 harti Exp $"); #endif extern u_char pca200e_microcode[]; @@ -1036,7 +1036,7 @@ */ air = (struct air_cfg_rsp *)buf; - if (air->acp_vendor == VENDOR_FORE ) + if (air->acp_vendapi == VENDAPI_FORE_1 && air->acp_ram != 0) { /* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 25 13:56:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69C2237B404; Fri, 25 Jul 2003 13:56: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 0BB6537B401 for ; Fri, 25 Jul 2003 13:56:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D013C43F75 for ; Fri, 25 Jul 2003 13:56:55 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6PKut0U062219 for ; Fri, 25 Jul 2003 13:56:55 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6PKusEk062216 for perforce@freebsd.org; Fri, 25 Jul 2003 13:56:54 -0700 (PDT) Date: Fri, 25 Jul 2003 13:56:54 -0700 (PDT) Message-Id: <200307252056.h6PKusEk062216@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 35004 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, 25 Jul 2003 20:56:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=35004 Change 35004 by marcel@marcel_nfs on 2003/07/25 13:56:38 IFC @35003 Affected files ... .. //depot/projects/ia64/Makefile.inc1#76 integrate .. //depot/projects/ia64/bin/ed/Makefile#9 integrate .. //depot/projects/ia64/contrib/tar/src/tar.c#2 integrate .. //depot/projects/ia64/etc/rc.subr#13 integrate .. //depot/projects/ia64/games/factor/Makefile#4 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#31 integrate .. //depot/projects/ia64/lib/Makefile#32 integrate .. //depot/projects/ia64/lib/libatm/Makefile#3 integrate .. //depot/projects/ia64/lib/libatm/ioctl_subr.c#4 integrate .. //depot/projects/ia64/lib/libatm/ip_addr.c#4 integrate .. //depot/projects/ia64/lib/libatm/ip_checksum.c#3 integrate .. //depot/projects/ia64/lib/libc/net/ip6opt.c#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_to_text.c#4 integrate .. //depot/projects/ia64/lib/libc_r/uthread/Makefile.inc#8 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_kqueue.c#1 branch .. //depot/projects/ia64/lib/libgeom/Makefile#6 integrate .. //depot/projects/ia64/lib/libncp/ncpl_conn.c#3 integrate .. //depot/projects/ia64/lib/libncp/ncpl_subr.c#5 integrate .. //depot/projects/ia64/lib/libtelnet/Makefile#6 integrate .. //depot/projects/ia64/lib/libthr/arch/alpha/alpha/_curthread.c#2 integrate .. //depot/projects/ia64/lib/libwrap/Makefile#6 integrate .. //depot/projects/ia64/libexec/telnetd/Makefile#6 integrate .. //depot/projects/ia64/release/Makefile#59 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#108 integrate .. //depot/projects/ia64/release/i386/drivers.conf#21 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#8 integrate .. //depot/projects/ia64/sbin/Makefile#28 integrate .. //depot/projects/ia64/sbin/atm/fore_dnld/fore_dnld.c#2 integrate .. //depot/projects/ia64/sbin/atm/ilmid/Makefile#4 integrate .. //depot/projects/ia64/sbin/atm/ilmid/ilmid.c#9 integrate .. //depot/projects/ia64/sbin/devd/devd.cc#10 integrate .. //depot/projects/ia64/sbin/devd/token.l#4 integrate .. //depot/projects/ia64/share/man/man7/release.7#23 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#32 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#36 integrate .. //depot/projects/ia64/sys/alpha/alpha/support.s#8 integrate .. //depot/projects/ia64/sys/alpha/include/alpha_cpu.h#3 integrate .. //depot/projects/ia64/sys/alpha/include/ucontext.h#5 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#10 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#13 integrate .. //depot/projects/ia64/sys/amd64/amd64/sys_machdep.c#3 integrate .. //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#15 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#35 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#18 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vfsops.c#17 integrate .. //depot/projects/ia64/sys/ia64/conf/SKI#15 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#82 integrate .. //depot/projects/ia64/sys/ia64/ia64/mem.c#9 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#71 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#60 integrate .. //depot/projects/ia64/sys/ia64/include/_regset.h#8 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#62 integrate .. //depot/projects/ia64/sys/libkern/scanc.c#3 integrate .. //depot/projects/ia64/sys/netatm/atm_cm.c#15 integrate .. //depot/projects/ia64/sys/netatm/atm_device.c#11 integrate .. //depot/projects/ia64/sys/netatm/atm_if.c#13 integrate .. //depot/projects/ia64/sys/netatm/atm_ioctl.h#4 integrate .. //depot/projects/ia64/sys/netatm/atm_proto.c#4 integrate .. //depot/projects/ia64/sys/netatm/atm_socket.c#11 integrate .. //depot/projects/ia64/sys/netatm/atm_subr.c#15 integrate .. //depot/projects/ia64/sys/netatm/atm_var.h#10 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_input.c#6 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_load.c#7 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_output.c#4 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_usrreq.c#5 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_var.h#5 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_vcm.c#8 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_cls.c#9 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_proto.c#8 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_var.h#5 integrate .. //depot/projects/ia64/sys/netatm/uni/sscf_uni.c#8 integrate .. //depot/projects/ia64/sys/netatm/uni/sscf_uni_lower.c#5 integrate .. //depot/projects/ia64/sys/netatm/uni/sscf_uni_var.h#4 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_pdu.c#6 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_var.h#5 integrate .. //depot/projects/ia64/sys/netatm/uni/uniarp.c#9 integrate .. //depot/projects/ia64/sys/netatm/uni/uniarp_input.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/uniip_var.h#4 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_msg.c#7 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_proto.c#3 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_var.h#5 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#20 integrate .. //depot/projects/ia64/sys/netncp/ncp_ncp.c#10 integrate .. //depot/projects/ia64/sys/netsmb/smb_usr.c#4 integrate .. //depot/projects/ia64/sys/sys/cdefs.h#17 integrate .. //depot/projects/ia64/tools/tools/tinderbox/current.rc#2 integrate .. //depot/projects/ia64/tools/tools/tinderbox/releng_4.rc#2 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#16 integrate .. //depot/projects/ia64/usr.bin/Makefile#51 integrate .. //depot/projects/ia64/usr.bin/find/find.1#13 integrate .. //depot/projects/ia64/usr.bin/telnet/Makefile#6 integrate .. //depot/projects/ia64/usr.sbin/Makefile#46 integrate .. //depot/projects/ia64/usr.sbin/ctm/ctm_rmail/ctm_rmail.1#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/Makefile#6 integrate .. //depot/projects/ia64/usr.sbin/pppd/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/sendmail/Makefile#9 integrate .. //depot/projects/ia64/usr.sbin/tcpdchk/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/tcpdump/tcpdump/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/zzz/zzz.sh#2 integrate .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#5 edit Differences ... ==== //depot/projects/ia64/Makefile.inc1#76 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.381 2003/07/14 16:21:16 gordon Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.382 2003/07/24 18:14:29 markm Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -339,7 +339,8 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 4: building libraries" @echo "--------------------------------------------------------------" - cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG libraries + cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG -DNOLINT \ + libraries _depend: @echo @echo "--------------------------------------------------------------" ==== //depot/projects/ia64/bin/ed/Makefile#9 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.28 2003/07/20 12:26:24 ru Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.29 2003/07/24 18:30:24 markm Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DISTRIBUTION=crypto CFLAGS+=-DDES WARNS?= 2 ==== //depot/projects/ia64/contrib/tar/src/tar.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/tar/src/tar.c,v 1.2 2002/06/04 17:31:16 sobomax Exp $ */ +/* $FreeBSD: src/contrib/tar/src/tar.c,v 1.3 2003/07/24 00:04:01 peter Exp $ */ #include "system.h" @@ -549,7 +549,7 @@ /* Allocate a new argument array, and copy program name in it. */ new_argc = argc - 1 + strlen (argv[1]); - new_argv = xmalloc (new_argc * sizeof (char *)); + new_argv = xmalloc ((new_argc + 1) * sizeof (char *)); in = argv; out = new_argv; *out++ = *in++; @@ -577,6 +577,9 @@ while (in < argv + argc) *out++ = *in++; + /* And NULL terminate the argv[] array */ + *out++ = NULL; + /* Replace the old option list by the new one. */ argc = new_argc; ==== //depot/projects/ia64/etc/rc.subr#13 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.13 2003/06/09 17:31:06 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.14 2003/07/24 18:17:21 mtm Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -669,7 +669,7 @@ # if the precmd failed and force # isn't set, exit # - if [ -n $_precmd ]; then + if [ -n "$_precmd" ]; then eval $_precmd _return=$? [ $_return -ne 0 ] && [ -z "$rc_force" ] && ==== //depot/projects/ia64/games/factor/Makefile#4 (text+ko) ==== @@ -1,11 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/factor/Makefile,v 1.6 2003/05/19 15:52:50 des Exp $ +# $FreeBSD: src/games/factor/Makefile,v 1.7 2003/07/24 18:30:24 markm Exp $ PROG= factor SRCS= factor.c pr_tbl.c CFLAGS+=-I${.CURDIR}/../primes -.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) CFLAGS+=-DHAVE_OPENSSL LDADD+= -lcrypto DPADD+= ${LIBCRYPTO} ==== //depot/projects/ia64/games/fortune/datfiles/fortunes#31 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.114 2003/07/14 22:22:56 mph Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.115 2003/07/25 11:14:03 mux Exp $ % -- Gifts for Children -- @@ -9550,10 +9550,6 @@ % Man is the only animal that can remain on friendly terms with the victims he intends to eat until he eats them. - -- Samuel Butler -% -Man is the only animal that can remain on friendly terms with the -victims he intends to eat until he eats them. -- Samuel Butler (1835-1902) % Man, n.: ==== //depot/projects/ia64/lib/Makefile#32 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.164 2003/07/20 01:34:40 mtm Exp $ +# $FreeBSD: src/lib/Makefile,v 1.166 2003/07/24 18:30:24 markm Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -79,6 +79,11 @@ _compat= compat .endif +.if ${MACHINE_ARCH} == "amd64" +_libncp= libncp +_libsmb= libsmb +.endif + .if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "powerpc" .if !defined(NOLIBTHR) _libthr= libthr @@ -89,7 +94,7 @@ _libdisk= libdisk .endif -.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) _libmp= libmp .endif ==== //depot/projects/ia64/lib/libatm/Makefile#3 (text+ko) ==== @@ -23,7 +23,7 @@ # Copies of this Software may be made, however, the above copyright # notice must be reproduced on all copies. # -# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.6 2003/03/25 17:40:00 mdodd Exp $ +# @(#) $FreeBSD: src/lib/libatm/Makefile,v 1.7 2003/07/25 08:22:08 harti Exp $ # # @@ -33,6 +33,6 @@ LDADD+= -lmd DPADD+= ${LIBMD} -WARNS?= 3 +WARNS?= 6 .include ==== //depot/projects/ia64/lib/libatm/ioctl_subr.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libatm/ioctl_subr.c,v 1.8 2002/09/30 09:18:54 mdodd Exp $"); +__FBSDID("$FreeBSD: src/lib/libatm/ioctl_subr.c,v 1.9 2003/07/25 08:22:08 harti Exp $"); /* * User Space Library Functions @@ -172,7 +172,7 @@ /* * Return a pointer to the VCC info and its length */ - *vccp = (struct air_vcc_rsp *) air.air_buf_addr; + *vccp = (struct air_vcc_rsp *)(void *)air.air_buf_addr; return(buf_len); } @@ -226,7 +226,7 @@ /* * Give the answer back to the caller */ - ip_mask = (struct sockaddr_in *)&req.ifr_addr; + ip_mask = (struct sockaddr_in *)(void *)&req.ifr_addr; *mask = *ip_mask; mask->sin_family = AF_INET; @@ -392,7 +392,7 @@ /* * Return a pointer to the Config info and its length */ - *cfgp = (struct air_cfg_rsp *) air.air_buf_addr; + *cfgp = (struct air_cfg_rsp *)(void *)air.air_buf_addr; return ( buf_len ); } @@ -430,7 +430,7 @@ /* * Return a pointer to the Physical Interface info and its length */ - *intp = (struct air_int_rsp *) air.air_buf_addr; + *intp = (struct air_int_rsp *)(void *)air.air_buf_addr; return ( buf_len ); } ==== //depot/projects/ia64/lib/libatm/ip_addr.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libatm/ip_addr.c,v 1.8 2003/03/25 04:29:26 mdodd Exp $"); +__FBSDID("$FreeBSD: src/lib/libatm/ip_addr.c,v 1.9 2003/07/25 08:22:08 harti Exp $"); /* * User Space Library Functions @@ -96,7 +96,8 @@ ip_host->h_addrtype != AF_INET) { return((struct sockaddr_in *)0); } - s.sin_addr.s_addr = *(u_long *)ip_host->h_addr_list[0]; + memcpy(&s.sin_addr.s_addr, ip_host->h_addr_list[0], + sizeof(s.sin_addr.s_addr)); } return(&s); } ==== //depot/projects/ia64/lib/libatm/ip_checksum.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libatm/ip_checksum.c,v 1.7 2002/03/21 23:35:20 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libatm/ip_checksum.c,v 1.8 2003/07/25 08:22:08 harti Exp $"); /* * User Space Library Functions @@ -77,7 +77,7 @@ while( count > 1 ) { /* This is the inner loop */ - sum += ntohs(* (unsigned short *) addr); + sum += ntohs(* (unsigned short *)(void *)addr); addr += sizeof(unsigned short); count -= sizeof(unsigned short); } ==== //depot/projects/ia64/lib/libc/net/ip6opt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.3 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.4 2003/07/25 12:23:25 mux Exp $"); #include #include @@ -111,8 +111,6 @@ return(-1); if (plusy < 0 || plusy > 7) return(-1); - if (typep[0] > 255) - return(-1); /* * If this is the first option, allocate space for the ==== //depot/projects/ia64/lib/libc/posix1e/acl_to_text.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_to_text.c,v 1.10 2002/03/22 21:52:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_to_text.c,v 1.11 2003/07/24 23:33:25 rwatson Exp $"); #include #include "namespace.h" @@ -177,9 +177,10 @@ effective_perm_buf); if (error) goto error_label; - len = asprintf(&tmpbuf, "%sgroup::%s\t\t# " + len = asprintf(&tmpbuf, "%sgroup:%s:%s\t\t# " "effective: %s\n", - buf, perm_buf, effective_perm_buf); + buf, name_buf, perm_buf, + effective_perm_buf); } else { len = asprintf(&tmpbuf, "%sgroup:%s:%s\n", buf, name_buf, perm_buf); ==== //depot/projects/ia64/lib/libc_r/uthread/Makefile.inc#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.36 2003/04/20 01:53:12 jdp Exp $ +# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.37 2003/07/25 17:02:33 mp Exp $ # uthread sources .PATH: ${.CURDIR}/uthread @@ -77,6 +77,7 @@ uthread_join.c \ uthread_kern.c \ uthread_kevent.c \ + uthread_kqueue.c \ uthread_kill.c \ uthread_listen.c \ uthread_main_np.c \ ==== //depot/projects/ia64/lib/libgeom/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libgeom/Makefile,v 1.6 2003/05/17 19:05:17 ru Exp $ +# $FreeBSD: src/lib/libgeom/Makefile,v 1.7 2003/07/24 19:53:02 markm Exp $ LIB= geom SRCS+= geom_getxml.c @@ -7,7 +7,7 @@ SRCS+= geom_ctl.c INCS= libgeom.h -CFLAGS += -I${.CURDIR} -g +CFLAGS += -I${.CURDIR} WARNS?= 3 ==== //depot/projects/ia64/lib/libncp/ncpl_conn.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libncp/ncpl_conn.c,v 1.7 2003/04/04 04:16:06 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libncp/ncpl_conn.c,v 1.8 2003/07/25 19:17:46 peter Exp $"); /* * @@ -274,7 +274,8 @@ int ncp_conn_cnt(void) { - int error, cnt = 0, len = sizeof(cnt); + int error, cnt = 0; + size_t len = sizeof(cnt); error = sysctlbyname("net.ncp.conn_cnt", &cnt, &len, NULL, 0); if (error) cnt = 0; @@ -382,7 +383,8 @@ void * ncp_conn_list(void) { - int error, cnt = 0, len; + int error, cnt = 0; + size_t len; void *p; cnt = ncp_conn_cnt(); ==== //depot/projects/ia64/lib/libncp/ncpl_subr.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libncp/ncpl_subr.c,v 1.8 2003/04/04 04:16:06 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libncp/ncpl_subr.c,v 1.9 2003/07/25 19:17:46 peter Exp $"); #include #include @@ -243,7 +243,8 @@ int ncp_initlib(void){ int error; - int kv, kvlen = sizeof(kv); + int kv; + size_t kvlen = sizeof(kv); static int ncp_initialized; if (ncp_initialized) ==== //depot/projects/ia64/lib/libtelnet/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 12/15/93 -# $FreeBSD: src/lib/libtelnet/Makefile,v 1.16 2003/07/20 23:29:46 markm Exp $ +# $FreeBSD: src/lib/libtelnet/Makefile,v 1.18 2003/07/24 17:19:15 markm Exp $ TELNETDIR= ${.CURDIR}/../../contrib/telnet .PATH: ${TELNETDIR}/libtelnet @@ -13,7 +13,9 @@ WARNS?= 2 +.if !defined(RELEASE_CRUNCH) .if !defined(NOCRYPT) && !defined(NO_OPENSSL) +DISTRIBUTION= crypto SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA .if !defined(NO_KERBEROS) @@ -22,6 +24,7 @@ CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write .endif .endif +.endif INCS= ${TELNETDIR}/arpa/telnet.h INCSDIR= ${INCLUDEDIR}/arpa ==== //depot/projects/ia64/lib/libthr/arch/alpha/alpha/_curthread.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libthr/arch/alpha/alpha/_curthread.c,v 1.1.1.1 2003/07/19 15:57:52 mtm Exp $"); +__FBSDID("$FreeBSD: src/lib/libthr/arch/alpha/alpha/_curthread.c,v 1.2 2003/07/24 07:51:49 marcel Exp $"); #include #include @@ -35,13 +35,18 @@ void * _set_curthread(ucontext_t *uc, struct pthread *thread, int *err) { + *err = 0; + if (uc != NULL) + uc->uc_mcontext.mc_thrptr = (uint64_t)thread; + else + __builtin_set_thread_pointer(thread); return (NULL); } struct pthread * _get_curthread(void) { - return (NULL); + return (__builtin_thread_pointer()); } void ==== //depot/projects/ia64/lib/libwrap/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libwrap/Makefile,v 1.13 2003/06/04 16:01:37 markm Exp $ +# $FreeBSD: src/lib/libwrap/Makefile,v 1.14 2003/07/24 19:58:55 markm Exp $ # LIB= wrap @@ -16,7 +16,7 @@ -DREAL_DAEMON_DIR=\"/usr/libexec\" -DPROCESS_OPTIONS \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \ -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \ - -DSYS_ERRLIST_DEFINED -DALWAYS_HOSTNAME -DUSE_STRSEP + -DSYS_ERRLIST_DEFINED -DALWAYS_HOSTNAME -DUSE_STRSEP -DPROCESS_OPTIONS .if !defined(NOINET6) CFLAGS+=-DINET6 .endif ==== //depot/projects/ia64/libexec/telnetd/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/libexec/telnetd/Makefile,v 1.21 2003/07/20 23:29:46 markm Exp $ +# $FreeBSD: src/libexec/telnetd/Makefile,v 1.23 2003/07/24 17:19:15 markm Exp $ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. @@ -28,7 +28,9 @@ DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} LDADD= -lutil -ltermcap ${LIBTELNET} +.if !defined(RELEASE_CRUNCH) .if !defined(NOCRYPT) && !defined(NO_OPENSSL) +DISTRIBUTION= crypto SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM} @@ -39,5 +41,6 @@ LDADD+= -lkrb5 -lasn1 -lroken -lcom_err .endif .endif +.endif .include ==== //depot/projects/ia64/release/Makefile#59 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.793 2003/07/23 20:53:37 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.799 2003/07/25 13:39:11 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -29,6 +29,12 @@ # If this is a -stable snapshot, then set #RELEASETAG=RELENG_4 # +# To test a release with a source tree containing patches and +# other work. This tree will get copied instead of getting the +# src/ tree from a CVS checkout. For "rerelease", this will NOT +# be copied; cvs update will be used instead. +#EXTSRCDIR=/usr/src +# # To add other options to the CVS subcommands (co,up), set #CVSCMDARGS="-D '01/01/2002 00:00:00 UTC'" # @@ -38,6 +44,9 @@ # To prefix the cvs command #CVSPREFIX="/usr/bin/time" # +# Where the CVS repository is +#CVSROOT="/home/ncvs" +# # Non-zero if ${RELEASETAG} is in the form "RELENG_ver_RELEASE"; we # are building an official release. Otherwise, we are building for # a branch. @@ -232,14 +241,9 @@ # Things that need to be compiled without crypto support in releases .if !defined(FIXCRYPTO) -FIXCRYPTO!= cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS -FIXCRYPTO+= bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump \ - lib/libfetch usr.bin/fetch -.if !defined(NO_SENDMAIL) -FIXCRYPTO+= usr.sbin/sendmail +FIXCRYPTO!= cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS; \ + cd ${.CURDIR}/../secure; ${MAKE} -V SPROGS .endif -.endif - # Things which may get you into trouble if you change them MTREEFILES= ${.CURDIR}/../etc/mtree @@ -264,23 +268,16 @@ .if ${TARGET_ARCH} == "sparc64" CRUNCH_TARGETS= boot -FIXIT_TARGET= .elif ${TARGET_ARCH} == "ia64" CRUNCH_TARGETS= boot -FIXIT_TARGET= .elif ${TARGET} == "pc98" CRUNCH_TARGETS= boot fixit fixit-small .elif ${TARGET_ARCH} == "amd64" CRUNCH_TARGETS= boot -FIXIT_TARGET= .endif CRUNCH_TARGETS?=boot fixit -.if !defined(FIXIT_TARGET) -FIXIT_TARGET= release.10 -.endif - EXTRAS= ftp.1 .if !defined(NOCDROM) EXTRAS+= cdrom.1 @@ -488,7 +485,7 @@ env -i /usr/sbin/chroot ${CHROOTDIR} /mk clean: - rm -rf ${CRUNCH_TARGETS:S/$/_crunch/} release.[0-9] ${FIXIT_TARGET} \ + rm -rf ${CRUNCH_TARGETS:S/$/_crunch/} release.[0-9] release.10 \ ${EXTRAS} fetch-distfiles: @@ -522,13 +519,13 @@ mtree -deU -f ${MTREEFILES}/BSD.var.dist \ -p ${RD}/trees/$$i/var > /dev/null ; \ done - touch release.1 + touch ${.TARGET} # Install the system into the various distributions. release.2: cd ${.CURDIR}/../etc && make distrib-dirs DESTDIR=${RD}/trees/base cd ${.CURDIR}/.. && ${CROSSMAKE} distributeworld DISTDIR=${RD}/trees - touch release.2 + touch ${.TARGET} # Build and install crypto distributions. release.3: @@ -538,7 +535,7 @@ SUBDIR_OVERRIDE="${FIXCRYPTO}" \ buildworld distributeworld DISTDIR=${RD}/trees -chflags -R noschg ${RD}/trees - touch release.3 + touch ${.TARGET} # Make and install the generic kernel(s). release.4: @@ -557,7 +554,7 @@ ${CROSSMAKE} ${KERNEL_FLAGS} -DNO_MODULES \ reinstallkernel -DINSTALL_DEBUG \ DESTDIR=${RD}/trees/base - touch release.4 + touch ${.TARGET} # Make and install the three crunched binaries which live on the floppies. # You are not supposed to like this :-) @@ -579,7 +576,7 @@ ${WMAKEENV} strip -R .comment ${j}_crunch/${j}_crunch mv ${j}_crunch/${j}_crunch ${RD}/crunch/${j} .endfor - touch release.5 + touch ${.TARGET} # # --==## Fix up the distributions. ##==-- @@ -597,7 +594,7 @@ # Remove all the directories we don't need. -cd ${RD}/trees && \ find ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} -depth -type d -print | xargs rmdir - touch release.6 + touch ${.TARGET} # # --==## Package up the tarballs from assembled trees ##==-- @@ -614,7 +611,7 @@ echo "$${i} distribution is finished."; \ fi ; \ done - touch release.7 + touch ${.TARGET} # @@ -651,7 +648,7 @@ (cd ${RD}/dists/src; rm -f CHECKSUM.MD5; md5 * > CHECKSUM.MD5) @echo "src distribution is finished." .endif - touch release.8 + touch ${.TARGET} # Complete the bootfd # @@ -667,7 +664,6 @@ # release.9: -.if ${TARGET_ARCH} != "ia64" || ${TARGET_ARCH} == ${MACHINE_ARCH} cp ${RD}/trees/base/etc/disktab /etc rm -rf ${RD}/mfsfd mkdir ${RD}/mfsfd @@ -713,34 +709,40 @@ .if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64" @cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot .endif - @echo "Making the regular boot floppy." @tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \ tar xf - -C ${RD}/mfsfd/stand .if ${TARGET_ARCH} == "alpha" && !defined(NO_FLOPPIES) rm -rf ${RD}/mfsfd/stand/help/* .endif -.if defined(SMALLBOOTSIZE) && !defined(NO_FLOPPIES) + @mkdir -p ${RD}/mfsroot +.if defined(SMALLBOOTSIZE) .if exists(${.CURDIR}/${TARGET}/drivers-small.conf) - @rm -rf ${RD}/mfsfd/modules @mkdir -p ${RD}/mfsfd/modules @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \ ${.CURDIR}/${TARGET}/drivers-small.conf \ ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules .endif - sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ + sh -e ${DOFS_SH} mfsroot-small ${RD} ${MNT} \ ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} - @gzip -9vc mfsroot > mfsroot.gz - @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \ - ${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot.gz \ - ${BOOTINODE} ${SMALLBOOTLABEL} + @gzip -9vc mfsroot-small > ${RD}/mfsroot/mfsroot-small.gz + @rm -rf ${RD}/mfsfd/modules .endif .if exists(${.CURDIR}/${TARGET}/drivers.conf) - @rm -rf ${RD}/mfsfd/modules @mkdir -p ${RD}/mfsfd/modules @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \ ${.CURDIR}/${TARGET}/drivers.conf \ ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules +.endif + sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ + ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} + @gzip -9vc mfsroot > ${RD}/mfsroot/mfsroot.gz + @rm mfsroot mfsroot-small + touch ${.TARGET} + +release.10: .if !defined(NO_FLOPPIES) +.if exists(${.CURDIR}/${TARGET}/drivers.conf) + @echo "Making the drivers floppy." @rm -rf ${RD}/driversfd @mkdir ${RD}/driversfd @awk -f ${.CURDIR}/scripts/driver-copy2.awk 3 \ @@ -755,35 +757,25 @@ *.dsc >> ${RD}/floppies/DRIVERS.TXT; \ fi .endif -.endif - sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ - ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} - @gzip -9vc mfsroot > mfsroot.gz - @mkdir -p ${RD}/mfsroot - @cp mfsroot.gz ${RD}/mfsroot -.if !defined(NO_FLOPPIES) .if defined(BOOTSIZE) + @echo "Making the regular boot floppy." @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot.flp \ - ${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL} + ${RD} ${MNT} ${BOOTSIZE} ${RD}/mfsroot/mfsroot.gz \ + ${BOOTINODE} ${BOOTLABEL} @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern .endif .if defined(SMALLBOOTSIZE) + @echo "Making the small boot floppy." + @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \ + ${RD} ${MNT} ${SMALLBOOTSIZE} ${RD}/mfsroot/mfsroot-small.gz \ + ${BOOTINODE} ${SMALLBOOTLABEL} @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL .endif .if defined(BIGBOOTSIZE) + @echo "Making the big boot floppy." @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot FDSIZE=BIG .endif -.endif - @rm mfsroot mfsroot.gz - @echo "Regular and MFS boot floppies made." -.endif - touch release.9 - -# -# --==## Create a fixit floppy ##==-- -# -release.10: -.if !defined(NO_FLOPPIES) +.if defined(FIXITSIZE) || defined(SMALLFIXITSIZE) @echo "Making fixit floppy." @rm -rf ${RD}/fixitfd @mkdir ${RD}/fixitfd @@ -809,10 +801,13 @@ @rm -rf ${RD}/fixitfd/stand @mkdir ${RD}/fixitfd/stand .endif +.if defined(FIXITSIZE) @cd ${.CURDIR} && ${MAKE} installCRUNCH CRUNCH=fixit \ DIR=${RD}/fixitfd/stand ZIP=false @sh -e ${DOFS_SH} ${RD}/floppies/fixit.flp ${RD} \ ${MNT} ${FIXITSIZE} ${RD}/fixitfd ${FIXITINODE} ${FIXITLABEL} +.endif +.endif # Do our last minute floppies directory setup in a convenient place. .if !defined(NODOC) @cp ${RND}/${RELNOTES_LANG}/installation/${TARGET}/article.txt \ @@ -822,7 +817,7 @@ @(cd ${RD}/floppies; md5 *.flp > CHECKSUM.MD5) .endif .endif - touch release.10 + touch ${.TARGET} # # --==## Setup a suitable ftp-area ##==-- @@ -854,7 +849,7 @@ .if !defined(NOPORTS) @tar --exclude CVS -cBf - -C ${CD_DISC1} ports | tar -xBf - -C ${FD} .endif - touch ftp.1 + touch ${.TARGET} # # --==## Setup a suitable cdrom-area ##==-- @@ -915,7 +910,7 @@ cp ${.CURDIR}/scripts/ports-install.sh ${CD_DISC1}/ports/install.sh \ && (cd ${CD_DISC1}/ports; md5 * > CHECKSUM.MD5) .endif - touch cdrom.1 + touch ${.TARGET} iso.1: .if exists(${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh) @@ -933,7 +928,7 @@ ${CD_EXTRA_BITS} \ && false .endif - touch iso.1 + touch ${.TARGET} .else @echo "Do not know how to create an ISO for ${TARGET_ARCH}." .endif @@ -950,7 +945,7 @@ WITHOUT_PYTHON=yes FORCE_PKG_REGISTER=yes; \ done @cd /usr/doc && make all install 'FORMATS=html html-split txt' INSTALL_COMPRESSED='' DOCDIR=${RD}/trees/base/usr/share/doc - touch doc.1 + touch ${.TARGET} # # --==## RELNOTESng: Next-generation replacements for *.TXT files ##==-- @@ -958,7 +953,7 @@ doc.2: @echo "Making release documentation..." @cd ${.CURDIR}/doc && make all install clean 'FORMATS=html txt' INSTALL_COMPRESSED='' DOCDIR=${RND} - touch doc.2 + touch ${.TARGET} # Various "subroutine" and other supporting targets. @@ -1000,30 +995,16 @@ md5 * > CHECKSUM.MD5) \ ) -.if target(release.9.${TARGET_ARCH}) -RELEASE9=release.9.${TARGET_ARCH} -.else -RELEASE9=release.9 -.endif - doRELEASE: release.1 release.2 release.3 ${DOCREL} release.4 release.5 \ - release.6 release.7 release.8 ${RELEASE9} ${FIXIT_TARGET} + release.6 release.7 release.8 release.9 release.10 @cd ${.CURDIR} && ${MAKE} ${EXTRAS} @echo "Release done" floppies: - @cd ${.CURDIR} && ${MAKE} boot.flp - @cd ${.CURDIR} && ${MAKE} fixit.flp + @rm -f release.5 release.9 release.10 + @cd ${.CURDIR} && ${MAKE} release.5 release.9 release.10 @cd ${RD} && find floppies -print | cpio -dumpl ${FD} -boot.flp: - @rm -f release.5 release.9 - @cd ${.CURDIR} && ${MAKE} release.5 release.9 CRUNCH_TARGETS=boot - -fixit.flp: - @rm -f release.5 release.10 - @cd ${.CURDIR} && ${MAKE} release.5 release.10 CRUNCH_TARGETS=fixit - installCRUNCH: .if !defined(CRUNCH) @echo "CRUNCH undefined in installCRUNCH" && exit 1 @@ -1106,7 +1087,11 @@ @echo "echo Please insert MFS root floppy and press enter:" >> ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "read" >> ${RD}/image.${FSIMAGE}/boot/loader.rc .endif +.if defined(FDSIZE) && ${FDSIZE} == "SMALL" + @echo "load -t mfs_root /mfsroot-small" >> ${RD}/image.${FSIMAGE}/boot/loader.rc +.else @echo "load -t mfs_root /mfsroot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc +.endif .if ${TARGET_ARCH} != "ia64" @echo "set hint.acpi.0.disabled=1" >> ${RD}/image.${FSIMAGE}/boot/loader.rc .endif @@ -1122,7 +1107,7 @@ @gzip -9v ${RD}/image.${FSIMAGE}/kernel @rm -f ${RD}/floppies/${FSIMAGE}.flp .if defined(FDSIZE) && ${FDSIZE} == "BIG" - @cp mfsroot.gz ${RD}/image.${FSIMAGE} + @cp ${RD}/mfsroot/mfsroot.gz ${RD}/image.${FSIMAGE} sh -e ${DOFS_SH} ${RD}/floppies/${FSIMAGE}.flp \ ${RD} ${MNT} ${BIGBOOTSIZE} ${RD}/image.${FSIMAGE} \ ${BOOTINODE} ${BIGBOOTLABEL} ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#108 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 25 14:42:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5385C37B404; Fri, 25 Jul 2003 14:42:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0922437B401 for ; Fri, 25 Jul 2003 14:42:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B3FC43F93 for ; Fri, 25 Jul 2003 14:42:57 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6PLgv0U066721 for ; Fri, 25 Jul 2003 14:42:57 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6PLgut0066718 for perforce@freebsd.org; Fri, 25 Jul 2003 14:42:56 -0700 (PDT) Date: Fri, 25 Jul 2003 14:42:56 -0700 (PDT) Message-Id: <200307252142.h6PLgut0066718@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 35010 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, 25 Jul 2003 21:42:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=35010 Change 35010 by sam@sam_ebb on 2003/07/25 14:42:42 a lockdown a day makes Giant go away... Affected files ... .. //depot/projects/netperf/sys/netinet/raw_ip.c#2 edit Differences ... ==== //depot/projects/netperf/sys/netinet/raw_ip.c#2 (text+ko) ==== @@ -139,125 +139,103 @@ } static struct sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET }; + +static int +raw_append(struct inpcb *last, struct ip *ip, struct mbuf *n) +{ + int policyfail = 0; + +#ifdef IPSEC + /* check AH/ESP integrity. */ + if (ipsec4_in_reject_so(n, last->inp_socket)) { + policyfail = 1; + ipsecstat.in_polvio++; + /* do not inject data to pcb */ + } +#endif /*IPSEC*/ +#ifdef FAST_IPSEC + /* check AH/ESP integrity. */ + if (ipsec4_in_reject(n, last)) { + policyfail = 1; + /* do not inject data to pcb */ + } +#endif /*FAST_IPSEC*/ +#ifdef MAC + if (!policyfail && mac_check_socket_deliver(last->inp_socket, n) != 0) + policyfail = 1; +#endif + if (!policyfail) { + struct mbuf *opts = NULL; + + if ((last->inp_flags & INP_CONTROLOPTS) || + (last->inp_socket->so_options & SO_TIMESTAMP)) + ip_savecontrol(last, &opts, ip, n); + if (sbappendaddr(&last->inp_socket->so_rcv, + (struct sockaddr *)&ripsrc, n, opts) == 0) { + /* should notify about lost packet */ + m_freem(n); + if (opts) + m_freem(opts); + } else + sorwakeup(last->inp_socket); + } else + m_freem(n); + return policyfail; +} + /* * Setup generic address and protocol structures * for raw_input routine, then pass them along with * mbuf chain. */ void -rip_input(m, off) - struct mbuf *m; - int off; +rip_input(struct mbuf *m, int off) { - register struct ip *ip = mtod(m, struct ip *); - register struct inpcb *inp; - struct inpcb *last = 0; - struct mbuf *opts = 0; + struct ip *ip = mtod(m, struct ip *); int proto = ip->ip_p; + struct inpcb *inp, *last; + INP_INFO_RLOCK(&ripcbinfo); ripsrc.sin_addr = ip->ip_src; + last = NULL; LIST_FOREACH(inp, &ripcb, inp_list) { + INP_LOCK(inp); + if (inp->inp_ip_p && inp->inp_ip_p != proto) { + docontinue: + INP_UNLOCK(inp); + continue; + } #ifdef INET6 if ((inp->inp_vflag & INP_IPV4) == 0) - continue; + goto docontinue; #endif - if (inp->inp_ip_p && inp->inp_ip_p != proto) - continue; if (inp->inp_laddr.s_addr && - inp->inp_laddr.s_addr != ip->ip_dst.s_addr) - continue; + inp->inp_laddr.s_addr != ip->ip_dst.s_addr) + goto docontinue; if (inp->inp_faddr.s_addr && - inp->inp_faddr.s_addr != ip->ip_src.s_addr) - continue; + inp->inp_faddr.s_addr != ip->ip_src.s_addr) + goto docontinue; if (last) { - struct mbuf *n = m_copy(m, 0, (int)M_COPYALL); - int policyfail = 0; + struct mbuf *n; - if (n != NULL) { -#ifdef IPSEC - /* check AH/ESP integrity. */ - if (ipsec4_in_reject_so(n, last->inp_socket)) { - policyfail = 1; - ipsecstat.in_polvio++; - /* do not inject data to pcb */ - } -#endif /*IPSEC*/ -#ifdef FAST_IPSEC - /* check AH/ESP integrity. */ - if (ipsec4_in_reject(n, last)) { - policyfail = 1; - /* do not inject data to pcb */ - } -#endif /*FAST_IPSEC*/ -#ifdef MAC - if (policyfail == 0 && - mac_check_socket_deliver(last->inp_socket, - n) != 0) - policyfail = 1; -#endif - } - if (policyfail) - m_freem(n); - else if (n) { - if (last->inp_flags & INP_CONTROLOPTS || - last->inp_socket->so_options & SO_TIMESTAMP) - ip_savecontrol(last, &opts, ip, n); - if (sbappendaddr(&last->inp_socket->so_rcv, - (struct sockaddr *)&ripsrc, n, - opts) == 0) { - /* should notify about lost packet */ - m_freem(n); - if (opts) - m_freem(opts); - } else - sorwakeup(last->inp_socket); - opts = 0; - } + n = m_copy(m, 0, (int)M_COPYALL); + if (n != NULL) + (void) raw_append(last, ip, n); + /* XXX count dropped packet */ + INP_UNLOCK(last); } last = inp; } - if (last) { -#ifdef IPSEC - /* check AH/ESP integrity. */ - if (ipsec4_in_reject_so(m, last->inp_socket)) { - m_freem(m); - ipsecstat.in_polvio++; + if (last != NULL) { + if (raw_append(last, ip, m) != 0) ipstat.ips_delivered--; - /* do not inject data to pcb */ - return; - } -#endif /*IPSEC*/ -#ifdef FAST_IPSEC - /* check AH/ESP integrity. */ - if (ipsec4_in_reject(m, last)) { - m_freem(m); - ipstat.ips_delivered--; - /* do not inject data to pcb */ - return; - } -#endif /*FAST_IPSEC*/ -#ifdef MAC - if (mac_check_socket_deliver(last->inp_socket, m) != 0) { - m_freem(m); - ipstat.ips_delivered--; - return; - } -#endif - if (last->inp_flags & INP_CONTROLOPTS || - last->inp_socket->so_options & SO_TIMESTAMP) - ip_savecontrol(last, &opts, ip, m); - if (sbappendaddr(&last->inp_socket->so_rcv, - (struct sockaddr *)&ripsrc, m, opts) == 0) { - m_freem(m); - if (opts) - m_freem(opts); - } else - sorwakeup(last->inp_socket); + INP_UNLOCK(last); } else { m_freem(m); ipstat.ips_noproto++; ipstat.ips_delivered--; } + INP_INFO_RUNLOCK(&ripcbinfo); } /* @@ -265,13 +243,10 @@ * Tack on options user may have setup with control call. */ int -rip_output(m, so, dst) - struct mbuf *m; - struct socket *so; - u_long dst; +rip_output(struct mbuf *m, struct socket *so, u_long dst) { - register struct ip *ip; - register struct inpcb *inp = sotoinpcb(so); + struct ip *ip; + struct inpcb *inp = sotoinpcb(so); int flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST; #ifdef MAC @@ -340,9 +315,7 @@ * present. */ int -rip_ctloutput(so, sopt) - struct socket *so; - struct sockopt *sopt; +rip_ctloutput(struct socket *so, struct sockopt *sopt) { struct inpcb *inp = sotoinpcb(so); int error, optval; @@ -470,10 +443,7 @@ * interface routes. */ void -rip_ctlinput(cmd, sa, vip) - int cmd; - struct sockaddr *sa; - void *vip; +rip_ctlinput(int cmd, struct sockaddr *sa, void *vip) { struct in_ifaddr *ia; struct ifnet *ifp; @@ -524,48 +494,52 @@ u_long rip_sendspace = RIPSNDQ; u_long rip_recvspace = RIPRCVQ; -int rip_olddiverterror = 1; SYSCTL_INT(_net_inet_raw, OID_AUTO, maxdgram, CTLFLAG_RW, &rip_sendspace, 0, "Maximum outgoing raw IP datagram size"); SYSCTL_INT(_net_inet_raw, OID_AUTO, recvspace, CTLFLAG_RW, &rip_recvspace, 0, "Maximum incoming raw IP datagram size"); -SYSCTL_INT(_net_inet_raw, OID_AUTO, olddiverterror, CTLFLAG_RW, - &rip_olddiverterror, 0, "Return an error when creating an 'old' DIVERT socket"); static int rip_attach(struct socket *so, int proto, struct thread *td) { struct inpcb *inp; - int error, s; + int error; + /* XXX why not lower? */ + INP_INFO_WLOCK(&ripcbinfo); inp = sotoinpcb(so); - if (inp) - panic("rip_attach"); - if (td && (error = suser(td)) != 0) + if (inp) { + /* XXX counter, printf */ + INP_INFO_WUNLOCK(&ripcbinfo); + return EINVAL; + } + if (td && (error = suser(td)) != 0) { + INP_INFO_WUNLOCK(&ripcbinfo); return error; - - if (proto >= IPPROTO_MAX || proto < 0) + } + if (proto >= IPPROTO_MAX || proto < 0) { + INP_INFO_WUNLOCK(&ripcbinfo); return EPROTONOSUPPORT; - - /* To be removed before 5.2 */ - if (rip_olddiverterror && proto == IPPROTO_OLD_DIVERT) { - printf("Old IPDIVERT program needs to be recompiled, or new IP proto 254 user needs sysctl net.inet.raw.olddiverterror=0\n"); - return EPROTONOSUPPORT; } error = soreserve(so, rip_sendspace, rip_recvspace); - if (error) + if (error) { + INP_INFO_WUNLOCK(&ripcbinfo); return error; - s = splnet(); + } error = in_pcballoc(so, &ripcbinfo, td); - splx(s); - if (error) + if (error) { + INP_INFO_WUNLOCK(&ripcbinfo); return error; + } inp = (struct inpcb *)so->so_pcb; + INP_LOCK(inp); + INP_INFO_WUNLOCK(&ripcbinfo); inp->inp_vflag |= INP_IPV4; inp->inp_ip_p = proto; inp->inp_ip_ttl = ip_defttl; + INP_UNLOCK(inp); return 0; } @@ -574,9 +548,14 @@ { struct inpcb *inp; + INP_INFO_WLOCK(&ripcbinfo); inp = sotoinpcb(so); - if (inp == 0) - panic("rip_detach"); + if (inp == 0) { + /* XXX counter, printf */ + INP_INFO_WUNLOCK(&ripcbinfo); + return EINVAL; + } + INP_LOCK(inp); if (so == ip_mrouter && ip_mrouter_done) ip_mrouter_done(); if (ip_rsvp_force_done) @@ -584,6 +563,7 @@ if (so == ip_rsvpd) ip_rsvp_done(); in_pcbdetach(inp); + INP_INFO_WUNLOCK(&ripcbinfo); return 0; } @@ -673,7 +653,7 @@ static int rip_pcblist(SYSCTL_HANDLER_ARGS) { - int error, i, n, s; + int error, i, n; struct inpcb *inp, **inp_list; inp_gen_t gencnt; struct xinpgen xig; @@ -695,10 +675,10 @@ /* * OK, now we're committed to doing something. */ - s = splnet(); + INP_INFO_RLOCK(&ripcbinfo); gencnt = ripcbinfo.ipi_gencnt; n = ripcbinfo.ipi_count; - splx(s); + INP_INFO_RUNLOCK(&ripcbinfo); xig.xig_len = sizeof xig; xig.xig_count = n; @@ -712,17 +692,20 @@ if (inp_list == 0) return ENOMEM; - s = splnet(); + INP_INFO_RLOCK(&ripcbinfo); for (inp = LIST_FIRST(ripcbinfo.listhead), i = 0; inp && i < n; inp = LIST_NEXT(inp, inp_list)) { + INP_LOCK(inp); if (inp->inp_gencnt <= gencnt) { if (cr_canseesocket(req->td->td_ucred, inp->inp_socket)) continue; + /* XXX held references? */ inp_list[i++] = inp; } + INP_UNLOCK(inp); } - splx(s); + INP_INFO_RUNLOCK(&ripcbinfo); n = i; error = 0; @@ -746,11 +729,11 @@ * while we were processing this request, and it * might be necessary to retry. */ - s = splnet(); + INP_INFO_RLOCK(&ripcbinfo); xig.xig_gen = ripcbinfo.ipi_gencnt; xig.xig_sogen = so_gencnt; xig.xig_count = ripcbinfo.ipi_count; - splx(s); + INP_INFO_RUNLOCK(&ripcbinfo); error = SYSCTL_OUT(req, &xig, sizeof xig); } free(inp_list, M_TEMP); From owner-p4-projects@FreeBSD.ORG Fri Jul 25 16:49:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6B2E37B404; Fri, 25 Jul 2003 16:49: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 5A15437B401 for ; Fri, 25 Jul 2003 16:49:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1EFF43F3F for ; Fri, 25 Jul 2003 16:49:32 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6PNnW0U079002 for ; Fri, 25 Jul 2003 16:49:32 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6PNnWCY078999 for perforce@freebsd.org; Fri, 25 Jul 2003 16:49:32 -0700 (PDT) Date: Fri, 25 Jul 2003 16:49:32 -0700 (PDT) Message-Id: <200307252349.h6PNnWCY078999@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 35015 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, 25 Jul 2003 23:49:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=35015 Change 35015 by sam@sam_ebb on 2003/07/25 16:49:09 replace a bzero with potential pre-zeroing Affected files ... .. //depot/projects/netperf/sys/netinet/in_pcb.c#2 edit Differences ... ==== //depot/projects/netperf/sys/netinet/in_pcb.c#2 (text+ko) ==== @@ -165,11 +165,9 @@ #ifdef IPSEC int error; #endif - - inp = uma_zalloc(pcbinfo->ipi_zone, M_NOWAIT); + inp = uma_zalloc(pcbinfo->ipi_zone, M_NOWAIT | M_ZERO); if (inp == NULL) return (ENOBUFS); - bzero((caddr_t)inp, sizeof(*inp)); inp->inp_gencnt = ++pcbinfo->ipi_gencnt; inp->inp_pcbinfo = pcbinfo; inp->inp_socket = so; From owner-p4-projects@FreeBSD.ORG Fri Jul 25 16:50:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDF0437B404; Fri, 25 Jul 2003 16:50: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 93B5D37B401 for ; Fri, 25 Jul 2003 16:50:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2623C43F3F for ; Fri, 25 Jul 2003 16:50:35 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6PNoY0U079150 for ; Fri, 25 Jul 2003 16:50:34 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6PNoYLv079147 for perforce@freebsd.org; Fri, 25 Jul 2003 16:50:34 -0700 (PDT) Date: Fri, 25 Jul 2003 16:50:34 -0700 (PDT) Message-Id: <200307252350.h6PNoYLv079147@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 35016 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, 25 Jul 2003 23:50:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=35016 Change 35016 by sam@sam_ebb on 2003/07/25 16:50:26 missing udbinfo unlock in udp_attach Affected files ... .. //depot/projects/netperf/sys/netinet/udp_usrreq.c#2 edit Differences ... ==== //depot/projects/netperf/sys/netinet/udp_usrreq.c#2 (text+ko) ==== @@ -903,8 +903,10 @@ s = splnet(); error = in_pcballoc(so, &udbinfo, td); splx(s); - if (error) + if (error) { + INP_INFO_WUNLOCK(&udbinfo); return error; + } inp = (struct inpcb *)so->so_pcb; INP_LOCK(inp); From owner-p4-projects@FreeBSD.ORG Fri Jul 25 23:17:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 686B637B404; Fri, 25 Jul 2003 23:17: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 E9C4137B401 for ; Fri, 25 Jul 2003 23:17:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7EB843F93 for ; Fri, 25 Jul 2003 23:17:26 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6Q6HQ0U004564 for ; Fri, 25 Jul 2003 23:17:26 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6Q6HPYg004561 for perforce@freebsd.org; Fri, 25 Jul 2003 23:17:25 -0700 (PDT) Date: Fri, 25 Jul 2003 23:17:25 -0700 (PDT) Message-Id: <200307260617.h6Q6HPYg004561@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 35024 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, 26 Jul 2003 06:17:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=35024 Change 35024 by marcel@marcel_nfs on 2003/07/25 23:16:37 IFC @35023 Affected files ... .. //depot/projects/uart/alpha/alpha/machdep.c#4 integrate .. //depot/projects/uart/alpha/alpha/pmap.c#5 integrate .. //depot/projects/uart/alpha/alpha/support.s#3 integrate .. //depot/projects/uart/alpha/include/alpha_cpu.h#2 integrate .. //depot/projects/uart/alpha/include/ucontext.h#2 integrate .. //depot/projects/uart/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/uart/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/uart/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/uart/amd64/amd64/amd64-gdbstub.c#2 integrate .. //depot/projects/uart/amd64/amd64/atomic.c#2 integrate .. //depot/projects/uart/amd64/amd64/autoconf.c#2 integrate .. //depot/projects/uart/amd64/amd64/critical.c#2 integrate .. //depot/projects/uart/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/uart/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/uart/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/uart/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/uart/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/uart/amd64/amd64/genassym.c#2 integrate .. //depot/projects/uart/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/uart/amd64/amd64/in_cksum.c#2 integrate .. //depot/projects/uart/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/uart/amd64/amd64/legacy.c#2 integrate .. //depot/projects/uart/amd64/amd64/machdep.c#3 integrate .. //depot/projects/uart/amd64/amd64/mem.c#2 integrate .. //depot/projects/uart/amd64/amd64/nexus.c#2 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#7 integrate .. //depot/projects/uart/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/uart/amd64/amd64/trap.c#2 integrate .. //depot/projects/uart/amd64/amd64/tsc.c#2 integrate .. //depot/projects/uart/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/uart/amd64/ia32/ia32_genassym.c#2 integrate .. //depot/projects/uart/amd64/ia32/ia32_misc.c#2 integrate .. //depot/projects/uart/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/uart/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/uart/amd64/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/uart/amd64/isa/clock.c#2 integrate .. //depot/projects/uart/amd64/isa/intr_machdep.c#2 integrate .. //depot/projects/uart/amd64/isa/isa.c#2 integrate .. //depot/projects/uart/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/uart/amd64/isa/ithread.c#2 integrate .. //depot/projects/uart/amd64/isa/npx.c#2 integrate .. //depot/projects/uart/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/uart/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/uart/conf/kern.pre.mk#4 integrate .. //depot/projects/uart/conf/kmod.mk#3 integrate .. //depot/projects/uart/dev/acpica/acpi_ec.c#6 integrate .. //depot/projects/uart/dev/bge/if_bge.c#4 integrate .. //depot/projects/uart/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/uart/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/uart/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/uart/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/uart/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/uart/ia64/conf/SKI#2 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#3 integrate .. //depot/projects/uart/ia64/ia64/mem.c#2 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#5 integrate .. //depot/projects/uart/ia64/ia64/trap.c#3 integrate .. //depot/projects/uart/ia64/include/_regset.h#3 integrate .. //depot/projects/uart/ia64/include/setjmp.h#2 integrate .. //depot/projects/uart/kern/kern_descrip.c#4 integrate .. //depot/projects/uart/kern/kern_sig.c#6 integrate .. //depot/projects/uart/libkern/scanc.c#2 integrate .. //depot/projects/uart/netatm/atm_cm.c#3 integrate .. //depot/projects/uart/netatm/atm_device.c#3 integrate .. //depot/projects/uart/netatm/atm_if.c#3 integrate .. //depot/projects/uart/netatm/atm_ioctl.h#2 integrate .. //depot/projects/uart/netatm/atm_proto.c#2 integrate .. //depot/projects/uart/netatm/atm_socket.c#3 integrate .. //depot/projects/uart/netatm/atm_subr.c#4 integrate .. //depot/projects/uart/netatm/atm_var.h#2 integrate .. //depot/projects/uart/netatm/ipatm/ipatm_input.c#2 integrate .. //depot/projects/uart/netatm/ipatm/ipatm_load.c#3 integrate .. //depot/projects/uart/netatm/ipatm/ipatm_output.c#2 integrate .. //depot/projects/uart/netatm/ipatm/ipatm_usrreq.c#2 integrate .. //depot/projects/uart/netatm/ipatm/ipatm_var.h#2 integrate .. //depot/projects/uart/netatm/ipatm/ipatm_vcm.c#3 integrate .. //depot/projects/uart/netatm/spans/spans_cls.c#3 integrate .. //depot/projects/uart/netatm/spans/spans_proto.c#2 integrate .. //depot/projects/uart/netatm/spans/spans_var.h#2 integrate .. //depot/projects/uart/netatm/uni/sscf_uni.c#3 integrate .. //depot/projects/uart/netatm/uni/sscf_uni_lower.c#2 integrate .. //depot/projects/uart/netatm/uni/sscf_uni_var.h#2 integrate .. //depot/projects/uart/netatm/uni/sscop_pdu.c#2 integrate .. //depot/projects/uart/netatm/uni/sscop_var.h#2 integrate .. //depot/projects/uart/netatm/uni/uniarp.c#3 integrate .. //depot/projects/uart/netatm/uni/uniarp_input.c#2 integrate .. //depot/projects/uart/netatm/uni/uniip_var.h#2 integrate .. //depot/projects/uart/netatm/uni/unisig_msg.c#3 integrate .. //depot/projects/uart/netatm/uni/unisig_proto.c#2 integrate .. //depot/projects/uart/netatm/uni/unisig_var.h#2 integrate .. //depot/projects/uart/netinet/ip_dummynet.c#2 integrate .. //depot/projects/uart/netncp/ncp_ncp.c#2 integrate .. //depot/projects/uart/netsmb/smb_usr.c#2 integrate .. //depot/projects/uart/sys/cdefs.h#3 integrate .. //depot/projects/uart/vm/uma_core.c#3 integrate .. //depot/projects/uart/vm/vm_contig.c#4 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/machdep.c#4 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.205 2003/07/15 00:11:03 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.207 2003/07/24 07:49:44 marcel Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -2033,8 +2033,11 @@ * When the thread is the current thread, the user stack pointer * is not in the PCB; it must be read from the PAL. */ - if (td == curthread) + if (td == curthread) { mcp->mc_regs[FRAME_SP] = alpha_pal_rdusp(); + mcp->mc_thrptr = alpha_pal_rdunique(); + } else + mcp->mc_thrptr = td->td_pcb->pcb_hw.apcb_unique; mcp->mc_format = _MC_REV0_TRAPFRAME; PROC_LOCK(curthread->td_proc); @@ -2056,6 +2059,12 @@ else if ((ret = set_fpcontext(td, mcp)) != 0) return (ret); + /* + * NOTE: We only need to restore mc_thrptr when the ucontext format + * is _MC_REV0_TRAPFRAME. Only get_mcontext() above creates such + * contexts and that's also the only place where we save the thread + * pointer in the context. + */ if (mcp->mc_format == _MC_REV0_SIGFRAME) { set_regs(td, (struct reg *)&mcp->mc_regs); val = (mcp->mc_regs[R_PS] | ALPHA_PSL_USERSET) & @@ -2065,10 +2074,13 @@ td->td_frame->tf_regs[FRAME_FLAGS] = 0; if (td == curthread) alpha_pal_wrusp(mcp->mc_regs[R_SP]); - } else { - if (td == curthread) + if (td == curthread) { alpha_pal_wrusp(mcp->mc_regs[FRAME_SP]); + alpha_pal_wrunique(mcp->mc_thrptr); + } else + td->td_pcb->pcb_hw.apcb_unique = mcp->mc_thrptr; + /* * The context is a trapframe, so just copy it over the * threads frame. @@ -2370,9 +2382,3 @@ pcpu->pc_idlepcb.apcb_ptbr = thread0.td_pcb->pcb_hw.apcb_ptbr; pcpu->pc_current_asngen = 1; } - -intptr_t -casuptr(intptr_t *p, intptr_t old, intptr_t new) -{ - return (-1); -} ==== //depot/projects/uart/alpha/alpha/pmap.c#5 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.130 2003/07/06 20:32:42 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.131 2003/07/25 18:58:39 alc Exp $"); #include #include @@ -2130,7 +2130,7 @@ mpte = NULL; for (i = 0; i < PAGEORDER_SIZE; i++) { - vm_object_t lobject; + vm_object_t backing_object, lobject; pt_entry_t *pte; addr = addra + pmap_prefault_pageorder[i]; @@ -2150,15 +2150,18 @@ pindex = ((addr - entry->start) + entry->offset) >> PAGE_SHIFT; lobject = object; - for (m = vm_page_lookup(lobject, pindex); - (!m && (lobject->type == OBJT_DEFAULT) && (lobject->backing_object)); - lobject = lobject->backing_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); - m = vm_page_lookup(lobject->backing_object, pindex); + 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 */ ==== //depot/projects/uart/alpha/alpha/support.s#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.14 2003/06/29 17:14:42 marcel Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.15 2003/07/24 07:49:45 marcel Exp $ */ /* @@ -59,7 +59,35 @@ .text /**************************************************************************/ - + +/* + * intptr_t + * casuptr(intptr_t *p, intptr_t old, intptr_t new) + */ + LEAF(casuptr, 3) + LDGP(pv) + + ldiq t0, VM_MAXUSER_ADDRESS /* verify address validity */ + cmpult a0, t0, t1 + beq t1, fusufault + + lda t0, fusufault /* trap faults */ + ldq t2, PC_CURTHREAD(pcpup) + ldq t2, TD_PCB(t2) + + stq t0, PCB_ONFAULT(t2) +1: + ldq_l v0, 0(a0) /* try to load the old value */ + cmpeq v0, a1, t0 /* compare */ + beq t0, 2f /* exit if not equal */ + mov a2, t0 /* setup value to write */ + stq_c t0, 0(a0) /* write if address still locked */ + beq t0, 1b /* if it failed, spin */ +2: + stq zero, PCB_ONFAULT(t2) /* clean up */ + RET + END(casuptr) + /* * fu{byte,word} : fetch a byte (word) from user memory */ ==== //depot/projects/uart/alpha/include/alpha_cpu.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/alpha_cpu.h,v 1.9 2002/10/25 20:22:12 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/include/alpha_cpu.h,v 1.10 2003/07/24 07:41:08 marcel Exp $ */ /* From: NetBSD: alpha_cpu.h,v 1.15 1997/09/20 19:02:34 mjacob Exp */ /* @@ -459,6 +459,23 @@ } static __inline void +alpha_pal_wrunique(u_int64_t tp) +{ + register u_int64_t a0 __asm__("$16") = tp; + __asm__ __volatile__("call_pal 0x9f # PAL_wrunique" + : "+r" (a0) : : "$1", "$22", "$23", "$24", "$25"); +} + +static __inline u_int64_t +alpha_pal_rdunique(void) +{ + register u_int64_t v0 __asm__("$0"); + __asm__ __volatile__("call_pal 0x9e # PAL_rdunique" + : "=r" (v0) : : "$1", "$22", "$23", "$24", "$25"); + return (v0); +} + +static __inline void alpha_pal_tbi(u_int64_t op, u_int64_t va) { register u_int64_t a0 __asm__("$16") = op; ==== //depot/projects/uart/alpha/include/ucontext.h#2 (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/alpha/include/ucontext.h,v 1.6 2002/11/16 06:35:51 deischen Exp $ + * $FreeBSD: src/sys/alpha/include/ucontext.h,v 1.7 2003/07/24 07:34:31 marcel Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -50,7 +50,8 @@ #define _MC_REV0_SIGFRAME 1 /* context is a signal frame */ #define _MC_REV0_TRAPFRAME 2 /* context is a trap frame */ long mc_format; - long mc_spare[6]; + long mc_thrptr; /* Thread pointer */ + long mc_spare[5]; } mcontext_t; #if defined(_KERNEL) && defined(COMPAT_FREEBSD4) ==== //depot/projects/uart/amd64/acpica/OsdEnvironment.c#2 (text+ko) ==== @@ -23,10 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.9 2003/05/31 06:47:05 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.10 2003/07/25 21:10:18 obrien Exp $"); + /* * 6.1 : Environmental support */ ==== //depot/projects/uart/amd64/acpica/acpi_machdep.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.9 2003/05/01 01:05:21 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.10 2003/07/25 21:10:19 obrien Exp $"); + #include #include ==== //depot/projects/uart/amd64/acpica/acpi_wakeup.c#2 (text+ko) ==== @@ -23,9 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.19 2003/05/01 01:05:21 peter Exp $ */ + +#include +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.20 2003/07/25 21:10:19 obrien Exp $"); + #include #include ==== //depot/projects/uart/amd64/amd64/amd64-gdbstub.c#2 (text+ko) ==== @@ -92,7 +92,8 @@ * ****************************************************************************/ -/* $FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.24 2003/05/31 22:00:57 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.25 2003/07/25 21:15:44 obrien Exp $"); #include #include ==== //depot/projects/uart/amd64/amd64/atomic.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/amd64/atomic.c,v 1.4 2000/09/06 11:21:14 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/atomic.c,v 1.5 2003/07/25 21:15:44 obrien Exp $"); + /* This file creates publically callable functions to perform various * simple arithmetic on memory which is atomic in the presence of * interrupts and multiple processors. ==== //depot/projects/uart/amd64/amd64/autoconf.c#2 (text+ko) ==== @@ -33,10 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.173 2003/05/01 01:05:21 peter Exp $ + * @(#)autoconf.c 7.1 (Berkeley) 5/9/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.174 2003/07/25 21:15:44 obrien Exp $"); + /* * Setup the system to run on the current machine. * ==== //depot/projects/uart/amd64/amd64/critical.c#2 (text+ko) ==== @@ -1,10 +1,11 @@ /*- * Copyright (c) 2001 Matthew Dillon. This code is distributed under * the BSD copyright, /usr/src/COPYRIGHT. - * - * $FreeBSD: src/sys/amd64/amd64/critical.c,v 1.9 2003/05/01 01:05:21 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.10 2003/07/25 21:15:44 obrien Exp $"); + #include #include #include ==== //depot/projects/uart/amd64/amd64/db_disasm.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.26 2002/03/23 14:27:06 bde Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.27 2003/07/25 21:15:44 obrien Exp $"); + /* * Instruction disassembler. */ ==== //depot/projects/uart/amd64/amd64/db_interface.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.73 2003/05/30 01:01:07 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.74 2003/07/25 21:15:44 obrien Exp $"); + /* * Interface to new debugger. */ ==== //depot/projects/uart/amd64/amd64/db_trace.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.57 2003/05/31 22:02:11 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.58 2003/07/25 21:15:44 obrien Exp $"); + #include #include #include ==== //depot/projects/uart/amd64/amd64/dump_machdep.c#2 (text+ko) ==== @@ -31,10 +31,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.8 2003/05/01 01:05:21 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.9 2003/07/25 21:15:44 obrien Exp $"); + #include #include #include ==== //depot/projects/uart/amd64/amd64/elf_machdep.c#2 (text+ko) ==== @@ -21,10 +21,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.15 2003/05/11 22:40:24 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.16 2003/07/25 21:15:44 obrien Exp $"); + #include #include #include ==== //depot/projects/uart/amd64/amd64/genassym.c#2 (text+ko) ==== @@ -33,10 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.147 2003/05/23 05:04:53 peter Exp $ + * @(#)genassym.c 5.11 (Berkeley) 5/10/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.148 2003/07/25 21:15:44 obrien Exp $"); + #include "opt_compat.h" #include "opt_kstack_pages.h" ==== //depot/projects/uart/amd64/amd64/identcpu.c#2 (text+ko) ==== @@ -38,9 +38,11 @@ * SUCH DAMAGE. * * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp - * $FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.125 2003/05/27 21:59:56 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.126 2003/07/25 21:15:44 obrien Exp $"); + #include "opt_cpu.h" #include ==== //depot/projects/uart/amd64/amd64/in_cksum.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/amd64/amd64/in_cksum.c,v 1.3 2001/10/05 18:58:22 dfr Exp $ */ /* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */ /* @@ -39,6 +38,7 @@ */ #include /* RCS ID & Copyright macro defns */ +__FBSDID("$FreeBSD: src/sys/amd64/amd64/in_cksum.c,v 1.4 2003/07/25 21:15:44 obrien Exp $"); #include #include ==== //depot/projects/uart/amd64/amd64/initcpu.c#2 (text+ko) ==== @@ -25,10 +25,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.45 2003/05/01 01:05:21 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.46 2003/07/25 21:15:44 obrien Exp $"); + #include "opt_cpu.h" #include ==== //depot/projects/uart/amd64/amd64/legacy.c#2 (text+ko) ==== @@ -25,10 +25,11 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.50 2003/05/01 01:05:21 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.51 2003/07/25 21:15:44 obrien Exp $"); + /* * This code implements a system driver for legacy systems that do not * support ACPI or when ACPI support is not present in the kernel. ==== //depot/projects/uart/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -34,10 +34,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.584 2003/07/15 00:11:03 davidxu Exp $ + * @(#)machdep.c 7.4 (Berkeley) 6/3/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.587 2003/07/25 21:15:44 obrien Exp $"); + #include "opt_atalk.h" #include "opt_compat.h" #include "opt_cpu.h" @@ -307,14 +309,17 @@ { struct proc *p; struct thread *td; + struct trapframe *regs; td = curthread; p = td->td_proc; + regs = td->td_frame; PROC_LOCK_ASSERT(p, MA_OWNED); bzero(si, sizeof(*si)); si->si_signo = sig; si->si_code = code; + si->si_addr = (void *)regs->tf_addr; /* XXXKSE fill other fields */ } @@ -1170,7 +1175,7 @@ setidt(0, &IDTVEC(div), SDT_SYSIGT, SEL_KPL, 0); setidt(1, &IDTVEC(dbg), SDT_SYSIGT, SEL_KPL, 0); setidt(2, &IDTVEC(nmi), SDT_SYSIGT, SEL_KPL, 0); - setidt(3, &IDTVEC(bpt), SDT_SYSIGT, SEL_KPL, 0); + setidt(3, &IDTVEC(bpt), SDT_SYSIGT, SEL_UPL, 0); setidt(4, &IDTVEC(ofl), SDT_SYSIGT, SEL_KPL, 0); setidt(5, &IDTVEC(bnd), SDT_SYSIGT, SEL_KPL, 0); setidt(6, &IDTVEC(ill), SDT_SYSIGT, SEL_KPL, 0); ==== //depot/projects/uart/amd64/amd64/mem.c#2 (text+ko) ==== @@ -36,11 +36,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: Utah $Hdr: mem.c 1.13 89/10/08$ - * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/amd64/mem.c,v 1.109 2003/06/22 12:59:43 simokawa Exp $ + * Utah $Hdr: mem.c 1.13 89/10/08$ + * @(#)mem.c 7.2 (Berkeley) 5/9/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.110 2003/07/25 21:15:44 obrien Exp $"); + /* * Memory special file */ ==== //depot/projects/uart/amd64/amd64/nexus.c#2 (text+ko) ==== @@ -25,10 +25,11 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.53 2003/05/31 21:58:55 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.54 2003/07/25 21:15:44 obrien Exp $"); + /* * This code implements a `root nexus' for Intel Architecture * machines. The function of the root nexus is to serve as an ==== //depot/projects/uart/amd64/amd64/pmap.c#7 (text+ko) ==== @@ -38,8 +38,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.424 2003/07/23 19:49:32 alc Exp $ + * @(#)pmap.c 7.7 (Berkeley) 5/12/91 */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. @@ -73,6 +72,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.426 2003/07/25 21:15:44 obrien Exp $"); + /* * Manages physical address maps. * @@ -2176,7 +2178,7 @@ mpte = NULL; for (i = 0; i < PAGEORDER_SIZE; i++) { - vm_object_t lobject; + vm_object_t backing_object, lobject; pt_entry_t *pte; addr = addra + pmap_prefault_pageorder[i]; @@ -2196,15 +2198,18 @@ pindex = ((addr - entry->start) + entry->offset) >> PAGE_SHIFT; lobject = object; - for (m = vm_page_lookup(lobject, pindex); - (!m && (lobject->type == OBJT_DEFAULT) && (lobject->backing_object)); - lobject = lobject->backing_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); - m = vm_page_lookup(lobject->backing_object, pindex); + 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 */ ==== //depot/projects/uart/amd64/amd64/sys_machdep.c#2 (text+ko) ==== @@ -30,11 +30,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.83 2003/05/12 02:37:29 peter Exp $ - * + * @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.85 2003/07/25 21:15:44 obrien Exp $"); + #include #include #include @@ -77,7 +78,7 @@ case AMD64_SET_GSBASE: error = copyin(uap->parms, &pcb->pcb_gsbase, sizeof(pcb->pcb_gsbase)); if (!error) - wrmsr(MSR_KGSBASE, pcb->pcb_fsbase); + wrmsr(MSR_KGSBASE, pcb->pcb_gsbase); break; default: ==== //depot/projects/uart/amd64/amd64/trap.c#2 (text+ko) ==== @@ -34,10 +34,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.261 2003/06/15 00:31:22 davidxu Exp $ + * @(#)trap.c 7.4 (Berkeley) 5/13/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.262 2003/07/25 21:15:44 obrien Exp $"); + /* * AMD64 Trap and System call handling */ ==== //depot/projects/uart/amd64/amd64/tsc.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.200 2003/05/01 01:05:22 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.201 2003/07/25 21:15:44 obrien Exp $"); + #include "opt_clock.h" #include ==== //depot/projects/uart/amd64/amd64/vm_machdep.c#2 (text+ko) ==== @@ -36,11 +36,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 + * @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.211 2003/06/11 05:20:32 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.214 2003/07/25 21:15:45 obrien Exp $"); + #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -221,6 +223,51 @@ void cpu_set_upcall(struct thread *td, struct thread *td0) { + struct pcb *pcb2; + + /* Point the pcb to the top of the stack. */ + pcb2 = td->td_pcb; + + /* + * Copy the upcall pcb. This loads kernel regs. + * Those not loaded individually below get their default + * values here. + * + * XXXKSE It might be a good idea to simply skip this as + * the values of the other registers may be unimportant. + * This would remove any requirement for knowing the KSE + * at this time (see the matching comment below for + * more analysis) (need a good safe default). + */ + bcopy(td0->td_pcb, pcb2, sizeof(*pcb2)); + + /* + * Create a new fresh stack for the new thread. + * Don't forget to set this stack value into whatever supplies + * the address for the fault handlers. + * The contexts are filled in at the time we actually DO the + * upcall as only then do we know which KSE we got. + */ + bcopy(td0->td_frame, td->td_frame, sizeof(struct trapframe)); + + /* + * Set registers for trampoline to user mode. Leave space for the + * return address on stack. These are the kernel mode register values. + */ + pcb2->pcb_cr3 = vtophys(vmspace_pmap(td->td_proc->p_vmspace)->pm_pml4); + pcb2->pcb_r12 = (register_t)fork_return; /* trampoline arg */ + pcb2->pcb_rbp = 0; + pcb2->pcb_rsp = (register_t)td->td_frame - sizeof(void *); /* trampoline arg */ + pcb2->pcb_rbx = (register_t)td; /* trampoline arg */ + pcb2->pcb_rip = (register_t)fork_trampoline; + pcb2->pcb_rflags = td->td_frame->tf_rflags & ~PSL_I; /* ints disabled */ + /* + * If we didn't copy the pcb, we'd need to do the following registers: + * pcb2->pcb_savefpu: cloned above. + * pcb2->pcb_rflags: cloned above. + * pcb2->pcb_onfault: cloned above (always NULL here?). + * pcb2->pcb_[fg]sbase: cloned above + */ } /* @@ -231,6 +278,30 @@ void cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) { + + /* + * Do any extra cleaning that needs to be done. + * The thread may have optional components + * that are not present in a fresh thread. + * This may be a recycled thread so make it look + * as though it's newly allocated. + */ + cpu_thread_clean(td); + + /* + * Set the trap frame to point at the beginning of the uts + * function. + */ + td->td_frame->tf_rsp = + ((register_t)ku->ku_stack.ss_sp + ku->ku_stack.ss_size) & ~0x0f; + td->td_frame->tf_rsp -= 8; + td->td_frame->tf_rip = (register_t)ku->ku_func; + + /* + * Pass the address of the mailbox for this kse to the uts + * function as a parameter on the stack. + */ + td->td_frame->tf_rdi = (register_t)ku->ku_mailbox; } ==== //depot/projects/uart/amd64/ia32/ia32_genassym.c#2 (text+ko) ==== @@ -1,4 +1,5 @@ -/* $FreeBSD: src/sys/amd64/ia32/ia32_genassym.c,v 1.1 2003/05/14 04:10:48 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_genassym.c,v 1.2 2003/07/25 21:16:26 obrien Exp $"); #include "opt_compat.h" ==== //depot/projects/uart/amd64/ia32/ia32_misc.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/ia32/ia32_misc.c,v 1.10 2003/05/14 04:10:48 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_misc.c,v 1.11 2003/07/25 21:16:26 obrien Exp $"); + #include "opt_compat.h" #include ==== //depot/projects/uart/amd64/ia32/ia32_signal.c#2 (text+ko) ==== @@ -33,10 +33,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.2 2003/05/23 05:07:33 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.3 2003/07/25 21:16:26 obrien Exp $"); + #include "opt_compat.h" #include ==== //depot/projects/uart/amd64/ia32/ia32_syscall.c#2 (text+ko) ==== @@ -33,10 +33,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.2 2003/05/31 06:49:53 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.3 2003/07/25 21:16:26 obrien Exp $"); + /* * 386 Trap and System call handling */ ==== //depot/projects/uart/amd64/ia32/ia32_sysvec.c#2 (text+ko) ==== @@ -23,10 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/ia32/ia32_sysvec.c,v 1.5 2003/05/23 05:07:33 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_sysvec.c,v 1.6 2003/07/25 21:16:26 obrien Exp $"); + #include "opt_compat.h" #define __ELF_WORD_SIZE 32 ==== //depot/projects/uart/amd64/isa/clock.c#2 (text+ko) ==== @@ -33,10 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/isa/clock.c,v 1.199 2003/05/01 01:05:24 peter Exp $ + * @(#)clock.c 7.2 (Berkeley) 5/12/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.200 2003/07/25 21:18:52 obrien Exp $"); + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jul 26 00:21:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7E6B37B404; Sat, 26 Jul 2003 00:21: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 6913537B401 for ; Sat, 26 Jul 2003 00:21:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EDE943F3F for ; Sat, 26 Jul 2003 00:21:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6Q7Lj0U007781 for ; Sat, 26 Jul 2003 00:21:45 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6Q7Ljoq007778 for perforce@freebsd.org; Sat, 26 Jul 2003 00:21:45 -0700 (PDT) Date: Sat, 26 Jul 2003 00:21:45 -0700 (PDT) Message-Id: <200307260721.h6Q7Ljoq007778@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 35027 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, 26 Jul 2003 07:21:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=35027 Change 35027 by marcel@marcel_nfs on 2003/07/26 00:21:06 Move uart_debug() to uart_core.c. It's useful enough to keep and the sloppy implementation is causing a build failure. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus.h#8 edit .. //depot/projects/uart/dev/uart/uart_core.c#8 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus.h#8 (text+ko) ==== @@ -30,7 +30,6 @@ #define _DEV_UART_BUS_H_ #include -#include /* Drain and flush targets. */ #define UART_DRAIN_RECEIVER 0x0001 @@ -114,18 +113,7 @@ int uart_tty_detach(struct uart_softc *); void uart_tty_intr(void *arg); -static __inline void -uart_debug(struct uart_softc *sc, const char *fmt, ...) -{ -#if defined(UART_DEBUG) || 1 - va_list ap; - va_start(ap, fmt); - if (sc != NULL) - device_print_prettyname(sc->sc_dev); - vprintf(fmt, ap); - va_end(ap); -#endif -} +void uart_debug(struct uart_softc *, const char *, ...); /* * Receive buffer operations. ==== //depot/projects/uart/dev/uart/uart_core.c#8 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -70,6 +71,19 @@ .d_kqfilter = ttykqfilter, }; +void +uart_debug(struct uart_softc *sc, const char *fmt, ...) +{ +#if defined(UART_DEBUG) || 1 + va_list ap; + va_start(ap, fmt); + if (sc != NULL) + device_print_prettyname(sc->sc_dev); + vprintf(fmt, ap); + va_end(ap); +#endif +} + static void uart_tty_oproc(struct tty *tp) { From owner-p4-projects@FreeBSD.ORG Sat Jul 26 01:15:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D39A37B404; Sat, 26 Jul 2003 01:15:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BCBFF37B401 for ; Sat, 26 Jul 2003 01:15:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8425343FBD for ; Sat, 26 Jul 2003 01:15:56 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6Q8Fu0U016523 for ; Sat, 26 Jul 2003 01:15:56 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6Q8FtUQ016520 for perforce@freebsd.org; Sat, 26 Jul 2003 01:15:55 -0700 (PDT) Date: Sat, 26 Jul 2003 01:15:55 -0700 (PDT) Message-Id: <200307260815.h6Q8FtUQ016520@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 35032 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, 26 Jul 2003 08:15:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=35032 Change 35032 by marcel@marcel_nfs on 2003/07/26 01:15:50 IFC @35031 Affected files ... .. //depot/projects/ia64/contrib/smbfs/lib/smb/kiconv.c#3 integrate .. //depot/projects/ia64/contrib/smbfs/lib/smb/rap.c#2 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/_setjmp.S#6 integrate .. //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/context.S#2 integrate .. //depot/projects/ia64/release/Makefile#60 integrate .. //depot/projects/ia64/sys/amd64/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/ia64/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/ia64/sys/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/amd64-gdbstub.c#3 integrate .. //depot/projects/ia64/sys/amd64/amd64/atomic.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/autoconf.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/critical.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/ia64/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/ia64/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/ia64/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/ia64/sys/amd64/amd64/in_cksum.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#11 integrate .. //depot/projects/ia64/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/ia64/sys/amd64/amd64/nexus.c#5 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#14 integrate .. //depot/projects/ia64/sys/amd64/amd64/sys_machdep.c#4 integrate .. //depot/projects/ia64/sys/amd64/amd64/trap.c#8 integrate .. //depot/projects/ia64/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#7 integrate .. //depot/projects/ia64/sys/amd64/ia32/ia32_genassym.c#2 integrate .. //depot/projects/ia64/sys/amd64/ia32/ia32_misc.c#2 integrate .. //depot/projects/ia64/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/ia64/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/ia64/sys/amd64/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/ia64/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/ia64/sys/amd64/isa/intr_machdep.c#2 integrate .. //depot/projects/ia64/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/ia64/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/ia64/sys/amd64/isa/ithread.c#2 integrate .. //depot/projects/ia64/sys/amd64/isa/npx.c#2 integrate .. //depot/projects/ia64/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/ia64/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/ia64/sys/coda/coda_fbsd.c#7 integrate .. //depot/projects/ia64/sys/coda/coda_vnops.c#11 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#26 integrate .. //depot/projects/ia64/sys/conf/kern.pre.mk#21 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#24 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcireg.h#10 integrate .. //depot/projects/ia64/sys/dev/raidframe/rf_freebsdkintf.c#13 integrate .. //depot/projects/ia64/sys/fs/hpfs/hpfs_vfsops.c#16 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#19 integrate .. //depot/projects/ia64/sys/fs/ntfs/ntfs_subr.c#12 integrate .. //depot/projects/ia64/sys/fs/ntfs/ntfs_vfsops.c#15 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_io.c#8 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_io.c#11 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#18 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vfsops.c#12 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_subr.c#14 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_vnops.c#11 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_vfsops.c#19 integrate .. //depot/projects/ia64/sys/i386/ibcs2/imgact_coff.c#15 integrate .. //depot/projects/ia64/sys/ia64/include/acpica_machdep.h#2 integrate .. //depot/projects/ia64/sys/ia64/include/setjmp.h#5 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vfsops.c#19 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#61 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#52 integrate .. //depot/projects/ia64/sys/kern/uipc_socket2.c#25 integrate .. //depot/projects/ia64/sys/kern/vfs_export.c#11 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#49 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#33 integrate .. //depot/projects/ia64/sys/kern/vnode_if.src#14 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#36 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#19 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#34 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#44 integrate .. //depot/projects/ia64/sys/vm/vm_contig.c#16 integrate .. //depot/projects/ia64/tools/tools/tinderbox/current.rc#3 integrate .. //depot/projects/ia64/usr.sbin/mount_nwfs/mount_nwfs.c#2 integrate Differences ... ==== //depot/projects/ia64/contrib/smbfs/lib/smb/kiconv.c#3 (text+ko) ==== @@ -30,6 +30,7 @@ * SUCH DAMAGE. * * $Id: kiconv.c,v 1.3 2001/08/22 03:31:36 bp Exp $ + * $FreeBSD: src/contrib/smbfs/lib/smb/kiconv.c,v 1.2 2003/07/26 04:03:18 peter Exp $ */ #include @@ -48,7 +49,7 @@ { struct iconv_add_in din; struct iconv_add_out dout; - int olen; + size_t olen; if (strlen(from) > ICONV_CSNMAXLEN || strlen(to) > ICONV_CSNMAXLEN) return EINVAL; ==== //depot/projects/ia64/contrib/smbfs/lib/smb/rap.c#2 (text+ko) ==== @@ -30,6 +30,7 @@ * SUCH DAMAGE. * * $Id: rap.c,v 1.8 2001/02/24 15:56:05 bp Exp $ + * $FreeBSD: src/contrib/smbfs/lib/smb/rap.c,v 1.2 2003/07/26 04:02:22 peter Exp $ * * This is very simple implementation of RAP protocol. */ @@ -40,7 +41,7 @@ #include #include #include -#include +#include #include #include ==== //depot/projects/ia64/lib/libc/ia64/gen/_setjmp.S#6 (text+ko) ==== @@ -51,7 +51,7 @@ .file "setjmp.s" #include -__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/_setjmp.S,v 1.10 2003/03/05 04:39:24 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/_setjmp.S,v 1.11 2003/07/25 22:36:48 marcel Exp $"); #define LOCORE #include @@ -171,11 +171,10 @@ mov r3 = b4 ;; st8 [r11] = r2, J_B5-J_B3 - st8 [r10] = r3, J_GP-J_B4 + st8 [r10] = r3 mov r2 = b5 ;; st8 [r11] = r2 - st8 [r10] = r1 ;; // // return @@ -291,12 +290,11 @@ mov b1 = r2 mov b2 = r3 ld8 r2 = [r10], J_B5-J_B3 - ld8 r3 = [r11], J_GP-J_B4 + ld8 r3 = [r11] ;; mov b3 = r2 mov b4 = r3 ld8 r2 = [r10] - ld8 r1 = [r11] ld8 r21 = [r31] // get user unat ;; mov b5 = r2 ==== //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/context.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/amd64/amd64/context.S,v 1.1 2003/07/19 04:44:21 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/arch/amd64/amd64/context.S,v 1.2 2003/07/26 02:36:50 davidxu Exp $"); /* * The following notes ("cheat sheet") was provided by Peter Wemm. @@ -123,7 +123,7 @@ * No values are saved to mc_trapno, mc_addr, mc_err, mc_cs, or mc_ss. * For the FPU state, only the floating point control word is stored. */ -ENTRY(_amd64_ctx_save) +ENTRY(_amd64_save_context) cmpq $0, %rdi /* check for null pointer */ jne 1f movq $-1, %rax @@ -149,7 +149,7 @@ popq %rax movq %rax, MC_RFLAGS(%rdi) /* save flags */ movq %rsp, %rax /* setcontext pushes the return */ - addq $4, %rax /* address onto the stack; */ + addq $8, %rax /* address onto the stack; */ movq %rax, MC_RSP(%rdi) /* account for this -- ???. */ fnstcw MC_FP_CW_OFFSET(%rdi) /* save FPU control word */ movq $MC_OWNEDFP_NONE, MC_OWNEDFP_OFFSET(%rdi) /* no FP */ @@ -161,7 +161,7 @@ /* * _amd64_ctx_restore(mcontext_t *mcp, intptr_t val, intptr_t *loc); */ -ENTRY(_amd64_ctx_restore) +ENTRY(_amd64_restore_context) cmpq $0, %rdi /* check for null pointer */ jne 1f movq $-1, %rax @@ -198,7 +198,7 @@ 5: movq MC_RSP(%rdi), %rsp /* switch to context stack */ movq MC_RIP(%rdi), %rax /* return address on stack */ pushq %rax - movq MC_RSI(%rdi), %rax /* rdi on stack */ + movq MC_RDI(%rdi), %rax /* rdi on stack */ pushq %rax movq MC_RDX(%rdi), %rax /* rdx on stack */ pushq %rax @@ -209,7 +209,7 @@ movq MC_RAX(%rdi), %rax /* restore rax */ /* At this point we're done with the context. */ cmpq $0, %rdx /* set *loc to val */ - je 7f + je 6f movq %rsi, (%rdx) 6: popfq /* restore flags */ popq %rsi /* restore rsi, rdx, and rdi */ ==== //depot/projects/ia64/release/Makefile#60 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.799 2003/07/25 13:39:11 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.801 2003/07/26 06:47:40 scottl Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -736,7 +736,7 @@ sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} @gzip -9vc mfsroot > ${RD}/mfsroot/mfsroot.gz - @rm mfsroot mfsroot-small + @rm -f mfsroot mfsroot-small touch ${.TARGET} release.10: ==== //depot/projects/ia64/sys/amd64/acpica/OsdEnvironment.c#3 (text+ko) ==== @@ -23,10 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.9 2003/05/31 06:47:05 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.10 2003/07/25 21:10:18 obrien Exp $"); + /* * 6.1 : Environmental support */ ==== //depot/projects/ia64/sys/amd64/acpica/acpi_machdep.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.9 2003/05/01 01:05:21 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.10 2003/07/25 21:10:19 obrien Exp $"); + #include #include ==== //depot/projects/ia64/sys/amd64/acpica/acpi_wakeup.c#2 (text+ko) ==== @@ -23,9 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.19 2003/05/01 01:05:21 peter Exp $ */ + +#include +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.20 2003/07/25 21:10:19 obrien Exp $"); + #include #include ==== //depot/projects/ia64/sys/amd64/amd64/amd64-gdbstub.c#3 (text+ko) ==== @@ -92,7 +92,8 @@ * ****************************************************************************/ -/* $FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.24 2003/05/31 22:00:57 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.25 2003/07/25 21:15:44 obrien Exp $"); #include #include ==== //depot/projects/ia64/sys/amd64/amd64/atomic.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/amd64/atomic.c,v 1.4 2000/09/06 11:21:14 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/atomic.c,v 1.5 2003/07/25 21:15:44 obrien Exp $"); + /* This file creates publically callable functions to perform various * simple arithmetic on memory which is atomic in the presence of * interrupts and multiple processors. ==== //depot/projects/ia64/sys/amd64/amd64/autoconf.c#2 (text+ko) ==== @@ -33,10 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.173 2003/05/01 01:05:21 peter Exp $ + * @(#)autoconf.c 7.1 (Berkeley) 5/9/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.174 2003/07/25 21:15:44 obrien Exp $"); + /* * Setup the system to run on the current machine. * ==== //depot/projects/ia64/sys/amd64/amd64/critical.c#2 (text+ko) ==== @@ -1,10 +1,11 @@ /*- * Copyright (c) 2001 Matthew Dillon. This code is distributed under * the BSD copyright, /usr/src/COPYRIGHT. - * - * $FreeBSD: src/sys/amd64/amd64/critical.c,v 1.9 2003/05/01 01:05:21 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.10 2003/07/25 21:15:44 obrien Exp $"); + #include #include #include ==== //depot/projects/ia64/sys/amd64/amd64/db_disasm.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.26 2002/03/23 14:27:06 bde Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.27 2003/07/25 21:15:44 obrien Exp $"); + /* * Instruction disassembler. */ ==== //depot/projects/ia64/sys/amd64/amd64/db_interface.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.73 2003/05/30 01:01:07 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_interface.c,v 1.74 2003/07/25 21:15:44 obrien Exp $"); + /* * Interface to new debugger. */ ==== //depot/projects/ia64/sys/amd64/amd64/db_trace.c#3 (text+ko) ==== @@ -22,10 +22,11 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.57 2003/05/31 22:02:11 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.58 2003/07/25 21:15:44 obrien Exp $"); + #include #include #include ==== //depot/projects/ia64/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ==== @@ -31,10 +31,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.8 2003/05/01 01:05:21 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.9 2003/07/25 21:15:44 obrien Exp $"); + #include #include #include ==== //depot/projects/ia64/sys/amd64/amd64/elf_machdep.c#3 (text+ko) ==== @@ -21,10 +21,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.15 2003/05/11 22:40:24 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.16 2003/07/25 21:15:44 obrien Exp $"); + #include #include #include ==== //depot/projects/ia64/sys/amd64/amd64/genassym.c#5 (text+ko) ==== @@ -33,10 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.147 2003/05/23 05:04:53 peter Exp $ + * @(#)genassym.c 5.11 (Berkeley) 5/10/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.148 2003/07/25 21:15:44 obrien Exp $"); + #include "opt_compat.h" #include "opt_kstack_pages.h" ==== //depot/projects/ia64/sys/amd64/amd64/identcpu.c#4 (text+ko) ==== @@ -38,9 +38,11 @@ * SUCH DAMAGE. * * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp - * $FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.125 2003/05/27 21:59:56 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.126 2003/07/25 21:15:44 obrien Exp $"); + #include "opt_cpu.h" #include ==== //depot/projects/ia64/sys/amd64/amd64/in_cksum.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/amd64/amd64/in_cksum.c,v 1.3 2001/10/05 18:58:22 dfr Exp $ */ /* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */ /* @@ -39,6 +38,7 @@ */ #include /* RCS ID & Copyright macro defns */ +__FBSDID("$FreeBSD: src/sys/amd64/amd64/in_cksum.c,v 1.4 2003/07/25 21:15:44 obrien Exp $"); #include #include ==== //depot/projects/ia64/sys/amd64/amd64/initcpu.c#2 (text+ko) ==== @@ -25,10 +25,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.45 2003/05/01 01:05:21 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.46 2003/07/25 21:15:44 obrien Exp $"); + #include "opt_cpu.h" #include ==== //depot/projects/ia64/sys/amd64/amd64/legacy.c#2 (text+ko) ==== @@ -25,10 +25,11 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.50 2003/05/01 01:05:21 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.51 2003/07/25 21:15:44 obrien Exp $"); + /* * This code implements a system driver for legacy systems that do not * support ACPI or when ACPI support is not present in the kernel. ==== //depot/projects/ia64/sys/amd64/amd64/machdep.c#11 (text+ko) ==== @@ -34,10 +34,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.586 2003/07/24 08:51:22 davidxu Exp $ + * @(#)machdep.c 7.4 (Berkeley) 6/3/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.587 2003/07/25 21:15:44 obrien Exp $"); + #include "opt_atalk.h" #include "opt_compat.h" #include "opt_cpu.h" ==== //depot/projects/ia64/sys/amd64/amd64/mem.c#4 (text+ko) ==== @@ -36,11 +36,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: Utah $Hdr: mem.c 1.13 89/10/08$ - * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/amd64/mem.c,v 1.109 2003/06/22 12:59:43 simokawa Exp $ + * Utah $Hdr: mem.c 1.13 89/10/08$ + * @(#)mem.c 7.2 (Berkeley) 5/9/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.110 2003/07/25 21:15:44 obrien Exp $"); + /* * Memory special file */ ==== //depot/projects/ia64/sys/amd64/amd64/nexus.c#5 (text+ko) ==== @@ -25,10 +25,11 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.53 2003/05/31 21:58:55 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.54 2003/07/25 21:15:44 obrien Exp $"); + /* * This code implements a `root nexus' for Intel Architecture * machines. The function of the root nexus is to serve as an ==== //depot/projects/ia64/sys/amd64/amd64/pmap.c#14 (text+ko) ==== @@ -38,8 +38,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.425 2003/07/25 18:58:39 alc Exp $ + * @(#)pmap.c 7.7 (Berkeley) 5/12/91 */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. @@ -73,6 +72,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.426 2003/07/25 21:15:44 obrien Exp $"); + /* * Manages physical address maps. * ==== //depot/projects/ia64/sys/amd64/amd64/sys_machdep.c#4 (text+ko) ==== @@ -30,11 +30,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.84 2003/07/23 23:17:15 peter Exp $ - * + * @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.85 2003/07/25 21:15:44 obrien Exp $"); + #include #include #include ==== //depot/projects/ia64/sys/amd64/amd64/trap.c#8 (text+ko) ==== @@ -34,10 +34,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.261 2003/06/15 00:31:22 davidxu Exp $ + * @(#)trap.c 7.4 (Berkeley) 5/13/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.262 2003/07/25 21:15:44 obrien Exp $"); + /* * AMD64 Trap and System call handling */ ==== //depot/projects/ia64/sys/amd64/amd64/tsc.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.200 2003/05/01 01:05:22 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.201 2003/07/25 21:15:44 obrien Exp $"); + #include "opt_clock.h" #include ==== //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#7 (text+ko) ==== @@ -36,11 +36,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 + * @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.213 2003/07/25 00:21:37 davidxu Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.214 2003/07/25 21:15:45 obrien Exp $"); + #include "opt_isa.h" #include "opt_kstack_pages.h" ==== //depot/projects/ia64/sys/amd64/ia32/ia32_genassym.c#2 (text+ko) ==== @@ -1,4 +1,5 @@ -/* $FreeBSD: src/sys/amd64/ia32/ia32_genassym.c,v 1.1 2003/05/14 04:10:48 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_genassym.c,v 1.2 2003/07/25 21:16:26 obrien Exp $"); #include "opt_compat.h" ==== //depot/projects/ia64/sys/amd64/ia32/ia32_misc.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/ia32/ia32_misc.c,v 1.10 2003/05/14 04:10:48 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_misc.c,v 1.11 2003/07/25 21:16:26 obrien Exp $"); + #include "opt_compat.h" #include ==== //depot/projects/ia64/sys/amd64/ia32/ia32_signal.c#3 (text+ko) ==== @@ -33,10 +33,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.2 2003/05/23 05:07:33 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.3 2003/07/25 21:16:26 obrien Exp $"); + #include "opt_compat.h" #include ==== //depot/projects/ia64/sys/amd64/ia32/ia32_syscall.c#3 (text+ko) ==== @@ -33,10 +33,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.2 2003/05/31 06:49:53 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.3 2003/07/25 21:16:26 obrien Exp $"); + /* * 386 Trap and System call handling */ ==== //depot/projects/ia64/sys/amd64/ia32/ia32_sysvec.c#3 (text+ko) ==== @@ -23,10 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/ia32/ia32_sysvec.c,v 1.5 2003/05/23 05:07:33 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_sysvec.c,v 1.6 2003/07/25 21:16:26 obrien Exp $"); + #include "opt_compat.h" #define __ELF_WORD_SIZE 32 ==== //depot/projects/ia64/sys/amd64/isa/clock.c#2 (text+ko) ==== @@ -33,10 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/isa/clock.c,v 1.199 2003/05/01 01:05:24 peter Exp $ + * @(#)clock.c 7.2 (Berkeley) 5/12/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.200 2003/07/25 21:18:52 obrien Exp $"); + /* * Routines to handle clock hardware. */ ==== //depot/projects/ia64/sys/amd64/isa/intr_machdep.c#2 (text+ko) ==== @@ -33,10 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/amd64/isa/intr_machdep.c,v 1.75 2003/05/01 01:05:24 peter Exp $ + * @(#)isa.c 7.2 (Berkeley) 5/13/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/isa/intr_machdep.c,v 1.76 2003/07/25 21:18:52 obrien Exp $"); + #include "opt_isa.h" #include ==== //depot/projects/ia64/sys/amd64/isa/isa.c#2 (text+ko) ==== @@ -22,10 +22,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/isa/isa.c,v 1.143 2003/05/01 01:05:24 peter Exp $ */ - /* * Modifications for Intel architecture by Garrett A. Wollman. * Copyright 1998 Massachusetts Institute of Technology @@ -56,6 +53,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.144 2003/07/25 21:18:52 obrien Exp $"); + #include #include #include ==== //depot/projects/ia64/sys/amd64/isa/isa_dma.c#2 (text+ko) ==== @@ -33,10 +33,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.14 2003/05/01 01:05:25 peter Exp $ + * @(#)isa.c 7.2 (Berkeley) 5/13/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.15 2003/07/25 21:18:52 obrien Exp $"); + /* * code to manage AT bus * ==== //depot/projects/ia64/sys/amd64/isa/ithread.c#2 (text+ko) ==== @@ -25,10 +25,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * From BSDI: intr.c,v 1.6.2.5 1999/07/06 19:16:52 cp Exp - * $FreeBSD: src/sys/amd64/isa/ithread.c,v 1.21 2003/05/01 01:05:25 peter Exp $ + * BSDI Id: intr.c,v 1.6.2.5 1999/07/06 19:16:52 cp Exp */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/isa/ithread.c,v 1.22 2003/07/25 21:18:52 obrien Exp $"); + /* Interrupt thread code. */ #include ==== //depot/projects/ia64/sys/amd64/isa/npx.c#2 (text+ko) ==== @@ -31,10 +31,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/isa/npx.c,v 1.141 2003/05/01 01:05:25 peter Exp $ + * @(#)npx.c 7.2 (Berkeley) 5/12/91 */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/isa/npx.c,v 1.142 2003/07/25 21:18:52 obrien Exp $"); + #include "opt_debug_npx.h" #include "opt_isa.h" ==== //depot/projects/ia64/sys/amd64/pci/pci_bus.c#2 (text+ko) ==== @@ -22,11 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.99 2003/05/01 01:05:25 peter Exp $ - * */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.100 2003/07/25 21:19:18 obrien Exp $"); + #include "opt_cpu.h" #include ==== //depot/projects/ia64/sys/amd64/pci/pci_cfgreg.c#2 (text+ko) ==== @@ -24,11 +24,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.102 2003/05/01 01:05:25 peter Exp $ - * */ +#include +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.103 2003/07/25 21:19:19 obrien Exp $"); + #include /* XXX trim includes */ #include #include ==== //depot/projects/ia64/sys/coda/coda_fbsd.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.30 2003/06/10 21:21:59 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.31 2003/07/26 07:32:20 phk Exp $"); #include "vcoda.h" @@ -127,7 +127,7 @@ if (cfvp == NULL) { opened_internally = 1; - error = VOP_OPEN(vp, FREAD, cred, p); + error = VOP_OPEN(vp, FREAD, cred, p, -1); printf("coda_getp: Internally Opening %p\n", vp); if (error) { ==== //depot/projects/ia64/sys/coda/coda_vnops.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.49 2003/06/15 18:45:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.50 2003/07/26 07:32:20 phk Exp $"); #include #include @@ -296,7 +296,7 @@ cp->c_inode = inode; /* Open the cache file. */ - error = VOP_OPEN(vp, flag, cred, td); + error = VOP_OPEN(vp, flag, cred, td, -1); if (error) { printf("coda_open: VOP_OPEN on container failed %d\n", error); return (error); @@ -467,7 +467,7 @@ opened_internally = 1; MARK_INT_GEN(CODA_OPEN_STATS); error = VOP_OPEN(vp, (rw == UIO_READ ? FREAD : FWRITE), - cred, td); + cred, td, -1); printf("coda_rdwr: Internally Opening %p\n", vp); if (error) { printf("coda_rdwr: VOP_OPEN on container failed %d\n", error); @@ -1646,7 +1646,7 @@ if (cp->c_ovp == NULL) { opened_internally = 1; MARK_INT_GEN(CODA_OPEN_STATS); - error = VOP_OPEN(vp, FREAD, cred, td); + error = VOP_OPEN(vp, FREAD, cred, td, -1); printf("coda_readdir: Internally Opening %p\n", vp); if (error) { printf("coda_readdir: VOP_OPEN on container failed %d\n", error); ==== //depot/projects/ia64/sys/compat/linux/linux_misc.c#26 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.145 2003/07/18 10:26:09 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.146 2003/07/26 07:32:20 phk Exp $"); #include "opt_mac.h" @@ -310,7 +310,7 @@ if (error) goto cleanup; #endif - error = VOP_OPEN(vp, FREAD, td->td_ucred, td); + error = VOP_OPEN(vp, FREAD, td->td_ucred, td, -1); if (error) goto cleanup; ==== //depot/projects/ia64/sys/conf/kern.pre.mk#21 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kernels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.30 2003/07/23 22:02:30 peter Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.32 2003/07/26 03:46:39 peter Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -52,9 +52,9 @@ .endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jul 26 01:34:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8F6B37B404; Sat, 26 Jul 2003 01:34:20 -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 37D6337B401 for ; Sat, 26 Jul 2003 01:34:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 404D443F3F for ; Sat, 26 Jul 2003 01:34:19 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6Q8YJ0U017775 for ; Sat, 26 Jul 2003 01:34:19 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6Q8YILI017772 for perforce@freebsd.org; Sat, 26 Jul 2003 01:34:18 -0700 (PDT) Date: Sat, 26 Jul 2003 01:34:18 -0700 (PDT) Message-Id: <200307260834.h6Q8YILI017772@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 35033 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, 26 Jul 2003 08:34:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=35033 Change 35033 by marcel@marcel_nfs on 2003/07/26 01:33:34 IFC @35031 Affected files ... .. //depot/projects/uart/coda/coda_fbsd.c#2 integrate .. //depot/projects/uart/coda/coda_vnops.c#2 integrate .. //depot/projects/uart/compat/linux/linux_misc.c#3 integrate .. //depot/projects/uart/dev/raidframe/rf_freebsdkintf.c#2 integrate .. //depot/projects/uart/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/uart/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/uart/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/uart/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/uart/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/uart/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/uart/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/uart/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/uart/gnu/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/uart/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/uart/ia64/include/acpica_machdep.h#2 integrate .. //depot/projects/uart/ia64/include/setjmp.h#3 integrate .. //depot/projects/uart/isofs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/uart/kern/kern_exec.c#2 integrate .. //depot/projects/uart/kern/uipc_socket2.c#2 integrate .. //depot/projects/uart/kern/vfs_export.c#2 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#3 integrate .. //depot/projects/uart/kern/vfs_vnops.c#2 integrate .. //depot/projects/uart/kern/vnode_if.src#2 integrate .. //depot/projects/uart/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/uart/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/uart/vm/swap_pager.c#4 integrate Differences ... ==== //depot/projects/uart/coda/coda_fbsd.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.30 2003/06/10 21:21:59 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.31 2003/07/26 07:32:20 phk Exp $"); #include "vcoda.h" @@ -127,7 +127,7 @@ if (cfvp == NULL) { opened_internally = 1; - error = VOP_OPEN(vp, FREAD, cred, p); + error = VOP_OPEN(vp, FREAD, cred, p, -1); printf("coda_getp: Internally Opening %p\n", vp); if (error) { ==== //depot/projects/uart/coda/coda_vnops.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.49 2003/06/15 18:45:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.50 2003/07/26 07:32:20 phk Exp $"); #include #include @@ -296,7 +296,7 @@ cp->c_inode = inode; /* Open the cache file. */ - error = VOP_OPEN(vp, flag, cred, td); + error = VOP_OPEN(vp, flag, cred, td, -1); if (error) { printf("coda_open: VOP_OPEN on container failed %d\n", error); return (error); @@ -467,7 +467,7 @@ opened_internally = 1; MARK_INT_GEN(CODA_OPEN_STATS); error = VOP_OPEN(vp, (rw == UIO_READ ? FREAD : FWRITE), - cred, td); + cred, td, -1); printf("coda_rdwr: Internally Opening %p\n", vp); if (error) { printf("coda_rdwr: VOP_OPEN on container failed %d\n", error); @@ -1646,7 +1646,7 @@ if (cp->c_ovp == NULL) { opened_internally = 1; MARK_INT_GEN(CODA_OPEN_STATS); - error = VOP_OPEN(vp, FREAD, cred, td); + error = VOP_OPEN(vp, FREAD, cred, td, -1); printf("coda_readdir: Internally Opening %p\n", vp); if (error) { printf("coda_readdir: VOP_OPEN on container failed %d\n", error); ==== //depot/projects/uart/compat/linux/linux_misc.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.145 2003/07/18 10:26:09 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.146 2003/07/26 07:32:20 phk Exp $"); #include "opt_mac.h" @@ -310,7 +310,7 @@ if (error) goto cleanup; #endif - error = VOP_OPEN(vp, FREAD, td->td_ucred, td); + error = VOP_OPEN(vp, FREAD, td->td_ucred, td, -1); if (error) goto cleanup; ==== //depot/projects/uart/dev/raidframe/rf_freebsdkintf.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/raidframe/rf_freebsdkintf.c,v 1.18 2003/04/01 15:06:24 phk Exp $ + * $FreeBSD: src/sys/dev/raidframe/rf_freebsdkintf.c,v 1.19 2003/07/26 07:32:20 phk Exp $ */ /* $NetBSD: rf_netbsdkintf.c,v 1.105 2001/04/05 02:48:51 oster Exp $ */ @@ -2333,7 +2333,7 @@ vref(vp); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(vp, FREAD, td->td_ucred, td); + error = VOP_OPEN(vp, FREAD, td->td_ucred, td, -1); VOP_UNLOCK(vp, 0, td); if (error) { vput(vp); @@ -2364,7 +2364,7 @@ vref(vp); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(vp, FREAD, td->td_ucred, td); + error = VOP_OPEN(vp, FREAD, td->td_ucred, td, -1); VOP_UNLOCK(vp, 0, td); if (error) { continue; @@ -2419,7 +2419,7 @@ vref(vp); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(vp, FREAD, td->td_ucred, td); + error = VOP_OPEN(vp, FREAD, td->td_ucred, td, -1); VOP_UNLOCK(vp, 0, td); if (error) { /* Whatever... */ ==== //depot/projects/uart/fs/hpfs/hpfs_vfsops.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.34 2003/06/12 20:48:36 phk Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.35 2003/07/26 07:32:20 phk Exp $ */ @@ -243,7 +243,7 @@ ronly = (mp->mnt_flag & MNT_RDONLY) != 0; vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td); + error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td, -1); VOP_UNLOCK(devvp, 0, td); if (error) return (error); ==== //depot/projects/uart/fs/msdosfs/msdosfs_vfsops.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.103 2003/06/29 03:05:59 tjr Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.104 2003/07/26 07:32:20 phk Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -324,9 +324,9 @@ * we don't VOP_OPEN the device again in that case. */ #ifdef notyet - error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td); + error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td, -1); #else - error = VOP_OPEN(devvp, FREAD|FWRITE, FSCRED, td); + error = VOP_OPEN(devvp, FREAD|FWRITE, FSCRED, td, -1); #endif VOP_UNLOCK(devvp, 0, td); if (error) ==== //depot/projects/uart/fs/ntfs/ntfs_vfsops.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.55 2003/07/26 02:21:49 tjr Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.56 2003/07/26 07:32:21 phk Exp $ */ @@ -299,7 +299,7 @@ ronly = (mp->mnt_flag & MNT_RDONLY) != 0; vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td); + error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td, -1); VOP_UNLOCK(devvp, 0, td); if (error) return (error); ==== //depot/projects/uart/fs/nwfs/nwfs_io.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nwfs/nwfs_io.c,v 1.28 2003/06/19 03:08:10 alc Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_io.c,v 1.29 2003/07/26 07:32:21 phk Exp $ * */ #include @@ -528,7 +528,7 @@ #ifndef NWFS_RWCACHE td = curthread; /* XXX */ cred = td->td_ucred; /* XXX */ - VOP_OPEN(vp, FWRITE, cred, td); + VOP_OPEN(vp, FWRITE, cred, td, -1); error = vop_stdputpages(ap); VOP_CLOSE(vp, FWRITE, cred, td); return error; @@ -545,7 +545,7 @@ td = curthread; /* XXX */ cred = td->td_ucred; /* XXX */ -/* VOP_OPEN(vp, FWRITE, cred, td);*/ +/* VOP_OPEN(vp, FWRITE, cred, td, -1);*/ np = VTONW(vp); nmp = VFSTONWFS(vp->v_mount); pages = ap->a_m; ==== //depot/projects/uart/fs/smbfs/smbfs_io.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.21 2003/06/19 03:38:05 alc Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.22 2003/07/26 07:32:21 phk Exp $ * */ #include @@ -594,7 +594,7 @@ #ifdef SMBFS_RWGENERIC td = curthread; /* XXX */ cred = td->td_ucred; /* XXX */ - VOP_OPEN(vp, FWRITE, cred, td); + VOP_OPEN(vp, FWRITE, cred, td, -1); error = vop_stdputpages(ap); VOP_CLOSE(vp, FWRITE, cred, td); return error; @@ -612,7 +612,7 @@ td = curthread; /* XXX */ cred = td->td_ucred; /* XXX */ -/* VOP_OPEN(vp, FWRITE, cred, td);*/ +/* VOP_OPEN(vp, FWRITE, cred, td, -1);*/ np = VTOSMB(vp); smp = VFSTOSMBFS(vp->v_mount); pages = ap->a_m; ==== //depot/projects/uart/fs/smbfs/smbfs_vnops.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.38 2003/06/17 12:58:02 tjr Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.39 2003/07/26 07:32:21 phk Exp $ */ #include #include @@ -380,7 +380,7 @@ */ if ((np->n_flag & NOPEN) == 0) { if (vcp->vc_flags & SMBV_WIN95) { - error = VOP_OPEN(vp, FWRITE, ap->a_cred, ap->a_td); + error = VOP_OPEN(vp, FWRITE, ap->a_cred, ap->a_td, -1); if (!error) { /* error = smbfs_smb_setfattrNT(np, 0, mtime, atime, &scred); VOP_GETATTR(vp, &vattr, ap->a_cred, ap->a_td);*/ ==== //depot/projects/uart/fs/udf/udf_vfsops.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.13 2003/06/12 20:48:37 phk Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.14 2003/07/26 07:32:21 phk Exp $ */ /* udf_vfsops.c */ @@ -305,7 +305,7 @@ return (error); vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(devvp, FREAD, FSCRED, td); + error = VOP_OPEN(devvp, FREAD, FSCRED, td, -1); VOP_UNLOCK(devvp, 0, td); if (error) return error; ==== //depot/projects/uart/fs/unionfs/union_subr.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_subr.c 8.20 (Berkeley) 5/20/95 - * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.74 2003/06/22 08:41:41 phk Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.75 2003/07/26 07:32:21 phk Exp $ */ #include @@ -784,7 +784,7 @@ * from VOP_CLOSE() */ vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(lvp, FREAD, cred, td); + error = VOP_OPEN(lvp, FREAD, cred, td, -1); if (error == 0 && vn_canvmio(lvp) == TRUE) error = vfs_object_create(lvp, td, cred); if (error == 0) { @@ -815,7 +815,7 @@ for (i = 0; i < un->un_openl; i++) { (void) VOP_CLOSE(lvp, FREAD, cred, td); - (void) VOP_OPEN(uvp, FREAD, cred, td); + (void) VOP_OPEN(uvp, FREAD, cred, td, -1); } if (un->un_openl) { if (vn_canvmio(uvp) == TRUE) @@ -1130,7 +1130,7 @@ if (error) return (error); - error = VOP_OPEN(vp, fmode, cred, td); + error = VOP_OPEN(vp, fmode, cred, td, -1); if (error == 0 && vn_canvmio(vp) == TRUE) error = vfs_object_create(vp, td, cred); if (error) { @@ -1340,7 +1340,7 @@ } if (lvp != NULLVP) { - error = VOP_OPEN(lvp, FREAD, fp->f_cred, td); + error = VOP_OPEN(lvp, FREAD, fp->f_cred, td, -1); if (error == 0 && vn_canvmio(lvp) == TRUE) error = vfs_object_create(lvp, td, fp->f_cred); if (error) { ==== //depot/projects/uart/fs/unionfs/union_vnops.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 - * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.101 2003/06/15 18:52:58 phk Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.102 2003/07/26 07:32:21 phk Exp $ */ #include @@ -776,7 +776,7 @@ */ if (error == 0) - error = VOP_OPEN(tvp, mode, cred, td); + error = VOP_OPEN(tvp, mode, cred, td, -1); /* * This is absolutely necessary or UFS will blow up. ==== //depot/projects/uart/gnu/ext2fs/ext2_vfsops.c#2 (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.105 2003/06/12 20:48:38 phk Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.106 2003/07/26 07:32:21 phk Exp $ */ #include @@ -649,7 +649,7 @@ ronly = (mp->mnt_flag & MNT_RDONLY) != 0; vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td); + error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td, -1); VOP_UNLOCK(devvp, 0, td); if (error) return (error); ==== //depot/projects/uart/i386/ibcs2/imgact_coff.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/ibcs2/imgact_coff.c,v 1.59 2003/06/02 06:48:51 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/ibcs2/imgact_coff.c,v 1.60 2003/07/26 07:32:21 phk Exp $"); #include #include @@ -200,7 +200,7 @@ if ((error = VOP_ACCESS(vp, VEXEC, td->td_ucred, td)) != 0) goto fail; - if ((error = VOP_OPEN(vp, FREAD, td->td_ucred, td)) != 0) + if ((error = VOP_OPEN(vp, FREAD, td->td_ucred, td, -1)) != 0) goto fail; /* ==== //depot/projects/uart/ia64/include/acpica_machdep.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/acpica_machdep.h,v 1.1 2002/07/30 19:35:31 iwasaki Exp $ + * $FreeBSD: src/sys/ia64/include/acpica_machdep.h,v 1.2 2003/07/26 07:23:25 marcel Exp $ */ /****************************************************************************** @@ -65,7 +65,7 @@ #define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \ do { \ - __asm__ volatile ("1: ld4 r29=%1\n" \ + __asm__ volatile ("1: ld4 r29=[%1]\n" \ ";;\n" \ "mov ar.ccv=r29\n" \ "mov r2=r29\n" \ @@ -77,7 +77,7 @@ ";;\n" \ "add r29=r29,r30\n" \ ";;\n" \ - "cmpxchg4.acq r30=%1,r29,ar.ccv\n" \ + "cmpxchg4.acq r30=[%1],r29,ar.ccv\n" \ ";;\n" \ "cmp.eq p6,p7=r2,r30\n" \ "(p7) br.dpnt.few 1b\n" \ @@ -85,24 +85,24 @@ ";;\n" \ "(p8) mov %0=-1\n" \ "(p9) mov %0=r0\n" \ - :"=r"(Acq):"m"(GLptr):"r2","r29","r30","memory"); \ + :"=r"(Acq):"r"(GLptr):"r2","r29","r30","memory"); \ } while (0) #define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \ do { \ - __asm__ volatile ("1: ld4 r29=%1\n" \ + __asm__ volatile ("1: ld4 r29=[%1]\n" \ ";;\n" \ "mov ar.ccv=r29\n" \ "mov r2=r29\n" \ "and r29=-4,r29\n" \ ";;\n" \ - "cmpxchg4.acq r30=%1,r29,ar.ccv\n" \ + "cmpxchg4.acq r30=[%1],r29,ar.ccv\n" \ ";;\n" \ "cmp.eq p6,p7=r2,r30\n" \ "(p7) br.dpnt.few 1b\n" \ "and %0=1,r2\n" \ ";;\n" \ - :"=r"(Acq):"m"(GLptr):"r2","r29","r30","memory"); \ + :"=r"(Acq):"r"(GLptr):"r2","r29","r30","memory"); \ } while (0) /*! [End] no source code translation !*/ ==== //depot/projects/uart/ia64/include/setjmp.h#3 (text+ko) ==== @@ -36,7 +36,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/setjmp.h,v 1.11 2003/07/25 22:36:48 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/setjmp.h,v 1.12 2003/07/26 08:03:43 marcel Exp $ */ #ifndef _MACHINE_SETJMP_H_ @@ -90,11 +90,7 @@ #define J_SIGSET 0x1e0 #endif /* __BSD_VISIBLE */ -/* - * We only have 16 bytes left for future use, but it's a nice round, - * but above all large number. Size is in bytes. - */ -#define _JMPBUFSZ 0x200 +#define _JBLEN 0x20 /* Size in long doubles */ /* * XXX this check is wrong, since LOCORE is in the application namespace and @@ -113,16 +109,22 @@ */ #if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE struct _sigjmp_buf { - char _Buffer[_JMPBUFSZ]; -} __aligned(16); + long double buf[_JBLEN]; +}; typedef struct _sigjmp_buf sigjmp_buf[1]; #endif struct _jmp_buf { - char _Buffer[_JMPBUFSZ]; -} __aligned(16); + long double buf[_JBLEN]; +}; typedef struct _jmp_buf jmp_buf[1]; +#ifdef _KERNEL +#ifdef CTASSERT +CTASSERT(sizeof(struct _jmp_buf) == 512); +#endif +#endif + #endif /* !LOCORE */ #endif /* !_MACHINE_SETJMP_H_ */ ==== //depot/projects/uart/isofs/cd9660/cd9660_vfsops.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.111 2003/06/12 20:48:38 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.112 2003/07/26 07:32:22 phk Exp $"); #include #include @@ -154,7 +154,7 @@ args.flags = ISOFSMNT_ROOT; vn_lock(rootvp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(rootvp, FREAD, FSCRED, td); + error = VOP_OPEN(rootvp, FREAD, FSCRED, td, -1); VOP_UNLOCK(rootvp, 0, td); if (error) return error; @@ -304,7 +304,7 @@ return (error); vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_OPEN(devvp, FREAD, FSCRED, td); + error = VOP_OPEN(devvp, FREAD, FSCRED, td, -1); VOP_UNLOCK(devvp, 0, td); if (error) return error; ==== //depot/projects/uart/kern/kern_exec.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.224 2003/06/15 00:31:23 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.225 2003/07/26 07:32:22 phk Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -1142,7 +1142,7 @@ * Call filesystem specific open routine (which does nothing in the * general case). */ - error = VOP_OPEN(vp, FREAD, td->td_ucred, td); + error = VOP_OPEN(vp, FREAD, td->td_ucred, td, -1); return (error); } ==== //depot/projects/uart/kern/uipc_socket2.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.113 2003/06/11 00:56:58 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.114 2003/07/26 07:23:24 scottl Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -626,8 +626,10 @@ space += m_length(control, &n); if (space > sbspace(sb)) return (0); +#if MSIZE <= 256 if (asa->sa_len > MLEN) return (0); +#endif MGET(m, M_DONTWAIT, MT_SONAME); if (m == 0) return (0); ==== //depot/projects/uart/kern/vfs_export.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.323 2003/06/11 00:56:58 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.324 2003/07/26 07:23:24 scottl Exp $"); #include #include @@ -120,8 +120,10 @@ return (0); } +#if MSIZE <= 256 if (argp->ex_addrlen > MLEN) return (EINVAL); +#endif i = sizeof(struct netcred) + argp->ex_addrlen + argp->ex_masklen; np = (struct netcred *) malloc(i, M_NETADDR, M_WAITOK | M_ZERO); ==== //depot/projects/uart/kern/vfs_syscalls.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.324 2003/07/04 12:20:27 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.325 2003/07/26 07:32:22 phk Exp $"); /* For 4.3 integer FS ID compatibility */ #include "opt_compat.h" @@ -3621,7 +3621,7 @@ if (error) goto bad; } - error = VOP_OPEN(vp, fmode, td->td_ucred, td); + error = VOP_OPEN(vp, fmode, td->td_ucred, td, -1); if (error) goto bad; /* ==== //depot/projects/uart/kern/vfs_vnops.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.190 2003/06/22 23:03:07 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.191 2003/07/26 07:32:22 phk Exp $"); #include "opt_mac.h" @@ -234,7 +234,7 @@ vp->v_cachedfs = vap->va_fsid; vp->v_cachedid = vap->va_fileid; } - if ((error = VOP_OPEN(vp, fmode, cred, td)) != 0) + if ((error = VOP_OPEN(vp, fmode, cred, td, -1)) != 0) goto bad; /* * Make sure that a VM object is created for VMIO support. ==== //depot/projects/uart/kern/vnode_if.src#2 (text+ko) ==== @@ -31,7 +31,7 @@ # SUCH DAMAGE. # # @(#)vnode_if.src 8.12 (Berkeley) 5/14/95 -# $FreeBSD: src/sys/kern/vnode_if.src,v 1.63 2003/06/22 22:45:24 rwatson Exp $ +# $FreeBSD: src/sys/kern/vnode_if.src,v 1.64 2003/07/26 07:32:22 phk Exp $ # # @@ -135,6 +135,7 @@ IN int mode; IN struct ucred *cred; IN struct thread *td; + IN int fd; }; # ==== //depot/projects/uart/ufs/ffs/ffs_vfsops.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.214 2003/06/12 20:48:38 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.215 2003/07/26 07:32:22 phk Exp $"); #include "opt_mac.h" #include "opt_quota.h" @@ -610,9 +610,9 @@ * XXX: start to avoid getting trashed later on. */ #ifdef notyet - error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td); + error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, td, -1); #else - error = VOP_OPEN(devvp, FREAD|FWRITE, FSCRED, td); + error = VOP_OPEN(devvp, FREAD|FWRITE, FSCRED, td, -1); #endif VOP_UNLOCK(devvp, 0, td); if (error) ==== //depot/projects/uart/ufs/ufs/ufs_extattr.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_extattr.c,v 1.65 2003/06/11 06:34:30 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_extattr.c,v 1.66 2003/07/26 07:32:22 phk Exp $"); #include "opt_ufs.h" @@ -324,7 +324,7 @@ { int error; - error = VOP_OPEN(vp, FREAD|FWRITE, td->td_ucred, td); + error = VOP_OPEN(vp, FREAD|FWRITE, td->td_ucred, td, -1); if (error) { printf("ufs_extattr_enable_with_open.VOP_OPEN(): failed " "with %d\n", error); ==== //depot/projects/uart/vm/swap_pager.c#4 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.210 2003/07/22 20:54:26 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.211 2003/07/26 07:32:23 phk Exp $"); #include "opt_mac.h" #include "opt_swap.h" @@ -2493,7 +2493,7 @@ error = mac_check_system_swapon(td->td_ucred, vp); if (error == 0) #endif - error = VOP_OPEN(vp, FREAD | FWRITE, td->td_ucred, td); + error = VOP_OPEN(vp, FREAD | FWRITE, td->td_ucred, td, -1); (void) VOP_UNLOCK(vp, 0, td); if (error) return (error); From owner-p4-projects@FreeBSD.ORG Sat Jul 26 10:26:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 479BE37B401; Sat, 26 Jul 2003 10:26: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 DB5A437B404 for ; Sat, 26 Jul 2003 10:26:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDDDF43F85 for ; Sat, 26 Jul 2003 10:26:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6QHQF0U058582 for ; Sat, 26 Jul 2003 10:26:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6QHQDGi058579 for perforce@freebsd.org; Sat, 26 Jul 2003 10:26:13 -0700 (PDT) Date: Sat, 26 Jul 2003 10:26:13 -0700 (PDT) Message-Id: <200307261726.h6QHQDGi058579@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 35045 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, 26 Jul 2003 17:26:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=35045 Change 35045 by rwatson@rwatson_tislabs on 2003/07/26 10:25:28 Integrate the TrustedBSD base branch a bit further -- various fixes for gcc 3.3, threading fixes, etc, etc. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#19 integrate .. //depot/projects/trustedbsd/base/Makefile#25 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#42 integrate .. //depot/projects/trustedbsd/base/UPDATING#34 integrate .. //depot/projects/trustedbsd/base/bin/ed/Makefile#8 integrate .. //depot/projects/trustedbsd/base/bin/ed/re.c#4 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_types.h#12 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/kiconv.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/rap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/mount_smbfs/mount_smbfs.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tar/src/tar.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/top/commands.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/top/machine.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.c#3 integrate .. //depot/projects/trustedbsd/base/etc/defaults/pccard.conf#17 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#12 integrate .. //depot/projects/trustedbsd/base/games/factor/Makefile#4 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#28 integrate .. //depot/projects/trustedbsd/base/kerberos5/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libasn1/Makefile#7 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libgssapi/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libhdb/Makefile#8 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libkadm5clnt/Makefile#2 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libkadm5srv/Makefile#2 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libkrb5/Makefile#6 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libroken/Makefile#5 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libsl/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libvers/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/hprop/Makefile#5 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/hpropd/Makefile#7 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-master/Makefile#8 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-slave/Makefile#8 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/kadmind/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/kdc/Makefile#8 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/kpasswdd/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/kadmin/Makefile#5 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/kdestroy/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/kinit/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/klist/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/kpasswd/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/krb5-config/Makefile#7 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/ksu/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.sbin/kstash/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.sbin/ktutil/Makefile#8 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#21 integrate .. //depot/projects/trustedbsd/base/lib/libatm/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libatm/ioctl_subr.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libatm/ip_addr.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libatm/ip_checksum.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpgetmask.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpgetprec.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpgetround.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpgetsticky.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpsetmask.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpsetprec.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpsetround.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/fpsetsticky.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/makecontext.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/signalcontext.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gen/getpwent.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/raise.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/time.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/time.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/_setjmp.S#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/ip6opt.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_to_text.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/connect.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_kqueue.c#1 branch .. //depot/projects/trustedbsd/base/lib/libfetch/Makefile#14 integrate .. //depot/projects/trustedbsd/base/lib/libgeom/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libncp/ncpl_conn.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libncp/ncpl_subr.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_radius/pam_radius.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/Makefile#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/context.S#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/enter_uts.S#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/include/atomic_ops.h#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/include/ksd.h#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/include/ksd.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/pthread.map#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/test/sigsuspend_d.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_init.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cancel.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_concurrency.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_create.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_detach.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_find_thread.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_init.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_nanosleep.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#10 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_raise.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_resume_np.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigmask.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigpending.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigsuspend.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigwait.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_yield.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libtelnet/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/alpha/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/arch/alpha/alpha/_curthread.c#1 branch .. //depot/projects/trustedbsd/base/lib/libwrap/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/msun/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/e_acos.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/e_asin.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/e_atan2.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/e_exp.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/e_fmod.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/e_log.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/e_log10.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/e_remainder.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/e_scalb.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/e_sqrt.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/get_hw_float.c#3 delete .. //depot/projects/trustedbsd/base/lib/msun/src/math_private.h#7 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_atan.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_ceil.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_copysign.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_copysignf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_cos.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_finite.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_floor.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_ilogb.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_logb.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_rint.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_scalbn.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_significand.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_sin.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_tan.c#3 integrate .. //depot/projects/trustedbsd/base/libexec/getty/main.c#7 integrate .. //depot/projects/trustedbsd/base/libexec/telnetd/Makefile#5 integrate .. //depot/projects/trustedbsd/base/release/Makefile#46 integrate .. //depot/projects/trustedbsd/base/release/amd64/dokern.sh#2 delete .. //depot/projects/trustedbsd/base/release/amd64/fixit_crunch.conf#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#69 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#25 integrate .. //depot/projects/trustedbsd/base/release/i386/drivers.conf#16 integrate .. //depot/projects/trustedbsd/base/release/i386/mkisoimages.sh#4 integrate .. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#17 integrate .. //depot/projects/trustedbsd/base/sbin/atm/fore_dnld/fore_dnld.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/atm/ilmid/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/atm/ilmid/ilmid.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.cc#7 integrate .. //depot/projects/trustedbsd/base/sbin/devd/token.l#4 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/devfs.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/fsck/fsck.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/fsck/fsck.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#25 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#18 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/ping6/ping6.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/umount/umount.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/umount/umount.c#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#35 integrate .. //depot/projects/trustedbsd/base/share/man/man4/an.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ath.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ath_hal.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/harp.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/npx.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/patm.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/safe.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/sbp.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/wi.4#15 integrate .. //depot/projects/trustedbsd/base/share/man/man4/wlan.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man7/Makefile#11 integrate .. //depot/projects/trustedbsd/base/share/man/man7/release.7#14 integrate .. //depot/projects/trustedbsd/base/share/man/man7/rescue.7#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#31 integrate .. //depot/projects/trustedbsd/base/share/man/man9/zone.9#9 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#26 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#31 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/support.s#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#24 integrate .. //depot/projects/trustedbsd/base/sys/alpha/conf/NOTES#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/alpha_cpu.h#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/ucontext.h#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/amd64-gdbstub.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/atomic.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/autoconf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/critical.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/in_cksum.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/nexus.c#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/sys_machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_genassym.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_misc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/npx.h#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/ithread.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/npx.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#34 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_fbsd.c#6 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_vnops.c#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#18 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#23 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#38 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#62 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.alpha#16 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#32 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#30 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#27 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.pre.mk#19 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#20 integrate .. //depot/projects/trustedbsd/base/sys/conf/newvers.sh#6 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#38 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.i386#18 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.pc98#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_button.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_ec.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_isab.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpivar.h#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/buslogic/bt.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_pccard.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwdma.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci_pci.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohcireg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/if_fwe.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/harp/if_harp.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ie/if_ie.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lnc.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/patm/if_patm_tx.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs.h#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/raidframe/rf_freebsdkintf.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/rp/rp.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/safe/safe.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/safe/safereg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/safe/safevar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/fire/fire_saver.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/logo/logo_saver.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/warp/warp_saver.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pccard.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wivar.h#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vfsops.c#15 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_subr.c#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vfsops.c#15 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_io.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_io.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vfsops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vnops.c#17 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_subr.c#15 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vnops.c#12 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vfsops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/Changelog#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/README#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/control_w.h#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/div_small.s#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/errors.c#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/exception.h#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_arith.c#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_asm.h#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_aux.c#3 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_emu.h#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_entry.c#4 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_etc.c#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_proto.h#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_system.h#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/fpu_trig.c#3 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/get_address.c#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/load_store.c#3 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/math_emu.h#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/poly_2xm1.c#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/poly_atan.c#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/poly_div.s#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/poly_l2.c#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/poly_mul64.s#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/poly_sin.c#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/poly_tan.c#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/polynomial.s#3 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_add_sub.c#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_compare.c#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_constant.c#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_constant.h#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_div.s#3 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_ld_str.c#3 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_mul.c#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_norm.s#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_round.s#3 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_u_add.s#3 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_u_div.s#3 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_u_mul.s#3 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/reg_u_sub.s#3 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/status_w.h#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/version.h#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/wm_shrx.s#2 delete .. //depot/projects/trustedbsd/base/sys/gnu/i386/fpemul/wm_sqrt.s#3 delete .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakeup.c#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#38 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/math_emu.h#2 delete .. //depot/projects/trustedbsd/base/sys/i386/i386/math_emulate.c#7 delete .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#25 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mpapic.c#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#38 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#27 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/imgact_coff.c#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/apic.h#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/asm.h#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/cpufunc.h#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/frame.h#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/npx.c#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/vesa.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i4b/capi/iavc/iavc.h#2 integrate .. //depot/projects/trustedbsd/base/sys/i4b/capi/iavc/iavc_lli.c#6 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/SKI#13 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#37 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/mem.c#8 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#33 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#21 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/_regset.h#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/acpica_machdep.h#2 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/cpu.h#8 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/setjmp.h#5 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vfsops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_main.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#41 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#36 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_umtx.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/md5c.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_autoconf.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#34 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_subr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cluster.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_export.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#45 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/vnode_if.src#17 integrate .. //depot/projects/trustedbsd/base/sys/libkern/scanc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#47 integrate .. //depot/projects/trustedbsd/base/sys/modules/fpu/Makefile#3 delete .. //depot/projects/trustedbsd/base/sys/modules/gnufpu/Makefile#3 delete .. //depot/projects/trustedbsd/base/sys/modules/harp/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/safe/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/net/if.c#21 integrate .. //depot/projects/trustedbsd/base/sys/net/if_atm.h#8 integrate .. //depot/projects/trustedbsd/base/sys/net/if_media.h#10 integrate .. //depot/projects/trustedbsd/base/sys/net/route.h#7 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_cm.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_device.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_if.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_if.h#8 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_ioctl.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_proto.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_socket.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_subr.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_var.h#11 integrate .. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_if.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_input.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_load.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_output.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_usrreq.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_var.h#5 integrate .. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_vcm.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatm/sigpvc/sigpvc_if.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_arp.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_cls.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_if.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_proto.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_var.h#5 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/sscf_uni.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/sscf_uni_lower.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/sscf_uni_var.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/sscop.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/sscop_pdu.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/sscop_var.h#5 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/uniarp.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/uniarp_cache.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/uniarp_input.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/uniarp_vcm.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/uniip.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/uniip_var.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_decode.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_if.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_msg.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_proto.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_subr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_var.h#5 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_vc_state.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#17 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#27 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#24 integrate .. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#17 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_ncp.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_usr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#27 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#6 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/pc98gdc.c#5 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_dc.c#28 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_dcreg.h#14 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_rl.c#25 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#24 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sisreg.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/cache.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/cdefs.h#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/kse.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#44 integrate .. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#27 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#34 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#34 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#35 integrate .. //depot/projects/trustedbsd/base/sys/sys/systm.h#21 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#28 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extattr.c#21 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#21 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.h#10 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#23 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#12 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#28 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#37 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_swap.c#16 delete .. //depot/projects/trustedbsd/base/tools/tools/crypto/Makefile#4 integrate .. //depot/projects/trustedbsd/base/tools/tools/crypto/safestats.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/ada.rc#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/current.rc#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/default.rc#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/dsa.rc#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/dwp.rc#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/releng_4.rc#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/stanley.rc#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.1#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.pl#10 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tinderbox.1#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/index.cgi#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/Makefile#30 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#26 integrate .. //depot/projects/trustedbsd/base/usr.bin/fetch/Makefile#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/find/find.1#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/getconf/getconf.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/sed/TEST/sed.test#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/sed/sed.1#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/telnet/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/top/machine.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/top/top.local.1#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#28 integrate .. //depot/projects/trustedbsd/base/usr.sbin/arp/arp.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/arp/arp.c#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/burncd/burncd.c#15 integrate .. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/exec_elf32.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ctm/ctm_rmail/ctm_rmail.1#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mount_nwfs/mount_nwfs.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardc/enabler.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pppd/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sendmail/Makefile#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/tcpdchk/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/tcpdump/tcpdump/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/traceroute6/traceroute6.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/zzz/zzz.sh#2 integrate Differences ... ==== //depot/projects/trustedbsd/base/MAINTAINERS#19 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.74 2003/07/15 16:52:08 dwmalone Exp $ +$FreeBSD: src/MAINTAINERS,v 1.75 2003/07/19 00:17:36 markm Exp $ subsystem login notes ----------------------------- @@ -13,9 +13,8 @@ NEWCARD imp Pre-commit review requested. OLDCARD imp Pre-commit review requested. wi imp Pre-commit review requested. -telnet markm commits _must_ be made to src/crypto/telnet - first, only then to "base" telnet via "make - unifdef". The "base" commit _must_ be made. +telnet markm please ensure that a security-aware person + sanity-checks your work. secure/* markm please ensure that a security-aware person sanity-checks your work. kerberos5/* markm please ensure that a security-aware person ==== //depot/projects/trustedbsd/base/Makefile#25 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.284 2003/07/04 17:35:26 ru Exp $ +# $FreeBSD: src/Makefile,v 1.286 2003/07/20 12:38:29 ru Exp $ # # The user-driven targets are: # @@ -65,7 +65,7 @@ hierarchy install installcheck installkernel installkernel.debug\ reinstallkernel reinstallkernel.debug installmost installworld \ libraries lint maninstall \ - mk most obj objlink regress rerelease tags update + most obj objlink regress rerelease tags update BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} @@ -141,7 +141,7 @@ # upgrade_checks: @if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \ - PATH=${PATH} ${MAKE} >/dev/null 2>&1); \ + PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ (cd ${.CURDIR} && make make); \ fi ==== //depot/projects/trustedbsd/base/Makefile.inc1#42 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.381 2003/07/14 16:21:16 gordon Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.382 2003/07/24 18:14:29 markm Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -339,7 +339,8 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 4: building libraries" @echo "--------------------------------------------------------------" - cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG libraries + cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG -DNOLINT \ + libraries _depend: @echo @echo "--------------------------------------------------------------" ==== //depot/projects/trustedbsd/base/UPDATING#34 (text+ko) ==== @@ -17,6 +17,18 @@ developers choose to disable these features on build machines to maximize performance. +20030722: + FPU-less support has been removed from FreeBSD. Chances are you won't + notice. 386+387 support should still work after this change, but + it is now a minimum requirement for the i386 port that you have real + FPU hardware. + +20030714: + Some people are having problems with changes related to /rescue. + If you are building -j N, you will need to define NO_RESCUE. Others + will need to define it if /rescue has issues with their environment. + People should report those issues to current@. + 20030711: gcc was upgraded to 3.3. You are advised to not build -DNOCLEAN across this point. Further, it might be a good idea to remove @@ -1314,4 +1326,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.258 2003/07/12 01:16:54 ceri Exp $ +$FreeBSD: src/UPDATING,v 1.259 2003/07/22 11:08:41 imp Exp $ ==== //depot/projects/trustedbsd/base/bin/ed/Makefile#8 (text+ko) ==== @@ -1,14 +1,14 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.26 2003/06/29 10:03:35 ru Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.29 2003/07/24 18:30:24 markm Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DISTRIBUTION=crypto CFLAGS+=-DDES -WARNS= 2 +WARNS?= 2 DPADD= ${LIBCRYPTO} LDADD= -lcrypto .endif ==== //depot/projects/trustedbsd/base/bin/ed/re.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ed/re.c,v 1.19 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/re.c,v 1.20 2003/07/20 10:24:09 ru Exp $"); #include "ed.h" @@ -41,10 +41,10 @@ pattern_t * get_compiled_pattern(void) { - static pattern_t *exp = NULL; + static pattern_t *expr = NULL; static char error[1024]; - char *exps; + char *exprs; char delimiter; int n; @@ -52,27 +52,27 @@ errmsg = "invalid pattern delimiter"; return NULL; } else if (delimiter == '\n' || *++ibufp == '\n' || *ibufp == delimiter) { - if (!exp) + if (!expr) errmsg = "no previous pattern"; - return exp; - } else if ((exps = extract_pattern(delimiter)) == NULL) + return expr; + } else if ((exprs = extract_pattern(delimiter)) == NULL) return NULL; /* buffer alloc'd && not reserved */ - if (exp && !patlock) - regfree(exp); - else if ((exp = (pattern_t *) malloc(sizeof(pattern_t))) == NULL) { + if (expr && !patlock) + regfree(expr); + else if ((expr = (pattern_t *) malloc(sizeof(pattern_t))) == NULL) { fprintf(stderr, "%s\n", strerror(errno)); errmsg = "out of memory"; return NULL; } patlock = 0; - if ((n = regcomp(exp, exps, 0))) { - regerror(n, exp, error, sizeof error); + if ((n = regcomp(expr, exprs, 0))) { + regerror(n, expr, error, sizeof error); errmsg = error; - free(exp); - return exp = NULL; + free(expr); + return expr = NULL; } - return exp; + return expr; } ==== //depot/projects/trustedbsd/base/bin/setfacl/setfacl.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.7 2002/12/30 15:36:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.8 2003/07/18 16:00:26 rwatson Exp $"); #include #include @@ -153,7 +153,7 @@ entry = zmalloc(sizeof(struct sf_entry)); entry->acl = acl_from_text(optarg); if (entry->acl == NULL) - err(1, "acl_from_text() failed"); + err(1, "%s", optarg); entry->op = OP_MERGE_ACL; TAILQ_INSERT_TAIL(&entrylist, entry, next); break; @@ -164,7 +164,7 @@ entry = zmalloc(sizeof(struct sf_entry)); entry->acl = acl_from_text(optarg); if (entry->acl == NULL) - err(1, "acl_from_text() failed"); + err(1, "%s", optarg); entry->op = OP_REMOVE_ACL; TAILQ_INSERT_TAIL(&entrylist, entry, next); break; ==== //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_types.h#12 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_types.h#12 $ + * $P4: //depot/projects/openpam/include/security/pam_types.h#13 $ */ #ifndef _PAM_TYPES_H_INCLUDED @@ -47,22 +47,22 @@ * XSSO 5.1.1 */ struct pam_message { - int msg_style; - const char *msg; + int msg_style; + char *msg; }; struct pam_response { - char *resp; - int resp_retcode; + char *resp; + int resp_retcode; }; /* * XSSO 5.1.2 */ struct pam_conv { - int (*conv)(int, const struct pam_message **, - struct pam_response **, void *); - void *appdata_ptr; + int (*conv)(int, const struct pam_message **, + struct pam_response **, void *); + void *appdata_ptr; }; /* @@ -75,9 +75,9 @@ * Solaris 9 */ typedef struct pam_repository { - char *type; - void *scope; - size_t scope_len; + char *type; + void *scope; + size_t scope_len; } pam_repository_t; #ifdef __cplusplus ==== //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/kiconv.c#3 (text+ko) ==== @@ -30,6 +30,7 @@ * SUCH DAMAGE. * * $Id: kiconv.c,v 1.3 2001/08/22 03:31:36 bp Exp $ + * $FreeBSD: src/contrib/smbfs/lib/smb/kiconv.c,v 1.2 2003/07/26 04:03:18 peter Exp $ */ #include @@ -48,7 +49,7 @@ { struct iconv_add_in din; struct iconv_add_out dout; - int olen; + size_t olen; if (strlen(from) > ICONV_CSNMAXLEN || strlen(to) > ICONV_CSNMAXLEN) return EINVAL; ==== //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/rap.c#2 (text+ko) ==== @@ -30,6 +30,7 @@ * SUCH DAMAGE. * * $Id: rap.c,v 1.8 2001/02/24 15:56:05 bp Exp $ + * $FreeBSD: src/contrib/smbfs/lib/smb/rap.c,v 1.2 2003/07/26 04:02:22 peter Exp $ * * This is very simple implementation of RAP protocol. */ @@ -40,7 +41,7 @@ #include #include #include -#include +#include #include #include ==== //depot/projects/trustedbsd/base/contrib/smbfs/mount_smbfs/mount_smbfs.c#5 (text+ko) ==== @@ -30,6 +30,7 @@ * SUCH DAMAGE. * * $Id: mount_smbfs.c,v 1.17 2002/04/10 04:17:51 bp Exp $ + * $FreeBSD: src/contrib/smbfs/mount_smbfs/mount_smbfs.c,v 1.2 2003/07/20 11:27:54 tjr Exp $ */ #include #include @@ -75,7 +76,7 @@ extern void dropsuid(); extern int loadsmbvfs(); #else - struct vfsconf vfc; + struct xvfsconf vfc; #endif /* APPLE */ char *next; int opt, error, mntflags, caseopt; ==== //depot/projects/trustedbsd/base/contrib/tar/src/tar.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/tar/src/tar.c,v 1.2 2002/06/04 17:31:16 sobomax Exp $ */ +/* $FreeBSD: src/contrib/tar/src/tar.c,v 1.3 2003/07/24 00:04:01 peter Exp $ */ #include "system.h" @@ -549,7 +549,7 @@ /* Allocate a new argument array, and copy program name in it. */ new_argc = argc - 1 + strlen (argv[1]); - new_argv = xmalloc (new_argc * sizeof (char *)); + new_argv = xmalloc ((new_argc + 1) * sizeof (char *)); in = argv; out = new_argv; *out++ = *in++; @@ -577,6 +577,9 @@ while (in < argv + argc) *out++ = *in++; + /* And NULL terminate the argv[] array */ + *out++ = NULL; + /* Replace the old option list by the new one. */ argc = new_argc; ==== //depot/projects/trustedbsd/base/contrib/top/commands.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/commands.c,v 1.5 2002/01/24 17:52:26 dwmalone Exp $ + * $FreeBSD: src/contrib/top/commands.c,v 1.6 2003/07/17 23:56:40 julian Exp $ */ /* @@ -71,6 +71,7 @@ d - change number of displays to show\n\ e - list errors generated by last \"kill\" or \"renice\" command\n\ i - toggle the displaying of idle processes\n\ +H - toggle the displaying of threads\n\ I - same as 'i'\n\ k - kill processes; send a signal to a list of processes\n\ n or # - change number of processes to display\n", stdout); ==== //depot/projects/trustedbsd/base/contrib/top/machine.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.5 2002/01/24 17:58:42 dwmalone Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.6 2003/07/17 23:56:40 julian Exp $ */ /* @@ -59,6 +59,7 @@ int idle; /* show idle processes */ int self; /* show self */ int system; /* show system processes */ + int thread; /* show threads */ int uid; /* only this uid (unless uid == -1) */ char *command; /* only this command (unless == NULL) */ }; ==== //depot/projects/trustedbsd/base/contrib/top/top.c#3 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.9 2002/01/24 17:55:40 dwmalone Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.10 2003/07/17 23:56:40 julian Exp $ */ /* @@ -192,9 +192,9 @@ fd_set readfds; #ifdef ORDER - static char command_chars[] = "\f qh?en#sdkriIuto"; + static char command_chars[] = "\f qh?en#sdkriIutHo"; #else - static char command_chars[] = "\f qh?en#sdkriIut"; + static char command_chars[] = "\f qh?en#sdkriIutH"; #endif /* these defines enumerate the "strchr"s of the commands in command_chars */ #define CMD_redraw 0 @@ -214,8 +214,9 @@ #define CMD_idletog2 13 #define CMD_user 14 #define CMD_selftog 15 +#define CMD_thrtog 16 #ifdef ORDER -#define CMD_order 16 +#define CMD_order 17 #endif /* set the buffer for stdout */ @@ -245,6 +246,7 @@ ps.self = -1; ps.system = No; ps.uid = -1; + ps.thread = No; ps.command = NULL; /* get preset options from the environment */ @@ -270,7 +272,7 @@ optind = 1; } - while ((i = getopt(ac, av, "SIbinquvs:d:U:o:t")) != EOF) + while ((i = getopt(ac, av, "SIHbinquvs:d:U:o:t")) != EOF) { switch(i) { @@ -365,10 +367,14 @@ ps.self = (ps.self == -1) ? getpid() : -1; break; + case 'H': + ps.thread = !ps.thread; + break; + default: fprintf(stderr, "\ Top version %s\n\ -Usage: %s [-ISbinqut] [-d x] [-s x] [-o field] [-U username] [number]\n", +Usage: %s [-HISbinqut] [-d x] [-s x] [-o field] [-U username] [number]\n", version_string(), myname); exit(1); } @@ -955,6 +961,13 @@ } break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jul 26 12:09:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BD3C37B404; Sat, 26 Jul 2003 12:09:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DCC1D37B401 for ; Sat, 26 Jul 2003 12:09:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2706243FB1 for ; Sat, 26 Jul 2003 12:09:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6QJ9M0U069117 for ; Sat, 26 Jul 2003 12:09:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6QJ9MdA069114 for perforce@freebsd.org; Sat, 26 Jul 2003 12:09:22 -0700 (PDT) Date: Sat, 26 Jul 2003 12:09:22 -0700 (PDT) Message-Id: <200307261909.h6QJ9MdA069114@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 35049 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, 26 Jul 2003 19:09:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=35049 Change 35049 by rwatson@rwatson_tislabs on 2003/07/26 12:09:20 Since we're in the throes of moving towards explicit system calls and VOP's for each of the EA operations, and avoiding API overloading, introduce new MAC Framework and MAC Policy APIs to check for delete and list operations. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#239 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#192 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#239 (text+ko) ==== @@ -285,6 +285,8 @@ struct vnode *vp, struct componentname *cnp); int mac_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, acl_type_t type); +int mac_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, + int attrnamespace, const char *name); int mac_check_vnode_exec(struct ucred *cred, struct vnode *vp, struct image_params *imgp); int mac_check_vnode_getacl(struct ucred *cred, struct vnode *vp, @@ -293,6 +295,8 @@ int attrnamespace, const char *name, struct uio *uio); int mac_check_vnode_link(struct ucred *cred, struct vnode *dvp, struct vnode *vp, struct componentname *cnp); +int mac_check_vnode_listextattr(struct ucred *cred, struct vnode *vp, + int attrnamespace); int mac_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct componentname *cnp); int mac_check_vnode_mmap(struct ucred *cred, struct vnode *vp, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#192 (text+ko) ==== @@ -368,6 +368,9 @@ struct componentname *cnp); int (*mpo_check_vnode_deleteacl)(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type); + int (*mpo_check_vnode_deleteextattr)(struct ucred *cred, + struct vnode *vp, struct label *label, int attrnamespace, + const char *name); int (*mpo_check_vnode_exec)(struct ucred *cred, struct vnode *vp, struct label *label, struct image_params *imgp, struct label *execlabel); @@ -379,6 +382,8 @@ int (*mpo_check_vnode_link)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp); + int (*mpo_check_vnode_listextattr)(struct ucred *cred, + struct vnode *vp, struct label *label, int attrnamespace); int (*mpo_check_vnode_lookup)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp); From owner-p4-projects@FreeBSD.ORG Sat Jul 26 12:13:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6B9C37B404; Sat, 26 Jul 2003 12:13: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 73E3137B401 for ; Sat, 26 Jul 2003 12:13:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0D9743FCB for ; Sat, 26 Jul 2003 12:13:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6QJDS0U069336 for ; Sat, 26 Jul 2003 12:13:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6QJDSjL069329 for perforce@freebsd.org; Sat, 26 Jul 2003 12:13:28 -0700 (PDT) Date: Sat, 26 Jul 2003 12:13:28 -0700 (PDT) Message-Id: <200307261913.h6QJDSjL069329@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 35050 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, 26 Jul 2003 19:13:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=35050 Change 35050 by rwatson@rwatson_tislabs on 2003/07/26 12:13:16 Use the mac_check_vnode_deleteextattr and mac_check_vnode_listextattr checks to test for delete and list permission rather than setextattr and getextattr checks. Policy updates to follow. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#392 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#106 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#392 (text+ko) ==== @@ -1663,6 +1663,22 @@ } int +mac_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, + int attrnamespace, const char *name) +{ + int error; + + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_deleteextattr"); + + if (!mac_enforce_fs) + return (0); + + MAC_CHECK(check_vnode_deleteextattr, cred, vp, &vp->v_label, + attrnamespace, name); + return (error); +} + +int mac_check_vnode_exec(struct ucred *cred, struct vnode *vp, struct image_params *imgp) { @@ -1727,6 +1743,22 @@ } int +mac_check_vnode_listextattr(struct ucred *cred, struct vnode *vp, + int attrnamespace) +{ + int error; + + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_listextattr"); + + if (!mac_enforce_fs) + return (0); + + MAC_CHECK(check_vnode_listextattr, cred, vp, &vp->v_label, + attrnamespace); + return (error); +} + +int mac_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct componentname *cnp) { ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#106 (text+ko) ==== @@ -4240,8 +4240,8 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_check_vnode_setextattr(td->td_ucred, vp, attrnamespace, - attrname, NULL); + error = mac_check_vnode_deleteextattr(td->td_ucred, vp, attrnamespace, + attrname); if (error) goto done; #endif @@ -4387,8 +4387,7 @@ sizep = &size; #ifdef MAC - error = mac_check_vnode_getextattr(td->td_ucred, vp, attrnamespace, - "", &auio); + error = mac_check_vnode_listextattr(td->td_ucred, vp, attrnamespace); if (error) goto done; #endif From owner-p4-projects@FreeBSD.ORG Sat Jul 26 12:16:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DA1237B404; Sat, 26 Jul 2003 12:16: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 EE84537B401 for ; Sat, 26 Jul 2003 12:16:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43F8943FAF for ; Sat, 26 Jul 2003 12:16: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.6/8.12.6) with ESMTP id h6QJGX0U069505 for ; Sat, 26 Jul 2003 12:16:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6QJGWKZ069502 for perforce@freebsd.org; Sat, 26 Jul 2003 12:16:32 -0700 (PDT) Date: Sat, 26 Jul 2003 12:16:32 -0700 (PDT) Message-Id: <200307261916.h6QJGWKZ069502@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 35051 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, 26 Jul 2003 19:16:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=35051 Change 35051 by rwatson@rwatson_tislabs on 2003/07/26 12:16:10 For now, don't inline the _unbusy primitive, because it causes this version of the kern_mac.c implementation to break on gcc 3.3 due to inline failures. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#393 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#393 (text+ko) ==== @@ -330,7 +330,7 @@ return (ret); } -static __inline void +static void mac_policy_list_unbusy(void) { mtx_lock(&mac_policy_mtx); From owner-p4-projects@FreeBSD.ORG Sat Jul 26 12:41:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA41D37B401; Sat, 26 Jul 2003 12:41: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 7565E37B404 for ; Sat, 26 Jul 2003 12:41:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7214A43FBD for ; Sat, 26 Jul 2003 12:41:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6QJf40U070431 for ; Sat, 26 Jul 2003 12:41:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6QJf3QV070428 for perforce@freebsd.org; Sat, 26 Jul 2003 12:41:03 -0700 (PDT) Date: Sat, 26 Jul 2003 12:41:03 -0700 (PDT) Message-Id: <200307261941.h6QJf3QV070428@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 35053 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, 26 Jul 2003 19:41:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=35053 Change 35053 by rwatson@rwatson_tislabs on 2003/07/26 12:40:56 Update Biba, BSD Extended, MLS, None, and Test policies for new extended attribute checks (delete, list). For now, leave out LOMAC and SEBSD. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#216 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#72 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#174 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#124 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#108 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#216 (text+ko) ==== @@ -2158,6 +2158,24 @@ } static int +mac_biba_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, + struct label *label, int attrnamespace, const char *name) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_biba_check_vnode_exec(struct ucred *cred, struct vnode *vp, struct label *label, struct image_params *imgp, struct label *execlabel) @@ -2250,6 +2268,24 @@ } static int +mac_biba_check_vnode_listextattr(struct ucred *cred, struct vnode *vp, + struct label *label, int attrnamespace) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int mac_biba_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { @@ -2770,10 +2806,12 @@ .mpo_check_vnode_create = mac_biba_check_vnode_create, .mpo_check_vnode_delete = mac_biba_check_vnode_delete, .mpo_check_vnode_deleteacl = mac_biba_check_vnode_deleteacl, + .mpo_check_vnode_deleteextattr = mac_biba_check_vnode_deleteextattr, .mpo_check_vnode_exec = mac_biba_check_vnode_exec, .mpo_check_vnode_getacl = mac_biba_check_vnode_getacl, .mpo_check_vnode_getextattr = mac_biba_check_vnode_getextattr, .mpo_check_vnode_link = mac_biba_check_vnode_link, + .mpo_check_vnode_listextattr = mac_biba_check_vnode_listextattr, .mpo_check_vnode_lookup = mac_biba_check_vnode_lookup, .mpo_check_vnode_mmap = mac_biba_check_vnode_mmap, .mpo_check_vnode_mprotect = mac_biba_check_vnode_mmap, ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#72 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson - * Copyright (c) 2001, 2002 Networks Associates Technology, Inc. + * Copyright (c) 2001, 2002, 2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -418,6 +418,22 @@ } static int +mac_bsdextended_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, + struct label *label, int attrnamespace, const char *name) +{ + struct vattr vap; + int error; + + if (!mac_bsdextended_enabled) + return (0); + + error = VOP_GETATTR(vp, &vap, cred, curthread); + if (error) + return (error); + return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VWRITE)); +} + +static int mac_bsdextended_check_vnode_exec(struct ucred *cred, struct vnode *vp, struct label *label, struct image_params *imgp, struct label *execlabel) @@ -495,6 +511,22 @@ } static int +mac_bsdextended_check_vnode_listextattr(struct ucred *cred, struct vnode *vp, + struct label *label, int attrnamespace) +{ + struct vattr vap; + int error; + + if (!mac_bsdextended_enabled) + return (0); + + error = VOP_GETATTR(vp, &vap, cred, curthread); + if (error) + return (error); + return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VREAD)); +} + +static int mac_bsdextended_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { @@ -752,10 +784,12 @@ .mpo_check_vnode_create = mac_bsdextended_check_create_vnode, .mpo_check_vnode_delete = mac_bsdextended_check_vnode_delete, .mpo_check_vnode_deleteacl = mac_bsdextended_check_vnode_deleteacl, + .mpo_check_vnode_deleteextattr = mac_bsdextended_check_vnode_deleteextattr, .mpo_check_vnode_exec = mac_bsdextended_check_vnode_exec, .mpo_check_vnode_getacl = mac_bsdextended_check_vnode_getacl, .mpo_check_vnode_getextattr = mac_bsdextended_check_vnode_getextattr, .mpo_check_vnode_link = mac_bsdextended_check_vnode_link, + .mpo_check_vnode_listextattr = mac_bsdextended_check_vnode_listextattr, .mpo_check_vnode_lookup = mac_bsdextended_check_vnode_lookup, .mpo_check_vnode_open = mac_bsdextended_check_vnode_open, .mpo_check_vnode_readdir = mac_bsdextended_check_vnode_readdir, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#174 (text+ko) ==== @@ -1930,6 +1930,24 @@ } static int +mac_mls_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, + struct label *label, int attrnamespace, const char *name) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int mac_mls_check_vnode_exec(struct ucred *cred, struct vnode *vp, struct label *label, struct image_params *imgp, struct label *execlabel) @@ -2021,6 +2039,25 @@ } static int +mac_mls_check_vnode_listextattr(struct ucred *cred, struct vnode *vp, + struct label *label, int attrnamespace) +{ + + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_mls_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { @@ -2535,10 +2572,12 @@ .mpo_check_vnode_create = mac_mls_check_vnode_create, .mpo_check_vnode_delete = mac_mls_check_vnode_delete, .mpo_check_vnode_deleteacl = mac_mls_check_vnode_deleteacl, + .mpo_check_vnode_deleteextattr = mac_mls_check_vnode_deleteextattr, .mpo_check_vnode_exec = mac_mls_check_vnode_exec, .mpo_check_vnode_getacl = mac_mls_check_vnode_getacl, .mpo_check_vnode_getextattr = mac_mls_check_vnode_getextattr, .mpo_check_vnode_link = mac_mls_check_vnode_link, + .mpo_check_vnode_listextattr = mac_mls_check_vnode_listextattr, .mpo_check_vnode_lookup = mac_mls_check_vnode_lookup, .mpo_check_vnode_mmap = mac_mls_check_vnode_mmap, .mpo_check_vnode_mprotect = mac_mls_check_vnode_mmap, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#124 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson - * Copyright (c) 2001, 2002 Networks Associates Technology, Inc. + * Copyright (c) 2001, 2002, 2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -784,6 +784,14 @@ } static int +mac_none_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, + struct label *label, int attrnamespace, const char *name) +{ + + return (0); +} + +static int mac_none_check_vnode_exec(struct ucred *cred, struct vnode *vp, struct label *label, struct image_params *imgp, struct label *execlabel) @@ -818,6 +826,14 @@ } static int +mac_none_check_vnode_listextattr(struct ucred *cred, struct vnode *vp, + struct label *label, int attrnamespace) +{ + + return (0); +} + +static int mac_none_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { @@ -1104,10 +1120,12 @@ .mpo_check_vnode_create = mac_none_check_vnode_create, .mpo_check_vnode_delete = mac_none_check_vnode_delete, .mpo_check_vnode_deleteacl = mac_none_check_vnode_deleteacl, + .mpo_check_vnode_deleteextattr = mac_none_check_vnode_deleteextattr, .mpo_check_vnode_exec = mac_none_check_vnode_exec, .mpo_check_vnode_getacl = mac_none_check_vnode_getacl, .mpo_check_vnode_getextattr = mac_none_check_vnode_getextattr, .mpo_check_vnode_link = mac_none_check_vnode_link, + .mpo_check_vnode_listextattr = mac_none_check_vnode_listextattr, .mpo_check_vnode_lookup = mac_none_check_vnode_lookup, .mpo_check_vnode_mmap = mac_none_check_vnode_mmap, .mpo_check_vnode_mprotect = mac_none_check_vnode_mprotect, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#108 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson - * Copyright (c) 2001, 2002 Networks Associates Technology, Inc. + * Copyright (c) 2001, 2002, 2003 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -1456,6 +1456,17 @@ } static int +mac_test_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, + struct label *label, int attrnamespace, const char *name) +{ + + ASSERT_CRED_LABEL(&cred->cr_label); + ASSERT_VNODE_LABEL(label); + + return (0); +} + +static int mac_test_check_vnode_exec(struct ucred *cred, struct vnode *vp, struct label *label, struct image_params *imgp, struct label *execlabel) @@ -1506,6 +1517,17 @@ } static int +mac_test_check_vnode_listextattr(struct ucred *cred, struct vnode *vp, + struct label *label, int attrnamespace) +{ + + ASSERT_CRED_LABEL(&cred->cr_label); + ASSERT_VNODE_LABEL(label); + + return (0); +} + +static int mac_test_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { @@ -1869,10 +1891,12 @@ .mpo_check_vnode_create = mac_test_check_vnode_create, .mpo_check_vnode_delete = mac_test_check_vnode_delete, .mpo_check_vnode_deleteacl = mac_test_check_vnode_deleteacl, + .mpo_check_vnode_deleteextattr = mac_test_check_vnode_deleteextattr, .mpo_check_vnode_exec = mac_test_check_vnode_exec, .mpo_check_vnode_getacl = mac_test_check_vnode_getacl, .mpo_check_vnode_getextattr = mac_test_check_vnode_getextattr, .mpo_check_vnode_link = mac_test_check_vnode_link, + .mpo_check_vnode_listextattr = mac_test_check_vnode_listextattr, .mpo_check_vnode_lookup = mac_test_check_vnode_lookup, .mpo_check_vnode_mmap = mac_test_check_vnode_mmap, .mpo_check_vnode_mprotect = mac_test_check_vnode_mprotect, From owner-p4-projects@FreeBSD.ORG Sat Jul 26 13:55:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0632537B404; Sat, 26 Jul 2003 13:55: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 A26D937B401 for ; Sat, 26 Jul 2003 13:55:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3AD043FAF for ; Sat, 26 Jul 2003 13:55:34 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6QKtY0U079309 for ; Sat, 26 Jul 2003 13:55:34 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6QKtYQ6079306 for perforce@freebsd.org; Sat, 26 Jul 2003 13:55:34 -0700 (PDT) Date: Sat, 26 Jul 2003 13:55:34 -0700 (PDT) Message-Id: <200307262055.h6QKtYQ6079306@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 35054 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, 26 Jul 2003 20:55:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=35054 Change 35054 by marcel@marcel_nfs on 2003/07/26 13:55:01 IFC @35052 Affected files ... .. //depot/projects/ia64/etc/rc.d/dhclient#7 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/signalcontext.c#2 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#109 integrate .. //depot/projects/ia64/sbin/devfs/devfs.8#6 integrate .. //depot/projects/ia64/sbin/fsck/fsck.8#7 integrate .. //depot/projects/ia64/sbin/fsck/fsck.c#11 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_button.c#7 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt.c#11 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#15 integrate .. //depot/projects/ia64/sys/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#32 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#32 integrate .. //depot/projects/ia64/sys/ia64/include/cpu.h#17 integrate .. //depot/projects/ia64/sys/netatm/atm_cm.c#16 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.c#14 integrate Differences ... ==== //depot/projects/ia64/etc/rc.d/dhclient#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.6 2003/06/29 05:34:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.8 2003/07/26 18:58:46 mtm Exp $ # # PROVIDE: dhclient @@ -23,7 +23,6 @@ rcvar= start_precmd="dhclient_prestart" start_postcmd="dhclient_poststart" - stop_cmd="dhclient_stop" stop_precmd="dhclient_prestop" stop_postcmd="dhclient_poststop" ;; @@ -73,8 +72,14 @@ done } -dhclient_stop() +dhclient_prestop() { + dhclient_common || return 1 + + for ifn in ${_cooked_list}; do + ipx_down ${ifn} + ifalias_down ${ifn} + done echo -n "Releasing DHCP leases:" for ifn in $_cooked_list ; do ${command} -r $ifn @@ -88,16 +93,6 @@ debug "The following leases failed to release: $_fail" } -dhclient_prestop() -{ - dhclient_common || return 1 - - for ifn in ${_cooked_list}; do - ipx_down ${ifn} - ifalias_down ${ifn} - done -} - dhclient_poststop() { for ifn in ${_cooked_list}; do @@ -107,6 +102,7 @@ if [ -n "$2" ]; then _cmdifn="$2" + stop_cmd=":" fi load_rc_config $name ==== //depot/projects/ia64/lib/libc/amd64/gen/signalcontext.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/signalcontext.c,v 1.1 2003/07/19 04:41:08 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/signalcontext.c,v 1.2 2003/07/26 12:58:28 davidxu Exp $"); #include #include @@ -79,6 +79,7 @@ ucp->uc_link = sig_uc; sigdelset(&ucp->uc_sigmask, sig); + ucp->uc_mcontext.mc_len = sizeof(mcontext_t); ucp->uc_mcontext.mc_rdi = (register_t)ucp; ucp->uc_mcontext.mc_rsi = (register_t)func; ucp->uc_mcontext.mc_rdx = (register_t)args; ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#109 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.596 2003/07/25 14:08:32 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.597 2003/07/26 13:04:40 simon Exp $ 2000 @@ -329,14 +329,6 @@ more functionality and is updated by as part of buildworld/installworld operations. More details can be found in &man.rescue.7;. - - - Due to some cross-build interactions, - /rescue is currently disabled by default - and only included in buildworld/installworld operations if the - RESCUE Makefile variable is set. - - ==== //depot/projects/ia64/sbin/devfs/devfs.8#6 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.6 2003/06/17 09:53:03 sobomax Exp $ +.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.7 2003/07/26 12:41:44 simon Exp $ .\" .Dd July 1, 2002 .Dt DEVFS 8 @@ -43,7 +43,9 @@ .Xr devfs 5 mounts. .Pp -The first keyword after the program name determines the context for +The +.Ar keyword +argument determines the context for the rest of the arguments. For example, most of the commands related to the rule subsystem must be preceded by the @@ -339,10 +341,10 @@ but ruleset 10 may already have rules with non-conflicting numbers (these will be preserved). .Sh SEE ALSO +.Xr chmod 1 , .Xr jail 2 , .Xr glob 3 , .Xr devfs 5 , -.Xr chmod 1 , .Xr chown 8 , .Xr jail 8 , .Xr mknod 8 ==== //depot/projects/ia64/sbin/fsck/fsck.8#7 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: fsck.8,v 1.19 1999/03/10 00:08:33 erh Exp $ -.\" $FreeBSD: src/sbin/fsck/fsck.8,v 1.32 2002/12/27 12:15:32 schweikh Exp $ +.\" $FreeBSD: src/sbin/fsck/fsck.8,v 1.33 2003/07/26 12:57:56 simon Exp $ .\" .\" Copyright (c) 1996 Christos Zoulas. All rights reserved. .\" @@ -36,9 +36,8 @@ .Nd file system consistency check and interactive repair .Sh SYNOPSIS .Nm -.Op Fl dvplfyn +.Op Fl dvpfyn .Op Fl B | F -.Op Fl l Ar maxparallel .Op Fl t Ar fstype .Op Fl T Ar fstype : Ns Ar fsoptions .Op Ar special | node ... ==== //depot/projects/ia64/sbin/fsck/fsck.c#11 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/fsck/fsck.c,v 1.15 2003/06/29 17:53:48 gordon Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck/fsck.c,v 1.16 2003/07/26 15:29:10 maxim Exp $"); #include #include @@ -567,7 +567,7 @@ usage(void) { static const char common[] = - "[-BFdpvlyn] [-T fstype:fsoptions] [-t fstype]"; + "[-BFdfnpvy] [-T fstype:fsoptions] [-t fstype]"; (void)fprintf(stderr, "usage: %s %s [special|node]...\n", getprogname(), common); ==== //depot/projects/ia64/sys/dev/acpica/acpi_button.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.11 2002/07/22 12:52:54 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.12 2003/07/26 09:54:17 takawata Exp $ */ #include "opt_acpi.h" @@ -64,6 +64,7 @@ DEVMETHOD(device_probe, acpi_button_probe), DEVMETHOD(device_attach, acpi_button_attach), DEVMETHOD(device_suspend, acpi_button_suspend), + DEVMETHOD(device_shutdown, acpi_button_suspend), DEVMETHOD(device_resume, acpi_button_resume), {0, 0} ==== //depot/projects/ia64/sys/dev/buslogic/bt.c#11 (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/dev/buslogic/bt.c,v 1.40 2003/07/01 15:51:54 scottl Exp $ + * $FreeBSD: src/sys/dev/buslogic/bt.c,v 1.41 2003/07/26 11:53:40 bde Exp $ */ /* @@ -961,9 +961,9 @@ if ((i >= BT_NUM_ISAPORTS) || (ioport != bt_isa_ports[i].addr)) { printf( -"bt_isa_probe: Invalid baseport of 0x%x specified.\n" -"bt_isa_probe: Nearest valid baseport is 0x%x.\n" -"bt_isa_probe: Failing probe.\n", +"bt_find_probe_range: Invalid baseport of 0x%x specified.\n" +"bt_find_probe_range: Nearest valid baseport is 0x%x.\n" +"bt_find_probe_range: Failing probe.\n", ioport, (i < BT_NUM_ISAPORTS) ? bt_isa_ports[i].addr ==== //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#15 (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/ed/if_ed_pccard.c,v 1.49 2003/07/19 05:36:09 imp Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.50 2003/07/26 17:52:09 imp Exp $ */ #include "opt_ed.h" @@ -173,6 +173,7 @@ { PCMCIA_CARD(SOCKET, EA_ETHER, 0), 0}, { PCMCIA_CARD(SOCKET, LP_ETHER, 0), 0}, { PCMCIA_CARD(SOCKET, LP_ETHER_CF, 0), 0}, + { PCMCIA_CARD(SOCKET, LP_ETH_10_100_CF, 0), 0}, { PCMCIA_CARD(SVEC, COMBOCARD, 0), 0}, { PCMCIA_CARD(SVEC, LANCARD, 0), 0}, { PCMCIA_CARD(SYNERGY21, S21810, 0), 0}, ==== //depot/projects/ia64/sys/dev/patm/if_patm_rx.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * Driver for IDT77252 based cards like ProSum's. */ #include -__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_rx.c,v 1.1 2003/07/15 11:57:23 harti Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_rx.c,v 1.2 2003/07/26 14:57:26 harti Exp $"); #include "opt_inet.h" #include "opt_natm.h" @@ -84,12 +84,6 @@ { patm_sram_write(sc, sc->mmap->rct + cid * IDT_RCT_ENTRY_SIZE + w, val); } -static __inline void -rct_init(struct patm_softc *sc, u_int cid, u_int w1) -{ - patm_sram_write4(sc, sc->mmap->rct + cid * IDT_RCT_ENTRY_SIZE, - w1, 0, 0, 0xffffffff); -} static __inline u_int rct_read(struct patm_softc *sc, u_int cid, u_int w) { @@ -130,7 +124,8 @@ } if (vcc->cid != 0) - rct_init(sc, vcc->cid, w1); + patm_sram_write4(sc, sc->mmap->rct + vcc->cid * + IDT_RCT_ENTRY_SIZE, w1, 0, 0, 0xffffffff); else { /* switch the interface into promiscuous mode */ patm_nor_write(sc, IDT_NOR_CFG, patm_nor_read(sc, IDT_NOR_CFG) | ==== //depot/projects/ia64/sys/dev/pccard/pccarddevs#32 (text+ko) ==== @@ -1,5 +1,5 @@ -$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.60 2003/07/19 05:49:17 imp Exp $ -/* $NetBSD: pcmciadevs,v 1.182 2003/04/09 02:09:55 christos Exp $ */ +$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.61 2003/07/26 17:45:45 imp Exp $ +/* $NetBSD: pcmciadevs,v 1.184 2003/07/26 10:39:32 martin Exp $ */ /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ /*- @@ -49,6 +49,7 @@ vendor NEWMEDIA 0x0057 New Media Corporation vendor INTEL 0x0089 Intel vendor IBM 0x00a4 IBM Corporation +vendor SHARP 0x00b0 Sharp Corporation vendor 3COM 0x0101 3Com Corporation vendor MEGAHERTZ 0x0102 Megahertz Corporation vendor SOCKET 0x0104 Socket Communications @@ -376,6 +377,9 @@ /* Sandisk Products */ product SANDISK SDCFB 0x0401 Sandisk CompactFlash Card +/* Sharp Products */ +product SHARP PALDIO611S 0x0000 PALDIO 611S PC CARD + /* Siemens */ product SIEMENS SS1021 0x0002 Siemens SpeedStream 1021 @@ -395,6 +399,7 @@ product SOCKET DUAL_RS232 0x0006 Socket Communications Dual RS232 product SOCKET LP_ETHER 0x000d Socket Communications LP-E product SOCKET LP_ETHER_CF 0x0075 Socket Communications LP-E CF +product SOCKET LP_ETH_10_100_CF 0x0145 Socket Communications 10/100 Ethernet /* Symbol */ product SYMBOL LA4100 0x0001 Symbol Spectrum24 LA4100 Series WLAN ==== //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#32 (text+ko) ==== @@ -1,12 +1,12 @@ -/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.60 2003/07/19 05:51:10 imp Exp $ */ +/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.61 2003/07/26 17:46:43 imp Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.60 2003/07/19 05:49:17 imp Exp + * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.61 2003/07/26 17:45:45 imp Exp */ -/* $NetBSD: pcmciadevs,v 1.182 2003/04/09 02:09:55 christos Exp $ */ +/* $NetBSD: pcmciadevs,v 1.184 2003/07/26 10:39:32 martin Exp $ */ /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ /*- @@ -56,6 +56,7 @@ #define PCMCIA_VENDOR_NEWMEDIA 0x0057 /* New Media Corporation */ #define PCMCIA_VENDOR_INTEL 0x0089 /* Intel */ #define PCMCIA_VENDOR_IBM 0x00a4 /* IBM Corporation */ +#define PCMCIA_VENDOR_SHARP 0x00b0 /* Sharp Corporation */ #define PCMCIA_VENDOR_3COM 0x0101 /* 3Com Corporation */ #define PCMCIA_VENDOR_MEGAHERTZ 0x0102 /* Megahertz Corporation */ #define PCMCIA_VENDOR_SOCKET 0x0104 /* Socket Communications */ @@ -649,6 +650,11 @@ #define PCMCIA_PRODUCT_SANDISK_SDCFB 0x0401 #define PCMCIA_STR_SANDISK_SDCFB "Sandisk CompactFlash Card" +/* Sharp Products */ +#define PCMCIA_CIS_SHARP_PALDIO611S { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_SHARP_PALDIO611S 0x0000 +#define PCMCIA_STR_SHARP_PALDIO611S "PALDIO 611S PC CARD" + /* Siemens */ #define PCMCIA_CIS_SIEMENS_SS1021 { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_SIEMENS_SS1021 0x0002 @@ -690,6 +696,9 @@ #define PCMCIA_CIS_SOCKET_LP_ETHER_CF { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_SOCKET_LP_ETHER_CF 0x0075 #define PCMCIA_STR_SOCKET_LP_ETHER_CF "Socket Communications LP-E CF" +#define PCMCIA_CIS_SOCKET_LP_ETH_10_100_CF { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_SOCKET_LP_ETH_10_100_CF 0x0145 +#define PCMCIA_STR_SOCKET_LP_ETH_10_100_CF "Socket Communications 10/100 Ethernet" /* Symbol */ #define PCMCIA_CIS_SYMBOL_LA4100 { NULL, NULL, NULL, NULL } ==== //depot/projects/ia64/sys/ia64/include/cpu.h#17 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/include/cpu.h,v 1.33 2003/06/06 23:27:18 marcel Exp $ */ +/* $FreeBSD: src/sys/ia64/include/cpu.h,v 1.34 2003/07/26 10:13:30 marcel Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /* @@ -114,7 +114,6 @@ int ia64_highfp_load(struct thread *); int ia64_highfp_save(struct thread *); void ia64_init(void); -int ia64_pa_access(u_long); void init_prom_interface(struct rpb*); void interrupt(u_int64_t, struct trapframe *); void machine_check(unsigned long, struct trapframe *, unsigned long, ==== //depot/projects/ia64/sys/netatm/atm_cm.c#16 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netatm/atm_cm.c,v 1.30 2003/07/25 06:43:41 harti Exp $"); +__FBSDID("$FreeBSD: src/sys/netatm/atm_cm.c,v 1.31 2003/07/26 14:20:37 harti Exp $"); #include #include @@ -2779,8 +2779,7 @@ * We have to allocate another buffer and tack it * onto the front of the packet */ - KB_ALLOCPKT(n, llcp->v.llc_len, KB_F_NOWAIT, - KB_T_HEADER); + MGETHDR(n, KB_F_NOWAIT, KB_T_HEADER); if (n == 0) { err = ENOMEM; goto done; ==== //depot/projects/ia64/usr.sbin/burncd/burncd.c#14 (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/usr.sbin/burncd/burncd.c,v 1.36 2003/05/04 10:09:57 sos Exp $ + * $FreeBSD: src/usr.sbin/burncd/burncd.c,v 1.37 2003/07/26 12:14:58 pb Exp $ */ #include @@ -611,8 +611,10 @@ size = 0; while ((count = read(track_info->file, buf, - MIN((track_info->file_size - size), - track_info->block_size * BLOCKS))) > 0) { + track_info->file_size == -1 + ? track_info->block_size * BLOCKS + : MIN((track_info->file_size - size), + track_info->block_size * BLOCKS))) > 0) { int res; if (count % track_info->block_size) { @@ -641,7 +643,8 @@ fprintf(stderr, " total %jd KB\r", (intmax_t)tot_size / 1024); } - if (size >= track_info->file_size) + if (track_info->file_size != -1 + && size >= track_info->file_size) break; } From owner-p4-projects@FreeBSD.ORG Sat Jul 26 13:56:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FE9B37B404; Sat, 26 Jul 2003 13:56: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 00A5237B401 for ; Sat, 26 Jul 2003 13:56:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DCF843F93 for ; Sat, 26 Jul 2003 13:56:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6QKub0U079630 for ; Sat, 26 Jul 2003 13:56:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6QKuahZ079627 for perforce@freebsd.org; Sat, 26 Jul 2003 13:56:36 -0700 (PDT) Date: Sat, 26 Jul 2003 13:56:36 -0700 (PDT) Message-Id: <200307262056.h6QKuahZ079627@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 35056 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, 26 Jul 2003 20:56:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=35056 Change 35056 by marcel@marcel_nfs on 2003/07/26 13:56:19 IFC @35052 Affected files ... .. //depot/projects/uart/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/uart/dev/buslogic/bt.c#3 integrate .. //depot/projects/uart/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/uart/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/uart/dev/pccard/pccarddevs#5 integrate .. //depot/projects/uart/dev/pccard/pccarddevs.h#5 integrate .. //depot/projects/uart/ia64/include/cpu.h#2 integrate .. //depot/projects/uart/netatm/atm_cm.c#4 integrate Differences ... ==== //depot/projects/uart/dev/acpica/acpi_button.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.11 2002/07/22 12:52:54 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.12 2003/07/26 09:54:17 takawata Exp $ */ #include "opt_acpi.h" @@ -64,6 +64,7 @@ DEVMETHOD(device_probe, acpi_button_probe), DEVMETHOD(device_attach, acpi_button_attach), DEVMETHOD(device_suspend, acpi_button_suspend), + DEVMETHOD(device_shutdown, acpi_button_suspend), DEVMETHOD(device_resume, acpi_button_resume), {0, 0} ==== //depot/projects/uart/dev/buslogic/bt.c#3 (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/dev/buslogic/bt.c,v 1.40 2003/07/01 15:51:54 scottl Exp $ + * $FreeBSD: src/sys/dev/buslogic/bt.c,v 1.41 2003/07/26 11:53:40 bde Exp $ */ /* @@ -961,9 +961,9 @@ if ((i >= BT_NUM_ISAPORTS) || (ioport != bt_isa_ports[i].addr)) { printf( -"bt_isa_probe: Invalid baseport of 0x%x specified.\n" -"bt_isa_probe: Nearest valid baseport is 0x%x.\n" -"bt_isa_probe: Failing probe.\n", +"bt_find_probe_range: Invalid baseport of 0x%x specified.\n" +"bt_find_probe_range: Nearest valid baseport is 0x%x.\n" +"bt_find_probe_range: Failing probe.\n", ioport, (i < BT_NUM_ISAPORTS) ? bt_isa_ports[i].addr ==== //depot/projects/uart/dev/ed/if_ed_pccard.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/ed/if_ed_pccard.c,v 1.49 2003/07/19 05:36:09 imp Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.50 2003/07/26 17:52:09 imp Exp $ */ #include "opt_ed.h" @@ -173,6 +173,7 @@ { PCMCIA_CARD(SOCKET, EA_ETHER, 0), 0}, { PCMCIA_CARD(SOCKET, LP_ETHER, 0), 0}, { PCMCIA_CARD(SOCKET, LP_ETHER_CF, 0), 0}, + { PCMCIA_CARD(SOCKET, LP_ETH_10_100_CF, 0), 0}, { PCMCIA_CARD(SVEC, COMBOCARD, 0), 0}, { PCMCIA_CARD(SVEC, LANCARD, 0), 0}, { PCMCIA_CARD(SYNERGY21, S21810, 0), 0}, ==== //depot/projects/uart/dev/patm/if_patm_rx.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * Driver for IDT77252 based cards like ProSum's. */ #include -__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_rx.c,v 1.1 2003/07/15 11:57:23 harti Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/patm/if_patm_rx.c,v 1.2 2003/07/26 14:57:26 harti Exp $"); #include "opt_inet.h" #include "opt_natm.h" @@ -84,12 +84,6 @@ { patm_sram_write(sc, sc->mmap->rct + cid * IDT_RCT_ENTRY_SIZE + w, val); } -static __inline void -rct_init(struct patm_softc *sc, u_int cid, u_int w1) -{ - patm_sram_write4(sc, sc->mmap->rct + cid * IDT_RCT_ENTRY_SIZE, - w1, 0, 0, 0xffffffff); -} static __inline u_int rct_read(struct patm_softc *sc, u_int cid, u_int w) { @@ -130,7 +124,8 @@ } if (vcc->cid != 0) - rct_init(sc, vcc->cid, w1); + patm_sram_write4(sc, sc->mmap->rct + vcc->cid * + IDT_RCT_ENTRY_SIZE, w1, 0, 0, 0xffffffff); else { /* switch the interface into promiscuous mode */ patm_nor_write(sc, IDT_NOR_CFG, patm_nor_read(sc, IDT_NOR_CFG) | ==== //depot/projects/uart/dev/pccard/pccarddevs#5 (text+ko) ==== @@ -1,5 +1,5 @@ -$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.60 2003/07/19 05:49:17 imp Exp $ -/* $NetBSD: pcmciadevs,v 1.182 2003/04/09 02:09:55 christos Exp $ */ +$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.61 2003/07/26 17:45:45 imp Exp $ +/* $NetBSD: pcmciadevs,v 1.184 2003/07/26 10:39:32 martin Exp $ */ /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ /*- @@ -49,6 +49,7 @@ vendor NEWMEDIA 0x0057 New Media Corporation vendor INTEL 0x0089 Intel vendor IBM 0x00a4 IBM Corporation +vendor SHARP 0x00b0 Sharp Corporation vendor 3COM 0x0101 3Com Corporation vendor MEGAHERTZ 0x0102 Megahertz Corporation vendor SOCKET 0x0104 Socket Communications @@ -376,6 +377,9 @@ /* Sandisk Products */ product SANDISK SDCFB 0x0401 Sandisk CompactFlash Card +/* Sharp Products */ +product SHARP PALDIO611S 0x0000 PALDIO 611S PC CARD + /* Siemens */ product SIEMENS SS1021 0x0002 Siemens SpeedStream 1021 @@ -395,6 +399,7 @@ product SOCKET DUAL_RS232 0x0006 Socket Communications Dual RS232 product SOCKET LP_ETHER 0x000d Socket Communications LP-E product SOCKET LP_ETHER_CF 0x0075 Socket Communications LP-E CF +product SOCKET LP_ETH_10_100_CF 0x0145 Socket Communications 10/100 Ethernet /* Symbol */ product SYMBOL LA4100 0x0001 Symbol Spectrum24 LA4100 Series WLAN ==== //depot/projects/uart/dev/pccard/pccarddevs.h#5 (text+ko) ==== @@ -1,12 +1,12 @@ -/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.60 2003/07/19 05:51:10 imp Exp $ */ +/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.61 2003/07/26 17:46:43 imp Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.60 2003/07/19 05:49:17 imp Exp + * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.61 2003/07/26 17:45:45 imp Exp */ -/* $NetBSD: pcmciadevs,v 1.182 2003/04/09 02:09:55 christos Exp $ */ +/* $NetBSD: pcmciadevs,v 1.184 2003/07/26 10:39:32 martin Exp $ */ /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ /*- @@ -56,6 +56,7 @@ #define PCMCIA_VENDOR_NEWMEDIA 0x0057 /* New Media Corporation */ #define PCMCIA_VENDOR_INTEL 0x0089 /* Intel */ #define PCMCIA_VENDOR_IBM 0x00a4 /* IBM Corporation */ +#define PCMCIA_VENDOR_SHARP 0x00b0 /* Sharp Corporation */ #define PCMCIA_VENDOR_3COM 0x0101 /* 3Com Corporation */ #define PCMCIA_VENDOR_MEGAHERTZ 0x0102 /* Megahertz Corporation */ #define PCMCIA_VENDOR_SOCKET 0x0104 /* Socket Communications */ @@ -649,6 +650,11 @@ #define PCMCIA_PRODUCT_SANDISK_SDCFB 0x0401 #define PCMCIA_STR_SANDISK_SDCFB "Sandisk CompactFlash Card" +/* Sharp Products */ +#define PCMCIA_CIS_SHARP_PALDIO611S { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_SHARP_PALDIO611S 0x0000 +#define PCMCIA_STR_SHARP_PALDIO611S "PALDIO 611S PC CARD" + /* Siemens */ #define PCMCIA_CIS_SIEMENS_SS1021 { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_SIEMENS_SS1021 0x0002 @@ -690,6 +696,9 @@ #define PCMCIA_CIS_SOCKET_LP_ETHER_CF { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_SOCKET_LP_ETHER_CF 0x0075 #define PCMCIA_STR_SOCKET_LP_ETHER_CF "Socket Communications LP-E CF" +#define PCMCIA_CIS_SOCKET_LP_ETH_10_100_CF { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_SOCKET_LP_ETH_10_100_CF 0x0145 +#define PCMCIA_STR_SOCKET_LP_ETH_10_100_CF "Socket Communications 10/100 Ethernet" /* Symbol */ #define PCMCIA_CIS_SYMBOL_LA4100 { NULL, NULL, NULL, NULL } ==== //depot/projects/uart/ia64/include/cpu.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/include/cpu.h,v 1.33 2003/06/06 23:27:18 marcel Exp $ */ +/* $FreeBSD: src/sys/ia64/include/cpu.h,v 1.34 2003/07/26 10:13:30 marcel Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /* @@ -114,7 +114,6 @@ int ia64_highfp_load(struct thread *); int ia64_highfp_save(struct thread *); void ia64_init(void); -int ia64_pa_access(u_long); void init_prom_interface(struct rpb*); void interrupt(u_int64_t, struct trapframe *); void machine_check(unsigned long, struct trapframe *, unsigned long, ==== //depot/projects/uart/netatm/atm_cm.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netatm/atm_cm.c,v 1.30 2003/07/25 06:43:41 harti Exp $"); +__FBSDID("$FreeBSD: src/sys/netatm/atm_cm.c,v 1.31 2003/07/26 14:20:37 harti Exp $"); #include #include @@ -2779,8 +2779,7 @@ * We have to allocate another buffer and tack it * onto the front of the packet */ - KB_ALLOCPKT(n, llcp->v.llc_len, KB_F_NOWAIT, - KB_T_HEADER); + MGETHDR(n, KB_F_NOWAIT, KB_T_HEADER); if (n == 0) { err = ENOMEM; goto done; From owner-p4-projects@FreeBSD.ORG Sat Jul 26 14:10:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8465437B404; Sat, 26 Jul 2003 14: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 3CEA937B401 for ; Sat, 26 Jul 2003 14:10:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E480243F75 for ; Sat, 26 Jul 2003 14:10:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6QLAh0U081845 for ; Sat, 26 Jul 2003 14:10:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6QL9rYV081116 for perforce@freebsd.org; Sat, 26 Jul 2003 14:09:53 -0700 (PDT) Date: Sat, 26 Jul 2003 14:09:53 -0700 (PDT) Message-Id: <200307262109.h6QL9rYV081116@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 35057 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, 26 Jul 2003 21:10:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=35057 Change 35057 by rwatson@rwatson_tislabs on 2003/07/26 14:09:22 Integrate the TrustedBSD MAC branch. Boatloads and boatloads of changes, including gcc upgrade, lots of ATM fixes Kerberos5 becomes default-enabled, and more. Any nits in the integration will be fixed over the next day or so. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#18 integrate .. //depot/projects/trustedbsd/mac/Makefile#22 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#40 integrate .. //depot/projects/trustedbsd/mac/UPDATING#29 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.c#13 integrate .. //depot/projects/trustedbsd/mac/bin/csh/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/bin/ed/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/bin/ed/re.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#19 integrate .. //depot/projects/trustedbsd/mac/bin/pwd/pwd.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/rmail/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/setfacl.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/alias.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/cd.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/exec.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/exec.h#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/expand.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/sh/input.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/jobs.c#14 integrate .. //depot/projects/trustedbsd/mac/bin/sh/memalloc.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/nodes.c.pat#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/output.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/parser.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/sh/redir.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/var.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cpio/copypass.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/main.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog.0#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog.2#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog.4#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog.5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog.6#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog.7#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/FSFChangeLog.10#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/FSFChangeLog.11#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/LANGUAGES#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/Makefile.in#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ONEWS#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/README.Portability#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/aclocal.m4#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/alias.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ansidecl.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/attribs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/basic-block.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/bb-reorder.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/bitmap.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/bitmap.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/builtin-attrs.def#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/builtin-types.def#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/builtins.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/builtins.def#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-aux-info.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-common.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-common.def#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-common.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-config-lang.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/c-convert.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-decl.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-dump.c#3 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/c-errors.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-format.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-lang.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-lex.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-objc-common.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-opts.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/c-parse.in#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-pragma.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-pragma.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-pretty-print.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/c-pretty-print.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/c-semantics.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-tree.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-typeck.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/caller-save.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/calls.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfg.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfganal.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfgbuild.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfgcleanup.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfglayout.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfglayout.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfgloop.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfgrtl.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/collect2.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/collect2.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/combine.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config.gcc#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config.in#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/alpha-interix.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/alpha-protos.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/alpha.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/alpha.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/alpha.md#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/elf.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/ev4.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/ev5.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/ev6.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/freebsd.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/gnu.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/linux-elf.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/linux.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/netbsd.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/openbsd.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/osf.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/osf5.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/t-crtfm#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/unicosmk.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/vms-cc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/vms-crt0-64.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/vms-crt0.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/vms-ld.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/vms-psxcrt0-64.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/vms-psxcrt0.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/vms.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/vxworks.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/README-interworking#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/aof.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/aout.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/arm-modes.def#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/arm-protos.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/arm.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/arm.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/arm.md#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/coff.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/conix-elf.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/crti.asm#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/crtn.asm#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/elf.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/freebsd.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/linux-elf.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/linux-gas.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/netbsd-elf.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/netbsd.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/pe.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/pe.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/rtems-elf.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/semi.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/semiaof.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/t-arm-elf#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/t-pe#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/unknown-elf-oabi.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/unknown-elf.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/vxarm.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/xscale-coff.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/xscale-elf.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/darwin-c.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/darwin-crt2.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/darwin-protos.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/darwin.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/darwin.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/dbx.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/dbxcoff.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/dbxelf.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/elfos.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/fp-bit.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/fp-bit.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/freebsd-spec.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/freebsd.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/cmovd.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/cmovh.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/cmovw.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/frv-abi.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/frv-asm.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/frv-modes.def#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/frv-protos.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/frv.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/frv.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/frv.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/frvbegin.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/frvend.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/lib1funcs.asm#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/modi.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/t-frv#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/uitod.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/uitof.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/ulltod.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/ulltof.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/frv/umodi.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/gnu.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/gofast.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/athlon.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/att.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/beos-elf.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/biarch64.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/bsd.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/crtdll.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/cygwin.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/darwin.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/djgpp.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd-aout.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#14 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h.fixed#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd64.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/gas.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/gnu.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/gstabs.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/gthr-win32.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386-aout.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386-coff.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386-interix.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386-interix3.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386-modes.def#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386-protos.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.md#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386elf.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/k6.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/linux-aout.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/linux.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/linux64.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/lynx-ng.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/lynx.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/mach.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/mingw32.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/mmintrin.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/moss.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/netbsd-elf.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/netbsd.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/netbsd64.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/openbsd.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/pentium.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/ppro.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/ptx4-i.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/rtemself.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sco5.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sol2.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/svr3dbx.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/svr3gas.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sysv3.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sysv4-cpp.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sysv4.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sysv5.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-cygwin#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-interix#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-linux64#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-mingw32#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-sco5gas#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/unix.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/uwin.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/vsta.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/vxi386.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/win32.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/winnt.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x86-64.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-vsta.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xmmintrin.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/aix.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/crtbegin.asm#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/crtend.asm#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/elf.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/freebsd.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/hpux.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/hpux_longdouble.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/ia64-c.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/ia64-modes.def#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/ia64-protos.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/ia64.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/ia64.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/ia64.md#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/linux.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/quadlib.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/sysv4.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/t-aix#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/t-hpux#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/t-ia64#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/unwind-ia64.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/interix.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/libgloss.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/linux-aout.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/linux.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/lynx-ng.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/lynx.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/netbsd-aout.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/netbsd-elf.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/netbsd.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/openbsd-oldgas.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/openbsd.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/psos.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ptx4.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/aix.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/aix31.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/aix41.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/aix43.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/aix51.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/aix52.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/altivec.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/altivec.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/beos.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/darwin-tramp.asm#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/darwin.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/eabi.asm#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/eabi.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/eabiaix.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/eabisim.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/eabispe.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/freebsd.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/gnu.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/linux.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/linux64.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/lynx.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/mach.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/netbsd.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/ppc-asm.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/ppc64-fp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000-c.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000-modes.def#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.md#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rtems.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/spe.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/spe.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/sysv4.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/sysv4le.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-aix43#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-aix52#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-darwin#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-linux64#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-netbsd#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-ppccomm#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-ppcendian#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-rs6000-c-rule#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/vxppc.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/windiss.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/xcoff.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/s390/fixdfdi.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/s390/libgcc-glibc.ver#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/s390/linux.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/s390/s390-modes.def#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/s390/s390-protos.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/s390/s390.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/s390/s390.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/s390/s390.md#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/s390/t-crtstuff#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/s390/t-linux64#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sol2.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/aout.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/cypress.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/freebsd.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/gmon-sol2.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/hypersparc.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/lb1spc.asm#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/lb1spl.asm#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/linux-aout.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/linux.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/linux64.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/litecoff.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/liteelf.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/lynx.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/netbsd-elf.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/netbsd.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/openbsd.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/pbd.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sol2-bi.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sol2.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sol26-sld.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sp64-elf.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sp86x-elf.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc-modes.def#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc-protos.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc.md#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparclet.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sunos4.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/supersparc.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sysv4.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/ultra1_2.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/ultra3.md#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/vxsim.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/vxsparc64.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/svr3.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/svr4.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-darwin#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-libc-ok#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-linux#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-linux-gnulibc1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-netbsd#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/configure#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/configure.in#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/conflict.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/convert.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp-demangle.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/ChangeLog#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/ChangeLog.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/ChangeLog.2#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/Make-lang.in#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/NEWS#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/call.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cfns.gperf#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/class.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/config-lang.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cp-lang.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cp-tree.def#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cp-tree.h#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cvt.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/decl.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/decl.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/decl2.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/dump.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/error.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/except.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/expr.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/friend.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/g++spec.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/init.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/lang-options.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/lang-specs.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/lex.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/lex.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/mangle.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/method.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/operators.def#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/optimize.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/parse.y#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/pt.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/ptree.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/repo.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/rtti.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/search.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/semantics.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/spew.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/tree.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/typeck.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/typeck2.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cplus-dem.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppdefault.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpperror.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppexp.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppfiles.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpphash.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpphash.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppinit.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpplex.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpplib.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpplib.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppmacro.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppmain.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppspec.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpptrad.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/crtstuff.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cse.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cselib.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cselib.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dbxout.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/debug.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/debug.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/defaults.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/demangle.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/df.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/df.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/diagnostic.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/diagnostic.def#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/diagnostic.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/bugreport.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/c-tree.texi#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/collect2.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/compat.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/contrib.texi#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/cpp.texi#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/cppenv.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/cppopts.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/extend.texi#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/frontends.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/gcc.texi#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/gccint.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/gcov.texi#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/gty.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/headerdirs.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/include/fdl.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/include/gcc-common.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/include/gpl.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/include/texinfo.tex#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/interface.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/invoke.texi#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/makefile.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/md.texi#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/objc.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/passes.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/rtl.texi#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/service.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/sourcebuild.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/standards.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/tm.texi#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/trouble.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doloop.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dominance.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doschk.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dummy-conditions.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/dwarf2.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dwarf2asm.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dwarf2asm.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dwarf2out.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dwarf2out.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dwarfout.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/emit-rtl.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/errors.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/et-forest.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/et-forest.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/except.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/except.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/explow.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/expmed.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/expr.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/expr.h#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/ChangeLog#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/ChangeLog.0#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/Make-lang.in#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/bad.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/bit.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/bld.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/bugs.texi#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/com.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/com.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/config-lang.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/data.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/expr.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/ffe.texi#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/g77.texi#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/g77spec.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/intdoc.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/intdoc.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/invoke.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/lang-specs.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/lex.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/news.texi#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/parse.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/root.texi#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/stc.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/std.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/ste.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/target.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/target.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/top.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/where.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/where.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/fibheap.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/fibheap.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/final.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/fix-header.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/fixproto#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/flags.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/flow.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/fold-const.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/function.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/function.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gbl-ctors.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcc.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcc.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcc.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gccbug.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gccspec.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcov-io.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcov.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcse.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gdbinit.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/genattr.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/genattrtab.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/genattrtab.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/genautomata.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/gencodes.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/genconditions.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/genconfig.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/genemit.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/genflags.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gengenrtl.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gengtype-lex.l#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/gengtype-yacc.y#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/gengtype.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/gengtype.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/genopinit.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/genpreds.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/genrecog.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gensupport.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gensupport.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/getopt.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/getopt.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/getruntime.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/ggc-common.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ggc-none.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ggc-page.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ggc-simple.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ggc.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/float.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/stdarg.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/varargs.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/glimits.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/global.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/graph.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/graph.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gthr-dce.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gthr-posix.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gthr-rtems.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gthr-single.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gthr-solaris.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gthr-vxworks.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gthr-win32.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gthr.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/haifa-sched.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/hard-reg-set.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/hashtab.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/hashtab.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/hashtable.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/hashtable.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/hex.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/hooks.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/hooks.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/hwint.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ifcvt.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/input.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/insn-addr.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/integrate.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/integrate.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/jump.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/langhooks-def.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/langhooks.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/langhooks.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/lbasename.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/lcm.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/libfuncs.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/libgcc-std.ver#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/libgcc2.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/libgcc2.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/libiberty.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/line-map.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/lists.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/local-alloc.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/location.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/longlong.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/loop.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/loop.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/machmode.def#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/machmode.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/mbchar.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/md5.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/mkconfig.sh#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/mkheaders.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/mklibgcc.in#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/mkmap-symver.awk#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/objc/Make-lang.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/objc/config-lang.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/objc/lang-specs.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/objc/objc-act.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/objc/objc-act.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/objc/objc-lang.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/optabs.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/optabs.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/output.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/params.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/params.def#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/params.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/partition.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/physmem.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/predict.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/predict.def#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/predict.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/prefix.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/pretty-print.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/print-rtl.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/print-tree.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/profile.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/profile.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/protoize.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ra-build.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/ra-colorize.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/ra-debug.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/ra-rewrite.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/ra.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/ra.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/read-rtl.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/real.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/real.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/recog.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/recog.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/reg-stack.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/regclass.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/regmove.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/regrename.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/regs.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/reload.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/reload.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/reload1.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/reorg.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/resource.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/rtl-error.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/rtl.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/rtl.def#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/rtl.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/rtlanal.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sbitmap.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sbitmap.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/scan-decls.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/scan.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sched-deps.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sched-ebb.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sched-int.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sched-rgn.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sched-vis.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sdbout.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sibcall.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/simplify-rtx.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/splay-tree.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/splay-tree.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ssa-ccp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ssa-dce.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ssa.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ssa.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/stab.def#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/stmt.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/stor-layout.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/stringpool.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/system.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/target-def.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/target.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/timevar.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/timevar.def#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/timevar.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tlink.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/toplev.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/toplev.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tracer.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/tree-dump.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree-dump.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree-inline.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree-inline.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree.def#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tsystem.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unroll.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-c.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-dw2-fde-darwin.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-dw2-fde-glibc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-dw2-fde.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-dw2-fde.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-dw2.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-pe.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-sjlj.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind.inc#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/varasm.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/varray.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/varray.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/version.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/version.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/vmsdbg.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/vmsdbgout.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/xcoffout.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/xcoffout.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/xmemdup.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-common#11 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc.tmac#7 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_mdoc.man#10 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/tty-char.tmac#5 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/cf/freebsd.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/ChangeLog#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/Makefile.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/aclocal.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/configure#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/configure.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/f2cext.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/g2c.hin#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/F77_aloc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/Version.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/abort_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/c_abs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/c_cos.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/c_div.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/c_exp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/c_log.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/c_sin.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/c_sqrt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/cabs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/configure#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/configure.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_abs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_acos.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_asin.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_atan.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_atn2.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_cnjg.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_cos.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_cosh.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_dim.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_exp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_imag.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_int.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_lg10.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_log.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_mod.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_nint.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_prod.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_sign.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_sin.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_sinh.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_sqrt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_tan.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/d_tanh.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/derf_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/derfc_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/dtime_.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/ef1asc_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/ef1cmc_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/erf_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/erfc_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/etime_.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/exit_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/f2ch.add#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/getarg_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/getenv_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/h_abs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/h_dim.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/h_dnnt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/h_indx.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/h_len.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/h_mod.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/h_nint.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/h_sign.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/hl_ge.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/hl_gt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/hl_le.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/hl_lt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/i_abs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/i_dim.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/i_dnnt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/i_indx.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/i_len.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/i_mod.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/i_nint.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/i_sign.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/iargc_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/l_ge.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/l_gt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/l_le.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/l_lt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/lbitbits.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/lbitshft.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/main.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/pow_ci.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/pow_dd.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/pow_di.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/pow_hh.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/pow_ii.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/pow_qq.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/pow_ri.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/pow_zi.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/pow_zz.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/qbitbits.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/qbitshft.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_abs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_acos.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_asin.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_atan.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_atn2.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_cnjg.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_cos.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_cosh.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_dim.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_exp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_imag.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_int.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_lg10.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_log.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_mod.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_nint.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_sign.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_sin.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_sinh.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_sqrt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_tan.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/r_tanh.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/s_cat.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/s_cmp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/s_copy.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/s_paus.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/s_rnge.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/s_stop.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/setarg.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/setsig.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/sig_die.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/signal1.h0#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/signal_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/system_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/z_abs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/z_cos.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/z_div.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/z_exp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/z_log.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/z_sin.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/z_sqrt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/Version.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/backspace.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/close.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/configure#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/configure.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/dfe.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/dolio.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/due.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/endfile.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/err.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/f2ch.add#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/fio.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/fmt.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/fmt.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/fmtlib.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/fp.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/ftell_.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/iio.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/ilnw.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/inquire.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/lio.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/lread.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/lwrite.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/open.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/rdfmt.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/rewind.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/rsfe.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/rsli.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/rsne.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/sfe.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/sue.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/typesize.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/uio.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/util.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/wref.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/wrtfmt.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/wsfe.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/wsle.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/wsne.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/xwsne.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/Version.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/access_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/alarm_.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/bes.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/chdir_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/chmod_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/config.hin#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/configure#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/configure.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/ctime_.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/date_.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/datetime_.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/dbes.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/dtime_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/etime_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/fdate_.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/fgetc_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/flush1_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/fnum_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/fputc_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/fstat_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/gerror_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/getcwd_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/getgid_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/getlog_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/getpid_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/getuid_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/gmtime_.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/hostnm_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/idate_.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/ierrno_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/irand_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/isatty_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/itime_.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/kill_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/link_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/lnblnk_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/lstat_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/ltime_.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/mclock_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/perror_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/rand_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/rename_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/secnds_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/second_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/sleep_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/srand_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/stat_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/symlnk_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/sys_clock_.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/time_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/ttynam_.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/umask_.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jul 26 14:45:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4C6037B404; Sat, 26 Jul 2003 14:45:27 -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 775A137B401 for ; Sat, 26 Jul 2003 14:45:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2127B43F75 for ; Sat, 26 Jul 2003 14:45:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6QLjQ0U005369 for ; Sat, 26 Jul 2003 14:45:26 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6QLjQoq005366 for perforce@freebsd.org; Sat, 26 Jul 2003 14:45:26 -0700 (PDT) Date: Sat, 26 Jul 2003 14:45:26 -0700 (PDT) Message-Id: <200307262145.h6QLjQoq005366@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 35059 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, 26 Jul 2003 21:45:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=35059 Change 35059 by marcel@marcel_nfs on 2003/07/26 14:45:15 Add defines for modem and line signals. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus.h#9 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus.h#9 (text+ko) ==== @@ -50,6 +50,17 @@ #define UART_STAT_OVERRUN 0x0400 #define UART_STAT_PARERR 0x0800 +/* Modem and line signals */ +#define UART_SIG_DTR 0x0001 +#define UART_SIG_RTS 0x0002 +#define UART_SIG_DCR 0x0100 +#define UART_SIG_CTS 0x0200 +#define UART_SIG_DCD 0x0400 +#define UART_SIG_RI 0x0800 + +#define UART_SIGMASK_DTE 0x00FF +#define UART_SIGMASK_DCE 0xFF00 + /* * UART class & instance (=softc) */ From owner-p4-projects@FreeBSD.ORG Sat Jul 26 18:16:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77FAB37B404; Sat, 26 Jul 2003 18:16: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 F19A937B401 for ; Sat, 26 Jul 2003 18:16:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8355F43F85 for ; Sat, 26 Jul 2003 18:16:45 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6R1Gj0U038851 for ; Sat, 26 Jul 2003 18:16:45 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6R1GiWv038848 for perforce@freebsd.org; Sat, 26 Jul 2003 18:16:44 -0700 (PDT) Date: Sat, 26 Jul 2003 18:16:44 -0700 (PDT) Message-Id: <200307270116.h6R1GiWv038848@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 35065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jul 2003 01:16:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=35065 Change 35065 by marcel@marcel_nfs on 2003/07/26 18:16:27 o Keep uart_core.c clean. Move utility functions to uart_subr.c. That way we don't clutter the bi picture. o Add UART_SETSIG() to the hardware interface. Affected files ... .. //depot/projects/uart/conf/files#12 edit .. //depot/projects/uart/dev/uart/uart_core.c#9 edit .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#9 edit .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#6 edit .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#2 edit .. //depot/projects/uart/dev/uart/uart_if.m#5 edit .. //depot/projects/uart/dev/uart/uart_subr.c#1 add Differences ... ==== //depot/projects/uart/conf/files#12 (text+ko) ==== @@ -781,9 +781,6 @@ dev/tx/if_tx.c optional tx dev/txp/if_txp.c optional txp dev/uart/uart_if.m optional uart -dev/uart/uart_dev_ns8250.c optional uart -dev/uart/uart_dev_sab82532.c optional uart -dev/uart/uart_dev_z8530.c optional uart dev/uart/uart_bus_acpi.c optional uart acpi dev/uart/uart_bus_ebus.c optional uart ebus dev/uart/uart_bus_isa.c optional uart isa @@ -792,6 +789,10 @@ dev/uart/uart_bus_puc.c optional uart puc dev/uart/uart_cons.c optional uart dev/uart/uart_core.c optional uart +dev/uart/uart_dev_ns8250.c optional uart +dev/uart/uart_dev_sab82532.c optional uart +dev/uart/uart_dev_z8530.c optional uart +dev/uart/uart_subr.c optional uart dev/ubsec/ubsec.c optional ubsec # # USB support ==== //depot/projects/uart/dev/uart/uart_core.c#9 (text+ko) ==== @@ -71,19 +71,6 @@ .d_kqfilter = ttykqfilter, }; -void -uart_debug(struct uart_softc *sc, const char *fmt, ...) -{ -#if defined(UART_DEBUG) || 1 - va_list ap; - va_start(ap, fmt); - if (sc != NULL) - device_print_prettyname(sc->sc_dev); - vprintf(fmt, ap); - va_end(ap); -#endif -} - static void uart_tty_oproc(struct tty *tp) { @@ -522,6 +509,8 @@ tp->t_ispeed = tp->t_ospeed = uart_console.baudrate; } else tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + + UART_SETSIG(sc, UART_SIG_DTR|UART_SIG_RTS); } error = (*linesw[tp->t_line].l_open)(dev, tp); ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#9 (text+ko) ==== @@ -328,6 +328,7 @@ static int ns8250_bus_ipend(struct uart_softc *); static int ns8250_bus_probe(struct uart_softc *); static int ns8250_bus_receive(struct uart_softc *); +static int ns8250_bus_setsig(struct uart_softc *, int); static int ns8250_bus_transmit(struct uart_softc *); static kobj_method_t ns8250_methods[] = { @@ -338,6 +339,7 @@ KOBJMETHOD(uart_ipend, ns8250_bus_ipend), KOBJMETHOD(uart_probe, ns8250_bus_probe), KOBJMETHOD(uart_receive, ns8250_bus_receive), + KOBJMETHOD(uart_setsig, ns8250_bus_setsig), KOBJMETHOD(uart_transmit, ns8250_bus_transmit), { 0, 0 } }; @@ -581,6 +583,13 @@ } static int +ns8250_bus_setsig(struct uart_softc *sc, int sig) +{ + + return (0); +} + +static int ns8250_bus_transmit(struct uart_softc *sc) { struct uart_bas *bas; ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#6 (text+ko) ==== @@ -122,17 +122,19 @@ static int sab82532_bus_ipend(struct uart_softc *); static int sab82532_bus_probe(struct uart_softc *); static int sab82532_bus_receive(struct uart_softc *); +static int sab82532_bus_setsig(struct uart_softc *, int); static int sab82532_bus_transmit(struct uart_softc *); static kobj_method_t sab82532_methods[] = { KOBJMETHOD(uart_attach, sab82532_bus_attach), KOBJMETHOD(uart_detach, sab82532_bus_detach), KOBJMETHOD(uart_flush, sab82532_bus_flush), - KOBJMETHOD(uart_getsig, sab82532_bus_getsig), - KOBJMETHOD(uart_ipend, sab82532_bus_ipend), + KOBJMETHOD(uart_getsig, sab82532_bus_getsig), + KOBJMETHOD(uart_ipend, sab82532_bus_ipend), KOBJMETHOD(uart_probe, sab82532_bus_probe), - KOBJMETHOD(uart_receive, sab82532_bus_receive), - KOBJMETHOD(uart_transmit, sab82532_bus_transmit), + KOBJMETHOD(uart_receive, sab82532_bus_receive), + KOBJMETHOD(uart_setsig, sab82532_bus_setsig), + KOBJMETHOD(uart_transmit, sab82532_bus_transmit), { 0, 0 } }; @@ -229,6 +231,13 @@ } static int +sab82532_bus_setsig(struct uart_softc *sc, int sig) +{ + + return (0); +} + +static int sab82532_bus_transmit(struct uart_softc *sc) { ==== //depot/projects/uart/dev/uart/uart_dev_z8530.c#2 (text+ko) ==== @@ -110,6 +110,7 @@ static int z8530_bus_ipend(struct uart_softc *); static int z8530_bus_probe(struct uart_softc *); static int z8530_bus_receive(struct uart_softc *); +static int z8530_bus_setsig(struct uart_softc *, int); static int z8530_bus_transmit(struct uart_softc *); static kobj_method_t z8530_methods[] = { @@ -120,6 +121,7 @@ KOBJMETHOD(uart_ipend, z8530_bus_ipend), KOBJMETHOD(uart_probe, z8530_bus_probe), KOBJMETHOD(uart_receive, z8530_bus_receive), + KOBJMETHOD(uart_setsig, z8530_bus_setsig), KOBJMETHOD(uart_transmit, z8530_bus_transmit), { 0, 0 } }; @@ -182,6 +184,13 @@ } static int +z8530_bus_setsig(struct uart_softc *sc, int sig) +{ + + return (0); +} + +static int z8530_bus_transmit(struct uart_softc *sc) { ==== //depot/projects/uart/dev/uart/uart_if.m#5 (text+ko) ==== @@ -85,6 +85,13 @@ struct uart_softc *this; }; +# setsig() - set line and modem signals. +# XXX needs explanation. +METHOD int setsig { + struct uart_softc *this; + int sig; +}; + # transmit() - move data from the transmit buffer to the transmit FIFO. # XXX needs explanation. METHOD int transmit { From owner-p4-projects@FreeBSD.ORG Sat Jul 26 20:12:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F8CE37B404; Sat, 26 Jul 2003 20:12: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 CB5F637B401 for ; Sat, 26 Jul 2003 20:12:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 594E943F93 for ; Sat, 26 Jul 2003 20:12:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6R3C70U044562 for ; Sat, 26 Jul 2003 20:12:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6R3C6Br044559 for perforce@freebsd.org; Sat, 26 Jul 2003 20:12:06 -0700 (PDT) Date: Sat, 26 Jul 2003 20:12:06 -0700 (PDT) Message-Id: <200307270312.h6R3C6Br044559@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 35068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jul 2003 03:12:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=35068 Change 35068 by marcel@marcel_nfs on 2003/07/26 20:11:07 o Add delta bit to the signals. o Add a description for getsig & setsig. o Implement getsig and setsig properly for ns8250. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus.h#10 edit .. //depot/projects/uart/dev/uart/uart_core.c#10 edit .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#10 edit .. //depot/projects/uart/dev/uart/uart_if.m#6 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus.h#10 (text+ko) ==== @@ -50,16 +50,24 @@ #define UART_STAT_OVERRUN 0x0400 #define UART_STAT_PARERR 0x0800 -/* Modem and line signals */ +/* Modem and line signals. */ #define UART_SIG_DTR 0x0001 #define UART_SIG_RTS 0x0002 -#define UART_SIG_DCR 0x0100 -#define UART_SIG_CTS 0x0200 -#define UART_SIG_DCD 0x0400 -#define UART_SIG_RI 0x0800 +#define UART_SIG_DSR 0x0004 +#define UART_SIG_CTS 0x0008 +#define UART_SIG_DCD 0x0010 +#define UART_SIG_RI 0x0020 +#define UART_SIG_DDTR 0x0100 +#define UART_SIG_DRTS 0x0200 +#define UART_SIG_DDSR 0x0400 +#define UART_SIG_DCTS 0x0800 +#define UART_SIG_DDCD 0x1000 +#define UART_SIG_DRI 0x2000 -#define UART_SIGMASK_DTE 0x00FF -#define UART_SIGMASK_DCE 0xFF00 +#define UART_SIGMASK_DTE 0x0003 +#define UART_SIGMASK_DCE 0x003c +#define UART_SIGMASK_STATE 0x003f +#define UART_SIGMASK_DELTA 0x3f00 /* * UART class & instance (=softc) ==== //depot/projects/uart/dev/uart/uart_core.c#10 (text+ko) ==== @@ -510,7 +510,8 @@ } else tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; - UART_SETSIG(sc, UART_SIG_DTR|UART_SIG_RTS); + UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DRTS | + UART_SIG_DTR | UART_SIG_RTS); } error = (*linesw[tp->t_line].l_open)(dev, tp); ==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#10 (text+ko) ==== @@ -317,8 +317,7 @@ uint8_t fcr; uint8_t lcr; uint8_t mcr; - uint8_t signals; - uint8_t sigchg; + int signals; }; static int ns8250_bus_attach(struct uart_softc *); @@ -352,6 +351,13 @@ .uc_rclk = 1843200 }; +#define SIGCHG(c, i, s, d) \ + if (c) { \ + i |= (i & s) ? s : s | d; \ + } else { \ + i = (i & s) ? (i & ~s) | d : i; \ + } + static int ns8250_bus_attach(struct uart_softc *sc) { @@ -367,8 +373,11 @@ uart_setreg(bas, REG_IER, IER_ERXRDY | IER_ETXRDY | IER_ERLS | IER_EMSC); uart_barrier(bas); - ns8250->signals = uart_getreg(bas, REG_MSR) >> 4; - ns8250->sigchg = 0; + if (ns8250->mcr & MCR_DTR) + ns8250->signals |= UART_SIG_DTR; + if (ns8250->mcr & MCR_RTS) + ns8250->signals |= UART_SIG_RTS; + ns8250_bus_getsig(sc); return (0); } @@ -394,14 +403,17 @@ ns8250_bus_getsig(struct uart_softc *sc) { struct ns8250_softc *ns8250 = (struct ns8250_softc*)sc; - struct uart_bas *bas; - uint8_t sig; + uint8_t msr; + int sig; - bas = &sc->sc_bas; - sig = uart_getreg(bas, REG_MSR) >> 4; - ns8250->sigchg |= ns8250->signals ^ sig; - ns8250->signals = sig; - return ((ns8250->sigchg << 4) | ns8250->signals); + msr = uart_getreg(&sc->sc_bas, REG_MSR); + sig = ns8250->signals; + SIGCHG(msr & MSR_DSR, sig, UART_SIG_DSR, UART_SIG_DDSR); + SIGCHG(msr & MSR_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); + SIGCHG(msr & MSR_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD); + SIGCHG(msr & MSR_RI, sig, UART_SIG_RI, UART_SIG_DRI); + ns8250->signals = sig & ~UART_SIGMASK_DELTA; + return (sig); } static int @@ -409,8 +421,8 @@ { struct ns8250_softc *ns8250 = (struct ns8250_softc*)sc; struct uart_bas *bas; - int ipend; - uint8_t lsr, sig; + int ipend, sig; + uint8_t lsr; bas = &sc->sc_bas; ipend = 0; @@ -423,11 +435,11 @@ ipend |= UART_IPEND_RXREADY; if (lsr & LSR_TEMT) ipend |= UART_IPEND_TXIDLE; - sig = uart_getreg(bas, REG_MSR) >> 4; - ns8250->sigchg |= ns8250->signals ^ sig; - ns8250->signals = sig; - if (ns8250->sigchg) + sig = ns8250_bus_getsig(sc); + if (sig & UART_SIGMASK_DELTA) { + ns8250->signals = sig; /* restore delta bits. */ ipend |= UART_IPEND_SIGCHG; + } return (ipend); } @@ -567,7 +579,6 @@ uint8_t lsr; bas = &sc->sc_bas; - while (!uart_rx_full(sc)) { lsr = uart_getreg(bas, REG_LSR); if ((lsr & LSR_RXRDY) == 0) @@ -585,7 +596,23 @@ static int ns8250_bus_setsig(struct uart_softc *sc, int sig) { + struct ns8250_softc *ns8250 = (struct ns8250_softc*)sc; + if (sig & UART_SIG_DDTR) { + SIGCHG(sig & UART_SIG_DTR, ns8250->signals, UART_SIG_DTR, + UART_SIG_DDTR); + } + if (sig & UART_SIG_DRTS) { + SIGCHG(sig & UART_SIG_DTR, ns8250->signals, UART_SIG_DTR, + UART_SIG_DDTR); + } + ns8250->mcr &= ~(MCR_DTR|MCR_RTS); + if (ns8250->signals & UART_SIG_DTR) + ns8250->mcr |= MCR_DTR; + if (ns8250->signals & UART_SIG_RTS) + ns8250->mcr |= MCR_RTS; + uart_setreg(&sc->sc_bas, REG_MCR, ns8250->mcr); + uart_barrier(&sc->sc_bas); return (0); } @@ -596,7 +623,6 @@ int xc; bas = &sc->sc_bas; - while (!uart_tx_empty(sc)) { if ((uart_getreg(bas, REG_LSR) & LSR_THRE) == 0) break; ==== //depot/projects/uart/dev/uart/uart_if.m#6 (text+ko) ==== @@ -54,7 +54,12 @@ }; # getsig() - get line and modem signals. -# XXX needs explanation. +# This method retrieves the DTE and DCE signals and their corresponding +# delta bits. The delta bits include those corresponding to DTE signals +# when they were changed by a call to setsig. The delta bits maintained +# by the hardware driver are cleared as a side-effect. A second call to +# this function will have not have any delta bits set, unless there was +# a change in the signals in the mean time. METHOD int getsig { struct uart_softc *this; }; @@ -86,7 +91,10 @@ }; # setsig() - set line and modem signals. -# XXX needs explanation. +# This method allows changing DTE signals. The DTE delta bits indicate which +# signals are to be changed and the DTE bits themselves indicate whether to +# set or clear the signals. A subsequent call to getsig will return with the +# DTE delta bits set of those DTE signals that did change by this method. METHOD int setsig { struct uart_softc *this; int sig;