From owner-p4-projects@FreeBSD.ORG Sun Jan 2 05:26:07 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E11C116A4D0; Sun, 2 Jan 2005 05:26:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E73716A4CE for ; Sun, 2 Jan 2005 05:26:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D6E943D2D for ; Sun, 2 Jan 2005 05:26:06 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j025Q63P085562 for ; Sun, 2 Jan 2005 05:26:06 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j025Q55D085559 for perforce@freebsd.org; Sun, 2 Jan 2005 05:26:05 GMT (envelope-from sam@freebsd.org) Date: Sun, 2 Jan 2005 05:26:05 GMT Message-Id: <200501020526.j025Q55D085559@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 68118 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jan 2005 05:26:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=68118 Change 68118 by sam@sam_ebb on 2005/01/02 05:25:04 make softled support flash the led based on tx/rx traffic Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#53 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#21 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#53 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.65 2004/12/31 20:35:05 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.66 2004/12/31 22:41:45 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -93,6 +93,11 @@ ((((u_int8_t *)(p))[0] ) | (((u_int8_t *)(p))[1] << 8) | \ (((u_int8_t *)(p))[2] << 16) | (((u_int8_t *)(p))[3] << 24))) +enum { + ATH_LED_TX, + ATH_LED_RX, +}; + static void ath_init(void *); static void ath_stop_locked(struct ifnet *); static void ath_stop(struct ifnet *); @@ -157,7 +162,7 @@ struct ieee80211_node *, int); static int ath_getchannels(struct ath_softc *, u_int cc, HAL_BOOL outdoor, HAL_BOOL xchanmode); -static void ath_update_led(struct ath_softc *); +static void ath_led_event(struct ath_softc *, int); static void ath_update_txpow(struct ath_softc *); static int ath_rate_setup(struct ath_softc *, u_int mode); @@ -215,6 +220,7 @@ ATH_DEBUG_KEYCACHE = 0x00020000, /* key cache management */ ATH_DEBUG_STATE = 0x00040000, /* 802.11 state transitions */ ATH_DEBUG_NODE = 0x00080000, /* node management */ + ATH_DEBUG_LED = 0x00100000, /* led management */ ATH_DEBUG_FATAL = 0x80000000, /* fatal errors */ ATH_DEBUG_ANY = 0xffffffff }; @@ -441,6 +447,7 @@ } sc->sc_ledstate = 1; + callout_init(&sc->sc_ledtimer, CALLOUT_MPSAFE); /* * Auto-enable soft led processing for IBM cards and for * 5211 minipci cards. Users can also manually enable/disable @@ -448,8 +455,9 @@ */ sc->sc_softled = (devid == AR5212_DEVID_IBM || devid == AR5211_DEVID); if (sc->sc_softled) { + sc->sc_ledon = 0; /* low true */ ath_hal_gpioCfgOutput(ah, sc->sc_ledpin); - ath_hal_gpioset(ah, sc->sc_ledpin, 0); + ath_hal_gpioset(ah, sc->sc_ledpin, !sc->sc_ledon); } ifp->if_softc = sc; @@ -933,8 +941,11 @@ ifp->if_flags &= ~IFF_RUNNING; ifp->if_timer = 0; if (!sc->sc_invalid) { - if (sc->sc_softled) - ath_hal_gpioset(ah, sc->sc_ledpin, 1); + if (sc->sc_softled) { + callout_stop(&sc->sc_ledtimer); + ath_hal_gpioset(ah, sc->sc_ledpin, + !sc->sc_ledon); + } ath_hal_intrset(ah, 0); } ath_draintxq(sc); @@ -2606,8 +2617,6 @@ len = ds->ds_rxstat.rs_datalen; m->m_pkthdr.len = m->m_len = len; - if (sc->sc_softled) - ath_update_led(sc); sc->sc_stats.ast_ant_rx[ds->ds_rxstat.rs_antenna]++; if (sc->sc_drvbpf) { @@ -2690,9 +2699,6 @@ ni = ieee80211_find_rxnode(ic, mtod(m, const struct ieee80211_frame_min *)); - /* - * Track rx rssi and do any rx antenna management. - */ an = ATH_NODE(ni); ATH_RSSI_LPF(an->an_avgrssi, ds->ds_rxstat.rs_rssi); if (sc->sc_diversity) { @@ -2715,6 +2721,20 @@ ieee80211_input(ic, m, ni, ds->ds_rxstat.rs_rssi, ds->ds_rxstat.rs_tstamp); + if (sc->sc_softled) { + /* + * Blink for any non-beacon frames. We decide if + * this was a beacon frame by monitoring the stats + * which means we'll blink for things like ACK frames + * when in monitor mode--probably not what we want. + */ + if (sc->sc_beacon == ic->ic_stats.is_rx_beacon) { + sc->sc_rxrate = ds->ds_rxstat.rs_rate; + ath_led_event(sc, ATH_LED_RX); + } else + sc->sc_beacon = ic->ic_stats.is_rx_beacon; + } + /* * Reclaim node reference. */ @@ -3094,6 +3114,7 @@ */ ath_rate_findrate(sc, an, shortPreamble, pktlen, &rix, &try0, &txrate); + sc->sc_txrate = txrate; /* for LED blinking */ /* * Default all non-QoS traffic to the background queue. */ @@ -3339,9 +3360,6 @@ txq->axq_link = &bf->bf_desc[bf->bf_nseg - 1].ds_link; ATH_TXQ_UNLOCK(txq); - if (sc->sc_softled) - ath_update_led(sc); - /* * The CAB queue is started from the SWBA handler since * frames only go out on DTIM and to avoid possible races. @@ -3469,6 +3487,9 @@ ifp->if_flags &= ~IFF_OACTIVE; sc->sc_tx_timer = 0; + if (sc->sc_softled) + ath_led_event(sc, ATH_LED_TX); + ath_start(ifp); } @@ -3494,6 +3515,9 @@ ifp->if_flags &= ~IFF_OACTIVE; sc->sc_tx_timer = 0; + if (sc->sc_softled) + ath_led_event(sc, ATH_LED_TX); + ath_start(ifp); } @@ -3518,6 +3542,9 @@ ifp->if_flags &= ~IFF_OACTIVE; sc->sc_tx_timer = 0; + if (sc->sc_softled) + ath_led_event(sc, ATH_LED_TX); + ath_start(ifp); } @@ -4001,26 +4028,55 @@ } static void -ath_update_led(struct ath_softc *sc) +ath_led_done(void *arg) +{ + struct ath_softc *sc = arg; + + sc->sc_blinking = 0; +} + +/* + * Turn the LED off: flip the pin and then set a timer so no + * update will happen for the specified duration. + */ +static void +ath_led_off(void *arg) +{ + struct ath_softc *sc = arg; + + ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin, !sc->sc_ledon); + callout_reset(&sc->sc_ledtimer, sc->sc_ledoff, ath_led_done, sc); +} + +/* + * Blink the LED according to the specified on/off times. + */ +static void +ath_led_blink(struct ath_softc *sc, int on, int off) +{ + DPRINTF(sc, ATH_DEBUG_LED, "%s: on %u off %u\n", __func__, on, off); + ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin, sc->sc_ledon); + sc->sc_blinking = 1; + sc->sc_ledoff = off; + callout_reset(&sc->sc_ledtimer, on, ath_led_off, sc); +} + +static void +ath_led_event(struct ath_softc *sc, int event) { struct ieee80211com *ic = &sc->sc_ic; - struct ath_hal *ah = sc->sc_ah; - u_int32_t threshold; - /* - * When not associated, flash LED on for 5s, off for 200ms. - * XXX this assumes 100ms beacon interval. - */ - if (ic->ic_state != IEEE80211_S_RUN) { - threshold = 2 + sc->sc_ledstate * 48; - } else { - threshold = 2 + sc->sc_ledstate * 18; - } - if (ic->ic_stats.is_rx_beacon - sc->sc_beacons >= threshold) { - ath_hal_gpioCfgOutput(ah, sc->sc_ledpin); - ath_hal_gpioset(ah, sc->sc_ledpin, sc->sc_ledstate); - sc->sc_ledstate ^= 1; - sc->sc_beacons = ic->ic_stats.is_rx_beacon; + if (sc->sc_blinking) /* don't interrupt active blink */ + return; + switch (event) { + case ATH_LED_TX: + ath_led_blink(sc, sc->sc_hwledon[sc->sc_txrate], + sc->sc_hwledoff[sc->sc_txrate]); + break; + case ATH_LED_RX: + ath_led_blink(sc, sc->sc_hwledon[sc->sc_rxrate], + sc->sc_hwledoff[sc->sc_rxrate]); + break; } } @@ -4094,8 +4150,30 @@ static void ath_setcurmode(struct ath_softc *sc, enum ieee80211_phymode mode) { +#define N(a) (sizeof(a)/sizeof(a[0])) + /* NB: on/off times from the Atheros NDIS driver, w/ permission */ + static const struct { + u_int rate; /* tx/rx 802.11 rate */ + u_int16_t timeOn; /* LED on time (ms) */ + u_int16_t timeOff; /* LED off time (ms) */ + } blinkrates[] = { + { 108, 40, 10 }, + { 96, 44, 11 }, + { 72, 50, 13 }, + { 48, 57, 14 }, + { 36, 67, 16 }, + { 24, 80, 20 }, + { 22, 100, 25 }, + { 18, 133, 34 }, + { 12, 160, 40 }, + { 10, 200, 50 }, + { 6, 240, 58 }, + { 4, 267, 66 }, + { 2, 400, 100 }, + { 0, 500, 130 }, + }; const HAL_RATE_TABLE *rt; - int i; + int i, j; memset(sc->sc_rixmap, 0xff, sizeof(sc->sc_rixmap)); rt = sc->sc_rates[mode]; @@ -4106,12 +4184,23 @@ memset(sc->sc_hwflags, 0, sizeof(sc->sc_hwflags)); for (i = 0; i < 32; i++) { u_int8_t ix = rt->rateCodeToIndex[i]; - if (ix == 0xff) + if (ix == 0xff) { + sc->sc_hwledon[i] = (500 * hz) / 1000; + sc->sc_hwledoff[i] = (130 * hz) / 1000; continue; + } sc->sc_hwmap[i] = rt->info[ix].dot11Rate & IEEE80211_RATE_VAL; if (rt->info[ix].shortPreamble || rt->info[ix].phy == IEEE80211_T_OFDM) sc->sc_hwflags[i] |= IEEE80211_RADIOTAP_F_SHORTPRE; + /* setup blink rate table to avoid per-packet lookup */ + for (j = 0; j < N(blinkrates)-1; j++) + if (blinkrates[j].rate == sc->sc_hwmap[i]) + break; + /* NB: this uses the last entry if the rate isn't found */ + /* XXX beware of overlow */ + sc->sc_hwledon[i] = (blinkrates[j].timeOn * hz) / 1000; + sc->sc_hwledoff[i] = (blinkrates[j].timeOff * hz) / 1000; } sc->sc_currates = rt; sc->sc_curmode = mode; @@ -4122,6 +4211,7 @@ */ sc->sc_protrix = (mode == IEEE80211_MODE_11G ? 1 : 0); /* NB: caller is responsible for reseting rate control state */ +#undef N } #ifdef AR_DEBUG @@ -4368,12 +4458,11 @@ error = sysctl_handle_int(oidp, &softled, 0, req); if (error || !req->newptr) return error; - if (softled > 1) - softled = 1; + softled = (softled != 0); if (softled != sc->sc_softled) { if (softled) ath_hal_gpioCfgOutput(sc->sc_ah, sc->sc_ledpin); - ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin, !softled); + ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin, !sc->sc_ledon); sc->sc_softled = softled; } return 0; @@ -4484,6 +4573,9 @@ "ledpin", CTLFLAG_RW, &sc->sc_ledpin, 0, "GPIO pin connected to LED"); SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "ledon", CTLFLAG_RW, &sc->sc_ledon, 0, + "setting to turn LED on"); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "txantenna", CTLFLAG_RW, &sc->sc_txantenna, 0, "tx antenna (0=auto)"); SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#21 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -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.16 2004/12/31 20:32:40 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.17 2004/12/31 22:41:45 sam Exp $ */ /* @@ -173,7 +173,9 @@ sc_hasdiversity : 1,/* rx diversity available */ sc_diversity : 1,/* enable rx diversity */ sc_hasveol : 1, /* tx VEOL support */ - sc_hastpc : 1; /* per-packet TPC support */ + sc_hastpc : 1, /* per-packet TPC support */ + sc_ledstate: 1, /* LED on/off state */ + sc_blinking: 1; /* LED blink operation active */ /* rate tables */ const HAL_RATE_TABLE *sc_rates[IEEE80211_MODE_MAX]; const HAL_RATE_TABLE *sc_currates; /* current rate table */ @@ -189,9 +191,15 @@ u_int sc_keymax; /* size of key cache */ u_int8_t sc_keymap[16]; /* bit map of key cache use */ - u_int32_t sc_beacons; /* beacon count for LED mgmt */ - u_int16_t sc_ledstate; /* LED on/off state */ - u_int16_t sc_ledpin; /* GPIO pin for driving LED */ + u_int sc_ledpin; /* GPIO pin for driving LED */ + u_int sc_ledon; /* pin setting for LED on */ + u_int32_t sc_beacon; /* last beacon count */ + u_int8_t sc_rxrate; /* current rx rate for LED */ + u_int8_t sc_txrate; /* current tx rate for LED */ + u_int16_t sc_ledoff; /* off time for current blink */ + u_int16_t sc_hwledon[32]; /* h/w rate ix to LED on time */ + u_int16_t sc_hwledoff[32];/* " " " to LED off time */ + struct callout sc_ledtimer; /* led off timer */ struct bpf_if *sc_drvbpf; union { From owner-p4-projects@FreeBSD.ORG Sun Jan 2 13:18:22 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7590816A4D0; Sun, 2 Jan 2005 13:18:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47AA016A4CF for ; Sun, 2 Jan 2005 13:18:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD88B43D49 for ; Sun, 2 Jan 2005 13:18:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j02DIL8q013491 for ; Sun, 2 Jan 2005 13:18:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j02DILts013488 for perforce@freebsd.org; Sun, 2 Jan 2005 13:18:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 2 Jan 2005 13:18:21 GMT Message-Id: <200501021318.j02DILts013488@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 68136 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jan 2005 13:18:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=68136 Change 68136 by rwatson@rwatson_zoo on 2005/01/02 13:18:00 Integrate netperf_socket from FreeBSD CVS HEAD: - 802.11 adhoc fix for if_wi - fxp fix - ia64 unaligned access fixes - random port allocation logic tweaked Loop back towards rwatson_netperf: - IPX header __packed fix. - Use rtalloc_ign() in preference to rtalloc() throughout IPX. - Move ipxpcb_lport_cache to ipx_pcb.c from ipx_input.c. - Use RTFREE() rather than rtfree() throughout IPX. - Style improvements to IPX. Affected files ... .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#23 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_card.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_card.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/re/if_re.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/wi/if_wi.c#8 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/support.S#4 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/unaligned.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/md_var.h#7 integrate .. //depot/projects/netperf_socket/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#18 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.h#10 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#27 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_var.h#12 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx.h#3 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_input.c#3 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_ip.c#2 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_outputfl.c#2 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_pcb.c#7 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#19 integrate .. //depot/projects/netperf_socket/sys/sys/msgbuf.h#4 integrate Differences ... ==== //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#23 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.97 2004/12/24 13:36:04 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.98 2005/01/01 19:24:25 sos Exp $"); #include "opt_ata.h" #include @@ -1367,6 +1367,11 @@ return ENXIO; } + if (ctlr->chip->max_dma >= ATA_SA150) + ctlr->setmode = ata_sata_setmode; + else + ctlr->setmode = ata_promise_setmode; + switch (ctlr->chip->cfg1) { case PRNEW: /* setup clocks */ @@ -1413,22 +1418,33 @@ ctlr->dmainit = ata_promise_mio_dmainit; ctlr->allocate = ata_promise_mio_allocate; - if (ctlr->chip->cfg2 & PRPATA) { - ctlr->channels = ((ATA_INL(ctlr->r_res2, 0x48) & 0x01) > 0) + - ((ATA_INL(ctlr->r_res2, 0x48) & 0x02) > 0) + 2; - } - else if (ctlr->chip->cfg2 & PRCMBO) { - ATA_OUTL(ctlr->r_res2, 0x06c, 0x000000ff); - ctlr->channels = ((ATA_INL(ctlr->r_res2, 0x48) & 0x02) > 0) + 3; - } - else if (ctlr->chip->cfg2 & PRCMBO2) { - ATA_OUTL(ctlr->r_res2, 0x060, 0x000000ff); - ctlr->channels = 3; - } - else - ctlr->channels = 4; + switch (ctlr->chip->cfg2) { + case PRPATA: + ctlr->channels = ((ATA_INL(ctlr->r_res2, 0x48) & 0x01) > 0) + + ((ATA_INL(ctlr->r_res2, 0x48) & 0x02) > 0) + 2; + break; + + case PRCMBO: + ATA_OUTL(ctlr->r_res2, 0x06c, 0x000000ff); + ctlr->channels = ((ATA_INL(ctlr->r_res2, 0x48) & 0x02) > 0) + 3; + break; + + case PRSATA: + ATA_OUTL(ctlr->r_res2, 0x06c, 0x000000ff); + ctlr->channels = 4; + break; + + case PRCMBO2: + ATA_OUTL(ctlr->r_res2, 0x060, 0x000000ff); + ctlr->channels = 3; + break; + + case PRSATA2: + ATA_OUTL(ctlr->r_res2, 0x060, 0x000000ff); + ctlr->channels = 4; + break; - if (ctlr->chip->cfg2 & PRSX4X) { + case PRSX4X: { struct ata_promise_sx4 *hpkt; u_int32_t dimm = ATA_INL(ctlr->r_res2, 0x000c0080); @@ -1448,26 +1464,25 @@ mtx_init(&hpkt->mtx, "ATA promise HPKT lock", NULL, MTX_DEF); hpkt->busy = hpkt->head = hpkt->tail = 0; + ctlr->channels = 4; + if ((bus_setup_intr(dev, ctlr->r_irq, ATA_INTR_FLAGS, ata_promise_sx4_intr, ctlr, &ctlr->handle))) { device_printf(dev, "unable to setup interrupt\n"); return ENXIO; } + return 0; + } } - else { - if ((bus_setup_intr(dev, ctlr->r_irq, ATA_INTR_FLAGS, - ata_promise_mio_intr, ctlr, &ctlr->handle))) { - device_printf(dev, "unable to setup interrupt\n"); - return ENXIO; - } + + if ((bus_setup_intr(dev, ctlr->r_irq, ATA_INTR_FLAGS, + ata_promise_mio_intr, ctlr, &ctlr->handle))) { + device_printf(dev, "unable to setup interrupt\n"); + return ENXIO; } - break; + return 0; } - if (ctlr->chip->max_dma >= ATA_SA150) - ctlr->setmode = ata_sata_setmode; - else - ctlr->setmode = ata_promise_setmode; - return 0; + return ENXIO; } static int @@ -1587,13 +1602,13 @@ struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(ch->dev)); - if (ctlr->chip->cfg2 & PRSX4X) { + switch (ctlr->chip->cfg2) { + case PRSX4X: { struct ata_promise_sx4 *hpktp = ctlr->driver; - /* softreset channels ATA module */ + /* softreset channel ATA module */ ATA_OUTL(ctlr->r_res2, 0xc0260 + (ch->unit << 7), ch->unit + 1); DELAY(1000); - ATA_OUTL(ctlr->r_res2, 0xc0260 + (ch->unit << 7), (ATA_INL(ctlr->r_res2, 0xc0260 + (ch->unit << 7)) & ~0x00003f9f) | (ch->unit + 1)); @@ -1606,8 +1621,20 @@ ATA_OUTL(ctlr->r_res2, 0xc012c, (ATA_INL(ctlr->r_res2, 0xc012c) & ~0x00000f9f)); mtx_unlock(&hpktp->mtx); - } - else if (ctlr->chip->cfg2 & PRSATA) { + } + break; + + case PRCMBO: + case PRCMBO2: + /* softreset channel ATA module */ + ATA_OUTL(ctlr->r_res2, 0x0260 + (ch->unit << 7), (1 << 11)); + ata_udelay(10000); + ATA_OUTL(ctlr->r_res2, 0x0260 + (ch->unit << 7), + (ATA_INL(ctlr->r_res2, 0x0260 + (ch->unit << 7)) & + ~0x00003f9f) | (ch->unit + 1)); + break; + + case PRSATA: { u_int32_t status = 0; int timeout; @@ -1633,14 +1660,16 @@ if (timeout >= 1000000) device_printf(ch->dev, "connect status=%08x\n", status); - /* enable plug/unplug intr */ + /* reset and enable plug/unplug intr */ ATA_OUTL(ctlr->r_res2, 0x06c, (0x00000011 << ch->unit)); - } - else if (ctlr->chip->cfg2 & PRSATA2) { + } + break; + + case PRSATA2: { u_int32_t status = 0; int timeout; - /* set PM port */ + /* set portmultiplier port */ ATA_OUTL(ctlr->r_res2, 0x4e8 + (ch->unit << 8), 0x0f); /* mask plug/unplug intr */ @@ -1670,11 +1699,13 @@ if (timeout >= 1000000) device_printf(ch->dev, "connect status=%08x\n", status); - /* enable plug/unplug intr */ + /* reset and enable plug/unplug intr */ ATA_OUTL(ctlr->r_res2, 0x060, (0x00000011 << ch->unit)); - /* set PM port */ - ATA_OUTL(ctlr->r_res2, 0x4e8 + (ch->unit * 0x100), 0x00); + /* set portmultiplier port */ + ATA_OUTL(ctlr->r_res2, 0x4e8 + (ch->unit << 8), 0x00); + } + break; } } ==== //depot/projects/netperf_socket/sys/dev/bktr/bktr_card.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.26 2004/12/17 00:57:48 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.27 2005/01/02 04:47:36 julian Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -380,6 +380,18 @@ { 0x02, 0x01, 0x00, 0x0a, 1 }, /* audio MUX values */ 0x03000F }, /* GPIO mask */ + { CARD_PIXELVIEW_PLAYTV_PAK, /* the card id */ + "PixelView PlayTV Pak", /* the 'name' */ + NULL, /* the tuner */ + 0, /* the tuner i2c address */ + 0, /* dbx is optional */ + 0, + 0, + PFC8582_WADDR, /* EEProm type */ + (u_char)(256 / EEPROMBLOCKSIZE), /* 256 bytes */ + { 0x20000, 0x80000, 0, 0xa8000, 1 }, /* audio MUX values */ + 0xAA0000 }, /* GPIO mask */ + }; struct bt848_card_sig bt848_card_signature[1]= { ==== //depot/projects/netperf_socket/sys/dev/bktr/bktr_card.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/bktr/bktr_card.h,v 1.9 2004/12/17 00:57:48 julian Exp $ */ +/* $FreeBSD: src/sys/dev/bktr/bktr_card.h,v 1.10 2005/01/02 04:47:36 julian Exp $ */ /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -79,7 +79,8 @@ #define CARD_IO_BCTV3 17 #define CARD_AOPEN_VA1000 18 #define CARD_PINNACLE_PCTV_RAVE 19 -#define Bt848_MAX_CARD 20 +#define CARD_PIXELVIEW_PLAYTV_PAK 20 +#define Bt848_MAX_CARD 21 #define CARD_IO_GV CARD_IO_BCTV2 ==== //depot/projects/netperf_socket/sys/dev/em/if_em.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.54 2004/11/14 20:20:28 rwatson Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.56 2005/01/01 19:57:23 tackerman Exp $*/ #include @@ -80,6 +80,7 @@ { 0x8086, 0x1011, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x1012, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x1013, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, 0x1014, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x1015, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x1016, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x1017, PCI_ANY_ID, PCI_ANY_ID, 0}, @@ -99,6 +100,7 @@ { 0x8086, 0x107A, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x107B, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, 0x107C, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, 0x108A, PCI_ANY_ID, PCI_ANY_ID, 0}, /* required last entry */ { 0, 0, 0, 0, 0} }; @@ -3003,8 +3005,20 @@ static void em_disable_intr(struct adapter *adapter) { - E1000_WRITE_REG(&adapter->hw, IMC, - (0xffffffff & ~E1000_IMC_RXSEQ)); + /* + * The first version of 82542 had an errata where when link was forced it + * would stay up even up even if the cable was disconnected. Sequence errors + * were used to detect the disconnect and then the driver would unforce the link. + * This code in the in the ISR. For this to work correctly the Sequence error + * interrupt had to be enabled all the time. + */ + + if (adapter->hw.mac_type == em_82542_rev2_0) + E1000_WRITE_REG(&adapter->hw, IMC, + (0xffffffff & ~E1000_IMC_RXSEQ)); + else + E1000_WRITE_REG(&adapter->hw, IMC, + 0xffffffff); return; } ==== //depot/projects/netperf_socket/sys/dev/re/if_re.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.35 2004/09/28 18:22:24 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.36 2005/01/02 01:37:21 cognet Exp $"); /* * RealTek 8139C+/8169/8169S/8110S PCI NIC driver @@ -1284,7 +1284,6 @@ * anymore. */ ifp->if_flags &= ~IFF_UP; - ether_ifdetach(ifp); } if (sc->rl_miibus) device_delete_child(dev, sc->rl_miibus); ==== //depot/projects/netperf_socket/sys/dev/sym/sym_hipd.c#4 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.50 2004/09/10 18:39:02 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.51 2005/01/01 19:05:46 se Exp $"); #define SYM_DRIVER_NAME "sym-1.6.5-20000902" @@ -431,7 +431,11 @@ */ #define MEMO_SHIFT 4 /* 16 bytes minimum memory chunk */ +#ifndef __amd64__ #define MEMO_PAGE_ORDER 0 /* 1 PAGE maximum */ +#else +#define MEMO_PAGE_ORDER 1 /* 2 PAGEs maximum on amd64 */ +#endif #if 0 #define MEMO_FREE_UNUSED /* Free unused pages immediately */ #endif @@ -440,8 +444,14 @@ #define MEMO_CLUSTER_SIZE (1UL << MEMO_CLUSTER_SHIFT) #define MEMO_CLUSTER_MASK (MEMO_CLUSTER_SIZE-1) +#ifndef __amd64__ #define get_pages() malloc(MEMO_CLUSTER_SIZE, M_DEVBUF, M_NOWAIT) #define free_pages(p) free((p), M_DEVBUF) +#else +#define get_pages() contigmalloc(MEMO_CLUSTER_SIZE, M_DEVBUF, \ + 0, 0, 1LL << 32, PAGE_SIZE, 1LL << 32) +#define free_pages(p) contigfree((p), MEMO_CLUSTER_SIZE, M_DEVBUF) +#endif typedef u_long m_addr_t; /* Enough bits to bit-hack addresses */ ==== //depot/projects/netperf_socket/sys/dev/wi/if_wi.c#8 (text+ko) ==== @@ -62,7 +62,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.173 2004/12/17 20:48:13 mdodd Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.174 2005/01/01 17:45:11 sam Exp $"); #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -783,9 +783,10 @@ ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; if (ic->ic_opmode == IEEE80211_M_AHDEMO || + ic->ic_opmode == IEEE80211_M_IBSS || ic->ic_opmode == IEEE80211_M_MONITOR || ic->ic_opmode == IEEE80211_M_HOSTAP) - ieee80211_new_state(ic, IEEE80211_S_RUN, -1); + ieee80211_create_ibss(ic, ic->ic_ibss_chan); /* Enable interrupts */ CSR_WRITE_2(sc, WI_INT_EN, WI_INTRS); @@ -1314,7 +1315,15 @@ WI_MAX_FALSE_SYNS)) return; - ieee80211_new_state(ic, IEEE80211_S_RUN, -1); + sc->sc_false_syns = MAX(0, sc->sc_false_syns - 1); + /* + * XXX hack; we should create a new node with the new bssid + * and replace the existing ic_bss with it but since we don't + * process management frames to collect state we cheat by + * reusing the existing node as we know wi_newstate will be + * called and it will overwrite the node state. + */ + ieee80211_sta_join(ic, ieee80211_ref_node(ni)); } static void @@ -2674,7 +2683,7 @@ { struct ifnet *ifp = ic->ic_ifp; struct wi_softc *sc = ifp->if_softc; - struct ieee80211_node *ni = ic->ic_bss; + struct ieee80211_node *ni; int buflen; u_int16_t val; struct wi_ssid ssid; @@ -2684,9 +2693,14 @@ ieee80211_state_name[ic->ic_state], ieee80211_state_name[nstate])); + /* + * Internal to the driver the INIT and RUN states are used + * so bypass the net80211 state machine for other states. + * Beware however that this requires use to net80211 state + * management that otherwise would be handled for us. + */ switch (nstate) { case IEEE80211_S_INIT: - ic->ic_flags &= ~IEEE80211_F_SIBSS; sc->sc_flags &= ~WI_FLAGS_OUTRANGE; return (*sc->sc_newstate)(ic, nstate, arg); @@ -2697,6 +2711,7 @@ break; case IEEE80211_S_RUN: + ni = ic->ic_bss; sc->sc_flags &= ~WI_FLAGS_OUTRANGE; buflen = IEEE80211_ADDR_LEN; IEEE80211_ADDR_COPY(old_bssid, ni->ni_bssid); @@ -2713,20 +2728,7 @@ sc->sc_tx_th.wt_chan_flags = sc->sc_rx_th.wr_chan_flags = htole16(ni->ni_chan->ic_flags); #endif - - /* If not equal, then discount a false synchronization. */ - if (!IEEE80211_ADDR_EQ(old_bssid, ni->ni_bssid)) - sc->sc_false_syns = MAX(0, sc->sc_false_syns - 1); - - if (ic->ic_opmode == IEEE80211_M_HOSTAP) { - ni->ni_esslen = ic->ic_des_esslen; - memcpy(ni->ni_essid, ic->ic_des_essid, ni->ni_esslen); - ni->ni_rates = ic->ic_sup_rates[IEEE80211_MODE_11B]; - ni->ni_intval = ic->ic_lintval; - ni->ni_capinfo = IEEE80211_CAPINFO_ESS; - if (ic->ic_flags & IEEE80211_F_PRIVACY) - ni->ni_capinfo |= IEEE80211_CAPINFO_PRIVACY; - } else { + if (ic->ic_opmode != IEEE80211_M_HOSTAP) { /* * XXX hack; unceremoniously clear * IEEE80211_F_DROPUNENC when operating with ==== //depot/projects/netperf_socket/sys/ia64/ia64/support.S#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/support.S,v 1.23 2004/08/30 01:32:28 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/support.S,v 1.24 2005/01/02 00:20:53 marcel Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -891,16 +891,6 @@ br.ret.sptk.few rp END(copyerr) -/* - * Support functions for handling of unaligned memory accesses. - */ -ENTRY(spillfd, 2) - ldfd f6 = [r32] - ;; - stf.spill [r33] = f6 - br.ret.sptk rp -END(spillfd) - #if defined(GPROF) /* * Important registers: ==== //depot/projects/netperf_socket/sys/ia64/ia64/unaligned.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/ia64/ia64/unaligned.c,v 1.9 2004/08/16 22:09:58 arun Exp $ + * $FreeBSD: src/sys/ia64/ia64/unaligned.c,v 1.10 2005/01/02 00:20:54 marcel Exp $ */ #include @@ -38,14 +38,13 @@ #include #include -static int ia64_unaligned_print = 1; /* warn about unaligned accesses. */ -static int ia64_unaligned_sigbus = 0; /* SIGBUS on all unaligned accesses. */ - -SYSCTL_INT(_machdep, OID_AUTO, unaligned_print, CTLFLAG_RW, +static int ia64_unaligned_print = 0; +SYSCTL_INT(_debug, OID_AUTO, unaligned_print, CTLFLAG_RW, &ia64_unaligned_print, 0, "warn about unaligned accesses"); -SYSCTL_INT(_machdep, OID_AUTO, unaligned_sigbus, CTLFLAG_RW, - &ia64_unaligned_sigbus, 0, "do not SIGBUS on fixed-up accesses"); +static int ia64_unaligned_test = 0; +SYSCTL_INT(_debug, OID_AUTO, unaligned_test, CTLFLAG_RW, + &ia64_unaligned_test, 0, "test emulation when PSR.ac is set"); static void * fpreg_ptr(mcontext_t *mc, int fr) @@ -129,7 +128,9 @@ { union { double d; + long double e; uint64_t i; + float s; } buf; void *reg; uint64_t postinc; @@ -157,11 +158,28 @@ wrreg(reg, buf.i); break; case ASM_OP_LDFD: - copyin((void*)va, (void*)&buf.d, 8); + copyin((void*)va, (void*)&buf.d, sizeof(buf.d)); + reg = fpreg_ptr(mc, (int)i->i_oper[1].o_value); + if (reg == NULL) + return (EINVAL); + __asm("ldfd f6=%1;; stf.spill %0=f6" : "=m"(*(double *)reg) : + "m"(buf.d) : "f6"); + break; + case ASM_OP_LDFE: + copyin((void*)va, (void*)&buf.e, sizeof(buf.e)); + reg = fpreg_ptr(mc, (int)i->i_oper[1].o_value); + if (reg == NULL) + return (EINVAL); + __asm("ldfe f6=%1;; stf.spill %0=f6" : + "=m"(*(long double *)reg) : "m"(buf.e) : "f6"); + break; + case ASM_OP_LDFS: + copyin((void*)va, (void*)&buf.s, sizeof(buf.s)); reg = fpreg_ptr(mc, (int)i->i_oper[1].o_value); if (reg == NULL) return (EINVAL); - spillfd((void*)&buf.d, reg); + __asm("ldfs f6=%1;; stf.spill %0=f6" : "=m"(*(float *)reg) : + "m"(buf.s) : "f6"); break; case ASM_OP_ST2: reg = greg_ptr(mc, (int)i->i_oper[2].o_value); @@ -184,6 +202,30 @@ buf.i = rdreg(reg); copyout((void*)&buf.i, (void*)va, 8); break; + case ASM_OP_STFD: + reg = fpreg_ptr(mc, (int)i->i_oper[2].o_value); + if (reg == NULL) + return (EINVAL); + __asm("ldf.fill f6=%1;; stfd %0=f6" : "=m"(buf.d) : + "m"(*(double *)reg) : "f6"); + copyout((void*)&buf.d, (void*)va, sizeof(buf.d)); + break; + case ASM_OP_STFE: + reg = fpreg_ptr(mc, (int)i->i_oper[2].o_value); + if (reg == NULL) + return (EINVAL); + __asm("ldf.fill f6=%1;; stfe %0=f6" : "=m"(buf.e) : + "m"(*(long double *)reg) : "f6"); + copyout((void*)&buf.e, (void*)va, sizeof(buf.e)); + break; + case ASM_OP_STFS: + reg = fpreg_ptr(mc, (int)i->i_oper[2].o_value); + if (reg == NULL) + return (EINVAL); + __asm("ldf.fill f6=%1;; stfs %0=f6" : "=m"(buf.s) : + "m"(*(float *)reg) : "f6"); + copyout((void*)&buf.s, (void*)va, sizeof(buf.s)); + break; default: return (ENOENT); } @@ -224,11 +266,16 @@ } /* - * If PSR.ac is set, then the process wants to know about misaligned - * loads and stores. Send it a SIGBUS so that it can deal with them. - * We also send a SIGBUS if configured to do so. + * If PSR.ac is set, the process wants to be signalled about mis- + * aligned loads and stores. Send it a SIGBUS. In order for us to + * test the emulation of misaligned loads and stores, we have a + * sysctl that tells us that we must emulate the load or store, + * instead of sending the signal. We need the sysctl because if + * PSR.ac is not set, the CPU may (and likely will) deal with the + * misaligned load or store itself. As such, we won't get the + * exception. */ - if ((tf->tf_special.psr & IA64_PSR_AC) || ia64_unaligned_sigbus) + if ((tf->tf_special.psr & IA64_PSR_AC) && !ia64_unaligned_test) return (SIGBUS); if (!asm_decode(tf->tf_special.iip, &bundle)) ==== //depot/projects/netperf_socket/sys/ia64/include/md_var.h#7 (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/md_var.h,v 1.20 2004/12/08 05:46:54 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/md_var.h,v 1.21 2005/01/02 00:20:54 marcel Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -88,7 +88,6 @@ void map_pal_code(void); void os_boot_rendez(void); void os_mca(void); -void spillfd(void *src, void *dst); int syscall(struct trapframe *); void trap(int, struct trapframe *); void trap_panic(int, struct trapframe *); ==== //depot/projects/netperf_socket/sys/net80211/ieee80211_node.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.30 2004/12/31 22:42:38 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.31 2005/01/01 17:48:27 sam Exp $"); #include #include @@ -547,23 +547,23 @@ (b->ni_capinfo & IEEE80211_CAPINFO_PRIVACY)) return -1; - /* best/max rate preferred if signal level close enough XXX */ - maxa = maxrate(a); - maxb = maxrate(b); rssia = ic->ic_node_getrssi(a); rssib = ic->ic_node_getrssi(b); - if (maxa != maxb && abs(rssib - rssia) < 5) - return maxa - maxb; - - /* XXX use freq for channel preference */ - /* for now just prefer 5Ghz band to all other bands */ - if (IEEE80211_IS_CHAN_5GHZ(a->ni_chan) && - !IEEE80211_IS_CHAN_5GHZ(b->ni_chan)) - return 1; - if (!IEEE80211_IS_CHAN_5GHZ(a->ni_chan) && - IEEE80211_IS_CHAN_5GHZ(b->ni_chan)) - return -1; - + if (abs(rssib - rssia) < 5) { + /* best/max rate preferred if signal level close enough XXX */ + maxa = maxrate(a); + maxb = maxrate(b); + if (maxa != maxb) + return maxa - maxb; + /* XXX use freq for channel preference */ + /* for now just prefer 5Ghz band to all other bands */ + if (IEEE80211_IS_CHAN_5GHZ(a->ni_chan) && + !IEEE80211_IS_CHAN_5GHZ(b->ni_chan)) + return 1; + if (!IEEE80211_IS_CHAN_5GHZ(a->ni_chan) && + IEEE80211_IS_CHAN_5GHZ(b->ni_chan)) + return -1; + } /* all things being equal, use signal level */ return rssia - rssib; } ==== //depot/projects/netperf_socket/sys/netinet/in_pcb.c#18 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.156 2004/10/18 22:19:43 rwatson Exp $ + * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.157 2005/01/02 01:50:57 silby Exp $ */ #include "opt_ipsec.h" @@ -59,6 +59,8 @@ #include #include #include +#include +#include #ifdef INET6 #include #include @@ -97,8 +99,13 @@ int ipport_reservedhigh = IPPORT_RESERVED - 1; /* 1023 */ int ipport_reservedlow = 0; -/* Shall we allocate ephemeral ports in random order? */ -int ipport_randomized = 1; +/* Variables dealing with random ephemeral port allocation. */ +int ipport_randomized = 1; /* user controlled via sysctl */ +int ipport_randomcps = 10; /* user controlled via sysctl */ +int ipport_randomtime = 45; /* user controlled via sysctl */ +int ipport_stoprandom = 0; /* toggled by ipport_tick */ +int ipport_tcpallocs; +int ipport_tcplastcount; #define RANGECHK(var, min, max) \ if ((var) < (min)) { (var) = (min); } \ @@ -143,6 +150,10 @@ CTLFLAG_RW|CTLFLAG_SECURE, &ipport_reservedlow, 0, ""); SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, randomized, CTLFLAG_RW, &ipport_randomized, 0, ""); +SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, randomcps, + CTLFLAG_RW, &ipport_randomcps, 0, ""); +SYSCTL_INT(_net_inet_ip_portrange, OID_AUTO, randomtime, + CTLFLAG_RW, &ipport_randomtime, 0, ""); /* * in_pcb.c: manage the Protocol Control Blocks. @@ -266,6 +277,7 @@ u_short lport = 0; int wild = 0, reuseport = (so->so_options & SO_REUSEPORT); int error, prison = 0; + int dorandom; INP_INFO_WLOCK_ASSERT(pcbinfo); INP_LOCK_ASSERT(inp); @@ -394,6 +406,20 @@ lastport = &pcbinfo->lastport; } /* + * For UDP, use random port allocation as long as the user + * allows it. For TCP (and as of yet unknown) connections, + * use random port allocation only if the user allows it AND + * ipport_tick allows it. + */ + if (ipport_randomized && + (!ipport_stoprandom || pcbinfo == &udbinfo)) + dorandom = 1; + else + dorandom = 0; + /* Make sure to not include UDP packets in the count. */ + if (pcbinfo != &udbinfo) + ipport_tcpallocs++; + /* * Simple check to ensure all ports are not used up causing * a deadlock here. * @@ -404,7 +430,7 @@ /* * counting down */ - if (ipport_randomized) + if (dorandom) *lastport = first - (arc4random() % (first - last)); count = first - last; @@ -422,7 +448,7 @@ /* * counting up */ - if (ipport_randomized) + if (dorandom) *lastport = first + (arc4random() % (last - first)); count = last - first; @@ -1181,3 +1207,25 @@ INP_UNLOCK(inp); #endif } + +/* + * ipport_tick runs once per second, determining if random port + * allocation should be continued. If more than ipport_randomcps + * ports have been allocated in the last second, then we return to + * sequential port allocation. We return to random allocation only + * once we drop below ipport_randomcps for at least 5 seconds. + */ + +void +ipport_tick(xtp) + void *xtp; +{ + if (ipport_tcpallocs > ipport_tcplastcount + ipport_randomcps) { + ipport_stoprandom = ipport_randomtime; + } else { + if (ipport_stoprandom > 0) + ipport_stoprandom--; + } + ipport_tcplastcount = ipport_tcpallocs; + callout_reset(&ipport_tick_callout, hz, ipport_tick, NULL); +} ==== //depot/projects/netperf_socket/sys/netinet/in_pcb.h#10 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/in_pcb.h,v 1.78 2004/12/05 22:07:14 rwatson Exp $ + * $FreeBSD: src/sys/netinet/in_pcb.h,v 1.79 2005/01/02 01:50:57 silby Exp $ */ #ifndef _NETINET_IN_PCB_H_ @@ -333,6 +333,7 @@ extern int ipport_lastauto; extern int ipport_hifirstauto; extern int ipport_hilastauto; +extern struct callout ipport_tick_callout; void in_pcbpurgeif0(struct inpcbinfo *, struct ifnet *); int in_pcballoc(struct socket *, struct inpcbinfo *, const char *); @@ -362,6 +363,7 @@ in_sockaddr(in_port_t port, struct in_addr *addr); void in_pcbsosetlabel(struct socket *so); void in_pcbremlists(struct inpcb *inp); +void ipport_tick(void *xtp); #endif /* _KERNEL */ #endif /* !_NETINET_IN_PCB_H_ */ ==== //depot/projects/netperf_socket/sys/netinet/ip_input.c#27 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_input.c,v 1.292 2004/10/19 15:45:57 andre Exp $ + * $FreeBSD: src/sys/netinet/ip_input.c,v 1.293 2005/01/02 01:50:57 silby Exp $ */ #include "opt_bootp.h" @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -186,6 +187,7 @@ static TAILQ_HEAD(ipqhead, ipq) ipq[IPREASS_NHASH]; struct mtx ipqlock; +struct callout ipport_tick_callout; #define IPQ_LOCK() mtx_lock(&ipqlock) #define IPQ_UNLOCK() mtx_unlock(&ipqlock) @@ -279,6 +281,12 @@ maxnipq = nmbclusters / 32; maxfragsperpacket = 16; + /* Start ipport_tick. */ + callout_init(&ipport_tick_callout, CALLOUT_MPSAFE); + ipport_tick(NULL); + EVENTHANDLER_REGISTER(shutdown_pre_sync, ip_fini, NULL, + SHUTDOWN_PRI_DEFAULT); + /* Initialize various other remaining things. */ ip_id = time_second & 0xffff; ipintrq.ifq_maxlen = ipqmaxlen; @@ -286,6 +294,12 @@ netisr_register(NETISR_IP, ip_input, &ipintrq, NETISR_MPSAFE); } +void ip_fini(xtp) + void *xtp; +{ + callout_stop(&ipport_tick_callout); +} + /* * Ip input routine. Checksum and byte swap header. If fragmented * try to reassemble. Process options. Pass to next level. ==== //depot/projects/netperf_socket/sys/netinet/ip_var.h#12 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ip_var.h 8.2 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/netinet/ip_var.h,v 1.92 2004/10/19 15:45:57 andre Exp $ + * $FreeBSD: src/sys/netinet/ip_var.h,v 1.93 2005/01/02 01:50:57 silby Exp $ */ #ifndef _NETINET_IP_VAR_H_ @@ -159,6 +159,7 @@ int ip_ctloutput(struct socket *, struct sockopt *sopt); void ip_drain(void); +void ip_fini(void *xtp); int ip_fragment(struct ip *ip, struct mbuf **m_frag, int mtu, u_long if_hwassist_flags, int sw_csum); void ip_freemoptions(struct ip_moptions *); ==== //depot/projects/netperf_socket/sys/netipx/ipx.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * * @(#)ipx.h * - * $FreeBSD: src/sys/netipx/ipx.h,v 1.18 2004/06/22 21:46:49 bms Exp $ + * $FreeBSD: src/sys/netipx/ipx.h,v 1.19 2005/01/02 02:30:27 rwatson Exp $ */ #ifndef _NETIPX_IPX_H_ @@ -145,7 +145,7 @@ u_char ipx_pt; /* Packet Type (i.e. level 2 protocol) */ struct ipx_addr ipx_dna; /* Destination Network Address */ struct ipx_addr ipx_sna; /* Source Network Address */ -}; +} __packed; #define ipx_neteqnn(a,b) \ (((a).s_net[0] == (b).s_net[0]) && ((a).s_net[1] == (b).s_net[1])) ==== //depot/projects/netperf_socket/sys/netipx/ipx_input.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/ipx_input.c,v 1.38 2004/12/31 17:05:37 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/ipx_input.c,v 1.40 2005/01/02 01:39:37 rwatson Exp $"); #include #include @@ -88,7 +88,6 @@ /* * IPX protocol control block (pcb) lists. */ -u_short ipxpcb_lport_cache; struct ipxpcbhead ipxpcb_list; struct ipxpcbhead ipxrawpcb_list; @@ -443,7 +442,7 @@ dst->sipx_family = AF_IPX; dst->sipx_addr = *src; dst->sipx_addr.x_port = 0; - rtalloc(ro); + rtalloc_ign(ro, 0); if (ro->ro_rt == NULL || ro->ro_rt->rt_ifp == NULL) { return (0); } ==== //depot/projects/netperf_socket/sys/netipx/ipx_ip.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/ipx_ip.c,v 1.36 2003/10/31 18:32:12 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/ipx_ip.c,v 1.37 2005/01/02 01:39:38 rwatson Exp $"); /* * Software interface driver for encapsulating IPX in IP. @@ -333,7 +333,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 2 13:26:33 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0132716A4D0; Sun, 2 Jan 2005 13:26:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D037916A4CE for ; Sun, 2 Jan 2005 13:26:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99D7743D54 for ; Sun, 2 Jan 2005 13:26:32 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j02DQWQ0013890 for ; Sun, 2 Jan 2005 13:26:32 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j02DQWCV013887 for perforce@freebsd.org; Sun, 2 Jan 2005 13:26:32 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 2 Jan 2005 13:26:32 GMT Message-Id: <200501021326.j02DQWCV013887@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68138 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jan 2005 13:26:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=68138 Change 68138 by davidxu@davidxu_tiger on 2005/01/02 13:26:06 simplicy cancellation code by not using thread lock. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cancel.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_exit.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#10 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sig.c#5 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cancel.c#5 (text+ko) ==== @@ -1,8 +1,32 @@ /* - * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.31 2003/12/09 02:20:56 davidxu Exp $ + * Copyright (c) 2005, David Xu + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + * */ -#include + #include #include "thr_private.h" @@ -11,183 +35,124 @@ __weak_reference(_pthread_setcanceltype, pthread_setcanceltype); __weak_reference(_pthread_testcancel, pthread_testcancel); -static inline int -checkcancel(struct pthread *curthread) -{ - /* - * Don't do cancellation again if it was already in progress. - */ - if ((curthread->cancelflags & - (THR_CANCEL_EXITING | THR_CANCELLING | THR_CANCEL_DISABLE | - THR_CANCEL_NEEDED)) == THR_CANCEL_NEEDED) { - curthread->cancelflags |= THR_CANCELLING; - return (1); - } - return (0); -} - -static inline void -testcancel(struct pthread *curthread) -{ - if (checkcancel(curthread) != 0) { - /* Unlock before exiting: */ - THR_UNLOCK(curthread); - pthread_exit(PTHREAD_CANCELED); - PANIC("cancel"); - } -} - int _pthread_cancel(pthread_t pthread) { struct pthread *curthread = _get_curthread(); - long tid = -1; - int ret; + int oldval, newval, ret; + + if ((ret = _thr_ref_add(curthread, pthread, 0)) != 0) + return (ret); + do { + oldval = pthread->cancelflags; + if (oldval & THR_CANCEL_NEEDED) + break; + newval = oldval | THR_CANCEL_NEEDED; + } while (!atomic_cmpset_acq_int(&pthread->cancelflags, oldval, newval)); + + if (!(oldval & THR_CANCEL_NEEDED) && SHOULD_ASYNC_CANCEL(newval)) + thr_kill(pthread->tid, SIGCANCEL); - THREAD_LIST_LOCK(curthread); - if ((ret = _thr_find_thread(curthread, pthread, 0)) == 0) { - /* - * Take the thread's lock while we change the cancel flags. - */ - THR_THREAD_LOCK(curthread, pthread); - THREAD_LIST_UNLOCK(curthread); - if (pthread->cancelflags & - (THR_CANCELLING | THR_CANCEL_EXITING)) { - THR_THREAD_UNLOCK(curthread, pthread); - return (0); - } - pthread->cancelflags |= THR_CANCEL_NEEDED; - if ((pthread->cancelflags & PTHREAD_CANCEL_DISABLE) == 0 && - ((pthread->cancelflags & THR_CANCEL_AT_POINT) != 0 || - (pthread->cancelflags & THR_CANCEL_ASYNCHRONOUS) != 0)) { - tid = pthread->tid; - thr_kill(tid, SIGCANCEL); - } - /* - * Release the thread's lock and remove the - * reference: - */ - THR_THREAD_UNLOCK(curthread, pthread); - } else { - THREAD_LIST_UNLOCK(curthread); - } - return (ret); + _thr_ref_delete(curthread, pthread); + return (0); } int _pthread_setcancelstate(int state, int *oldstate) { - struct pthread *curthread = _get_curthread(); - int need_exit = 0; - int ostate; - int ret; + struct pthread *curthread = _get_curthread(); + int oldval, newval; + + if (state != PTHREAD_CANCEL_ENABLE && state != PTHREAD_CANCEL_DISABLE) + return (EINVAL); - /* Take the thread's lock while fiddling with the state: */ - THR_LOCK(curthread); + for (;;) { + oldval = curthread->cancelflags; + newval = (state == PTHREAD_CANCEL_DISABLE ? + oldval | THR_CANCEL_DISABLE : + oldval & ~THR_CANCEL_DISABLE); - if (curthread->cancelflags & THR_CANCEL_DISABLE) - ostate = PTHREAD_CANCEL_DISABLE; - else - ostate = PTHREAD_CANCEL_ENABLE; + if (oldstate != NULL) + *oldstate = ((oldval & THR_CANCEL_DISABLE) ? + PTHREAD_CANCEL_DISABLE : PTHREAD_CANCEL_ENABLE); - switch (state) { - case PTHREAD_CANCEL_ENABLE: - curthread->cancelflags &= ~THR_CANCEL_DISABLE; - if ((curthread->cancelflags & THR_CANCEL_ASYNCHRONOUS) != 0) - need_exit = checkcancel(curthread); - ret = 0; - break; - case PTHREAD_CANCEL_DISABLE: - curthread->cancelflags |= THR_CANCEL_DISABLE; - ret = 0; - break; - default: - ret = EINVAL; - } + if (oldval == newval) + break; - THR_UNLOCK(curthread); - if (need_exit != 0) { - pthread_exit(PTHREAD_CANCELED); - PANIC("cancel"); + if (atomic_cmpset_acq_int(&curthread->cancelflags, oldval, + newval)) { + if (SHOULD_CANCEL(newval)) + pthread_exit(PTHREAD_CANCELED); + break; + } } - if (ret == 0 && oldstate != NULL) - *oldstate = ostate; - - return (ret); + + return (0); } int _pthread_setcanceltype(int type, int *oldtype) { struct pthread *curthread = _get_curthread(); - int need_exit = 0; - int otype; - int ret; + int oldval, newval; - /* Take the thread's lock while fiddling with the state: */ - THR_LOCK(curthread); + if (type != PTHREAD_CANCEL_DEFERRED && + type != PTHREAD_CANCEL_ASYNCHRONOUS) + return (EINVAL); - if (curthread->cancelflags & THR_CANCEL_ASYNCHRONOUS) - otype = PTHREAD_CANCEL_ASYNCHRONOUS; - else - otype = PTHREAD_CANCEL_DEFERRED; - switch (type) { - case PTHREAD_CANCEL_ASYNCHRONOUS: - curthread->cancelflags |= THR_CANCEL_ASYNCHRONOUS; - need_exit = checkcancel(curthread); - ret = 0; - break; - case PTHREAD_CANCEL_DEFERRED: - curthread->cancelflags &= ~THR_CANCEL_ASYNCHRONOUS; - ret = 0; - break; - default: - ret = EINVAL; + for (;;) { + oldval = curthread->cancelflags; + if (oldtype != NULL) + *oldtype = ((oldval & THR_CANCEL_AT_POINT) ? + PTHREAD_CANCEL_ASYNCHRONOUS : + PTHREAD_CANCEL_DEFERRED); + newval = (type == PTHREAD_CANCEL_ASYNCHRONOUS ? + oldval | THR_CANCEL_AT_POINT : + oldval & ~THR_CANCEL_AT_POINT); + if (oldval == newval) + break; + if (atomic_cmpset_acq_int(&curthread->cancelflags, oldval, + newval)) { + if (SHOULD_CANCEL(newval)) + pthread_exit(PTHREAD_CANCELED); + break; + } } - - THR_UNLOCK(curthread); - if (need_exit != 0) { - pthread_exit(PTHREAD_CANCELED); - PANIC("cancel"); - } - if (ret == 0 && oldtype != NULL) - *oldtype = otype; - - return (ret); + + return (0); } void _pthread_testcancel(void) { - struct pthread *curthread = _get_curthread(); - - THR_LOCK(curthread); - testcancel(curthread); - THR_UNLOCK(curthread); + struct pthread *curthread = _get_curthread(); + + if (SHOULD_CANCEL(curthread->cancelflags)) + pthread_exit(PTHREAD_CANCELED); } int _thr_cancel_enter(struct pthread *curthread) { - int old; + int oldval; - /* Look for a cancellation before we block: */ - THR_LOCK(curthread); - old = curthread->cancelflags; - if (!(curthread->cancelflags & THR_CANCEL_AT_POINT)) { - testcancel(curthread); - curthread->cancelflags |= THR_CANCEL_AT_POINT; - } - THR_UNLOCK(curthread); - return (old); + for (;;) { + oldval = curthread->cancelflags; + if (oldval & THR_CANCEL_AT_POINT) + break; + int newval = oldval | THR_CANCEL_AT_POINT; + if (atomic_cmpset_acq_int(&curthread->cancelflags, oldval, + newval)) { + if (SHOULD_CANCEL(newval)) + pthread_exit(PTHREAD_CANCELED); + } + } + return (oldval); } void _thr_cancel_leave(struct pthread *curthread, int previous) { if (!(previous & THR_CANCEL_AT_POINT)) - return; - THR_LOCK(curthread); - curthread->cancelflags &= ~THR_CANCEL_AT_POINT; - THR_UNLOCK(curthread); + atomic_clear_int(&curthread->cancelflags, THR_CANCEL_AT_POINT); } ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_exit.c#5 (text+ko) ==== @@ -101,9 +101,7 @@ * Flag this thread as exiting. Threads should now be prevented * from joining to this thread. */ - THR_LOCK(curthread); - curthread->cancelflags |= THR_CANCEL_EXITING; - THR_UNLOCK(curthread); + atomic_set_int(&curthread->cancelflags, THR_CANCEL_EXITING); _thr_exit_cleanup(); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#8 (text+ko) ==== ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#10 (text+ko) ==== @@ -177,6 +177,7 @@ volatile long c_seqno; volatile long c_waiters; volatile long c_wakeups; + long c_count; long c_flags; }; @@ -412,9 +413,15 @@ #define THR_CANCEL_DISABLE 0x0001 #define THR_CANCEL_EXITING 0x0002 #define THR_CANCEL_AT_POINT 0x0004 -#define THR_CANCELLING 0x0008 -#define THR_CANCEL_NEEDED 0x0010 -#define THR_CANCEL_ASYNCHRONOUS 0x0020 +#define THR_CANCEL_NEEDED 0x0008 +#define SHOULD_CANCEL(val) \ + (((val) & (THR_CANCEL_DISABLE | THR_CANCEL_EXITING | \ + THR_CANCEL_NEEDED)) == THR_CANCEL_NEEDED) + +#define SHOULD_ASYNC_CANCEL(val) \ + (((val) & (THR_CANCEL_DISABLE | THR_CANCEL_EXITING | \ + THR_CANCEL_NEEDED | THR_CANCEL_AT_POINT)) == \ + (THR_CANCEL_NEEDED | THR_CANCEL_AT_POINT)) int cancelflags; /* Thread temporary signal mask. */ ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sig.c#5 (text+ko) ==== @@ -186,10 +186,8 @@ static void thr_cancel_handler(struct pthread *curthread) { - if ((curthread->cancelflags & - (THR_CANCEL_AT_POINT | THR_CANCEL_ASYNCHRONOUS))) { + if (curthread->cancelflags & THR_CANCEL_AT_POINT) pthread_testcancel(); - } _thr_suspend_check(curthread); } @@ -197,7 +195,6 @@ void _thr_suspend_check(struct pthread *curthread) { -#if 0 sigset_t set; long cycle; @@ -218,7 +215,6 @@ curthread->flags &= ~THR_FLAGS_SUSPENDED; } THR_UNLOCK(curthread); -#endif } void From owner-p4-projects@FreeBSD.ORG Sun Jan 2 13:37:47 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E85316A4D0; Sun, 2 Jan 2005 13:37:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 35DA516A4CE for ; Sun, 2 Jan 2005 13:37:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10C5F43D3F for ; Sun, 2 Jan 2005 13:37:47 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j02Dbk1h014226 for ; Sun, 2 Jan 2005 13:37:46 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j02DbkM5014223 for perforce@freebsd.org; Sun, 2 Jan 2005 13:37:46 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 2 Jan 2005 13:37:46 GMT Message-Id: <200501021337.j02DbkM5014223@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jan 2005 13:37:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=68140 Change 68140 by davidxu@davidxu_tiger on 2005/01/02 13:37:31 remove unused field. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#11 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#11 (text+ko) ==== @@ -177,7 +177,6 @@ volatile long c_seqno; volatile long c_waiters; volatile long c_wakeups; - long c_count; long c_flags; }; From owner-p4-projects@FreeBSD.ORG Sun Jan 2 16:06:56 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B19BE16A4D0; Sun, 2 Jan 2005 16:06:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8935C16A4CE for ; Sun, 2 Jan 2005 16:06:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 35F2343D46 for ; Sun, 2 Jan 2005 16:06:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j02G6teG019457 for ; Sun, 2 Jan 2005 16:06:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j02G6scf019454 for perforce@freebsd.org; Sun, 2 Jan 2005 16:06:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 2 Jan 2005 16:06:54 GMT Message-Id: <200501021606.j02G6scf019454@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 68159 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jan 2005 16:06:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=68159 Change 68159 by rwatson@rwatson_zoo on 2005/01/02 16:06:37 Integrate netperf_socket from FreeBSD CVS HEAD: Loop back towards rwatson_netperf: - Whitespace/style fixes for netipx. - Use M_WAITOK in ipx_setpeeraddr() so that it can't fail. - Remove extraneous ipxpcb list head extern left over from the previous world order. - Clean up ipx_input() return case for sbappendaddr() failing. - Use __packed for SPX packet headers. - Use KASSERT() in preference to if()panic(). - Compare pointers with NULL, not 0. - Hold the socket buffer locks over longer periods of time in various SPX routines, increasing atomicity and reducing the number of locking operations. Particularly, in spx_reass() and spx_rcvoob(). - Clearly mark the call to spx_close() in spx_reass() as broken. - Don't cast NULL. - Fix bug relating to spx_timers() returning NULL due to an SPX connection timing out. Affected files ... .. //depot/projects/netperf_socket/sys/netipx/README#2 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx.c#3 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_cksum.c#3 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_if.h#2 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_input.c#4 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_ip.c#3 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_pcb.c#8 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_pcb.h#3 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_proto.c#2 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_usrreq.c#7 integrate .. //depot/projects/netperf_socket/sys/netipx/spx.h#2 integrate .. //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#11 integrate Differences ... ==== //depot/projects/netperf_socket/sys/netipx/README#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/netipx/README,v 1.2 2000/05/01 20:14:29 peter Exp $ +$FreeBSD: src/sys/netipx/README,v 1.3 2005/01/02 15:10:02 rwatson Exp $ This protocol implements IPX/SPX over Ethernet_II frame type 0x8137. Please note: the SPX implementation may require further work and testing @@ -19,5 +19,6 @@ Copyright (c) 1984, 1985, 1986, 1987, 1993 The Regents of the University of California. All rights reserved. +Modifications Copyright (c) 2004, Robert N. M. Watson Modifications Copyright (c) 1995, Mike Mitchell Modifications Copyright (c) 1995, John Hay ==== //depot/projects/netperf_socket/sys/netipx/ipx.c#3 (text+ko) ==== @@ -30,12 +30,12 @@ * 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. - * + * * @(#)ipx.c */ #include -__FBSDID("$FreeBSD: src/sys/netipx/ipx.c,v 1.27 2004/08/28 15:24:53 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/ipx.c,v 1.28 2005/01/02 15:13:59 rwatson Exp $"); #include #include @@ -204,7 +204,7 @@ } IFAFREE((&oia->ia_ifa)); return (0); - + case SIOCAIFADDR: dstIsNew = 0; hostIsNew = 1; @@ -241,7 +241,7 @@ static void ipx_ifscrub(ifp, ia) register struct ifnet *ifp; - register struct ipx_ifaddr *ia; + register struct ipx_ifaddr *ia; { if (ia->ia_flags & IFA_ROUTE) { if (ifp->if_flags & IFF_POINTOPOINT) { ==== //depot/projects/netperf_socket/sys/netipx/ipx_cksum.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/ipx_cksum.c,v 1.11 2004/07/28 06:58:23 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/ipx_cksum.c,v 1.12 2005/01/02 15:13:59 rwatson Exp $"); #include #include @@ -100,7 +100,7 @@ w++; if (--len == 0) break; - } + } } ipx->ipx_tc = oldtc; ==== //depot/projects/netperf_socket/sys/netipx/ipx_if.h#2 (text+ko) ==== @@ -30,10 +30,10 @@ * 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. - * + * * @(#)ipx_if.h * - * $FreeBSD: src/sys/netipx/ipx_if.h,v 1.13 2003/03/04 23:19:53 jlemon Exp $ + * $FreeBSD: src/sys/netipx/ipx_if.h,v 1.14 2005/01/02 15:13:59 rwatson Exp $ */ #ifndef _NETIPX_IPX_IF_H_ ==== //depot/projects/netperf_socket/sys/netipx/ipx_input.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/ipx_input.c,v 1.40 2005/01/02 01:39:37 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/ipx_input.c,v 1.41 2005/01/02 15:13:59 rwatson Exp $"); #include #include @@ -215,7 +215,7 @@ */ for (ia = ipx_ifaddr; ia != NULL; ia = ia->ia_next) if((ia->ia_ifa.ifa_ifp == m->m_pkthdr.rcvif) && - ipx_neteq(ia->ia_addr.sipx_addr, + ipx_neteq(ia->ia_addr.sipx_addr, ipx->ipx_dna)) goto ours; @@ -484,8 +484,8 @@ if (ifp == ia->ia_ifp) break; if (ia == NULL) - ipx->ipx_sna.x_host = ipx_zerohost; - else + ipx->ipx_sna.x_host = ipx_zerohost; + else ipx->ipx_sna.x_host = ia->ia_addr.sipx_addr.x_host; ==== //depot/projects/netperf_socket/sys/netipx/ipx_ip.c#3 (text+ko) ==== @@ -30,12 +30,12 @@ * 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. - * + * * @(#)ipx_ip.c */ #include -__FBSDID("$FreeBSD: src/sys/netipx/ipx_ip.c,v 1.37 2005/01/02 01:39:38 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/ipx_ip.c,v 1.38 2005/01/02 15:13:59 rwatson Exp $"); /* * Software interface driver for encapsulating IPX in IP. @@ -346,7 +346,7 @@ register struct in_ifaddr *ia; struct ifnet *ifp = ro.ro_rt->rt_ifp; - for (ia = TAILQ_FIRST(&in_ifaddrhead); ia != NULL; + for (ia = TAILQ_FIRST(&in_ifaddrhead); ia != NULL; ia = TAILQ_NEXT(ia, ia_link)) if (ia->ia_ifp == ifp) break; @@ -385,7 +385,7 @@ (struct ifnet *)ifn, sopt->sopt_td); /* use any of our addresses */ - satoipx_addr(ifr_ipxip.ifr_addr).x_host = + satoipx_addr(ifr_ipxip.ifr_addr).x_host = ipx_ifaddr->ia_addr.sipx_addr.x_host; return (ipx_control(so, (int)SIOCSIFADDR, (caddr_t)&ifr_ipxip, ==== //depot/projects/netperf_socket/sys/netipx/ipx_pcb.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.37 2005/01/02 01:51:18 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.39 2005/01/02 15:25:59 rwatson Exp $"); #include #include @@ -53,7 +53,7 @@ #include static struct ipx_addr zeroipx_addr; -static u_short ipxpcb_lport_cache; +static u_short ipxpcb_lport_cache; int ipx_pcballoc(so, head, td) @@ -73,7 +73,7 @@ so->so_pcb = (caddr_t)ipxp; return (0); } - + int ipx_pcbbind(ipxp, nam, td) register struct ipxpcb *ipxp; @@ -185,7 +185,7 @@ rtalloc_ign(ro, 0); } if (ipx_neteqnn(ipxp->ipxp_laddr.x_net, ipx_zeronet)) { - /* + /* * If route is known or can be allocated now, * our src addr is taken from the i/f, else punt. */ @@ -214,7 +214,7 @@ ipxp->ipxp_laddr.x_net = satoipx_addr(ia->ia_addr).x_net; } if (ipx_nullhost(ipxp->ipxp_laddr)) { - /* + /* * If route is known or can be allocated now, * our src addr is taken from the i/f, else punt. */ @@ -286,7 +286,7 @@ struct sockaddr **nam; { struct sockaddr_ipx *sipx, ssipx; - + sipx = &ssipx; bzero((caddr_t)sipx, sizeof(*sipx)); sipx->sipx_len = sizeof(*sipx); @@ -303,11 +303,11 @@ struct sockaddr_ipx *sipx, ssipx; sipx = &ssipx; - bzero((caddr_t)sipx, sizeof(*sipx)); + bzero(sipx, sizeof(*sipx)); sipx->sipx_len = sizeof(*sipx); sipx->sipx_family = AF_IPX; sipx->sipx_addr = ipxp->ipxp_faddr; - *nam = sodupsockaddr((struct sockaddr *)sipx, M_NOWAIT); + *nam = sodupsockaddr((struct sockaddr *)sipx, M_WAITOK); } struct ipxpcb * ==== //depot/projects/netperf_socket/sys/netipx/ipx_pcb.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * * @(#)ipx_pcb.h * - * $FreeBSD: src/sys/netipx/ipx_pcb.h,v 1.20 2004/12/30 17:49:40 rwatson Exp $ + * $FreeBSD: src/sys/netipx/ipx_pcb.h,v 1.21 2005/01/02 15:16:35 rwatson Exp $ */ #ifndef _NETIPX_IPX_PCB_H_ @@ -85,8 +85,6 @@ #define IPXRCVQ 40960 #ifdef _KERNEL -extern struct ipxpcb ipxpcb; /* head of list */ - int ipx_pcballoc(struct socket *so, struct ipxpcbhead *head, struct thread *p); int ipx_pcbbind(struct ipxpcb *ipxp, struct sockaddr *nam, ==== //depot/projects/netperf_socket/sys/netipx/ipx_proto.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/ipx_proto.c,v 1.17 2003/06/11 05:25:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/ipx_proto.c,v 1.18 2005/01/02 15:13:59 rwatson Exp $"); #include "opt_ipx.h" @@ -94,7 +94,7 @@ }; static struct domain ipxdomain = - { AF_IPX, "network systems", 0, 0, 0, + { AF_IPX, "network systems", 0, 0, 0, ipxsw, &ipxsw[sizeof(ipxsw)/sizeof(ipxsw[0])], 0, rn_inithead, 16, sizeof(struct sockaddr_ipx)}; ==== //depot/projects/netperf_socket/sys/netipx/ipx_usrreq.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/ipx_usrreq.c,v 1.44 2004/12/31 17:05:37 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/ipx_usrreq.c,v 1.48 2005/01/02 15:29:29 rwatson Exp $"); #include "opt_ipx.h" @@ -82,7 +82,7 @@ static int ipx_detach(struct socket *so); static int ipx_disconnect(struct socket *so); static int ipx_send(struct socket *so, int flags, struct mbuf *m, - struct sockaddr *addr, struct mbuf *control, + struct sockaddr *addr, struct mbuf *control, struct thread *td); static int ipx_shutdown(struct socket *so); static int ripx_attach(struct socket *so, int proto, struct thread *td); @@ -128,8 +128,7 @@ struct ifnet *ifp = m->m_pkthdr.rcvif; struct sockaddr_ipx ipx_ipx; - if (ipxp == NULL) - panic("No ipxpcb"); + KASSERT(ipxp != NULL, ("ipx_input: NUL ipxpcb")); /* * Construct sockaddr format source address. * Stuff source address and datagram in user buffer. @@ -142,7 +141,7 @@ if (ipx_neteqnn(ipx->ipx_sna.x_net, ipx_zeronet) && ifp != NULL) { register struct ifaddr *ifa; - for (ifa = TAILQ_FIRST(&ifp->if_addrhead); ifa != NULL; + for (ifa = TAILQ_FIRST(&ifp->if_addrhead); ifa != NULL; ifa = TAILQ_NEXT(ifa, ifa_link)) { if (ifa->ifa_addr->sa_family == AF_IPX) { ipx_ipx.sipx_addr.x_net = @@ -152,18 +151,16 @@ } } ipxp->ipxp_rpt = ipx->ipx_pt; - if (!(ipxp->ipxp_flags & IPXP_RAWIN) ) { + if ((ipxp->ipxp_flags & IPXP_RAWIN) == 0) { m->m_len -= sizeof(struct ipx); m->m_pkthdr.len -= sizeof(struct ipx); m->m_data += sizeof(struct ipx); } - if (sbappendaddr(&ipxp->ipxp_socket->so_rcv, (struct sockaddr *)&ipx_ipx, - m, (struct mbuf *)NULL) == 0) - goto bad; - sorwakeup(ipxp->ipxp_socket); - return; -bad: - m_freem(m); + if (sbappendaddr(&ipxp->ipxp_socket->so_rcv, + (struct sockaddr *)&ipx_ipx, m, NULL) == 0) + m_freem(m); + else + sorwakeup(ipxp->ipxp_socket); } void @@ -225,7 +222,7 @@ /* * Make sure packet is actually of even length. */ - + if (len & 1) { m = mprev; if ((m->m_flags & M_EXT) == 0 && @@ -308,7 +305,7 @@ &satoipx_addr(ro->ro_dst); dst->x_host = ipx->ipx_dna.x_host; } - /* + /* * Otherwise, we go through the same gateway * and dst is already set up. */ @@ -351,7 +348,7 @@ case SO_IPX_CHECKSUM: mask = IPXP_CHECKSUM; goto get_flags; - + case SO_HEADERS_ON_OUTPUT: mask = IPXP_RAWOUT; get_flags: @@ -370,7 +367,7 @@ break; case SO_SEQNO: - error = sooptcopyout(sopt, &ipx_pexseq, + error = sooptcopyout(sopt, &ipx_pexseq, sizeof ipx_pexseq); ipx_pexseq++; break; @@ -532,7 +529,7 @@ { struct ipxpcb *ipxp = sotoipxpcb(so); - ipx_setpeeraddr(ipxp, nam); /* XXX what if alloc fails? */ + ipx_setpeeraddr(ipxp, nam); return (0); } @@ -600,7 +597,7 @@ { struct ipxpcb *ipxp = sotoipxpcb(so); - ipx_setsockaddr(ipxp, nam); /* XXX what if alloc fails? */ + ipx_setsockaddr(ipxp, nam); return (0); } ==== //depot/projects/netperf_socket/sys/netipx/spx.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * @(#)spx.h * - * $FreeBSD: src/sys/netipx/spx.h,v 1.17 2002/03/20 02:39:13 alfred Exp $ + * $FreeBSD: src/sys/netipx/spx.h,v 1.18 2005/01/02 15:06:47 rwatson Exp $ */ #ifndef _NETIPX_SPX_H_ @@ -55,7 +55,7 @@ u_short spx_seq; /* sequence number */ u_short spx_ack; /* acknowledge number */ u_short spx_alo; /* allocation number */ -}; +} __packed; /* * Definitions for NS(tm) Internet Datagram Protocol @@ -64,7 +64,7 @@ struct spx { struct ipx si_i; struct spxhdr si_s; -}; +} __packed; struct spx_q { struct spx_q *si_next; struct spx_q *si_prev; ==== //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.50 2004/12/31 17:05:37 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.58 2005/01/02 15:38:47 rwatson Exp $"); #include #include @@ -74,9 +74,9 @@ static struct spx_istat spx_istat; /* Following was struct spxstat spxstat; */ -#ifndef spxstat +#ifndef spxstat #define spxstat spx_istat.newstats -#endif +#endif static const int spx_backoff[SPX_MAXRXTSHIFT+1] = { 1, 2, 4, 8, 16, 32, 64, 64, 64, 64, 64, 64, 64 }; @@ -103,7 +103,7 @@ static int spx_rcvd(struct socket *so, int flags); static int spx_rcvoob(struct socket *so, struct mbuf *m, int flags); static int spx_send(struct socket *so, int flags, struct mbuf *m, - struct sockaddr *addr, struct mbuf *control, + struct sockaddr *addr, struct mbuf *control, struct thread *td); static int spx_shutdown(struct socket *so); static int spx_sp_attach(struct socket *so, int proto, struct thread *td); @@ -163,10 +163,7 @@ short ostate = 0; spxstat.spxs_rcvtotal++; - if (ipxp == NULL) { - panic("No ipxpcb in spx_input\n"); - return; - } + KASSERT(ipxp != NULL, ("spx_input: NULL ipxpcb")); cb = ipxtospxpcb(ipxp); if (cb == NULL) @@ -330,7 +327,7 @@ m_freem(m); } if (cb->s_force || (cb->s_flags & (SF_ACKNOW|SF_WIN|SF_RXT))) - spx_output(cb, (struct mbuf *)NULL); + spx_output(cb, NULL); cb->s_flags &= ~(SF_WIN|SF_RXT); return; @@ -358,7 +355,7 @@ drop: bad: - if (cb == 0 || cb->s_ipxpcb->ipxp_socket->so_options & SO_DEBUG || + if (cb == NULL || cb->s_ipxpcb->ipxp_socket->so_options & SO_DEBUG || traceallspxs) spx_trace(SA_DROP, (u_char)ostate, cb, &spx_savesi, 0); m_freem(m); @@ -411,7 +408,7 @@ cb->s_snxt = si->si_ack; cb->s_cwnd = CUNIT; cb->s_force = 1 + SPXT_REXMT; - spx_output(cb, (struct mbuf *)NULL); + spx_output(cb, NULL); cb->s_timer[SPXT_REXMT] = cb->s_rxtcur; cb->s_rtt = 0; if (cwnd >= 4 * CUNIT) @@ -489,13 +486,14 @@ /* * Trim Acked data from output queue. */ + SOCKBUF_LOCK(&so->so_snd); while ((m = so->so_snd.sb_mb) != NULL) { if (SSEQ_LT((mtod(m, struct spx *))->si_seq, si->si_ack)) - sbdroprecord(&so->so_snd); + sbdroprecord_locked(&so->so_snd); else break; } - sowwakeup(so); + sowwakeup_locked(so); cb->s_rack = si->si_ack; update_window: if (SSEQ_LT(cb->s_snxt, cb->s_rack)) @@ -533,11 +531,19 @@ return (0); } /* else queue this packet; */ } else { +#ifdef BROKEN + /* + * XXXRW: This is broken on at least one count: + * spx_close() will free the ipxp and related parts, + * which are then touched by spx_input() after the + * return from spx_reass(). + */ /*register struct socket *so = cb->s_ipxpcb->ipxp_socket; if (so->so_state && SS_NOFDREF) { spx_close(cb); } else would crash system*/ +#endif spx_istat.notyet++; m_freem(dtom(si)); return (0); @@ -585,6 +591,7 @@ } present: #define SPINC sizeof(struct spxhdr) + SOCKBUF_LOCK(&so->so_rcv); /* * Loop through all packets queued up to update acknowledge * number, and present all acknowledged data to user; @@ -596,12 +603,10 @@ m = dtom(q); if (SI(q)->si_cc & SPX_OB) { cb->s_oobflags &= ~SF_IOOB; - SOCKBUF_LOCK(&so->so_rcv); if (so->so_rcv.sb_cc) so->so_oobmark = so->so_rcv.sb_cc; else so->so_rcv.sb_state |= SBS_RCVATMARK; - SOCKBUF_UNLOCK(&so->so_rcv); } q = q->si_prev; remque(q->si_next); @@ -624,16 +629,14 @@ s[0] = 5; s[1] = 1; *(u_char *)(&s[2]) = dt; - sbappend(&so->so_rcv, mm); + sbappend_locked(&so->so_rcv, mm); } } if (sp->spx_cc & SPX_OB) { MCHTYPE(m, MT_OOBDATA); spx_newchecks[1]++; - SOCKBUF_LOCK(&so->so_rcv); so->so_oobmark = 0; so->so_rcv.sb_state &= ~SBS_RCVATMARK; - SOCKBUF_UNLOCK(&so->so_rcv); } if (packetp == 0) { m->m_data += SPINC; @@ -641,26 +644,28 @@ m->m_pkthdr.len -= SPINC; } if ((sp->spx_cc & SPX_EM) || packetp) { - sbappendrecord(&so->so_rcv, m); + sbappendrecord_locked(&so->so_rcv, m); spx_newchecks[9]++; } else - sbappend(&so->so_rcv, m); + sbappend_locked(&so->so_rcv, m); } else #endif if (packetp) { - sbappendrecord(&so->so_rcv, m); + sbappendrecord_locked(&so->so_rcv, m); } else { cb->s_rhdr = *mtod(m, struct spxhdr *); m->m_data += SPINC; m->m_len -= SPINC; m->m_pkthdr.len -= SPINC; - sbappend(&so->so_rcv, m); + sbappend_locked(&so->so_rcv, m); } } else break; } if (wakeup) - sorwakeup(so); + sorwakeup_locked(so); + else + SOCKBUF_UNLOCK(&so->so_rcv); return (0); } @@ -703,7 +708,7 @@ { struct socket *so = cb->s_ipxpcb->ipxp_socket; register struct mbuf *m; - register struct spx *si = (struct spx *)NULL; + register struct spx *si = NULL; register struct sockbuf *sb = &so->so_snd; int len = 0, win, rcv_win; short span, off, recordp = 0; @@ -916,7 +921,7 @@ if (rcv_win > 0) { u_short delta = 1 + cb->s_alo - cb->s_ack; int adv = rcv_win - (delta * cb->s_mtu); - + if ((so->so_rcv.sb_cc == 0 && adv >= (2 * cb->s_mtu)) || (100 * adv / so->so_rcv.sb_hiwat >= 35)) { spxstat.spxs_sndwinup++; @@ -971,7 +976,7 @@ if (rcv_win < 0) rcv_win = 0; alo = cb->s_ack - 1 + (rcv_win / ((short)cb->s_mtu)); - if (SSEQ_LT(alo, cb->s_alo)) + if (SSEQ_LT(alo, cb->s_alo)) alo = cb->s_alo; if (si != NULL) { @@ -1025,7 +1030,7 @@ if (cb->s_force != (1 + SPXT_PERSIST) || cb->s_timer[SPXT_PERSIST] == 0) { /* - * If this is a new packet and we are not currently + * If this is a new packet and we are not currently * timing anything, time this one. */ if (SSEQ_LT(cb->s_smax, si->si_seq)) { @@ -1081,7 +1086,7 @@ spx_trace(SA_OUTPUT, cb->s_state, cb, si, 0); if (so->so_options & SO_DONTROUTE) - error = ipx_outputfl(m, (struct route *)NULL, IPX_ROUTETOIF); + error = ipx_outputfl(m, NULL, IPX_ROUTETOIF); else error = ipx_outputfl(m, &cb->s_ipxpcb->ipxp_route, 0); } @@ -1169,12 +1174,12 @@ break; case SO_LAST_HEADER: - error = sooptcopyout(sopt, &cb->s_rhdr, + error = sooptcopyout(sopt, &cb->s_rhdr, sizeof cb->s_rhdr); break; case SO_DEFAULT_HEADERS: - error = sooptcopyout(sopt, &cb->s_shdr, + error = sooptcopyout(sopt, &cb->s_shdr, sizeof cb->s_shdr); break; @@ -1352,7 +1357,7 @@ SPXT_RANGESET(cb->s_rxtcur, ((SPXTV_SRTTBASE >> 2) + (SPXTV_SRTTDFLT << 2)) >> 1, SPXTV_MIN, SPXTV_REXMTMAX); - ipxp->ipxp_pcb = (caddr_t)cb; + ipxp->ipxp_pcb = (caddr_t)cb; spx_attach_end: splx(s); return (error); @@ -1363,14 +1368,14 @@ struct socket *so; struct sockaddr *nam; struct thread *td; -{ +{ struct ipxpcb *ipxp; ipxp = sotoipxpcb(so); return (ipx_pcbbind(ipxp, nam, td)); -} - +} + /* * Initiate connection to peer. * Enter SYN_SENT state, and mark socket as connecting. @@ -1393,7 +1398,7 @@ s = splnet(); if (ipxp->ipxp_lport == 0) { - error = ipx_pcbbind(ipxp, (struct sockaddr *)NULL, td); + error = ipx_pcbbind(ipxp, NULL, td); if (error) goto spx_connect_end; } @@ -1416,7 +1421,7 @@ * cb->s_dport. */ ipxp->ipxp_fport = 0; - error = spx_output(cb, (struct mbuf *)NULL); + error = spx_output(cb, NULL); spx_connect_end: splx(s); return (error); @@ -1480,7 +1485,7 @@ cb = ipxtospxpcb(ipxp); if (ipxp->ipxp_lport == 0) - error = ipx_pcbbind(ipxp, (struct sockaddr *)NULL, td); + error = ipx_pcbbind(ipxp, NULL, td); if (error == 0) cb->s_state = TCPS_LISTEN; return (error); @@ -1504,7 +1509,7 @@ s = splnet(); cb->s_flags |= SF_RVD; - spx_output(cb, (struct mbuf *)NULL); + spx_output(cb, NULL); cb->s_flags &= ~SF_RVD; splx(s); return (0); @@ -1522,12 +1527,15 @@ ipxp = sotoipxpcb(so); cb = ipxtospxpcb(ipxp); + SOCKBUF_LOCK(&so->so_rcv); if ((cb->s_oobflags & SF_IOOB) || so->so_oobmark || (so->so_rcv.sb_state & SBS_RCVATMARK)) { + SOCKBUF_UNLOCK(&so->so_rcv); m->m_len = 1; *mtod(m, caddr_t) = cb->s_iobc; return (0); } + SOCKBUF_UNLOCK(&so->so_rcv); return (EINVAL); } @@ -1580,7 +1588,7 @@ static int spx_shutdown(so) - struct socket *so; + struct socket *so; { int error; int s; @@ -1595,7 +1603,7 @@ socantsendmore(so); cb = spx_usrclosed(cb); if (cb != NULL) - error = spx_output(cb, (struct mbuf *)NULL); + error = spx_output(cb, NULL); splx(s); return (error); } @@ -1670,11 +1678,11 @@ } m_free(dtom(cb->s_ipx)); FREE(cb, M_PCB); - ipxp->ipxp_pcb = 0; + ipxp->ipxp_pcb = NULL; soisdisconnected(so); ipx_pcbdetach(ipxp); spxstat.spxs_closed++; - return ((struct spxpcb *)NULL); + return (NULL); } /* @@ -1738,7 +1746,7 @@ cb->s_flags &= ~SF_DELACK; cb->s_flags |= SF_ACKNOW; spxstat.spxs_delack++; - spx_output(cb, (struct mbuf *)NULL); + spx_output(cb, NULL); } } @@ -1772,13 +1780,16 @@ * spx_timers() returns (NULL) if it free'd * the pcb. */ - if (spx_timers(cb, i) == NULL) - continue; + cb = spx_timers(cb, i); + if (cb == NULL) + break; } } - cb->s_idle++; - if (cb->s_rtt) - cb->s_rtt++; + if (cb != NULL) { + cb->s_idle++; + if (cb->s_rtt) + cb->s_rtt++; + } } spx_iss += SPX_ISSINCR/PR_SLOWHZ; /* increment iss */ splx(s); @@ -1849,7 +1860,7 @@ win = 2; cb->s_cwnd = CUNIT; cb->s_ssthresh = win * CUNIT; - spx_output(cb, (struct mbuf *)NULL); + spx_output(cb, NULL); break; /* @@ -1859,7 +1870,7 @@ case SPXT_PERSIST: spxstat.spxs_persisttimeo++; spx_setpersist(cb); - spx_output(cb, (struct mbuf *)NULL); + spx_output(cb, NULL); break; /* @@ -1874,7 +1885,7 @@ if (cb->s_idle >= SPXTV_MAXIDLE) goto dropit; spxstat.spxs_keepprobe++; - spx_output(cb, (struct mbuf *)NULL); + spx_output(cb, NULL); } else cb->s_idle = 0; cb->s_timer[SPXT_KEEP] = SPXTV_KEEP; From owner-p4-projects@FreeBSD.ORG Sun Jan 2 22:29:44 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A0A016A4D0; Sun, 2 Jan 2005 22:29:44 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E58516A4CE for ; Sun, 2 Jan 2005 22:29:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC5CE43D39 for ; Sun, 2 Jan 2005 22:29:43 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j02MThOv045107 for ; Sun, 2 Jan 2005 22:29:43 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j02MTeRP045104 for perforce@freebsd.org; Sun, 2 Jan 2005 22:29:40 GMT (envelope-from marcel@freebsd.org) Date: Sun, 2 Jan 2005 22:29:40 GMT Message-Id: <200501022229.j02MTeRP045104@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 68168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jan 2005 22:29:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=68168 Change 68168 by marcel@marcel_nfs on 2005/01/02 22:29:13 IFC @68166 Affected files ... .. //depot/projects/ia64/COPYRIGHT#3 integrate .. //depot/projects/ia64/MAINTAINERS#44 integrate .. //depot/projects/ia64/Makefile#43 integrate .. //depot/projects/ia64/Makefile.inc1#99 integrate .. //depot/projects/ia64/UPDATING#74 integrate .. //depot/projects/ia64/UPDATING.64BTT#2 delete .. //depot/projects/ia64/bin/Makefile.inc#10 integrate .. //depot/projects/ia64/bin/ed/Makefile#11 integrate .. //depot/projects/ia64/bin/ps/ps.1#25 integrate .. //depot/projects/ia64/bin/rmail/Makefile#7 integrate .. //depot/projects/ia64/contrib/bind9/FREEBSD-Upgrade#3 integrate .. //depot/projects/ia64/contrib/file/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/file/LEGAL.NOTICE#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/animation#4 integrate .. //depot/projects/ia64/contrib/file/Magdir/archive#5 integrate .. //depot/projects/ia64/contrib/file/Magdir/audio#5 integrate .. //depot/projects/ia64/contrib/file/Magdir/console#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/elf#5 integrate .. //depot/projects/ia64/contrib/file/Magdir/esri#1 branch .. //depot/projects/ia64/contrib/file/Magdir/filesystems#6 integrate .. //depot/projects/ia64/contrib/file/Magdir/linux#4 integrate .. //depot/projects/ia64/contrib/file/Magdir/msdos#4 integrate .. //depot/projects/ia64/contrib/file/Magdir/os9#2 integrate .. //depot/projects/ia64/contrib/file/Magdir/perl#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/plan9#2 integrate .. //depot/projects/ia64/contrib/file/Magdir/sinclair#2 integrate .. //depot/projects/ia64/contrib/file/Magdir/sniffer#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/tex#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/virtutech#1 branch .. //depot/projects/ia64/contrib/file/Magdir/xo65#1 branch .. //depot/projects/ia64/contrib/file/Makefile.am#6 integrate .. //depot/projects/ia64/contrib/file/Makefile.in#6 integrate .. //depot/projects/ia64/contrib/file/PORTING#1 branch .. //depot/projects/ia64/contrib/file/aclocal.m4#5 integrate .. //depot/projects/ia64/contrib/file/apprentice.c#5 integrate .. //depot/projects/ia64/contrib/file/ascmagic.c#5 integrate .. //depot/projects/ia64/contrib/file/compress.c#4 integrate .. //depot/projects/ia64/contrib/file/config.h.in#6 integrate .. //depot/projects/ia64/contrib/file/configure#6 integrate .. //depot/projects/ia64/contrib/file/configure.in#6 integrate .. //depot/projects/ia64/contrib/file/file.c#6 integrate .. //depot/projects/ia64/contrib/file/file.h#5 integrate .. //depot/projects/ia64/contrib/file/fsmagic.c#4 integrate .. //depot/projects/ia64/contrib/file/funcs.c#2 integrate .. //depot/projects/ia64/contrib/file/install-sh#2 integrate .. //depot/projects/ia64/contrib/file/is_tar.c#4 integrate .. //depot/projects/ia64/contrib/file/magic.c#2 integrate .. //depot/projects/ia64/contrib/file/magic.h#2 integrate .. //depot/projects/ia64/contrib/file/magic.mime#5 integrate .. //depot/projects/ia64/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/ia64/contrib/file/names.h#4 integrate .. //depot/projects/ia64/contrib/file/patchlevel.h#6 integrate .. //depot/projects/ia64/contrib/file/print.c#5 integrate .. //depot/projects/ia64/contrib/file/readelf.c#6 integrate .. //depot/projects/ia64/contrib/file/readelf.h#4 integrate .. //depot/projects/ia64/contrib/file/softmagic.c#6 integrate .. //depot/projects/ia64/contrib/file/tar.h#3 integrate .. //depot/projects/ia64/contrib/file/test.c#2 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-common#14 integrate .. //depot/projects/ia64/etc/Makefile#46 integrate .. //depot/projects/ia64/etc/defaults/Makefile#5 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#58 integrate .. //depot/projects/ia64/etc/devd.conf#16 integrate .. //depot/projects/ia64/etc/isdn/Makefile#8 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#30 integrate .. //depot/projects/ia64/etc/mtree/Makefile#4 integrate .. //depot/projects/ia64/etc/namedb/Makefile#3 integrate .. //depot/projects/ia64/etc/pam.d/Makefile#10 integrate .. //depot/projects/ia64/etc/periodic/Makefile.inc#3 integrate .. //depot/projects/ia64/etc/rc.d/initdiskless#16 integrate .. //depot/projects/ia64/etc/rc.d/jail#13 integrate .. //depot/projects/ia64/etc/rc.d/named#12 integrate .. //depot/projects/ia64/etc/rc.d/ppp-user#7 integrate .. //depot/projects/ia64/etc/rc.shutdown#11 integrate .. //depot/projects/ia64/games/factor/Makefile#6 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#43 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes2#27 integrate .. //depot/projects/ia64/games/fortune/unstr/Makefile#3 integrate .. //depot/projects/ia64/games/ppt/Makefile#4 integrate .. //depot/projects/ia64/games/primes/Makefile#3 integrate .. //depot/projects/ia64/gnu/Makefile.inc#3 integrate .. //depot/projects/ia64/gnu/lib/libdialog/Makefile#8 integrate .. //depot/projects/ia64/gnu/lib/libg2c/Makefile#7 integrate .. //depot/projects/ia64/gnu/lib/libgcc/Makefile#21 integrate .. //depot/projects/ia64/gnu/lib/libgcov/Makefile#3 integrate .. //depot/projects/ia64/gnu/lib/libobjc/Makefile#11 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/ar/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/as/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile#14 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdbreplay/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile#11 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/ranlib/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/c++/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/c++filt/Makefile#10 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc1/Makefile#12 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc1obj/Makefile#11 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc1plus/Makefile#13 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/collect2/Makefile#9 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/f771/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/include/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/protoize/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/cvs/Makefile#10 integrate .. //depot/projects/ia64/gnu/usr.bin/dialog/TESTS/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/Makefile.inc#3 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/gdbtui/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/font/devX100-12/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/font/devX100/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/font/devX75-12/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/font/devX75/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grohtml/Makefile#8 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/html/Makefile#8 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#24 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.1#7 integrate .. //depot/projects/ia64/gnu/usr.bin/texinfo/infokey/Makefile#3 integrate .. //depot/projects/ia64/include/arpa/Makefile#3 integrate .. //depot/projects/ia64/include/protocols/Makefile#3 integrate .. //depot/projects/ia64/installworld_newk#2 delete .. //depot/projects/ia64/installworld_oldk#2 delete .. //depot/projects/ia64/kerberos5/Makefile.inc#15 integrate .. //depot/projects/ia64/kerberos5/libexec/ipropd-master/Makefile#10 integrate .. //depot/projects/ia64/kerberos5/libexec/ipropd-slave/Makefile#10 integrate .. //depot/projects/ia64/kerberos5/tools/asn1_compile/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/tools/make-print-version/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/tools/make-roken/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/usr.bin/ksu/Makefile#7 integrate .. //depot/projects/ia64/lib/Makefile#50 integrate .. //depot/projects/ia64/lib/bind/config.mk#5 integrate .. //depot/projects/ia64/lib/libarchive/Makefile#9 integrate .. //depot/projects/ia64/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_bzip2.c#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_all.c#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_iso9660.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_string.c#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_string.h#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#8 integrate .. //depot/projects/ia64/lib/libarchive/libarchive-formats.5#3 integrate .. //depot/projects/ia64/lib/libbsnmp/modules/Makefile#3 integrate .. //depot/projects/ia64/lib/libc/gen/signal.3#9 integrate .. //depot/projects/ia64/lib/libc/gen/sigsetops.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/syslog.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/syslog.c#11 integrate .. //depot/projects/ia64/lib/libc/net/inet6_option_space.3#6 integrate .. //depot/projects/ia64/lib/libc/regex/engine.c#6 integrate .. //depot/projects/ia64/lib/libc/sys/_exit.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/acct.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/adjtime.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/aio_suspend.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/chmod.2#9 integrate .. //depot/projects/ia64/lib/libc/sys/getitimer.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/recv.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/select.2#9 integrate .. //depot/projects/ia64/lib/libc_r/Makefile#9 integrate .. //depot/projects/ia64/lib/libcompat/Makefile#4 integrate .. //depot/projects/ia64/lib/libcrypt/Makefile#6 integrate .. //depot/projects/ia64/lib/libdisk/Makefile#13 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#25 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.3#8 integrate .. //depot/projects/ia64/lib/libfetch/Makefile#17 integrate .. //depot/projects/ia64/lib/libio/Makefile#3 integrate .. //depot/projects/ia64/lib/libipsec/Makefile#5 integrate .. //depot/projects/ia64/lib/libipx/ipx.3#4 integrate .. //depot/projects/ia64/lib/libmagic/config.h#2 integrate .. //depot/projects/ia64/lib/libmilter/Makefile#5 integrate .. //depot/projects/ia64/lib/libncp/Makefile#3 integrate .. //depot/projects/ia64/lib/libncurses/Makefile#19 integrate .. //depot/projects/ia64/lib/libpam/libpam/Makefile#28 integrate .. //depot/projects/ia64/lib/libpam/modules/Makefile.inc#10 integrate .. //depot/projects/ia64/lib/libpam/modules/modules.inc#18 integrate .. //depot/projects/ia64/lib/libpcap/Makefile#7 integrate .. //depot/projects/ia64/lib/libpcap/config.h#4 integrate .. //depot/projects/ia64/lib/libpthread/pthread.map#13 integrate .. //depot/projects/ia64/lib/libpthread/sys/thr_error.c#5 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#16 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_clean.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_concurrency.c#9 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#19 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_create.c#18 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_fork.c#6 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_init.c#21 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#48 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_mutex.c#16 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_once.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#35 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sem.c#5 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#30 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigsuspend.c#12 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_spinlock.c#8 integrate .. //depot/projects/ia64/lib/libradius/Makefile#8 integrate .. //depot/projects/ia64/lib/librpcsvc/Makefile#6 integrate .. //depot/projects/ia64/lib/libsm/Makefile#7 integrate .. //depot/projects/ia64/lib/libsmb/Makefile#5 integrate .. //depot/projects/ia64/lib/libstand/Makefile#19 integrate .. //depot/projects/ia64/lib/libstand/libstand.3#9 integrate .. //depot/projects/ia64/lib/libtelnet/Makefile#9 integrate .. //depot/projects/ia64/lib/libutil/_secure_path.c#4 integrate .. //depot/projects/ia64/lib/libutil/login_cap.3#7 integrate .. //depot/projects/ia64/lib/libwrap/Makefile#8 integrate .. //depot/projects/ia64/lib/liby/Makefile#7 integrate .. //depot/projects/ia64/lib/msun/bsdsrc/b_exp.c#4 integrate .. //depot/projects/ia64/lib/msun/bsdsrc/b_log.c#4 integrate .. //depot/projects/ia64/lib/msun/bsdsrc/b_tgamma.c#3 integrate .. //depot/projects/ia64/lib/msun/bsdsrc/mathimpl.h#4 integrate .. //depot/projects/ia64/libexec/Makefile#24 integrate .. //depot/projects/ia64/libexec/bootpd/bootpgw/Makefile#3 integrate .. //depot/projects/ia64/libexec/ftpd/Makefile#11 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.c#31 integrate .. //depot/projects/ia64/libexec/lukemftpd/Makefile#16 integrate .. //depot/projects/ia64/libexec/pt_chown/Makefile#3 integrate .. //depot/projects/ia64/libexec/save-entropy/Makefile#3 integrate .. //depot/projects/ia64/libexec/tcpd/Makefile#3 integrate .. //depot/projects/ia64/libexec/telnetd/Makefile#8 integrate .. //depot/projects/ia64/release/Makefile#87 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#32 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#87 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/early-adopter/article.sgml#11 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#22 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/intro.sgml#4 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#8 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml#5 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/share/sgml/release.dsl#9 integrate .. //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#8 integrate .. //depot/projects/ia64/release/doc/share/misc/man2hwnotes.pl#3 integrate .. //depot/projects/ia64/release/picobsd/bridge/crunch.conf#8 integrate .. //depot/projects/ia64/release/picobsd/build/picobsd#9 integrate .. //depot/projects/ia64/release/picobsd/tinyware/aps/Makefile#3 integrate .. //depot/projects/ia64/release/picobsd/tinyware/help/Makefile#3 integrate .. //depot/projects/ia64/release/picobsd/tinyware/login/Makefile#4 integrate .. //depot/projects/ia64/release/picobsd/tinyware/msg/Makefile#3 integrate .. //depot/projects/ia64/release/picobsd/tinyware/ns/Makefile#3 integrate .. //depot/projects/ia64/release/picobsd/tinyware/oinit/Makefile#3 integrate .. //depot/projects/ia64/release/picobsd/tinyware/passwd/Makefile#4 integrate .. //depot/projects/ia64/release/picobsd/tinyware/simple_httpd/Makefile#3 integrate .. //depot/projects/ia64/release/picobsd/tinyware/sps/Makefile#3 integrate .. //depot/projects/ia64/release/picobsd/tinyware/view/Makefile#3 integrate .. //depot/projects/ia64/release/picobsd/tinyware/vm/Makefile#3 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#22 integrate .. //depot/projects/ia64/sbin/Makefile#42 integrate .. //depot/projects/ia64/sbin/Makefile.inc#7 integrate .. //depot/projects/ia64/sbin/atm/atmconfig/Makefile#6 integrate .. //depot/projects/ia64/sbin/devd/Makefile#6 integrate .. //depot/projects/ia64/sbin/dhclient/dhcpctl/Makefile#3 integrate .. //depot/projects/ia64/sbin/dhclient/omapip/Makefile#4 integrate .. //depot/projects/ia64/sbin/dump/optr.c#16 integrate .. //depot/projects/ia64/sbin/fsck_ffs/main.c#16 integrate .. //depot/projects/ia64/sbin/geom/class/mirror/geom_mirror.c#3 integrate .. //depot/projects/ia64/sbin/geom/class/raid3/geom_raid3.c#4 integrate .. //depot/projects/ia64/sbin/geom/core/Makefile#3 integrate .. //depot/projects/ia64/sbin/geom/core/geom.c#5 integrate .. //depot/projects/ia64/sbin/growfs/growfs.8#13 integrate .. //depot/projects/ia64/sbin/gvinum/Makefile#3 integrate .. //depot/projects/ia64/sbin/ifconfig/af_link.c#2 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.c#24 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.h#7 integrate .. //depot/projects/ia64/sbin/ifconfig/ifieee80211.c#9 integrate .. //depot/projects/ia64/sbin/ifconfig/ifmac.c#3 integrate .. //depot/projects/ia64/sbin/ifconfig/ifmedia.c#9 integrate .. //depot/projects/ia64/sbin/ifconfig/ifvlan.c#4 integrate .. //depot/projects/ia64/sbin/init/Makefile#6 integrate .. //depot/projects/ia64/sbin/mca/Makefile#5 integrate .. //depot/projects/ia64/sbin/mdconfig/mdconfig.c#18 integrate .. //depot/projects/ia64/sbin/mknod/mknod.8#12 integrate .. //depot/projects/ia64/sbin/mount/mount.8#19 integrate .. //depot/projects/ia64/sbin/mount_cd9660/Makefile#5 integrate .. //depot/projects/ia64/sbin/mount_msdosfs/Makefile#8 integrate .. //depot/projects/ia64/sbin/mount_ntfs/Makefile#5 integrate .. //depot/projects/ia64/sbin/mount_udf/Makefile#4 integrate .. //depot/projects/ia64/sbin/mount_ufs/Makefile#2 integrate .. //depot/projects/ia64/sbin/rtsol/Makefile#7 integrate .. //depot/projects/ia64/sbin/sconfig/sconfig.8#5 integrate .. //depot/projects/ia64/sbin/slattach/slattach.8#7 integrate .. //depot/projects/ia64/secure/Makefile#7 integrate .. //depot/projects/ia64/secure/lib/libcrypto/Makefile#24 integrate .. //depot/projects/ia64/secure/lib/libssh/Makefile#15 integrate .. //depot/projects/ia64/secure/lib/libssl/Makefile#11 integrate .. //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#19 integrate .. //depot/projects/ia64/share/dict/Makefile#6 integrate .. //depot/projects/ia64/share/doc/IPv6/Makefile#4 integrate .. //depot/projects/ia64/share/doc/bind9/Makefile#3 integrate .. //depot/projects/ia64/share/examples/FreeBSD_version/Makefile#2 integrate .. //depot/projects/ia64/share/examples/Makefile#12 integrate .. //depot/projects/ia64/share/examples/autofs/driver/Makefile#3 integrate .. //depot/projects/ia64/share/examples/cvsup/ports-supfile#9 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#44 integrate .. //depot/projects/ia64/share/examples/find_interface/Makefile#2 integrate .. //depot/projects/ia64/share/examples/ipfilter/Makefile#4 integrate .. //depot/projects/ia64/share/examples/isdn/v21/Makefile#4 integrate .. //depot/projects/ia64/share/examples/kld/cdev/test/Makefile#3 integrate .. //depot/projects/ia64/share/examples/kld/syscall/test/Makefile#3 integrate .. //depot/projects/ia64/share/examples/libvgl/Makefile#4 integrate .. //depot/projects/ia64/share/examples/perfmon/Makefile#2 integrate .. //depot/projects/ia64/share/examples/pf/Makefile#3 integrate .. //depot/projects/ia64/share/examples/ppi/Makefile#3 integrate .. //depot/projects/ia64/share/examples/ppp/ppp.conf.isdn#4 integrate .. //depot/projects/ia64/share/examples/ppp/ppp.conf.sample#7 integrate .. //depot/projects/ia64/share/examples/ppp/ppp.conf.span-isp#4 integrate .. //depot/projects/ia64/share/examples/ppp/ppp.conf.span-isp.working#4 integrate .. //depot/projects/ia64/share/examples/smbfs/Makefile#5 integrate .. //depot/projects/ia64/share/examples/smbfs/print/Makefile#4 integrate .. //depot/projects/ia64/share/info/Makefile#6 integrate .. //depot/projects/ia64/share/man/Makefile#7 integrate .. //depot/projects/ia64/share/man/man3/Makefile#11 integrate .. //depot/projects/ia64/share/man/man3/pthread_once.3#3 integrate .. //depot/projects/ia64/share/man/man3/pthread_setspecific.3#2 integrate .. //depot/projects/ia64/share/man/man3/queue.3#6 integrate .. //depot/projects/ia64/share/man/man4/Makefile#80 integrate .. //depot/projects/ia64/share/man/man4/aac.4#9 integrate .. //depot/projects/ia64/share/man/man4/acpi.4#24 integrate .. //depot/projects/ia64/share/man/man4/altq.4#3 integrate .. //depot/projects/ia64/share/man/man4/ata.4#12 integrate .. //depot/projects/ia64/share/man/man4/ath.4#21 integrate .. //depot/projects/ia64/share/man/man4/atkbd.4#5 integrate .. //depot/projects/ia64/share/man/man4/aue.4#8 integrate .. //depot/projects/ia64/share/man/man4/bge.4#11 integrate .. //depot/projects/ia64/share/man/man4/bktr.4#8 integrate .. //depot/projects/ia64/share/man/man4/bpf.4#9 integrate .. //depot/projects/ia64/share/man/man4/de.4#7 integrate .. //depot/projects/ia64/share/man/man4/divert.4#8 integrate .. //depot/projects/ia64/share/man/man4/ef.4#6 integrate .. //depot/projects/ia64/share/man/man4/firewire.4#11 integrate .. //depot/projects/ia64/share/man/man4/fwe.4#6 integrate .. //depot/projects/ia64/share/man/man4/fwip.4#2 integrate .. //depot/projects/ia64/share/man/man4/fwohci.4#10 integrate .. //depot/projects/ia64/share/man/man4/ixgb.4#5 integrate .. //depot/projects/ia64/share/man/man4/lp.4#4 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/acpi_panasonic.4#3 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/cp.4#3 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/cs.4#4 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/ndis.4#5 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/ray.4#4 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/wl.4#5 integrate .. //depot/projects/ia64/share/man/man4/man4.sparc64/Makefile#2 integrate .. //depot/projects/ia64/share/man/man4/man4.sparc64/snd_audiocs.4#1 branch .. //depot/projects/ia64/share/man/man4/mpt.4#3 integrate .. //depot/projects/ia64/share/man/man4/netgraph.4#7 integrate .. //depot/projects/ia64/share/man/man4/ng_bt3c.4#8 integrate .. //depot/projects/ia64/share/man/man4/ng_etf.4#5 integrate .. //depot/projects/ia64/share/man/man4/ng_netflow.4#2 integrate .. //depot/projects/ia64/share/man/man4/ng_source.4#4 integrate .. //depot/projects/ia64/share/man/man4/ngatmbase.4#2 integrate .. //depot/projects/ia64/share/man/man4/pccbb.4#6 integrate .. //depot/projects/ia64/share/man/man4/polling.4#14 integrate .. //depot/projects/ia64/share/man/man4/pst.4#4 integrate .. //depot/projects/ia64/share/man/man4/random.4#7 integrate .. //depot/projects/ia64/share/man/man4/smp.4#9 integrate .. //depot/projects/ia64/share/man/man4/snd_maestro.4#1 branch .. //depot/projects/ia64/share/man/man4/snd_maestro3.4#2 integrate .. //depot/projects/ia64/share/man/man4/ti.4#10 integrate .. //depot/projects/ia64/share/man/man4/txp.4#4 integrate .. //depot/projects/ia64/share/man/man4/ubser.4#4 integrate .. //depot/projects/ia64/share/man/man4/umass.4#15 integrate .. //depot/projects/ia64/share/man/man4/vlan.4#10 integrate .. //depot/projects/ia64/share/man/man4/vpo.4#7 integrate .. //depot/projects/ia64/share/man/man4/wi.4#35 integrate .. //depot/projects/ia64/share/man/man4/wlan.4#6 integrate .. //depot/projects/ia64/share/man/man4/xl.4#6 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#50 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#58 integrate .. //depot/projects/ia64/share/man/man7/hier.7#28 integrate .. //depot/projects/ia64/share/man/man7/ports.7#14 integrate .. //depot/projects/ia64/share/man/man7/release.7#33 integrate .. //depot/projects/ia64/share/man/man8/picobsd.8#14 integrate .. //depot/projects/ia64/share/man/man9/Makefile#49 integrate .. //depot/projects/ia64/share/man/man9/bpf.9#2 integrate .. //depot/projects/ia64/share/man/man9/bus_dma.9#12 integrate .. //depot/projects/ia64/share/man/man9/ifnet.9#14 integrate .. //depot/projects/ia64/share/man/man9/kernel_mount.9#1 branch .. //depot/projects/ia64/share/man/man9/physio.9#6 integrate .. //depot/projects/ia64/share/man/man9/rtentry.9#8 integrate .. //depot/projects/ia64/share/man/man9/suser.9#8 integrate .. //depot/projects/ia64/share/man/man9/swi.9#7 integrate .. //depot/projects/ia64/share/man/man9/timeout.9#6 integrate .. //depot/projects/ia64/share/man/man9/vm_map_entry_resize_free.9#2 integrate .. //depot/projects/ia64/share/misc/Makefile#5 integrate .. //depot/projects/ia64/share/misc/bsd-family-tree#22 integrate .. //depot/projects/ia64/share/mk/Makefile#11 integrate .. //depot/projects/ia64/share/mk/bsd.README#9 integrate .. //depot/projects/ia64/share/mk/bsd.compat.mk#1 branch .. //depot/projects/ia64/share/mk/bsd.dep.mk#15 integrate .. //depot/projects/ia64/share/mk/bsd.doc.mk#7 integrate .. //depot/projects/ia64/share/mk/bsd.info.mk#8 integrate .. //depot/projects/ia64/share/mk/bsd.init.mk#2 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#32 integrate .. //depot/projects/ia64/share/mk/bsd.libnames.mk#28 integrate .. //depot/projects/ia64/share/mk/bsd.man.mk#11 integrate .. //depot/projects/ia64/share/mk/bsd.obj.mk#11 integrate .. //depot/projects/ia64/share/mk/bsd.pkg.mk#1 branch .. //depot/projects/ia64/share/mk/bsd.prog.mk#22 integrate .. //depot/projects/ia64/share/mk/sys.mk#19 integrate .. //depot/projects/ia64/share/security/Makefile#3 integrate .. //depot/projects/ia64/share/sendmail/Makefile#7 integrate .. //depot/projects/ia64/share/skel/Makefile#6 integrate .. //depot/projects/ia64/share/snmp/mibs/Makefile#3 integrate .. //depot/projects/ia64/share/syscons/fonts/Makefile#9 integrate .. //depot/projects/ia64/share/syscons/keymaps/Makefile#16 integrate .. //depot/projects/ia64/sys/alpha/alpha/cpuconf.c#6 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#47 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#53 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC#33 integrate .. //depot/projects/ia64/sys/alpha/include/rpb.h#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#45 integrate .. //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#21 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#22 integrate .. //depot/projects/ia64/sys/amd64/isa/isa.c#5 integrate .. //depot/projects/ia64/sys/arm/arm/intr.c#5 integrate .. //depot/projects/ia64/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/ia64/sys/arm/arm/swtch.S#6 integrate .. //depot/projects/ia64/sys/arm/arm/trap.c#6 integrate .. //depot/projects/ia64/sys/arm/conf/SIMICS#5 integrate .. //depot/projects/ia64/sys/arm/include/atomic.h#3 integrate .. //depot/projects/ia64/sys/arm/sa11x0/assabet_machdep.c#7 integrate .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_irqhandler.c#3 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/ia64/sys/boot/Makefile#14 integrate .. //depot/projects/ia64/sys/boot/alpha/boot1/Makefile#8 integrate .. //depot/projects/ia64/sys/boot/alpha/cdboot/Makefile#4 integrate .. //depot/projects/ia64/sys/boot/alpha/common/Makefile.common#5 integrate .. //depot/projects/ia64/sys/boot/alpha/netboot/Makefile#4 integrate .. //depot/projects/ia64/sys/boot/arc/loader/Makefile#3 integrate .. //depot/projects/ia64/sys/boot/i386/boot0/Makefile#9 integrate .. //depot/projects/ia64/sys/boot/i386/btx/btx/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/i386/btx/btxldr/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/i386/btx/lib/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/i386/cdboot/Makefile#5 integrate .. //depot/projects/ia64/sys/boot/i386/kgzldr/Makefile#11 integrate .. //depot/projects/ia64/sys/boot/i386/loader/Makefile#15 integrate .. //depot/projects/ia64/sys/boot/i386/mbr/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/ia64/efi/Makefile#3 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/ia64/sys/boot/pc98/boot0.5/Makefile#3 integrate .. //depot/projects/ia64/sys/boot/pc98/boot0/Makefile#3 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/Makefile#14 integrate .. //depot/projects/ia64/sys/boot/pc98/btx/btx/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/pc98/btx/btxldr/Makefile#5 integrate .. //depot/projects/ia64/sys/boot/pc98/btx/lib/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/pc98/kgzldr/Makefile#10 integrate .. //depot/projects/ia64/sys/boot/pc98/loader/Makefile#11 integrate .. //depot/projects/ia64/sys/boot/powerpc/loader/Makefile#9 integrate .. //depot/projects/ia64/sys/boot/sparc64/boot1/Makefile#7 integrate .. //depot/projects/ia64/sys/boot/sparc64/loader/Makefile#14 integrate .. //depot/projects/ia64/sys/compat/ndis/subr_hal.c#6 integrate .. //depot/projects/ia64/sys/conf/NOTES#85 integrate .. //depot/projects/ia64/sys/conf/files#124 integrate .. //depot/projects/ia64/sys/conf/files.amd64#24 integrate .. //depot/projects/ia64/sys/conf/files.i386#60 integrate .. //depot/projects/ia64/sys/conf/files.pc98#49 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#40 integrate .. //depot/projects/ia64/sys/conf/majors#38 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/fil.c#13 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_auth.c#10 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_compat.h#10 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_fil.c#16 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_fil.h#8 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_frag.c#9 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_log.c#10 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_nat.c#11 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_nat.h#7 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_proxy.c#11 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_state.c#11 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_state.h#6 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/mlfk_ipl.c#6 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf.c#11 integrate .. //depot/projects/ia64/sys/crypto/rijndael/Makefile#3 integrate .. //depot/projects/ia64/sys/dev/aac/aac_pci.c#31 integrate .. //depot/projects/ia64/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/ia64/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/ia64/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/ia64/sys/dev/acpi_support/acpi_sony.c#3 integrate .. //depot/projects/ia64/sys/dev/acpi_support/acpi_toshiba.c#2 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#57 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#23 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#25 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#22 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#27 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_powerres.c#13 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#18 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#32 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/Makefile#13 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#40 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#26 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#42 integrate .. //depot/projects/ia64/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/ia64/sys/dev/ath/ath_rate/amrr/amrr.h#2 integrate .. //depot/projects/ia64/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/ia64/sys/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#20 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath_pci.c#10 integrate .. //depot/projects/ia64/sys/dev/ath/if_athioctl.h#8 integrate .. //depot/projects/ia64/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/ia64/sys/dev/ath/if_athvar.h#11 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#56 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#28 integrate .. //depot/projects/ia64/sys/dev/bktr/CHANGELOG.TXT#3 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_card.c#9 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_card.h#5 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_tuner.c#6 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_tuner.h#2 integrate .. //depot/projects/ia64/sys/dev/bktr/msp34xx.c#4 integrate .. //depot/projects/ia64/sys/dev/cp/cpddk.c#3 integrate .. //depot/projects/ia64/sys/dev/cp/cpddk.h#3 integrate .. //depot/projects/ia64/sys/dev/cp/if_cp.c#6 integrate .. //depot/projects/ia64/sys/dev/ctau/if_ct.c#9 integrate .. //depot/projects/ia64/sys/dev/cx/if_cx.c#11 integrate .. //depot/projects/ia64/sys/dev/drm/drm_sysctl.h#7 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#41 integrate .. //depot/projects/ia64/sys/dev/fb/vga.c#18 integrate .. //depot/projects/ia64/sys/dev/fdc/fdc.c#11 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#54 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme_pci.c#16 integrate .. //depot/projects/ia64/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/ia64/sys/dev/ida/ida.c#15 integrate .. //depot/projects/ia64/sys/dev/ida/ida_pci.c#12 integrate .. //depot/projects/ia64/sys/dev/ida/idavar.h#5 integrate .. //depot/projects/ia64/sys/dev/if_ndis/if_ndis.c#10 integrate .. //depot/projects/ia64/sys/dev/kbd/atkbd.c#12 integrate .. //depot/projects/ia64/sys/dev/kbd/atkbdreg.h#2 integrate .. //depot/projects/ia64/sys/dev/kbd/kbd.c#14 integrate .. //depot/projects/ia64/sys/dev/md/md.c#48 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_pci.c#14 integrate .. //depot/projects/ia64/sys/dev/mse/mse.c#1 branch .. //depot/projects/ia64/sys/dev/mse/mse_cbus.c#1 branch .. //depot/projects/ia64/sys/dev/mse/mse_isa.c#1 branch .. //depot/projects/ia64/sys/dev/mse/msevar.h#1 branch .. //depot/projects/ia64/sys/dev/nmdm/nmdm.c#17 integrate .. //depot/projects/ia64/sys/dev/ofw/ofw_disk.c#12 integrate .. //depot/projects/ia64/sys/dev/patm/genrtab/Makefile#4 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbdevid.h#11 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#44 integrate .. //depot/projects/ia64/sys/dev/random/randomdev.c#17 integrate .. //depot/projects/ia64/sys/dev/random/randomdev_soft.c#5 integrate .. //depot/projects/ia64/sys/dev/re/if_re.c#18 integrate .. //depot/projects/ia64/sys/dev/snp/snp.c#22 integrate .. //depot/projects/ia64/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/usb/uaudio.h#2 integrate .. //depot/projects/ia64/sys/dev/sound/usb/uaudio_pcm.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/usb/uaudioreg.h#3 integrate .. //depot/projects/ia64/sys/dev/sym/sym_hipd.c#20 integrate .. //depot/projects/ia64/sys/dev/twe/twe.c#14 integrate .. //depot/projects/ia64/sys/dev/twe/tweio.h#4 integrate .. //depot/projects/ia64/sys/dev/usb/ehci.c#8 integrate .. //depot/projects/ia64/sys/dev/usb/ehci_pci.c#13 integrate .. //depot/projects/ia64/sys/dev/usb/ehcivar.h#4 integrate .. //depot/projects/ia64/sys/dev/usb/ohci.c#26 integrate .. //depot/projects/ia64/sys/dev/usb/ohci_pci.c#12 integrate .. //depot/projects/ia64/sys/dev/usb/ugen.c#27 integrate .. //depot/projects/ia64/sys/dev/usb/uhci_pci.c#14 integrate .. //depot/projects/ia64/sys/dev/usb/uhid.c#23 integrate .. //depot/projects/ia64/sys/dev/usb/ukbd.c#14 integrate .. //depot/projects/ia64/sys/dev/usb/umodem.c#15 integrate .. //depot/projects/ia64/sys/dev/usb/ums.c#19 integrate .. //depot/projects/ia64/sys/dev/usb/uplcom.c#16 integrate .. //depot/projects/ia64/sys/dev/usb/urio.c#18 integrate .. //depot/projects/ia64/sys/dev/usb/usb.c#22 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#64 integrate .. //depot/projects/ia64/sys/dev/usb/usbdi.h#10 integrate .. //depot/projects/ia64/sys/dev/usb/usbhid.h#3 integrate .. //depot/projects/ia64/sys/dev/usb/uscanner.c#23 integrate .. //depot/projects/ia64/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#56 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#35 integrate .. //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#31 integrate .. //depot/projects/ia64/sys/fs/ntfs/ntfs_vfsops.c#20 integrate .. //depot/projects/ia64/sys/fs/ntfs/ntfs_vnops.c#19 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_lock.c#11 integrate .. //depot/projects/ia64/sys/geom/geom.h#45 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#41 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#52 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#45 integrate .. //depot/projects/ia64/sys/geom/geom_kern.c#24 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#37 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#32 integrate .. //depot/projects/ia64/sys/geom/mirror/g_mirror.c#7 integrate .. //depot/projects/ia64/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/ia64/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/ia64/sys/geom/raid3/g_raid3.c#7 integrate .. //depot/projects/ia64/sys/geom/raid3/g_raid3.h#5 integrate .. //depot/projects/ia64/sys/geom/raid3/g_raid3_ctl.c#3 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_vnops.c#26 integrate .. //depot/projects/ia64/sys/i386/acpica/genwakecode.sh#3 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#53 integrate .. //depot/projects/ia64/sys/i386/i386/exception.s#15 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#33 integrate .. //depot/projects/ia64/sys/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/ia64/sys/i386/i386/local_apic.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/longrun.c#2 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#41 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#84 integrate .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#26 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#43 integrate .. //depot/projects/ia64/sys/i386/include/apicreg.h#3 integrate .. //depot/projects/ia64/sys/i386/include/apicvar.h#5 integrate .. //depot/projects/ia64/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/ia64/sys/i386/isa/isa.c#6 integrate .. //depot/projects/ia64/sys/i386/isa/mse.c#13 delete .. //depot/projects/ia64/sys/i386/pci/pci_cfgreg.c#24 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#87 integrate .. //depot/projects/ia64/sys/ia64/ia64/support.S#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/unaligned.c#6 integrate .. //depot/projects/ia64/sys/ia64/include/md_var.h#13 integrate .. //depot/projects/ia64/sys/isa/isa_common.c#11 integrate .. //depot/projects/ia64/sys/isa/isa_common.h#4 integrate .. //depot/projects/ia64/sys/isa/pnp.c#7 integrate .. //depot/projects/ia64/sys/isa/pnpvar.h#2 integrate .. //depot/projects/ia64/sys/kern/device_if.m#3 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#42 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#32 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#75 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#70 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#57 integrate .. //depot/projects/ia64/sys/kern/kern_intr.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_kse.c#8 integrate .. //depot/projects/ia64/sys/kern/kern_resource.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#79 integrate .. //depot/projects/ia64/sys/kern/kern_subr.c#32 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#39 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#58 integrate .. //depot/projects/ia64/sys/kern/kern_sysctl.c#27 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#85 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#12 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#27 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#40 integrate .. //depot/projects/ia64/sys/kern/subr_bus.c#36 integrate .. //depot/projects/ia64/sys/kern/subr_disk.c#20 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#46 integrate .. //depot/projects/ia64/sys/kern/subr_turnstile.c#10 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#49 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#43 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#44 integrate .. //depot/projects/ia64/sys/kern/sysv_msg.c#16 integrate .. //depot/projects/ia64/sys/kern/tty.c#41 integrate .. //depot/projects/ia64/sys/kern/tty_pty.c#24 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf.c#29 integrate .. //depot/projects/ia64/sys/kern/uipc_sem.c#12 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#46 integrate .. //depot/projects/ia64/sys/kern/uipc_socket2.c#34 integrate .. //depot/projects/ia64/sys/kern/uipc_usrreq.c#36 integrate .. //depot/projects/ia64/sys/kern/vfs_cluster.c#33 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#37 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#73 integrate .. //depot/projects/ia64/sys/modules/Makefile#80 integrate .. //depot/projects/ia64/sys/modules/acpi/acpi_asus/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/acpi/acpi_ibm/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/acpi/acpi_video/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/bktr/bktr/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/cp/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/if_gif/Makefile#6 integrate .. //depot/projects/ia64/sys/modules/if_ppp/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/if_tun/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/io/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/ipfilter/Makefile#6 integrate .. //depot/projects/ia64/sys/modules/mac_portacl/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/mem/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/mse/Makefile#1 branch .. //depot/projects/ia64/sys/modules/netgraph/Makefile#13 integrate .. //depot/projects/ia64/sys/modules/netgraph/bluetooth/ubt/Makefile#6 integrate .. //depot/projects/ia64/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/netgraph/fec/sample_startup#2 delete .. //depot/projects/ia64/sys/modules/pf/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/snp/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/sound/driver/uaudio/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/sppp/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/ti/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/ubsa/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/ubser/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/ucom/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/ucycom/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/uftdi/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/ugen/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/uhid/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/ukbd/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/ulpt/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/umct/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/umodem/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/ums/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/uplcom/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/urio/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/usb/Makefile#6 integrate .. //depot/projects/ia64/sys/modules/uscanner/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/uvisor/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/uvscom/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/vkbd/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/wlan_ccmp/Makefile#2 integrate .. //depot/projects/ia64/sys/net/bpf.c#34 integrate .. //depot/projects/ia64/sys/net/if_sppp.h#3 integrate .. //depot/projects/ia64/sys/net/if_spppfr.c#1 branch .. //depot/projects/ia64/sys/net/if_spppsubr.c#19 integrate .. //depot/projects/ia64/sys/net/if_tap.c#26 integrate .. //depot/projects/ia64/sys/net/if_tun.c#27 integrate .. //depot/projects/ia64/sys/net/ppp_tty.c#12 integrate .. //depot/projects/ia64/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211.c#12 integrate .. //depot/projects/ia64/sys/net80211/ieee80211.h#7 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_crypto.c#5 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_crypto.h#4 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_crypto_none.c#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_input.c#12 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.c#12 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.h#7 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_node.c#13 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_node.h#10 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_output.c#11 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_proto.c#10 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_proto.h#6 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_var.h#11 integrate .. //depot/projects/ia64/sys/net80211/ieee80211_xauth.c#2 integrate .. //depot/projects/ia64/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/ia64/sys/netgraph/ng_base.c#21 integrate .. //depot/projects/ia64/sys/netgraph/ng_bridge.c#15 integrate .. //depot/projects/ia64/sys/netgraph/ng_device.c#9 integrate .. //depot/projects/ia64/sys/netgraph/ng_ether.c#15 integrate .. //depot/projects/ia64/sys/netgraph/ng_sample.c#5 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#36 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.h#25 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#49 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#45 integrate .. //depot/projects/ia64/sys/netinet/ip_var.h#25 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#56 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#46 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.c#21 integrate .. //depot/projects/ia64/sys/netinet/tcp_var.h#23 integrate .. //depot/projects/ia64/sys/netipx/README#2 integrate .. //depot/projects/ia64/sys/netipx/ipx.c#8 integrate .. //depot/projects/ia64/sys/netipx/ipx.h#5 integrate .. //depot/projects/ia64/sys/netipx/ipx_cksum.c#4 integrate .. //depot/projects/ia64/sys/netipx/ipx_if.h#4 integrate .. //depot/projects/ia64/sys/netipx/ipx_input.c#10 integrate .. //depot/projects/ia64/sys/netipx/ipx_ip.c#10 integrate .. //depot/projects/ia64/sys/netipx/ipx_outputfl.c#6 integrate .. //depot/projects/ia64/sys/netipx/ipx_pcb.c#10 integrate .. //depot/projects/ia64/sys/netipx/ipx_pcb.h#4 integrate .. //depot/projects/ia64/sys/netipx/ipx_proto.c#4 integrate .. //depot/projects/ia64/sys/netipx/ipx_usrreq.c#15 integrate .. //depot/projects/ia64/sys/netipx/ipx_var.h#4 integrate .. //depot/projects/ia64/sys/netipx/spx.h#3 integrate .. //depot/projects/ia64/sys/netipx/spx_usrreq.c#14 integrate .. //depot/projects/ia64/sys/nfsclient/nfs.h#18 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_bio.c#32 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_nfsiod.c#12 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#33 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#39 integrate .. //depot/projects/ia64/sys/nfsclient/nfsnode.h#11 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#45 integrate .. //depot/projects/ia64/sys/pc98/pc98/fd.c#33 integrate .. //depot/projects/ia64/sys/pc98/pc98/mse.c#11 delete .. //depot/projects/ia64/sys/pci/agp_ali.c#11 integrate .. //depot/projects/ia64/sys/pci/agp_intel.c#19 integrate .. //depot/projects/ia64/sys/pci/agp_sis.c#12 integrate .. //depot/projects/ia64/sys/pci/agp_via.c#13 integrate .. //depot/projects/ia64/sys/pci/if_sk.c#29 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#39 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#48 integrate .. //depot/projects/ia64/sys/sparc64/include/ver.h#5 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/identcpu.c#10 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#54 integrate .. //depot/projects/ia64/sys/sys/bio.h#23 integrate .. //depot/projects/ia64/sys/sys/bus.h#19 integrate .. //depot/projects/ia64/sys/sys/copyright.h#6 integrate .. //depot/projects/ia64/sys/sys/filedesc.h#22 integrate .. //depot/projects/ia64/sys/sys/ktr.h#11 integrate .. //depot/projects/ia64/sys/sys/mdioctl.h#11 integrate .. //depot/projects/ia64/sys/sys/mouse.h#4 integrate .. //depot/projects/ia64/sys/sys/msgbuf.h#9 integrate .. //depot/projects/ia64/sys/sys/param.h#62 integrate .. //depot/projects/ia64/sys/sys/proc.h#90 integrate .. //depot/projects/ia64/sys/sys/sched.h#10 integrate .. //depot/projects/ia64/sys/sys/syscall.h#42 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#42 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#45 integrate .. //depot/projects/ia64/sys/sys/turnstile.h#5 integrate .. //depot/projects/ia64/sys/sys/umtx.h#5 integrate .. //depot/projects/ia64/sys/sys/vnode.h#44 integrate .. //depot/projects/ia64/sys/tools/usbdevs2h.awk#2 integrate .. //depot/projects/ia64/sys/tools/vnode_if.awk#10 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#49 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#42 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#23 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#43 integrate .. //depot/projects/ia64/sys/vm/uma.h#16 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#63 integrate .. //depot/projects/ia64/sys/vm/uma_dbg.c#15 integrate .. //depot/projects/ia64/sys/vm/uma_dbg.h#6 integrate .. //depot/projects/ia64/sys/vm/uma_int.h#24 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#47 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#76 integrate .. //depot/projects/ia64/sys/vm/vm_meter.c#18 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#79 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#68 integrate .. //depot/projects/ia64/sys/vm/vm_page.h#33 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#50 integrate .. //depot/projects/ia64/tools/KSE/ksetest/Makefile#4 integrate .. //depot/projects/ia64/tools/KSE/rr/Makefile#2 integrate .. //depot/projects/ia64/tools/diag/dumpvfscache/Makefile#4 integrate .. //depot/projects/ia64/tools/diag/localeck/Makefile#4 integrate .. //depot/projects/ia64/tools/regression/aio/aiotest/Makefile#2 integrate .. //depot/projects/ia64/tools/regression/fsx/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/gaithrstress/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/geom/ConfCmp/Makefile#6 integrate .. //depot/projects/ia64/tools/regression/geom/MdLoad/Makefile#4 integrate .. //depot/projects/ia64/tools/regression/geom_mirror/test-1.sh#2 integrate .. //depot/projects/ia64/tools/regression/geom_mirror/test-2.sh#2 integrate .. //depot/projects/ia64/tools/regression/geom_mirror/test-3.sh#2 integrate .. //depot/projects/ia64/tools/regression/geom_mirror/test-4.sh#2 integrate .. //depot/projects/ia64/tools/regression/geom_mirror/test-5.sh#2 integrate .. //depot/projects/ia64/tools/regression/geom_mirror/test-6.sh#2 integrate .. //depot/projects/ia64/tools/regression/geom_mirror/test-7.sh#2 integrate .. //depot/projects/ia64/tools/regression/geom_raid3/test-12.sh#2 integrate .. //depot/projects/ia64/tools/regression/ia64/unaligned/test.c#1 branch .. //depot/projects/ia64/tools/regression/ia64/unaligned/unaligned.t#1 branch .. //depot/projects/ia64/tools/regression/ia64_unaligned/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/include/tgmath/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/netatalk/simple_send/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/netinet/ipsockopt/Makefile#2 integrate .. //depot/projects/ia64/tools/regression/netinet/tcpconnect/Makefile#2 integrate .. //depot/projects/ia64/tools/regression/netinet/tcpfullwindowrst/Makefile#2 integrate .. //depot/projects/ia64/tools/regression/netinet/tcpstream/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/nfsmmap/test1/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/nfsmmap/test2/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/p1003_1b/Makefile#4 integrate .. //depot/projects/ia64/tools/regression/pipe/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/security/access/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/security/proc_to_proc/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/sockets/accept_fd_leak/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/sockets/accf_data_attach/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/sockets/kqueue/Makefile#2 integrate .. //depot/projects/ia64/tools/regression/sockets/listenclose/Makefile#2 integrate .. //depot/projects/ia64/tools/regression/sockets/socketpair/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/sysvmsg/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/sysvsem/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/sysvshm/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/tls/libxx/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/tls/libyy/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/tls/ttls1/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/tls/ttls2/Makefile#3 integrate .. //depot/projects/ia64/tools/sched/schedgraph.py#1 branch .. //depot/projects/ia64/tools/test/malloc/Makefile#4 integrate .. //depot/projects/ia64/tools/test/ppsapi/Makefile#4 integrate .. //depot/projects/ia64/tools/tools/aac/Makefile#3 integrate .. //depot/projects/ia64/tools/tools/ath/80211stats.c#4 integrate .. //depot/projects/ia64/tools/tools/find-sb/Makefile#2 integrate .. //depot/projects/ia64/tools/tools/gdb_regofs/Makefile#3 integrate .. //depot/projects/ia64/tools/tools/ifinfo/Makefile#2 integrate .. //depot/projects/ia64/tools/tools/kttcp/kttcp.c#2 integrate .. //depot/projects/ia64/tools/tools/kttcp/sys/kttcp.c#3 integrate .. //depot/projects/ia64/tools/tools/ministat/Makefile#5 integrate .. //depot/projects/ia64/tools/tools/nanobsd/Customize/comconsole#2 integrate .. //depot/projects/ia64/tools/tools/nanobsd/make.conf#6 integrate .. //depot/projects/ia64/tools/tools/netrate/Makefile.inc#1 branch .. //depot/projects/ia64/tools/tools/netrate/netblast/Makefile#2 integrate .. //depot/projects/ia64/tools/tools/netrate/netreceive/Makefile#3 integrate .. //depot/projects/ia64/tools/tools/netrate/netsend/Makefile#4 integrate .. //depot/projects/ia64/tools/tools/netrate/netsend/netsend.c#6 integrate .. //depot/projects/ia64/tools/tools/pirtool/Makefile#3 integrate .. //depot/projects/ia64/tools/tools/recoverdisk/Makefile#3 integrate .. //depot/projects/ia64/tools/tools/syscall_timing/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/Makefile#67 integrate .. //depot/projects/ia64/usr.bin/alias/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/bzip2recover/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#50 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.music#6 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.newzealand#2 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik#4 integrate .. //depot/projects/ia64/usr.bin/catman/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/catman/catman.1#4 integrate .. //depot/projects/ia64/usr.bin/catman/catman.c#8 integrate .. //depot/projects/ia64/usr.bin/chpass/Makefile#6 integrate .. //depot/projects/ia64/usr.bin/dirname/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/elf2aout/Makefile#8 integrate .. //depot/projects/ia64/usr.bin/fetch/Makefile#10 integrate .. //depot/projects/ia64/usr.bin/file/config.h#6 integrate .. //depot/projects/ia64/usr.bin/file/file.1#9 integrate .. //depot/projects/ia64/usr.bin/file/magic.5#5 integrate .. //depot/projects/ia64/usr.bin/lessecho/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/lex/lib/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/limits/limits.c#6 integrate .. //depot/projects/ia64/usr.bin/locate/bigram/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/locate/code/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/make/Makefile#16 integrate .. //depot/projects/ia64/usr.bin/make/arch.c#12 integrate .. //depot/projects/ia64/usr.bin/make/compat.c#15 integrate .. //depot/projects/ia64/usr.bin/make/cond.c#14 integrate .. //depot/projects/ia64/usr.bin/make/dir.c#14 integrate .. //depot/projects/ia64/usr.bin/make/dir.h#6 integrate .. //depot/projects/ia64/usr.bin/make/for.c#9 integrate .. //depot/projects/ia64/usr.bin/make/job.c#19 integrate .. //depot/projects/ia64/usr.bin/make/lst.h#8 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstConcat.c#6 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstDestroy.c#7 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstDupl.c#7 integrate .. //depot/projects/ia64/usr.bin/make/lst.lib/lstInit.c#6 delete .. //depot/projects/ia64/usr.bin/make/main.c#28 integrate .. //depot/projects/ia64/usr.bin/make/make.c#11 integrate .. //depot/projects/ia64/usr.bin/make/make.h#11 integrate .. //depot/projects/ia64/usr.bin/make/nonints.h#14 integrate .. //depot/projects/ia64/usr.bin/make/parse.c#21 integrate .. //depot/projects/ia64/usr.bin/make/str.c#13 integrate .. //depot/projects/ia64/usr.bin/make/suff.c#12 integrate .. //depot/projects/ia64/usr.bin/make/targ.c#12 integrate .. //depot/projects/ia64/usr.bin/make/var.c#20 integrate .. //depot/projects/ia64/usr.bin/netstat/ipx.c#5 integrate .. //depot/projects/ia64/usr.bin/netstat/main.c#14 integrate .. //depot/projects/ia64/usr.bin/passwd/Makefile#5 integrate .. //depot/projects/ia64/usr.bin/rev/rev.c#7 integrate .. //depot/projects/ia64/usr.bin/tar/Makefile#5 integrate .. //depot/projects/ia64/usr.bin/tar/bsdtar.c#6 integrate .. //depot/projects/ia64/usr.bin/tar/bsdtar_platform.h#5 integrate .. //depot/projects/ia64/usr.bin/tar/configure.ac.in#2 integrate .. //depot/projects/ia64/usr.bin/tar/fts.c#3 integrate .. //depot/projects/ia64/usr.bin/tar/matching.c#4 integrate .. //depot/projects/ia64/usr.bin/telnet/Makefile#8 integrate .. //depot/projects/ia64/usr.bin/unexpand/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/uudecode/Makefile#7 integrate .. //depot/projects/ia64/usr.bin/vgrind/RETEST/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/wc/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/wc/wc.c#8 integrate .. //depot/projects/ia64/usr.bin/xlint/lint2/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/Makefile#68 integrate .. //depot/projects/ia64/usr.sbin/apm/apm.c#9 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.c#16 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/bthidd/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/boot0cfg/boot0cfg.c#9 integrate .. //depot/projects/ia64/usr.sbin/bootparamd/callbootd/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.8#18 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.c#18 integrate .. //depot/projects/ia64/usr.sbin/config/config.8#10 integrate .. //depot/projects/ia64/usr.sbin/crunch/examples/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/ctm/ctm_dequeue/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/ctm/ctm_smail/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/ctm/mkCTM/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.8#13 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/common.c#8 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/ctlinfo.c#7 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/displayq.c#4 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/lp.h#6 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/matchjobs.c#4 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/rmjob.c#5 integrate .. //depot/projects/ia64/usr.sbin/lpr/filters.ru/koi2855/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/lpr/filters.ru/koi2alt/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/lpr/filters/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpd/printjob.c#11 integrate .. //depot/projects/ia64/usr.sbin/mount_smbfs/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/mrouted/testrsrr/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/nologin/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/ntp/Makefile#6 integrate .. //depot/projects/ia64/usr.sbin/ntp/Makefile.inc#5 integrate .. //depot/projects/ia64/usr.sbin/ntp/ntp-keygen/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/ntp/ntpd/Makefile#7 integrate .. //depot/projects/ia64/usr.sbin/ntp/ntpdate/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/ntp/ntpdc/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/ntp/ntpq/Makefile#5 integrate .. //depot/projects/ia64/usr.sbin/ntp/ntptime/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/ntp/ntptrace/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/ntp/sntp/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/pccard/Makefile.inc#2 integrate .. //depot/projects/ia64/usr.sbin/pcvt/Misc/Doc/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/pcvt/Misc/Etc/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/pcvt/Misc/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/pcvt/demo/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/pcvt/kbdio/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/Makefile#6 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/Makefile.inc#5 integrate .. //depot/projects/ia64/usr.sbin/ppp/Makefile#11 integrate .. //depot/projects/ia64/usr.sbin/ppp/command.c#21 integrate .. //depot/projects/ia64/usr.sbin/ppp/lcp.c#10 integrate .. //depot/projects/ia64/usr.sbin/ppp/lcp.h#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/lqr.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/main.c#10 integrate .. //depot/projects/ia64/usr.sbin/ppp/ppp.8.m4#24 integrate .. //depot/projects/ia64/usr.sbin/pppctl/pppctl.c#4 integrate .. //depot/projects/ia64/usr.sbin/pppd/Makefile#7 integrate .. //depot/projects/ia64/usr.sbin/repquota/repquota.c#10 integrate .. //depot/projects/ia64/usr.sbin/rpc.ypupdated/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/sendmail/Makefile#14 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/Makefile#13 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/devices.c#18 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#23 integrate .. //depot/projects/ia64/usr.sbin/tcpdchk/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/tcpdmatch/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/tcpdump/tcpdump/Makefile#7 integrate .. //depot/projects/ia64/usr.sbin/traceroute/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/vnconfig/Makefile#3 integrate Differences ... ==== //depot/projects/ia64/COPYRIGHT#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 3 02:02:13 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7833F16A4CE; Mon, 3 Jan 2005 02:02:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E85E16A4CF for ; Mon, 3 Jan 2005 02:02:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A2FF43D2D for ; Mon, 3 Jan 2005 02:02:06 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j03226k3058584 for ; Mon, 3 Jan 2005 02:02:06 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0322548058581 for perforce@freebsd.org; Mon, 3 Jan 2005 02:02:06 GMT (envelope-from davidxu@freebsd.org) Date: Mon, 3 Jan 2005 02:02:06 GMT Message-Id: <200501030202.j0322548058581@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68182 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jan 2005 02:02:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=68182 Change 68182 by davidxu@davidxu_celeron on 2005/01/03 02:01:16 simplify code. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cancel.c#6 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cancel.c#6 (text+ko) ==== @@ -39,17 +39,19 @@ _pthread_cancel(pthread_t pthread) { struct pthread *curthread = _get_curthread(); - int oldval, newval, ret; + int oldval, newval = 0; + int ret; if ((ret = _thr_ref_add(curthread, pthread, 0)) != 0) return (ret); + do { oldval = pthread->cancelflags; if (oldval & THR_CANCEL_NEEDED) break; newval = oldval | THR_CANCEL_NEEDED; } while (!atomic_cmpset_acq_int(&pthread->cancelflags, oldval, newval)); - + if (!(oldval & THR_CANCEL_NEEDED) && SHOULD_ASYNC_CANCEL(newval)) thr_kill(pthread->tid, SIGCANCEL); @@ -57,78 +59,75 @@ return (0); } +static inline void +testcancel(struct pthread *curthread) +{ + int newval; + + newval = curthread->cancelflags; + if (SHOULD_CANCEL(newval)) + pthread_exit(PTHREAD_CANCELED); +} + int _pthread_setcancelstate(int state, int *oldstate) { struct pthread *curthread = _get_curthread(); - int oldval, newval; + int oldval, ret; - if (state != PTHREAD_CANCEL_ENABLE && state != PTHREAD_CANCEL_DISABLE) - return (EINVAL); + oldval = curthread->cancelflags; + if (oldstate != NULL) + *oldstate = ((oldval & THR_CANCEL_DISABLE) ? + PTHREAD_CANCEL_DISABLE : PTHREAD_CANCEL_ENABLE); + switch (state) { + case PTHREAD_CANCEL_DISABLE: + atomic_set_int(&curthread->cancelflags, THR_CANCEL_DISABLE); + ret = 0; + break; + case PTHREAD_CANCEL_ENABLE: + atomic_clear_int(&curthread->cancelflags, THR_CANCEL_DISABLE); + testcancel(curthread); + ret = 0; + break; + default: + ret = EINVAL; + } - for (;;) { - oldval = curthread->cancelflags; - newval = (state == PTHREAD_CANCEL_DISABLE ? - oldval | THR_CANCEL_DISABLE : - oldval & ~THR_CANCEL_DISABLE); - - if (oldstate != NULL) - *oldstate = ((oldval & THR_CANCEL_DISABLE) ? - PTHREAD_CANCEL_DISABLE : PTHREAD_CANCEL_ENABLE); - - if (oldval == newval) - break; - - if (atomic_cmpset_acq_int(&curthread->cancelflags, oldval, - newval)) { - if (SHOULD_CANCEL(newval)) - pthread_exit(PTHREAD_CANCELED); - break; - } - } - - return (0); + return (ret); } int _pthread_setcanceltype(int type, int *oldtype) { struct pthread *curthread = _get_curthread(); - int oldval, newval; + int oldval, ret; - if (type != PTHREAD_CANCEL_DEFERRED && - type != PTHREAD_CANCEL_ASYNCHRONOUS) - return (EINVAL); - - for (;;) { - oldval = curthread->cancelflags; - if (oldtype != NULL) - *oldtype = ((oldval & THR_CANCEL_AT_POINT) ? + oldval = curthread->cancelflags; + if (oldtype != NULL) + *oldtype = ((oldval & THR_CANCEL_AT_POINT) ? PTHREAD_CANCEL_ASYNCHRONOUS : PTHREAD_CANCEL_DEFERRED); - newval = (type == PTHREAD_CANCEL_ASYNCHRONOUS ? - oldval | THR_CANCEL_AT_POINT : - oldval & ~THR_CANCEL_AT_POINT); - if (oldval == newval) - break; - if (atomic_cmpset_acq_int(&curthread->cancelflags, oldval, - newval)) { - if (SHOULD_CANCEL(newval)) - pthread_exit(PTHREAD_CANCELED); - break; - } + switch (type) { + case PTHREAD_CANCEL_ASYNCHRONOUS: + atomic_set_int(&curthread->cancelflags, THR_CANCEL_AT_POINT); + testcancel(curthread); + ret = 0; + break; + case PTHREAD_CANCEL_DEFERRED: + atomic_clear_int(&curthread->cancelflags, THR_CANCEL_AT_POINT); + ret = 0; + break; + default: + ret = EINVAL; } - - return (0); + + return (ret); } void _pthread_testcancel(void) { - struct pthread *curthread = _get_curthread(); - - if (SHOULD_CANCEL(curthread->cancelflags)) - pthread_exit(PTHREAD_CANCELED); + testcancel(_get_curthread()); } int @@ -136,16 +135,10 @@ { int oldval; - for (;;) { - oldval = curthread->cancelflags; - if (oldval & THR_CANCEL_AT_POINT) - break; - int newval = oldval | THR_CANCEL_AT_POINT; - if (atomic_cmpset_acq_int(&curthread->cancelflags, oldval, - newval)) { - if (SHOULD_CANCEL(newval)) - pthread_exit(PTHREAD_CANCELED); - } + oldval = curthread->cancelflags; + if (!(oldval & THR_CANCEL_AT_POINT)) { + atomic_set_int(&curthread->cancelflags, THR_CANCEL_AT_POINT); + testcancel(curthread); } return (oldval); } From owner-p4-projects@FreeBSD.ORG Mon Jan 3 12:13:02 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87DD616A4D0; Mon, 3 Jan 2005 12:13:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6335816A4CE for ; Mon, 3 Jan 2005 12:13:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B5B443D45 for ; Mon, 3 Jan 2005 12:13:02 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j03CD2c7017910 for ; Mon, 3 Jan 2005 12:13:02 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j03CD1mh017907 for perforce@freebsd.org; Mon, 3 Jan 2005 12:13:01 GMT (envelope-from davidxu@freebsd.org) Date: Mon, 3 Jan 2005 12:13:01 GMT Message-Id: <200501031213.j03CD1mh017907@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68199 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jan 2005 12:13:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=68199 Change 68199 by davidxu@davidxu_tiger on 2005/01/03 12:12:27 remove unused files. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_open.c#3 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_wait4.c#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 3 19:39:07 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1BA516A4D0; Mon, 3 Jan 2005 19:39:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B10A016A4CE for ; Mon, 3 Jan 2005 19:39:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8281743D31 for ; Mon, 3 Jan 2005 19:39:06 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j03Jd6ik045780 for ; Mon, 3 Jan 2005 19:39:06 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j03Jd6q9045777 for perforce@freebsd.org; Mon, 3 Jan 2005 19:39:06 GMT (envelope-from sam@freebsd.org) Date: Mon, 3 Jan 2005 19:39:06 GMT Message-Id: <200501031939.j03Jd6q9045777@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 68218 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jan 2005 19:39:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=68218 Change 68218 by sam@sam_ebb on 2005/01/03 19:38:59 o don't bzero the softc; it's created zero'd o don't save+restore common pci registers on suspend/resume; the system does this for us o force the retry timeout register to zero to disable Tx retries; this causes problems when the cpu is operating in C3 resulting in dma errors (taken from Linux) Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath_pci.c#7 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath_pci.c#7 (text+ko) ==== @@ -77,12 +77,10 @@ struct resource *sc_sr; /* memory resource */ struct resource *sc_irq; /* irq resource */ void *sc_ih; /* interrupt handler */ - u_int8_t sc_saved_intline; - u_int8_t sc_saved_cachelinesz; - u_int8_t sc_saved_lattimer; }; #define BS_BAR 0x10 +#define PCIR_RETRY_TIMEOUT 0x41 static int ath_pci_probe(device_t dev) @@ -97,32 +95,48 @@ return ENXIO; } -static int -ath_pci_attach(device_t dev) +static u_int32_t +ath_pci_setup(device_t dev) { - struct ath_pci_softc *psc = device_get_softc(dev); - struct ath_softc *sc = &psc->sc_sc; u_int32_t cmd; - int error = ENXIO; - int rid; - bzero(psc, sizeof (*psc)); - sc->sc_dev = dev; - + /* + * Enable memory mapping and bus mastering. + */ cmd = pci_read_config(dev, PCIR_COMMAND, 4); cmd |= PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN; pci_write_config(dev, PCIR_COMMAND, cmd, 4); cmd = pci_read_config(dev, PCIR_COMMAND, 4); - if ((cmd & PCIM_CMD_MEMEN) == 0) { device_printf(dev, "failed to enable memory mapping\n"); - goto bad; + return 0; } - if ((cmd & PCIM_CMD_BUSMASTEREN) == 0) { device_printf(dev, "failed to enable bus mastering\n"); + return 0; + } + + /* + * Disable retry timeout to keep PCI Tx retries from + * interfering with C3 CPU state. + */ + pci_write_config(dev, PCIR_RETRY_TIMEOUT, 0, 1); + + return 1; +} + +static int +ath_pci_attach(device_t dev) +{ + struct ath_pci_softc *psc = device_get_softc(dev); + struct ath_softc *sc = &psc->sc_sc; + int error = ENXIO; + int rid; + + sc->sc_dev = dev; + + if (!ath_pci_setup(dev)) goto bad; - } /* * Setup memory-mapping of PCI registers. @@ -235,10 +249,6 @@ ath_suspend(&psc->sc_sc); - psc->sc_saved_intline = pci_read_config(dev, PCIR_INTLINE, 1); - psc->sc_saved_cachelinesz= pci_read_config(dev, PCIR_CACHELNSZ, 1); - psc->sc_saved_lattimer = pci_read_config(dev, PCIR_LATTIMER, 1); - return (0); } @@ -246,16 +256,9 @@ ath_pci_resume(device_t dev) { struct ath_pci_softc *psc = device_get_softc(dev); - u_int16_t cmd; - pci_write_config(dev, PCIR_INTLINE, psc->sc_saved_intline, 1); - pci_write_config(dev, PCIR_CACHELNSZ, psc->sc_saved_cachelinesz, 1); - pci_write_config(dev, PCIR_LATTIMER, psc->sc_saved_lattimer, 1); - - /* re-enable mem-map and busmastering */ - cmd = pci_read_config(dev, PCIR_COMMAND, 2); - cmd |= PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN; - pci_write_config(dev, PCIR_COMMAND, cmd, 2); + if (!ath_pci_setup(dev)) + return ENXIO; ath_resume(&psc->sc_sc); From owner-p4-projects@FreeBSD.ORG Mon Jan 3 19:41:10 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09AE516A4D0; Mon, 3 Jan 2005 19:41:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BDDD316A4CE for ; Mon, 3 Jan 2005 19:41:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 923F043D39 for ; Mon, 3 Jan 2005 19:41:09 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j03Jf9QW045879 for ; Mon, 3 Jan 2005 19:41:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j03Jf9ft045876 for perforce@freebsd.org; Mon, 3 Jan 2005 19:41:09 GMT (envelope-from sam@freebsd.org) Date: Mon, 3 Jan 2005 19:41:09 GMT Message-Id: <200501031941.j03Jf9ft045876@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 68219 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jan 2005 19:41:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=68219 Change 68219 by sam@sam_ebb on 2005/01/03 19:41:08 combine separate arrays indexed by h/w rate ix into a single array of structures; appears to be no cost (code size goes down, no obvious performance diff) Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#54 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#22 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#54 (text+ko) ==== @@ -2636,8 +2636,8 @@ goto rx_next; } rix = ds->ds_rxstat.rs_rate; - sc->sc_rx_th.wr_flags = sc->sc_hwflags[rix]; - sc->sc_rx_th.wr_rate = sc->sc_hwmap[rix]; + sc->sc_rx_th.wr_flags = sc->sc_hwmap[rix].flags; + sc->sc_rx_th.wr_rate = sc->sc_hwmap[rix].ieeerate; sc->sc_rx_th.wr_antsignal = ds->ds_rxstat.rs_rssi; sc->sc_rx_th.wr_antenna = ds->ds_rxstat.rs_antenna; /* XXX TSF */ @@ -2685,7 +2685,7 @@ if (IFF_DUMPPKTS(sc, ATH_DEBUG_RECV)) { ieee80211_dump_pkt(ic, mtod(m, caddr_t), len, - sc->sc_hwmap[ds->ds_rxstat.rs_rate], + sc->sc_hwmap[ds->ds_rxstat.rs_rate].ieeerate, ds->ds_rxstat.rs_rssi); } @@ -3237,15 +3237,15 @@ if (IFF_DUMPPKTS(sc, ATH_DEBUG_XMIT)) ieee80211_dump_pkt(ic, mtod(m0, caddr_t), m0->m_len, - sc->sc_hwmap[txrate], -1); + sc->sc_hwmap[txrate].ieeerate, -1); if (ic->ic_rawbpf) bpf_mtap(ic->ic_rawbpf, m0); if (sc->sc_drvbpf) { - sc->sc_tx_th.wt_flags = sc->sc_hwflags[txrate]; + sc->sc_tx_th.wt_flags = sc->sc_hwmap[txrate].flags; if (iswep) sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP; - sc->sc_tx_th.wt_rate = sc->sc_hwmap[txrate]; + sc->sc_tx_th.wt_rate = sc->sc_hwmap[txrate].ieeerate; sc->sc_tx_th.wt_txpower = ni->ni_txpower; sc->sc_tx_th.wt_antenna = sc->sc_txantenna; @@ -4064,18 +4064,16 @@ static void ath_led_event(struct ath_softc *sc, int event) { - struct ieee80211com *ic = &sc->sc_ic; - if (sc->sc_blinking) /* don't interrupt active blink */ return; switch (event) { case ATH_LED_TX: - ath_led_blink(sc, sc->sc_hwledon[sc->sc_txrate], - sc->sc_hwledoff[sc->sc_txrate]); + ath_led_blink(sc, sc->sc_hwmap[sc->sc_txrate].ledon, + sc->sc_hwmap[sc->sc_txrate].ledoff); break; case ATH_LED_RX: - ath_led_blink(sc, sc->sc_hwledon[sc->sc_rxrate], - sc->sc_hwledoff[sc->sc_rxrate]); + ath_led_blink(sc, sc->sc_hwmap[sc->sc_rxrate].ledon, + sc->sc_hwmap[sc->sc_rxrate].ledoff); break; } } @@ -4181,26 +4179,26 @@ for (i = 0; i < rt->rateCount; i++) sc->sc_rixmap[rt->info[i].dot11Rate & IEEE80211_RATE_VAL] = i; memset(sc->sc_hwmap, 0, sizeof(sc->sc_hwmap)); - memset(sc->sc_hwflags, 0, sizeof(sc->sc_hwflags)); for (i = 0; i < 32; i++) { u_int8_t ix = rt->rateCodeToIndex[i]; if (ix == 0xff) { - sc->sc_hwledon[i] = (500 * hz) / 1000; - sc->sc_hwledoff[i] = (130 * hz) / 1000; + sc->sc_hwmap[i].ledon = (500 * hz) / 1000; + sc->sc_hwmap[i].ledoff = (130 * hz) / 1000; continue; } - sc->sc_hwmap[i] = rt->info[ix].dot11Rate & IEEE80211_RATE_VAL; + sc->sc_hwmap[i].ieeerate = + rt->info[ix].dot11Rate & IEEE80211_RATE_VAL; if (rt->info[ix].shortPreamble || rt->info[ix].phy == IEEE80211_T_OFDM) - sc->sc_hwflags[i] |= IEEE80211_RADIOTAP_F_SHORTPRE; + sc->sc_hwmap[i].flags |= IEEE80211_RADIOTAP_F_SHORTPRE; /* setup blink rate table to avoid per-packet lookup */ for (j = 0; j < N(blinkrates)-1; j++) - if (blinkrates[j].rate == sc->sc_hwmap[i]) + if (blinkrates[j].rate == sc->sc_hwmap[i].ieeerate) break; /* NB: this uses the last entry if the rate isn't found */ /* XXX beware of overlow */ - sc->sc_hwledon[i] = (blinkrates[j].timeOn * hz) / 1000; - sc->sc_hwledoff[i] = (blinkrates[j].timeOff * hz) / 1000; + sc->sc_hwmap[i].ledon = (blinkrates[j].timeOn * hz) / 1000; + sc->sc_hwmap[i].ledoff = (blinkrates[j].timeOff * hz) / 1000; } sc->sc_currates = rt; sc->sc_curmode = mode; ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#22 (text+ko) ==== @@ -183,8 +183,12 @@ u_int16_t sc_curtxpow; /* current tx power limit */ HAL_CHANNEL sc_curchan; /* current h/w channel */ u_int8_t sc_rixmap[256]; /* IEEE to h/w rate table ix */ - u_int8_t sc_hwmap[32]; /* h/w rate ix to IEEE table */ - u_int8_t sc_hwflags[32]; /* " " " to radiotap flags */ + struct { + u_int8_t ieeerate; /* IEEE rate */ + u_int8_t flags; /* radiotap flags */ + u_int16_t ledon; /* softled on time */ + u_int16_t ledoff; /* softled off time */ + } sc_hwmap[32]; /* h/w rate ix mappings */ u_int8_t sc_protrix; /* protection rate index */ u_int sc_txantenna; /* tx antenna (fixed or auto) */ HAL_INT sc_imask; /* interrupt mask copy */ @@ -197,8 +201,6 @@ u_int8_t sc_rxrate; /* current rx rate for LED */ u_int8_t sc_txrate; /* current tx rate for LED */ u_int16_t sc_ledoff; /* off time for current blink */ - u_int16_t sc_hwledon[32]; /* h/w rate ix to LED on time */ - u_int16_t sc_hwledoff[32];/* " " " to LED off time */ struct callout sc_ledtimer; /* led off timer */ struct bpf_if *sc_drvbpf; From owner-p4-projects@FreeBSD.ORG Mon Jan 3 22:24:28 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EF0C16A4D0; Mon, 3 Jan 2005 22:24:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E175B16A4CE for ; Mon, 3 Jan 2005 22:24:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0FCC43D2F for ; Mon, 3 Jan 2005 22:24:27 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j03MORZV057583 for ; Mon, 3 Jan 2005 22:24:27 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j03MORlm057580 for perforce@freebsd.org; Mon, 3 Jan 2005 22:24:27 GMT (envelope-from sam@freebsd.org) Date: Mon, 3 Jan 2005 22:24:27 GMT Message-Id: <200501032224.j03MORlm057580@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 68224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jan 2005 22:24:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=68224 Change 68224 by sam@sam_ebb on 2005/01/03 22:23:30 o count only beacon/probe resp frames we process o drop cummulative counter (but leave counter for now) Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#35 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#35 (text+ko) ==== @@ -1683,15 +1683,6 @@ u_int16_t capinfo, bintval, timoff; u_int16_t fhdwell; - if (subtype == IEEE80211_FC0_SUBTYPE_BEACON) { - /* - * Count beacon frames specially, some drivers - * use this info to do things like update LED's. - */ - ic->ic_stats.is_rx_beacon++; - IEEE80211_NODE_STAT(ni, rx_beacons); - } else - IEEE80211_NODE_STAT(ni, rx_proberesp); /* * We process beacon/probe response frames: * o when scanning, or @@ -1829,6 +1820,14 @@ } /* + * Count frame now that we know it's to be processed. + */ + if (subtype == IEEE80211_FC0_SUBTYPE_BEACON) + IEEE80211_NODE_STAT(ni, rx_beacons); + else + IEEE80211_NODE_STAT(ni, rx_proberesp); + + /* * When operating in station mode, check for state updates. * Be careful to ignore beacons received while doing a * background scan. We consider only 11g/WMM stuff right now. From owner-p4-projects@FreeBSD.ORG Mon Jan 3 22:27:32 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7870416A4D0; Mon, 3 Jan 2005 22:27:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3DA2416A4CE for ; Mon, 3 Jan 2005 22:27:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FF5443D49 for ; Mon, 3 Jan 2005 22:27:32 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j03MRWsH057675 for ; Mon, 3 Jan 2005 22:27:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j03MRVPO057672 for perforce@freebsd.org; Mon, 3 Jan 2005 22:27:31 GMT (envelope-from sam@freebsd.org) Date: Mon, 3 Jan 2005 22:27:31 GMT Message-Id: <200501032227.j03MRVPO057672@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 68225 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jan 2005 22:27:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=68225 Change 68225 by sam@sam_ebb on 2005/01/03 22:26:43 more frivolous futzing with fine leds: o fix edge case where marking the interface down in the middle of a blink stopped future blinks o add hearbeat blink when otherwise idle (interval is controllable for now fine tuning) o make rx events be triggered by data frames instead of !beacon frames; this is closer to how other devices work Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#55 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#23 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#55 (text+ko) ==== @@ -96,6 +96,7 @@ enum { ATH_LED_TX, ATH_LED_RX, + ATH_LED_POLL, }; static void ath_init(void *); @@ -446,7 +447,10 @@ goto bad2; } + sc->sc_blinking = 0; sc->sc_ledstate = 1; + sc->sc_ledon = 0; /* low true */ + sc->sc_ledidle = (2700*hz)/1000; /* 2.7sec */ callout_init(&sc->sc_ledtimer, CALLOUT_MPSAFE); /* * Auto-enable soft led processing for IBM cards and for @@ -455,7 +459,6 @@ */ sc->sc_softled = (devid == AR5212_DEVID_IBM || devid == AR5211_DEVID); if (sc->sc_softled) { - sc->sc_ledon = 0; /* low true */ ath_hal_gpioCfgOutput(ah, sc->sc_ledpin); ath_hal_gpioset(ah, sc->sc_ledpin, !sc->sc_ledon); } @@ -945,6 +948,7 @@ callout_stop(&sc->sc_ledtimer); ath_hal_gpioset(ah, sc->sc_ledpin, !sc->sc_ledon); + sc->sc_blinking = 0; } ath_hal_intrset(ah, 0); } @@ -2723,16 +2727,17 @@ if (sc->sc_softled) { /* - * Blink for any non-beacon frames. We decide if - * this was a beacon frame by monitoring the stats - * which means we'll blink for things like ACK frames - * when in monitor mode--probably not what we want. + * Blink for any data frame. Otherwise do a + * heartbeat-style blink when idle. The latter + * is mainly for station mode where we depend on + * periodic beacon frames to trigger the poll event. */ - if (sc->sc_beacon == ic->ic_stats.is_rx_beacon) { + if (sc->sc_ipackets != ifp->if_ipackets) { + sc->sc_ipackets = ifp->if_ipackets; sc->sc_rxrate = ds->ds_rxstat.rs_rate; ath_led_event(sc, ATH_LED_RX); - } else - sc->sc_beacon = ic->ic_stats.is_rx_beacon; + } else if (ticks - sc->sc_ledevent >= sc->sc_ledidle) + ath_led_event(sc, ATH_LED_POLL); } /* @@ -4064,9 +4069,15 @@ static void ath_led_event(struct ath_softc *sc, int event) { + + sc->sc_ledevent = ticks; /* time of last event */ if (sc->sc_blinking) /* don't interrupt active blink */ return; switch (event) { + case ATH_LED_POLL: + ath_led_blink(sc, sc->sc_hwmap[0].ledon, + sc->sc_hwmap[0].ledoff); + break; case ATH_LED_TX: ath_led_blink(sc, sc->sc_hwmap[sc->sc_txrate].ledon, sc->sc_hwmap[sc->sc_txrate].ledoff); @@ -4458,9 +4469,12 @@ return error; softled = (softled != 0); if (softled != sc->sc_softled) { - if (softled) + if (softled) { + /* NB: handle any sc_ledpin change */ ath_hal_gpioCfgOutput(sc->sc_ah, sc->sc_ledpin); - ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin, !sc->sc_ledon); + ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin, + !sc->sc_ledon); + } sc->sc_softled = softled; } return 0; @@ -4574,6 +4588,9 @@ "ledon", CTLFLAG_RW, &sc->sc_ledon, 0, "setting to turn LED on"); SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "ledidle", CTLFLAG_RW, &sc->sc_ledidle, 0, + "idle time for inactivity LED (ticks)"); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "txantenna", CTLFLAG_RW, &sc->sc_txantenna, 0, "tx antenna (0=auto)"); SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#23 (text+ko) ==== @@ -197,7 +197,9 @@ u_int sc_ledpin; /* GPIO pin for driving LED */ u_int sc_ledon; /* pin setting for LED on */ - u_int32_t sc_beacon; /* last beacon count */ + u_int sc_ledidle; /* idle polling interval */ + u_int32_t sc_ipackets; /* last data packet count */ + int sc_ledevent; /* time of last LED event */ u_int8_t sc_rxrate; /* current rx rate for LED */ u_int8_t sc_txrate; /* current tx rate for LED */ u_int16_t sc_ledoff; /* off time for current blink */ From owner-p4-projects@FreeBSD.ORG Tue Jan 4 05:22:51 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDCC016A4D0; Tue, 4 Jan 2005 05:22:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 969F416A4CE for ; Tue, 4 Jan 2005 05:22:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 814C643D3F for ; Tue, 4 Jan 2005 05:22:50 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j045MoUX084065 for ; Tue, 4 Jan 2005 05:22:50 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j045MoX1084062 for perforce@freebsd.org; Tue, 4 Jan 2005 05:22:50 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 4 Jan 2005 05:22:50 GMT Message-Id: <200501040522.j045MoX1084062@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68228 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jan 2005 05:22:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=68228 Change 68228 by davidxu@davidxu_celeron on 2005/01/04 05:22:45 Remove unused code. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#8 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#8 (text+ko) ==== @@ -56,14 +56,6 @@ * will be free()'d. */ #define MAX_CACHED_THREADS 100 -/* - * Define high water marks for the maximum number of KSEs and KSE groups - * that will be cached. Because we support 1:1 threading, there could have - * same number of KSEs and KSE groups as threads. Once these levels are - * reached, any extra KSE and KSE groups will be free()'d. - */ -#define MAX_CACHED_KSES ((_thread_scope_system <= 0) ? 50 : 100) -#define MAX_CACHED_KSEGS ((_thread_scope_system <= 0) ? 50 : 100) /* * We've got to keep track of everything that is allocated, not only From owner-p4-projects@FreeBSD.ORG Tue Jan 4 12:44:55 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A241816A4D1; Tue, 4 Jan 2005 12:44:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 609EB16A4CE for ; Tue, 4 Jan 2005 12:44:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2099C43D53 for ; Tue, 4 Jan 2005 12:44:54 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j04CisGC008557 for ; Tue, 4 Jan 2005 12:44:54 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j04CirwN008554 for perforce@freebsd.org; Tue, 4 Jan 2005 12:44:53 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 4 Jan 2005 12:44:53 GMT Message-Id: <200501041244.j04CirwN008554@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jan 2005 12:44:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=68249 Change 68249 by davidxu@davidxu_tiger on 2005/01/04 12:44:47 merge thread list operations into thr_list.c Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/Makefile.inc#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_find_thread.c#4 delete .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_fork.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_init.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#9 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_list.c#1 add .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#12 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/Makefile.inc#4 (text+ko) ==== @@ -23,6 +23,7 @@ thr_getschedparam.c \ thr_init.c \ thr_join.c \ + thr_list.c \ thr_kern.c \ thr_kill.c \ thr_main_np.c \ ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_fork.c#6 (text+ko) ==== @@ -87,13 +87,24 @@ /* Child process */ errsave = errno; + curthread->cancelflags &= ~THR_CANCEL_NEEDED; curthread->critical_count = 0; curthread->locklevel = 0; + /* clear other threads locked us. */ + umtx_init(&curthread->lock); + thr_self(&curthread->tid); + _thr_setthreaded(0); + _mutex_reinit(&_thr_atfork_mutex); - /* Reinitialize lib kernel. */ - _thr_single_thread(curthread); + /* reinitialize libc spinlocks, this includes __malloc_lock. */ + _thr_spinlock_init(); + TAILQ_INIT(&curthread->mutexq); + curthread->priority_mutex_count = 0; + + /* reinit library. */ + _libpthread_init(curthread); /* Restore signal mask. */ __sys_sigprocmask(SIG_SETMASK, &oldset, NULL); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_init.c#6 (text+ko) ==== @@ -260,7 +260,6 @@ /* Initialize pthread private data. */ init_private(); - _thr_kern_init(); /* Set the initial thread. */ if (curthread == NULL) { @@ -367,8 +366,7 @@ size_t len; int mib[2]; - TAILQ_INIT(&_thread_list); - TAILQ_INIT(&_thread_gc_list); + _thr_list_init(); /* * Avoid reinitializing some things if they don't need to be, @@ -392,7 +390,6 @@ umtx_init(&_cond_static_lock); umtx_init(&_rwlock_static_lock); umtx_init(&_keytable_lock); - umtx_init(&_thread_list_lock); _thr_spinlock_init(); _pthread_mutex_init(&_thr_atfork_mutex, NULL); } else { @@ -401,7 +398,6 @@ umtx_init(&_cond_static_lock); umtx_init(&_rwlock_static_lock); umtx_init(&_keytable_lock); - umtx_init(&_thread_list_lock); /* reinitialized in thr_fork.c */ #if 0 _thr_spinlock_init(); @@ -409,8 +405,6 @@ #endif } - - /* Are we in M:N mode (default) or 1:1 mode? */ #ifdef SYSTEM_SCOPE_ONLY _thread_scope_system = 1; #else @@ -419,9 +413,5 @@ else if (getenv("LIBPTHREAD_PROCESS_SCOPE") != NULL) _thread_scope_system = -1; #endif - /* - * _thread_list_lock is initialized - * by _thr_init() - */ init_once = 1; } ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#9 (text+ko) ==== @@ -30,16 +30,6 @@ #include __FBSDID("$FreeBSD$"); -#include -#include -#include - -#include -#include -#include -#include -#include - #include "thr_private.h" #include "libc_private.h" @@ -51,103 +41,21 @@ #endif /* - * Define a high water mark for the maximum number of threads that - * will be cached. Once this level is reached, any extra threads - * will be free()'d. - */ -#define MAX_CACHED_THREADS 100 - -/* - * We've got to keep track of everything that is allocated, not only - * to have a speedy free list, but also so they can be deallocated - * after a fork(). - */ -static TAILQ_HEAD(, pthread) free_threadq; -static struct umtx free_thread_lock; -static int free_thread_count = 0; -static int inited = 0; -static u_int64_t next_uniqueid = 1; - -LIST_HEAD(thread_hash_head, pthread); -#define HASH_QUEUES 128 -static struct thread_hash_head thr_hashtable[HASH_QUEUES]; -#define THREAD_HASH(thrd) (((unsigned long)thrd >> 12) % HASH_QUEUES) - -/* Lock for thread tcb constructor/destructor */ -static struct umtx tcb_lock; - -static void thr_destroy(struct pthread *curthread, struct pthread *thread); -static void thread_gc(struct pthread *thread); - -/* - * This is called after a fork(). - * No locks need to be taken here since we are guaranteed to be - * single threaded. - * - * XXX - * POSIX says for threaded process, fork() function is used - * only to run new programs, and the effects of calling functions - * that require certain resources between the call to fork() and - * the call to an exec function are undefined. - * - * It is not safe to free memory after fork(), because these data - * structures may be in inconsistent state. - */ -void -_thr_single_thread(struct pthread *curthread) -{ - curthread->cancelflags &= ~THR_CANCEL_NEEDED; - /* clear other threads locked us. */ - umtx_init(&curthread->lock); - thr_self(&curthread->tid); - /* reinitialize libc spinlocks, this includes __malloc_lock. */ - _thr_spinlock_init(); - TAILQ_INIT(&curthread->mutexq); - curthread->priority_mutex_count = 0; - _libpthread_init(curthread); -#if 0 - if (__isthreaded) { - _thr_rtld_fini(); - } -#endif - __isthreaded = 0; -} - -/* - * This is used to initialize housekeeping and to initialize the - * KSD for the KSE. - */ -void -_thr_kern_init(void) -{ - TAILQ_INIT(&free_threadq); - _gc_count = 0; - if (inited == 0) { - umtx_init(&free_thread_lock); - umtx_init(&tcb_lock); - inited = 1; - } else { - umtx_init(&free_thread_lock); - umtx_init(&tcb_lock); - } -} - -/* * This is called when the first thread (other than the initial * thread) is created. */ int _thr_setthreaded(int threaded) { - if ((threaded != 0) && (__isthreaded == 0)) { -#if 0 - /* - * Locking functions in libc are required when there are - * threads other than the initial thread. - */ - _thr_rtld_init(); -#endif + if (((threaded == 0) ^ (__isthreaded == 0)) == 0) + return (0); + + if (threaded != 0) { +/* _thr_rtld_init(); */ __isthreaded = 1; + } else { + __isthreaded = 0; +/* _thr_rtld_fini(); */ } return (0); } @@ -166,275 +74,7 @@ } void -_thr_gc(struct pthread *curthread) -{ - thread_gc(curthread); -} - -static void -thread_gc(struct pthread *curthread) -{ - struct pthread *td, *td_next; - TAILQ_HEAD(, pthread) worklist; - - TAILQ_INIT(&worklist); - THREAD_LIST_LOCK(curthread); - - /* Check the threads waiting for GC. */ - for (td = TAILQ_FIRST(&_thread_gc_list); td != NULL; td = td_next) { - td_next = TAILQ_NEXT(td, gcle); - if ((td->tlflags & TLFLAGS_GC_SAFE) == 0) - continue; - else if (td->isdead == 0) { - /* make sure we are not still in userland */ - continue; - } - /* - * Remove the thread from the GC list. If the thread - * isn't yet detached, it will get added back to the - * GC list at a later time. - */ - THR_GCLIST_REMOVE(td); - DBG_MSG("Freeing thread %p stack\n", td); - /* - * We can free the thread stack since it's no longer - * in use. - */ - _thr_stack_free(&td->attr); - if (((td->tlflags & TLFLAGS_DETACHED) != 0) && - (td->refcount == 0)) { - /* - * The thread has detached and is no longer - * referenced. It is safe to remove all - * remnants of the thread. - */ - THR_LIST_REMOVE(td); - TAILQ_INSERT_HEAD(&worklist, td, gcle); - } - } - THREAD_LIST_UNLOCK(curthread); - - while ((td = TAILQ_FIRST(&worklist)) != NULL) { - TAILQ_REMOVE(&worklist, td, gcle); - /* - * XXX we don't free initial thread and its kse - * (if thread is a bound thread), because there might - * have some code referencing initial thread and kse. - */ - if (td == _thr_initial) { - DBG_MSG("Initial thread won't be freed\n"); - continue; - } - - DBG_MSG("Freeing thread %p\n", td); - _thr_free(curthread, td); - } -} - -struct pthread * -_thr_alloc(struct pthread *curthread) -{ - struct pthread *thread = NULL; - - if (curthread != NULL) { - if (GC_NEEDED()) - _thr_gc(curthread); - if (free_thread_count > 0) { - THR_LOCK_ACQUIRE(curthread, &free_thread_lock); - if ((thread = TAILQ_FIRST(&free_threadq)) != NULL) { - TAILQ_REMOVE(&free_threadq, thread, tle); - free_thread_count--; - } - THR_LOCK_RELEASE(curthread, &free_thread_lock); - } - } - if ((thread == NULL) && - ((thread = malloc(sizeof(struct pthread))) != NULL)) { - bzero(thread, sizeof(struct pthread)); - if (curthread) { - THR_LOCK_ACQUIRE(curthread, &tcb_lock); - thread->tcb = _tcb_ctor(thread, 0 /* not initial tls */); - THR_LOCK_RELEASE(curthread, &tcb_lock); - } else { - thread->tcb = _tcb_ctor(thread, 1 /* initial tls */); - } - if (thread->tcb == NULL) { - free(thread); - thread = NULL; - } else { - /* - * Initialize thread locking. - */ - umtx_init(&thread->lock); - } - } else if (thread != NULL) { - umtx_init(&thread->lock); - } - return (thread); -} - -void -_thr_free(struct pthread *curthread, struct pthread *thread) -{ - DBG_MSG("Freeing thread %p\n", thread); - if (thread->name) { - free(thread->name); - thread->name = NULL; - } - if ((curthread == NULL) || (free_thread_count >= MAX_CACHED_THREADS)) { - thr_destroy(curthread, thread); - } else { - /* Add the thread to the free thread list. */ - THR_LOCK_ACQUIRE(curthread, &free_thread_lock); - TAILQ_INSERT_TAIL(&free_threadq, thread, tle); - free_thread_count++; - THR_LOCK_RELEASE(curthread, &free_thread_lock); - } -} - -static void -thr_destroy(struct pthread *curthread, struct pthread *thread) -{ - if (curthread) { - THR_LOCK_ACQUIRE(curthread, &tcb_lock); - _tcb_dtor(thread->tcb); - THR_LOCK_RELEASE(curthread, &tcb_lock); - } else { - _tcb_dtor(thread->tcb); - } - free(thread); -} - -/* - * Add an active thread: - * - * o Assign the thread a unique id (which GDB uses to track - * threads. - * o Add the thread to the list of all threads and increment - * number of active threads. - */ -void -_thr_link(struct pthread *curthread, struct pthread *thread) -{ - THREAD_LIST_LOCK(curthread); - /* - * Initialize the unique id (which GDB uses to track - * threads), add the thread to the list of all threads, - * and - */ - thread->uniqueid = next_uniqueid++; - THR_LIST_ADD(thread); - if (thread->attr.flags & PTHREAD_DETACHED) - thread->tlflags |= TLFLAGS_DETACHED; - _thread_active_threads++; - THREAD_LIST_UNLOCK(curthread); -} - -/* - * Remove an active thread. - */ -void -_thr_unlink(struct pthread *curthread, struct pthread *thread) -{ - THREAD_LIST_LOCK(curthread); - THR_LIST_REMOVE(thread); - _thread_active_threads--; - THREAD_LIST_UNLOCK(curthread); -} - -void -_thr_hash_add(struct pthread *thread) -{ - struct thread_hash_head *head; - - head = &thr_hashtable[THREAD_HASH(thread)]; - LIST_INSERT_HEAD(head, thread, hle); -} - -void -_thr_hash_remove(struct pthread *thread) -{ - LIST_REMOVE(thread, hle); -} - -struct pthread * -_thr_hash_find(struct pthread *thread) -{ - struct pthread *td; - struct thread_hash_head *head; - - head = &thr_hashtable[THREAD_HASH(thread)]; - LIST_FOREACH(td, head, hle) { - if (td == thread) - return (thread); - } - return (NULL); -} - -/* - * Find a thread in the linked list of active threads and add a reference - * to it. Threads with positive reference counts will not be deallocated - * until all references are released. - */ -int -_thr_ref_add(struct pthread *curthread, struct pthread *thread, - int include_dead) -{ - int ret; - - if (thread == NULL) - /* Invalid thread: */ - return (EINVAL); - - THREAD_LIST_LOCK(curthread); - if ((ret = _thr_find_thread(curthread, thread, include_dead)) == 0) { - thread->refcount++; - if (curthread != NULL) - curthread->critical_count++; - } - THREAD_LIST_UNLOCK(curthread); - - /* Return zero if the thread exists: */ - return (ret); -} - -void -_thr_ref_delete(struct pthread *curthread, struct pthread *thread) -{ - if (thread != NULL) { - THREAD_LIST_LOCK(curthread); - thread->refcount--; - if (curthread != NULL) - curthread->critical_count--; - if ((thread->refcount == 0) && - (thread->tlflags & TLFLAGS_GC_SAFE) != 0) - THR_GCLIST_ADD(thread); - THREAD_LIST_UNLOCK(curthread); - } -} - -int -_thr_find_thread(struct pthread *curthread, struct pthread *thread, - int include_dead) -{ - struct pthread *pthread; - - if (thread == NULL) - /* Invalid thread: */ - return (EINVAL); - - pthread = _thr_hash_find(thread); - if (pthread) { - if (include_dead == 0 && pthread->state == PS_DEAD) - pthread = NULL; - } - - /* Return zero if the thread exists: */ - return ((pthread != NULL) ? 0 : ESRCH); -} - -void _thr_assert_lock_level() { - PANIC("lockleve <=0"); + PANIC("lockleve <= 0"); } ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#12 (text+ko) ==== @@ -686,7 +686,7 @@ * Function prototype definitions. */ __BEGIN_DECLS -void _thr_kern_init(); +void _thr_list_init(); void _thr_single_thread(struct pthread *); int _thr_setthreaded(int); int _mutex_cv_lock(pthread_mutex_t *); From owner-p4-projects@FreeBSD.ORG Tue Jan 4 13:00:13 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5347616A4D0; Tue, 4 Jan 2005 13:00:13 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E14516A4CE for ; Tue, 4 Jan 2005 13:00:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C79743D31 for ; Tue, 4 Jan 2005 13:00:13 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j04D0Csc016403 for ; Tue, 4 Jan 2005 13:00:12 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j04D0CEx016400 for perforce@freebsd.org; Tue, 4 Jan 2005 13:00:12 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 4 Jan 2005 13:00:12 GMT Message-Id: <200501041300.j04D0CEx016400@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68250 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jan 2005 13:00:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=68250 Change 68250 by davidxu@davidxu_tiger on 2005/01/04 12:59:43 remove comma. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#10 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, David Xu + * Copyright (c) 2005 David Xu * Copyright (C) 2003 Daniel M. Eischen * All rights reserved. * @@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$"); #include "thr_private.h" -#include "libc_private.h" /*#define DEBUG_THREAD_KERN */ #ifdef DEBUG_THREAD_KERN From owner-p4-projects@FreeBSD.ORG Tue Jan 4 13:01:15 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB19716A4D0; Tue, 4 Jan 2005 13:01:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C6E3716A4CE for ; Tue, 4 Jan 2005 13:01:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B34EA43D48 for ; Tue, 4 Jan 2005 13:01:14 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j04D1Ego016479 for ; Tue, 4 Jan 2005 13:01:14 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j04D1Ep7016476 for perforce@freebsd.org; Tue, 4 Jan 2005 13:01:14 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 4 Jan 2005 13:01:14 GMT Message-Id: <200501041301.j04D1Ep7016476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jan 2005 13:01:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=68251 Change 68251 by davidxu@davidxu_tiger on 2005/01/04 13:00:32 lib name libthread.so remove -fno-builtin knob. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/Makefile#8 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/Makefile#8 (text+ko) ==== @@ -7,11 +7,7 @@ # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" -LIB=thread -.else LIB=thread -.endif SHLIB_MAJOR= 1 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ @@ -20,7 +16,7 @@ CFLAGS+=-I${.CURDIR}/sys CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH} -CFLAGS+=-fno-builtin -Winline +CFLAGS+=-Winline CFLAGS+= -g From owner-p4-projects@FreeBSD.ORG Tue Jan 4 13:14:32 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2102816A4D3; Tue, 4 Jan 2005 13:14:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D4FE16A4CE for ; Tue, 4 Jan 2005 13:14:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77AF743D4C for ; Tue, 4 Jan 2005 13:14:31 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j04DEVF3017248 for ; Tue, 4 Jan 2005 13:14:31 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j04DEVE3017245 for perforce@freebsd.org; Tue, 4 Jan 2005 13:14:31 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 4 Jan 2005 13:14:31 GMT Message-Id: <200501041314.j04DEVE3017245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68252 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jan 2005 13:14:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=68252 Change 68252 by davidxu@davidxu_tiger on 2005/01/04 13:14:06 insert "pause" instructor for i386. style fix. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_pspinlock.c#7 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_pspinlock.c#7 (text+ko) ==== @@ -100,6 +100,10 @@ else { count = SPIN_COUNT; while ((ret = umtx_trylock(&lck->s_lock, self->tid)) != 0) { +#ifdef __i386__ + /* tell cpu we are spinning */ + __asm __volatile("pause"); +#endif if (--count <= 0) { count = SPIN_COUNT; _pthread_yield(); @@ -120,7 +124,7 @@ if (lock == NULL || (lck = *lock) == NULL) ret = EINVAL; else { - ret =umtx_unlock(&lck->s_lock, self->tid); + ret = umtx_unlock(&lck->s_lock, self->tid); } return (ret); } From owner-p4-projects@FreeBSD.ORG Tue Jan 4 13:58:25 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 599C716A4D0; Tue, 4 Jan 2005 13:58:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3022716A4CE for ; Tue, 4 Jan 2005 13:58:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B2AC43D45 for ; Tue, 4 Jan 2005 13:58:25 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j04DwOmj021987 for ; Tue, 4 Jan 2005 13:58:24 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j04DwONg021984 for perforce@freebsd.org; Tue, 4 Jan 2005 13:58:24 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 4 Jan 2005 13:58:24 GMT Message-Id: <200501041358.j04DwONg021984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68254 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jan 2005 13:58:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=68254 Change 68254 by davidxu@davidxu_tiger on 2005/01/04 13:57:43 Fix a typo. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#11 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#11 (text+ko) ==== @@ -75,5 +75,5 @@ void _thr_assert_lock_level() { - PANIC("lockleve <= 0"); + PANIC("locklevel <= 0"); } From owner-p4-projects@FreeBSD.ORG Tue Jan 4 14:16:48 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6429516A4D0; Tue, 4 Jan 2005 14:16:48 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A24916A4CE for ; Tue, 4 Jan 2005 14:16:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13DB243D55 for ; Tue, 4 Jan 2005 14:16:48 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j04EGlPf022688 for ; Tue, 4 Jan 2005 14:16:47 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j04EGl0n022685 for perforce@freebsd.org; Tue, 4 Jan 2005 14:16:47 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 4 Jan 2005 14:16:47 GMT Message-Id: <200501041416.j04EGl0n022685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68256 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jan 2005 14:16:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=68256 Change 68256 by davidxu@davidxu_alona on 2005/01/04 14:16:44 use _thr_check_init() to test if lib was inited. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_self.c#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_self.c#3 (text+ko) ==== @@ -39,8 +39,7 @@ pthread_t _pthread_self(void) { - if (_thr_initial == NULL) - _libpthread_init(NULL); + _thr_check_init(); /* Return the running thread pointer: */ return (_get_curthread()); From owner-p4-projects@FreeBSD.ORG Tue Jan 4 15:43:34 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E1FC16A4D0; Tue, 4 Jan 2005 15:43:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED93416A4CE for ; Tue, 4 Jan 2005 15:43:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA5E843D31 for ; Tue, 4 Jan 2005 15:43:33 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j04FhXkA028306 for ; Tue, 4 Jan 2005 15:43:33 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j04FhX8o028303 for perforce@freebsd.org; Tue, 4 Jan 2005 15:43:33 GMT (envelope-from jhb@freebsd.org) Date: Tue, 4 Jan 2005 15:43:33 GMT Message-Id: <200501041543.j04FhX8o028303@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 68259 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jan 2005 15:43:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=68259 Change 68259 by jhb@jhb_twclab on 2005/01/04 15:43:29 Compile. Affected files ... .. //depot/projects/smpng/sys/i386/i386/local_apic.c#24 edit .. //depot/projects/smpng/sys/i386/i386/machdep.c#86 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/local_apic.c#24 (text+ko) ==== @@ -572,7 +572,6 @@ apic_init(void *dummy __unused) { struct apic_enumerator *enumerator; - uint64_t apic_base; int retval, best; /* We only support built in local APICs. */ ==== //depot/projects/smpng/sys/i386/i386/machdep.c#86 (text+ko) ==== @@ -111,6 +111,7 @@ #include #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Tue Jan 4 17:52:11 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34F8016A4D0; Tue, 4 Jan 2005 17:52:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E94B216A4CE for ; Tue, 4 Jan 2005 17:52:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CAEE943D2D for ; Tue, 4 Jan 2005 17:52:10 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j04HqAq3038882 for ; Tue, 4 Jan 2005 17:52:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j04HqAjU038879 for perforce@freebsd.org; Tue, 4 Jan 2005 17:52:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 4 Jan 2005 17:52:10 GMT Message-Id: <200501041752.j04HqAjU038879@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 68265 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jan 2005 17:52:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=68265 Change 68265 by rwatson@rwatson_tislabs on 2005/01/04 17:51:29 Sort using sort(1) to make it easier to update. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/files.lst#7 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/files.lst#7 (text+ko) ==== @@ -21,6 +21,7 @@ domains/misc/unused/fcron.te domains/misc/unused/startx.te domains/program +domains/program/apache.te domains/program/atrun.te domains/program/checkpolicy.te domains/program/chkpwd.te @@ -43,6 +44,7 @@ domains/program/modutil.te domains/program/mount.te domains/program/mta.te +domains/program/named.te domains/program/netutils.te domains/program/newrole.te domains/program/passwd.te @@ -79,8 +81,8 @@ domains/program/unused/dhcpd.te domains/program/unused/dictd.te domains/program/unused/dpkg.te +domains/program/unused/fingerd.te domains/program/unused/ftpd.te -domains/program/unused/fingerd.te domains/program/unused/games.te domains/program/unused/gatekeeper.te domains/program/unused/gnome-pty-helper.te @@ -155,8 +157,6 @@ domains/program/unused/ypbind.te domains/program/usbd.te domains/program/useradd.te -domains/program/apache.te -domains/program/named.te domains/user.te file_contexts file_contexts/program @@ -235,9 +235,9 @@ file_contexts/program/ntpd.fc file_contexts/program/oav-update.fc file_contexts/program/openca-ca.fc -file_contexts/program/passwd.fc file_contexts/program/openca-common.fc file_contexts/program/pamconsole.fc +file_contexts/program/passwd.fc file_contexts/program/perdition.fc file_contexts/program/ping.fc file_contexts/program/portmap.fc @@ -290,6 +290,7 @@ file_contexts/program/ypbind.fc file_contexts/runtime.fc file_contexts/types.fc +files.lst flask flask/Makefile flask/access_vectors @@ -341,4 +342,3 @@ types/procfs.te types/security.te users -files.lst From owner-p4-projects@FreeBSD.ORG Tue Jan 4 17:54:14 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5436916A4D0; Tue, 4 Jan 2005 17:54:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2EB2716A4CE for ; Tue, 4 Jan 2005 17:54:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF52D43D55 for ; Tue, 4 Jan 2005 17:54:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j04HsDYL038956 for ; Tue, 4 Jan 2005 17:54:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j04HsDNu038953 for perforce@freebsd.org; Tue, 4 Jan 2005 17:54:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 4 Jan 2005 17:54:13 GMT Message-Id: <200501041754.j04HsDNu038953@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 68266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jan 2005 17:54:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=68266 Change 68266 by rwatson@rwatson_tislabs on 2005/01/04 17:53:17 Update files.lst to reflect updated SEBSD policy pieces from SELinux. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/files.lst#8 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/files.lst#8 (text+ko) ==== @@ -13,13 +13,14 @@ constraints domains domains/admin.te -domains/httpadm.te domains/misc domains/misc/kernel.te domains/misc/unused domains/misc/unused/auth-net.te domains/misc/unused/fcron.te domains/misc/unused/startx.te +domains/misc/userspace_objmgr.te +domains/misc/xclient.te domains/program domains/program/apache.te domains/program/atrun.te @@ -28,9 +29,12 @@ domains/program/cleanvar.te domains/program/crond.te domains/program/crontab.te +domains/program/devd.te domains/program/dhcpc.te +domains/program/dmesg.te domains/program/fsadm.te domains/program/getty.te +domains/program/hostname.te domains/program/ifconfig.te domains/program/init.te domains/program/initrc.te @@ -48,69 +52,106 @@ domains/program/netutils.te domains/program/newrole.te domains/program/passwd.te +domains/program/restorecon.te domains/program/rpcd.te domains/program/save-entropy.te domains/program/sendmail.te domains/program/setfiles.te domains/program/ssh.te domains/program/su.te +domains/program/sulogin.te domains/program/syslogd.te domains/program/tmpreaper.te +domains/program/unconfined.te domains/program/unused domains/program/unused/acct.te domains/program/unused/amanda.te domains/program/unused/amavis.te +domains/program/unused/anaconda.te domains/program/unused/apache.te domains/program/unused/apmd.te -domains/program/unused/atd.te +domains/program/unused/asterisk.te +domains/program/unused/audio-entropyd.te +domains/program/unused/auditd.te domains/program/unused/authbind.te domains/program/unused/automount.te domains/program/unused/backup.te +domains/program/unused/bluetooth.te domains/program/unused/bootloader.te domains/program/unused/calamaris.te +domains/program/unused/canna.te domains/program/unused/cardmgr.te domains/program/unused/chroot.te +domains/program/unused/ciped.te domains/program/unused/clamav.te +domains/program/unused/consoletype.te domains/program/unused/courier.te +domains/program/unused/cpucontrol.te +domains/program/unused/cpuspeed.te domains/program/unused/crack.te domains/program/unused/cups.te domains/program/unused/cvs.te +domains/program/unused/cyrus.te +domains/program/unused/dbusd.te domains/program/unused/ddt-client.te domains/program/unused/devfsd.te domains/program/unused/dhcpc.te domains/program/unused/dhcpd.te domains/program/unused/dictd.te +domains/program/unused/distcc.te +domains/program/unused/dnsmasq.te +domains/program/unused/dovecot.te domains/program/unused/dpkg.te domains/program/unused/fingerd.te +domains/program/unused/firstboot.te +domains/program/unused/fs_daemon.te domains/program/unused/ftpd.te domains/program/unused/games.te domains/program/unused/gatekeeper.te domains/program/unused/gnome-pty-helper.te +domains/program/unused/gpg-agent.te domains/program/unused/gpg.te domains/program/unused/gpm.te +domains/program/unused/hald.te domains/program/unused/hotplug.te +domains/program/unused/howl.te domains/program/unused/hwclock.te +domains/program/unused/i18n_input.te +domains/program/unused/imazesrv.te domains/program/unused/inetd.te -domains/program/unused/ipchains.te +domains/program/unused/innd.te domains/program/unused/ipsec.te +domains/program/unused/iptables.te domains/program/unused/irc.te domains/program/unused/ircd.te -domains/program/unused/kcheckpass.te +domains/program/unused/irqbalance.te +domains/program/unused/jabberd.te +domains/program/unused/kerberos.te +domains/program/unused/kudzu.te +domains/program/unused/lcd.te +domains/program/unused/loadkeys.te domains/program/unused/lpd.te domains/program/unused/lpr.te +domains/program/unused/lrrd.te +domains/program/unused/lvm.te domains/program/unused/mailman.te +domains/program/unused/mdadm.te +domains/program/unused/monopd.te +domains/program/unused/mozilla.te domains/program/unused/mrtg.te domains/program/unused/mta.te domains/program/unused/mysqld.te +domains/program/unused/nagios.te domains/program/unused/named.te domains/program/unused/nessusd.te -domains/program/unused/netsaint.te -domains/program/unused/netscape.te +domains/program/unused/nrpe.te domains/program/unused/nscd.te domains/program/unused/nsd.te domains/program/unused/ntpd.te domains/program/unused/oav-update.te domains/program/unused/openca-ca.te +domains/program/unused/openvpn.te +domains/program/unused/pam.te domains/program/unused/pamconsole.te domains/program/unused/perdition.te domains/program/unused/ping.te @@ -118,43 +159,71 @@ domains/program/unused/portslave.te domains/program/unused/postfix.te domains/program/unused/postgresql.te +domains/program/unused/postgrey.te domains/program/unused/pppd.te +domains/program/unused/prelink.te +domains/program/unused/privoxy.te domains/program/unused/procmail.te domains/program/unused/pump.te +domains/program/unused/pxe.te domains/program/unused/qmail.te domains/program/unused/quota.te domains/program/unused/radius.te domains/program/unused/radvd.te +domains/program/unused/rhgb.te domains/program/unused/rlogind.te domains/program/unused/rpcd.te domains/program/unused/rpm.te domains/program/unused/rshd.te domains/program/unused/samba.te +domains/program/unused/saslauthd.te domains/program/unused/scannerdaemon.te domains/program/unused/screen.te -domains/program/unused/selopt.te +domains/program/unused/screensaver.te domains/program/unused/sendmail.te +domains/program/unused/seuser.te domains/program/unused/slapd.te +domains/program/unused/slocate.te +domains/program/unused/slrnpull.te domains/program/unused/snmpd.te domains/program/unused/snort.te +domains/program/unused/sound-server.te domains/program/unused/sound.te +domains/program/unused/spamassassin.te +domains/program/unused/spamc.te +domains/program/unused/spamd.te domains/program/unused/speedmgmt.te domains/program/unused/squid.te +domains/program/unused/ssh-agent.te +domains/program/unused/sudo.te domains/program/unused/sxid.te domains/program/unused/sysstat.te domains/program/unused/tcpd.te domains/program/unused/tftpd.te +domains/program/unused/tinydns.te domains/program/unused/traceroute.te domains/program/unused/transproxy.te +domains/program/unused/udev.te +domains/program/unused/uml.te +domains/program/unused/uml_net.te +domains/program/unused/updfstab.te +domains/program/unused/uptimed.te domains/program/unused/usbmodules.te +domains/program/unused/userhelper.te +domains/program/unused/usernetctl.te domains/program/unused/utempter.te +domains/program/unused/uwimapd.te domains/program/unused/vmware.te domains/program/unused/watchdog.te +domains/program/unused/webalizer.te domains/program/unused/xauth.te domains/program/unused/xdm.te domains/program/unused/xfs.te +domains/program/unused/xprint.te domains/program/unused/xserver.te domains/program/unused/ypbind.te +domains/program/unused/ypserv.te +domains/program/unused/zebra.te domains/program/usbd.te domains/program/useradd.te domains/user.te @@ -163,79 +232,116 @@ file_contexts/program/acct.fc file_contexts/program/amanda.fc file_contexts/program/amavis.fc +file_contexts/program/anaconda.fc file_contexts/program/apache.fc file_contexts/program/apmd.fc -file_contexts/program/atd.fc +file_contexts/program/asterisk.fc file_contexts/program/atrun.fc +file_contexts/program/audio-entropyd.fc +file_contexts/program/auditd.fc file_contexts/program/authbind.fc file_contexts/program/automount.fc file_contexts/program/backup.fc +file_contexts/program/bluetooth.fc file_contexts/program/bootloader.fc file_contexts/program/calamaris.fc +file_contexts/program/canna.fc file_contexts/program/cardmgr.fc file_contexts/program/checkpolicy.fc file_contexts/program/chkpwd.fc file_contexts/program/chroot.fc +file_contexts/program/ciped.fc file_contexts/program/clamav.fc file_contexts/program/cleanvar.fc +file_contexts/program/consoletype.fc file_contexts/program/courier.fc +file_contexts/program/cpucontrol.fc +file_contexts/program/cpuspeed.fc file_contexts/program/crack.fc file_contexts/program/crond.fc file_contexts/program/crontab.fc file_contexts/program/cups.fc file_contexts/program/cvs.fc +file_contexts/program/cyrus.fc +file_contexts/program/dbusd.fc file_contexts/program/ddt-client.fc +file_contexts/program/devd.fc file_contexts/program/devfsd.fc file_contexts/program/dhcpc.fc file_contexts/program/dhcpd.fc file_contexts/program/dictd.fc +file_contexts/program/distcc.fc +file_contexts/program/dmesg.fc +file_contexts/program/dnsmasq.fc +file_contexts/program/dovecot.fc file_contexts/program/dpkg.fc file_contexts/program/fingerd.fc +file_contexts/program/firstboot.fc +file_contexts/program/fs_daemon.fc file_contexts/program/fsadm.fc file_contexts/program/ftpd.fc file_contexts/program/games.fc file_contexts/program/gatekeeper.fc file_contexts/program/getty.fc file_contexts/program/gnome-pty-helper.fc +file_contexts/program/gpg-agent.fc file_contexts/program/gpg.fc file_contexts/program/gpm.fc file_contexts/program/groupadd.fc +file_contexts/program/hald.fc +file_contexts/program/hostname.fc file_contexts/program/hotplug.fc +file_contexts/program/howl.fc file_contexts/program/hwclock.fc +file_contexts/program/i18n_input.fc file_contexts/program/ifconfig.fc +file_contexts/program/imazesrv.fc file_contexts/program/inetd.fc file_contexts/program/init.fc file_contexts/program/initrc.fc -file_contexts/program/ipchains.fc +file_contexts/program/innd.fc file_contexts/program/ipsec.fc +file_contexts/program/iptables.fc file_contexts/program/irc.fc file_contexts/program/ircd.fc -file_contexts/program/kcheckpass.fc +file_contexts/program/irqbalance.fc +file_contexts/program/jabberd.fc +file_contexts/program/kerberos.fc file_contexts/program/klogd.fc +file_contexts/program/kudzu.fc +file_contexts/program/lcd.fc file_contexts/program/ldconfig.fc file_contexts/program/load_policy.fc +file_contexts/program/loadkeys.fc file_contexts/program/login.fc file_contexts/program/logrotate.fc file_contexts/program/lpd.fc file_contexts/program/lpr.fc +file_contexts/program/lrrd.fc +file_contexts/program/lvm.fc file_contexts/program/mailman.fc +file_contexts/program/mdadm.fc file_contexts/program/modutil.fc +file_contexts/program/monopd.fc file_contexts/program/mount.fc +file_contexts/program/mozilla.fc file_contexts/program/mrtg.fc file_contexts/program/mta.fc file_contexts/program/mysqld.fc +file_contexts/program/nagios.fc file_contexts/program/named.fc file_contexts/program/nessusd.fc -file_contexts/program/netsaint.fc -file_contexts/program/netscape.fc file_contexts/program/netutils.fc file_contexts/program/newrole.fc +file_contexts/program/nrpe.fc file_contexts/program/nscd.fc file_contexts/program/nsd.fc file_contexts/program/ntpd.fc file_contexts/program/oav-update.fc file_contexts/program/openca-ca.fc file_contexts/program/openca-common.fc +file_contexts/program/openvpn.fc +file_contexts/program/pam.fc file_contexts/program/pamconsole.fc file_contexts/program/passwd.fc file_contexts/program/perdition.fc @@ -244,53 +350,86 @@ file_contexts/program/portslave.fc file_contexts/program/postfix.fc file_contexts/program/postgresql.fc +file_contexts/program/postgrey.fc file_contexts/program/pppd.fc +file_contexts/program/prelink.fc +file_contexts/program/privoxy.fc file_contexts/program/procmail.fc file_contexts/program/pump.fc +file_contexts/program/pxe.fc file_contexts/program/qmail.fc file_contexts/program/quota.fc file_contexts/program/radius.fc file_contexts/program/radvd.fc +file_contexts/program/restorecon.fc +file_contexts/program/rhgb.fc file_contexts/program/rlogind.fc file_contexts/program/rpcd.fc file_contexts/program/rpm.fc file_contexts/program/rshd.fc file_contexts/program/samba.fc +file_contexts/program/saslauthd.fc file_contexts/program/save-entropy.fc file_contexts/program/scannerdaemon.fc file_contexts/program/screen.fc +file_contexts/program/screensaver.fc file_contexts/program/sendmail.fc file_contexts/program/setfiles.fc +file_contexts/program/seuser.fc file_contexts/program/slapd.fc +file_contexts/program/slocate.fc +file_contexts/program/slrnpull.fc file_contexts/program/snmpd.fc file_contexts/program/snort.fc +file_contexts/program/sound-server.fc file_contexts/program/sound.fc +file_contexts/program/spamassassin.fc +file_contexts/program/spamc.fc +file_contexts/program/spamd.fc file_contexts/program/speedmgmt.fc file_contexts/program/squid.fc +file_contexts/program/ssh-agent.fc file_contexts/program/ssh.fc file_contexts/program/su.fc +file_contexts/program/sudo.fc +file_contexts/program/sulogin.fc file_contexts/program/sxid.fc file_contexts/program/syslogd.fc file_contexts/program/sysstat.fc file_contexts/program/tcpd.fc file_contexts/program/tftpd.fc +file_contexts/program/tinydns.fc file_contexts/program/tmpreaper.fc file_contexts/program/traceroute.fc file_contexts/program/transproxy.fc +file_contexts/program/udev.fc +file_contexts/program/uml.fc +file_contexts/program/uml_net.fc +file_contexts/program/unconfined.fc +file_contexts/program/updfstab.fc +file_contexts/program/uptimed.fc file_contexts/program/usbd.fc file_contexts/program/usbmodules.fc file_contexts/program/useradd.fc +file_contexts/program/userhelper.fc +file_contexts/program/usernetctl.fc file_contexts/program/utempter.fc +file_contexts/program/uwimapd.fc file_contexts/program/vmware.fc file_contexts/program/watchdog.fc +file_contexts/program/webalizer.fc file_contexts/program/xauth.fc file_contexts/program/xdm.fc file_contexts/program/xfs.fc +file_contexts/program/xprint.fc file_contexts/program/xserver.fc file_contexts/program/ypbind.fc +file_contexts/program/ypserv.fc +file_contexts/program/zebra.fc file_contexts/runtime.fc file_contexts/types.fc files.lst +files.lst.sorted flask flask/Makefile flask/access_vectors @@ -300,11 +439,16 @@ flask/security_classes fs_use genfs_contexts +genhomedircon initial_sid_contexts macros macros/admin_macros.te +macros/base_user_macros.te +macros/core_macros.te macros/global_macros.te +macros/mini_user_macros.te macros/program +macros/program/apache_macros.te macros/program/chkpwd_macros.te macros/program/chroot_macros.te macros/program/clamav_macros.te @@ -312,27 +456,42 @@ macros/program/crontab_macros.te macros/program/cvs_macros.te macros/program/fingerd_macros.te +macros/program/games_domain.te +macros/program/gpg_agent_macros.te macros/program/gpg_macros.te macros/program/gph_macros.te macros/program/irc_macros.te +macros/program/login_macros.te macros/program/lpr_macros.te macros/program/mount_macros.te +macros/program/mozilla_macros.te macros/program/mta_macros.te -macros/program/netscape_macros.te +macros/program/newrole_macros.te +macros/program/rhgb_macros.te macros/program/run_program_macros.te macros/program/screen_macros.te +macros/program/screensaver_macros.te macros/program/sendmail_macros.te +macros/program/slocate_macros.te +macros/program/spamassassin_macros.te +macros/program/ssh_agent_macros.te macros/program/ssh_macros.te macros/program/su_macros.te +macros/program/sudo_macros.te +macros/program/uml_macros.te +macros/program/userhelper_macros.te macros/program/x_client_macros.te macros/program/xauth_macros.te macros/program/xserver_macros.te +macros/program/ypbind_macros.te macros/selinux_macros.te macros/user_macros.te mls net_contexts -policy.spec rbac +selinux-policy-strict.spec +selinux-policy-targeted.spec +serviceusers types types/device.te types/devpts.te @@ -341,4 +500,5 @@ types/nfs.te types/procfs.te types/security.te +types/x.te users From owner-p4-projects@FreeBSD.ORG Tue Jan 4 23:56:37 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42FE416A4D0; Tue, 4 Jan 2005 23:56:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 164DA16A4CE for ; Tue, 4 Jan 2005 23:56:37 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03F9D43D2D for ; Tue, 4 Jan 2005 23:56:37 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j04Nuaa1057018 for ; Tue, 4 Jan 2005 23:56:36 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j04NuaEI057015 for perforce@freebsd.org; Tue, 4 Jan 2005 23:56:36 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 4 Jan 2005 23:56:36 GMT Message-Id: <200501042356.j04NuaEI057015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68281 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jan 2005 23:56:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=68281 Change 68281 by davidxu@davidxu_tiger on 2005/01/04 23:55:48 Reduce the code size depends on thr_xxx api. now only need: 1. umtx API. 2. thr_create and thr_exit.(which can be replaced with kse_create & kse_exit); Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#9 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#9 (text+ko) ==== @@ -928,6 +928,7 @@ static inline int mutex_self_lock(struct pthread *curthread, pthread_mutex_t m) { + struct timespec ts; int ret; switch (m->m_type) { @@ -948,8 +949,10 @@ if (m->m_protocol != PTHREAD_PRIO_NONE) { /* Unlock the mutex structure: */ THR_LOCK_RELEASE(curthread, &m->m_lock); + ts.tv_sec = 30; + ts.tv_nsec = 0; for (;;) - thr_suspend(NULL); + __sys_nanosleep(&ts, NULL); } else { PANIC("shouldn't be here!\n"); } From owner-p4-projects@FreeBSD.ORG Wed Jan 5 02:42:00 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E064C16A4CE; Wed, 5 Jan 2005 02:41:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98E0F16A4CE for ; Wed, 5 Jan 2005 02:41:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6630343D39 for ; Wed, 5 Jan 2005 02:41:59 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j052fx5u069267 for ; Wed, 5 Jan 2005 02:41:59 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j052fxC7069264 for perforce@freebsd.org; Wed, 5 Jan 2005 02:41:59 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 5 Jan 2005 02:41:59 GMT Message-Id: <200501050241.j052fxC7069264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68289 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 02:42:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=68289 Change 68289 by davidxu@davidxu_celeron on 2005/01/05 02:41:17 A deadlock can be timeouted if timeout is specified. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#10 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#10 (text+ko) ==== @@ -75,7 +75,8 @@ */ static long 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 inline int mutex_self_lock(struct pthread *, pthread_mutex_t, + const struct timespec *abstime); static int mutex_unlock_common(pthread_mutex_t *, int); static void mutex_priority_adjust(struct pthread *, pthread_mutex_t); static void mutex_rescan_owned (struct pthread *, struct pthread *, @@ -515,14 +516,8 @@ TAILQ_INSERT_TAIL(&curthread->mutexq, (*m), m_qe); #endif - } else if (umtx_owner(&(*m)->m_lock) == curthread->tid && - (*m)->m_type != PTHREAD_MUTEX_NORMAL) { - /* - * We don't do deadlock sleep in mutex_self_lock - * if type is normal, instead let umtx_lock sleep - * in kernel. - */ - ret = mutex_self_lock(curthread, *m); + } else if (umtx_owner(&(*m)->m_lock) == curthread->tid) { + ret = mutex_self_lock(curthread, *m, abstime); } else { if (abstime == NULL) { UMTX_LOCK(&(*m)->m_lock, curthread->tid); @@ -611,7 +606,7 @@ /* Unlock the mutex structure: */ THR_LOCK_RELEASE(curthread, &(*m)->m_lock); } else if ((*m)->m_owner == curthread) { - ret = mutex_self_lock(curthread, *m); + ret = mutex_self_lock(curthread, *m, abstime); /* Unlock the mutex structure: */ THR_LOCK_RELEASE(curthread, &(*m)->m_lock); @@ -701,7 +696,7 @@ /* Unlock the mutex structure: */ THR_LOCK_RELEASE(curthread, &(*m)->m_lock); } else if ((*m)->m_owner == curthread) { - ret = mutex_self_lock(curthread, *m); + ret = mutex_self_lock(curthread, *m, abstime); /* Unlock the mutex structure: */ THR_LOCK_RELEASE(curthread, &(*m)->m_lock); @@ -926,9 +921,10 @@ } static inline int -mutex_self_lock(struct pthread *curthread, pthread_mutex_t m) +mutex_self_lock(struct pthread *curthread, pthread_mutex_t m, + const struct timespec *abstime) { - struct timespec ts; + struct timespec ts1, ts2; int ret; switch (m->m_type) { @@ -946,18 +942,22 @@ * What SS2 define as a 'normal' mutex. Intentionally * deadlock on attempts to get a lock you already own. */ + ret = 0; if (m->m_protocol != PTHREAD_PRIO_NONE) { /* Unlock the mutex structure: */ THR_LOCK_RELEASE(curthread, &m->m_lock); - ts.tv_sec = 30; - ts.tv_nsec = 0; + } + if (abstime) { + clock_gettime(CLOCK_REALTIME, &ts1); + TIMESPEC_SUB(&ts2, abstime, &ts1); + __sys_nanosleep(&ts2, NULL); + ret = ETIMEDOUT; + } else { + ts1.tv_sec = 30; + ts1.tv_nsec = 0; for (;;) - __sys_nanosleep(&ts, NULL); - } else { - PANIC("shouldn't be here!\n"); + __sys_nanosleep(&ts1, NULL); } - - ret = 0; break; case PTHREAD_MUTEX_RECURSIVE: From owner-p4-projects@FreeBSD.ORG Wed Jan 5 05:05:53 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AE8E16A4D0; Wed, 5 Jan 2005 05:05:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 653BC16A4CE for ; Wed, 5 Jan 2005 05:05:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FA6643D2F for ; Wed, 5 Jan 2005 05:05:53 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0555ri1081043 for ; Wed, 5 Jan 2005 05:05:53 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0555q5h081040 for perforce@freebsd.org; Wed, 5 Jan 2005 05:05:52 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 5 Jan 2005 05:05:52 GMT Message-Id: <200501050505.j0555q5h081040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68291 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 05:05:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=68291 Change 68291 by davidxu@davidxu_celeron on 2005/01/05 05:04:56 with new umtx generic wait queue code, mutex and condition variable are not needed to implement semaphore, this also eliminates the problem with signal. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#4 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#4 (text+ko) ==== @@ -43,11 +43,8 @@ #include "thr_private.h" -extern int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *); -extern int pthread_cond_timedwait(pthread_cond_t *, pthread_mutex_t *, - struct timespec *); - __weak_reference(_sem_init, sem_init); +__weak_reference(_sem_trywait, sem_trywait); __weak_reference(_sem_wait, sem_wait); __weak_reference(_sem_timedwait, sem_timedwait); __weak_reference(_sem_post, sem_post); @@ -65,19 +62,6 @@ } } -static void -decrease_nwaiters(void *arg) -{ - sem_t *sem = (sem_t *)arg; - - (*sem)->nwaiters--; - /* - * this function is called from cancellation point, - * the mutex should already be hold. - */ - _pthread_mutex_unlock(&(*sem)->lock); -} - static sem_t sem_alloc(unsigned int value, semid_t semid, int system_sem) { @@ -93,23 +77,11 @@ errno = ENOSPC; return (NULL); } - /* - * Initialize the semaphore. + * Fortunatly count and nwaiters are adjacency, so we can + * use umtx_wait to wait on it, umtx_wait needs an address + * can be accessed as a long interger. */ - if (_pthread_mutex_init(&sem->lock, NULL) != 0) { - free(sem); - errno = ENOSPC; - return (NULL); - } - - if (_pthread_cond_init(&sem->gtzero, NULL) != 0) { - _pthread_mutex_destroy(&sem->lock); - free(sem); - errno = ENOSPC; - return (NULL); - } - sem->count = (u_int32_t)value; sem->nwaiters = 0; sem->magic = SEM_MAGIC; @@ -137,11 +109,29 @@ } int +_sem_trywait(sem_t *sem) +{ + int val; + + if (sem_check_validity(sem) != 0) + return (-1); + + if ((*sem)->syssem != 0) + return (ksem_trywait((*sem)->semid)); + + if ((val = (*sem)->count) > 0) { + if (atomic_cmpset_acq_int(&(*sem)->count, val, val - 1)) + return (0); + } + errno = EAGAIN; + return (-1); +} + +int _sem_wait(sem_t *sem) { struct pthread *curthread; - int oldcancel; - int retval; + int val, oldcancel, retval; if (sem_check_validity(sem) != 0) return (-1); @@ -151,114 +141,84 @@ oldcancel = _thr_cancel_enter(curthread); retval = ksem_wait((*sem)->semid); _thr_cancel_leave(curthread, oldcancel); + return (retval); } - else { - pthread_testcancel(); - _pthread_mutex_lock(&(*sem)->lock); - while ((*sem)->count <= 0) { - (*sem)->nwaiters++; - THR_CLEANUP_PUSH(curthread, decrease_nwaiters, sem); - pthread_cond_wait(&(*sem)->gtzero, &(*sem)->lock); - THR_CLEANUP_POP(curthread, 0); - (*sem)->nwaiters--; + pthread_testcancel(); + do { + while ((val = (*sem)->count) > 0) { + if (atomic_cmpset_acq_int(&(*sem)->count, val, val - 1)) + return (0); } - (*sem)->count--; - - _pthread_mutex_unlock(&(*sem)->lock); - - retval = 0; - } - return (retval); + oldcancel = _thr_cancel_enter(curthread); + retval = umtx_wait((struct umtx *)&(*sem)->count, 0); + _thr_cancel_leave(curthread, oldcancel); + } while (retval == 0); + errno = retval; + return (-1); } int -_sem_timedwait(sem_t * __restrict sem, - struct timespec * __restrict abs_timeout) +_sem_timedwait(sem_t * __restrict sem, struct timespec * __restrict abstime) { struct pthread *curthread; - int retval; - int oldcancel; - int timeout_invalid; + int val, oldcancel, retval; if (sem_check_validity(sem) != 0) return (-1); + curthread = _get_curthread(); if ((*sem)->syssem != 0) { - curthread = _get_curthread(); oldcancel = _thr_cancel_enter(curthread); - retval = ksem_timedwait((*sem)->semid, abs_timeout); + retval = ksem_timedwait((*sem)->semid, abstime); _thr_cancel_leave(curthread, oldcancel); + return (retval); } - else { - /* - * The timeout argument is only supposed to - * be checked if the thread would have blocked. - * This is checked outside of the lock so a - * segfault on an invalid address doesn't end - * up leaving the mutex locked. - */ - pthread_testcancel(); - timeout_invalid = (abs_timeout->tv_nsec >= 1000000000) || - (abs_timeout->tv_nsec < 0); - _pthread_mutex_lock(&(*sem)->lock); - if ((*sem)->count <= 0) { - if (timeout_invalid) { - _pthread_mutex_unlock(&(*sem)->lock); - errno = EINVAL; - return (-1); - } - (*sem)->nwaiters++; - pthread_cleanup_push(decrease_nwaiters, sem); - pthread_cond_timedwait(&(*sem)->gtzero, - &(*sem)->lock, abs_timeout); - pthread_cleanup_pop(0); - (*sem)->nwaiters--; + /* + * The timeout argument is only supposed to + * be checked if the thread would have blocked. + */ + pthread_testcancel(); + do { + while ((val = (*sem)->count) > 0) { + if (atomic_cmpset_acq_int(&(*sem)->count, val, val-1)) + return (0); } - if ((*sem)->count == 0) { - errno = ETIMEDOUT; - retval = -1; + if (abstime == NULL) { + errno = EINVAL; + return (-1); } - else { - (*sem)->count--; - retval = 0; - } - - _pthread_mutex_unlock(&(*sem)->lock); - } - - return (retval); + oldcancel = _thr_cancel_enter(curthread); + retval = umtx_timedwait((struct umtx *)&(*sem)->count, 0, abstime); + _thr_cancel_leave(curthread, oldcancel); + } while (retval == 0); + if (retval == EAGAIN) + retval = ETIMEDOUT; + errno = retval; + return (-1); } int _sem_post(sem_t *sem) { - struct pthread *curthread; - int retval; + int val, retval; if (sem_check_validity(sem) != 0) return (-1); if ((*sem)->syssem != 0) - retval = ksem_post((*sem)->semid); - else { - /* - * sem_post() is required to be safe to call from within - * signal handlers. Thus, we must enter a critical region. - */ - curthread = _get_curthread(); - _thr_critical_enter(curthread); - _pthread_mutex_lock(&(*sem)->lock); + return (ksem_post((*sem)->semid)); - (*sem)->count++; - if ((*sem)->nwaiters > 0) - _pthread_cond_signal(&(*sem)->gtzero); - - _pthread_mutex_unlock(&(*sem)->lock); - _thr_critical_leave(curthread); + /* + * sem_post() is required to be safe to call from within + * signal handlers, these code should work as that. + */ + do { + val = (*sem)->count; + } while (!atomic_cmpset_acq_int(&(*sem)->count, val, val + 1)); + retval = umtx_wake((struct umtx *)&(*sem)->count, val + 1); + if (retval > 0) retval = 0; - } - return (retval); } From owner-p4-projects@FreeBSD.ORG Wed Jan 5 05:14:04 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCB4116A4D0; Wed, 5 Jan 2005 05:14:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A813316A4CE for ; Wed, 5 Jan 2005 05:14:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 80E5B43D31 for ; Wed, 5 Jan 2005 05:14:03 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j055E35i081291 for ; Wed, 5 Jan 2005 05:14:03 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j055E3hB081288 for perforce@freebsd.org; Wed, 5 Jan 2005 05:14:03 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 5 Jan 2005 05:14:03 GMT Message-Id: <200501050514.j055E3hB081288@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 05:14:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=68292 Change 68292 by davidxu@davidxu_celeron on 2005/01/05 05:13:10 in trywait, replace `if' with `while'. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#5 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#5 (text+ko) ==== @@ -119,7 +119,7 @@ if ((*sem)->syssem != 0) return (ksem_trywait((*sem)->semid)); - if ((val = (*sem)->count) > 0) { + while ((val = (*sem)->count) > 0) { if (atomic_cmpset_acq_int(&(*sem)->count, val, val - 1)) return (0); } From owner-p4-projects@FreeBSD.ORG Wed Jan 5 11:24:38 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA78816A4F7; Wed, 5 Jan 2005 11:24:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9977F16A4D9 for ; Wed, 5 Jan 2005 11:24:37 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71BF743D31 for ; Wed, 5 Jan 2005 11:24:37 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05BObjs001285 for ; Wed, 5 Jan 2005 11:24:37 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05BObRh001282 for perforce@freebsd.org; Wed, 5 Jan 2005 11:24:37 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 5 Jan 2005 11:24:37 GMT Message-Id: <200501051124.j05BObRh001282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68310 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 11:24:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=68310 Change 68310 by davidxu@davidxu_tiger on 2005/01/05 11:24:33 add a missing unlock . Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cond.c#7 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cond.c#7 (text+ko) ==== @@ -210,6 +210,7 @@ _thr_cancel_leave(curthread, oldcancel); THR_CLEANUP_POP(curthread, 0); } else { + THR_LOCK_RELEASE(curthread, &cv->c_lock); ret = umtx_timedwait((struct umtx *)&cv->c_seqno, seq, abstime); } From owner-p4-projects@FreeBSD.ORG Wed Jan 5 12:53:26 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B418216A4D0; Wed, 5 Jan 2005 12:53:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B0D216A4CE for ; Wed, 5 Jan 2005 12:53:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63BC243D55 for ; Wed, 5 Jan 2005 12:53:25 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05CrPOj010637 for ; Wed, 5 Jan 2005 12:53:25 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05CrPH8010634 for perforce@freebsd.org; Wed, 5 Jan 2005 12:53:25 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 5 Jan 2005 12:53:25 GMT Message-Id: <200501051253.j05CrPH8010634@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68313 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 12:53:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=68313 Change 68313 by davidxu@davidxu_tiger on 2005/01/05 12:53:18 To be consistent, just use _thr_initial to test if library has been initialized. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/alpha/pthread_md.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/include/pthread_md.h#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/include/pthread_md.h#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/include/pthread_md.h#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/include/pthread_md.h#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/include/pthread_md.h#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_init.c#7 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#13 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/alpha/pthread_md.c#3 (text+ko) ==== @@ -42,7 +42,6 @@ if ((tcb = malloc(sizeof(struct tcb))) != NULL) { tcb->tcb_thread = thread; } - printf("tcb=%p\n", tcb); return (tcb); } ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/include/pthread_md.h#3 (text+ko) ==== @@ -38,7 +38,7 @@ struct tdv; /* We don't know what this is yet? */ struct tcb { - struct tdv *tp_tdv; /* dynamic TLS */ + struct tdv *tcb_tdv; /* dynamic TLS */ struct pthread *tcb_thread; }; @@ -68,12 +68,12 @@ return (_tcb); } -extern int _thread_inited; +extern struct pthread *_thr_initial; static __inline struct pthread * _get_curthread(void) { - if (_thread_inited) + if (_thr_initial) return (_tcb->tcb_thread); return (NULL); } ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/amd64/include/pthread_md.h#4 (text+ko) ==== @@ -99,13 +99,13 @@ return (TCB_GET64(tcb_self)); } -extern int _thread_inited; +extern struct pthread *_thr_initial; /* Get the current thread. */ static __inline struct pthread * _get_curthread(void) { - if (_thread_inited) + if (_thr_initial) return (TCB_GET64(tcb_thread)); return (NULL); } ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/i386/include/pthread_md.h#4 (text+ko) ==== @@ -103,13 +103,13 @@ return (TCB_GET32(tcb_self)); } -extern int _thread_inited; +extern struct pthread *_thr_initial; /* Get the current thread. */ static __inline struct pthread * _get_curthread(void) { - if (_thread_inited) + if (_thr_initial) return (TCB_GET32(tcb_thread)); return (NULL); } ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/include/pthread_md.h#4 (text+ko) ==== @@ -65,12 +65,12 @@ return (_tcb); } -extern int _thread_inited; +extern struct pthread *_thr_initial; static __inline struct pthread * _get_curthread(void) { - if (_thread_inited) + if (_thr_initial) return (_tcb->tcb_thread); return (NULL); } ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/include/pthread_md.h#3 (text+ko) ==== @@ -72,12 +72,12 @@ return (_tcb); } -extern int _thread_inited; +extern struct pthread *_thr_initial; static __inline struct pthread * _get_curthread(void) { - if (_thread_inited) + if (_thr_initial) return (_tcb->tcb_thread); return (NULL); } ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_init.c#7 (text+ko) ==== @@ -282,11 +282,10 @@ _tcb_set(curthread->tcb); if (first) { - _thr_initial = curthread; SIGFILLSET(sigset); __sys_sigprocmask(SIG_SETMASK, &sigset, &oldset); _thr_signal_init(); - _thread_inited = 1; + _thr_initial = curthread; SIGDELSET(oldset, SIGCANCEL); __sys_sigprocmask(SIG_SETMASK, &oldset, NULL); } ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#13 (text+ko) ==== @@ -630,7 +630,6 @@ SCLASS struct pthread *_thr_initial SCLASS_PRESET(NULL); /* For debugger */ SCLASS int _libkse2_debug SCLASS_PRESET(0); -SCLASS int _thread_inited SCLASS_PRESET(0); SCLASS int _thread_scope_system SCLASS_PRESET(0); /* List of all threads: */ @@ -849,13 +848,13 @@ static inline int _thr_is_inited(void) { - return _thread_inited; + return (_thr_initial != 0); } static inline void _thr_check_init(void) { - if (_thread_inited == 0) + if (_thr_initial == 0) _libpthread_init(0); } From owner-p4-projects@FreeBSD.ORG Wed Jan 5 13:41:24 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FD7416A4D0; Wed, 5 Jan 2005 13:41:24 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 16CD116A4CE for ; Wed, 5 Jan 2005 13:41:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1E1943D31 for ; Wed, 5 Jan 2005 13:41:23 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05DfNQp012025 for ; Wed, 5 Jan 2005 13:41:23 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05DfNCS012022 for perforce@freebsd.org; Wed, 5 Jan 2005 13:41:23 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 5 Jan 2005 13:41:23 GMT Message-Id: <200501051341.j05DfNCS012022@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68315 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 13:41:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=68315 Change 68315 by davidxu@davidxu_tiger on 2005/01/05 13:40:49 Remove incorrect comment. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/Makefile#9 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/Makefile#9 (text+ko) ==== @@ -20,8 +20,6 @@ CFLAGS+= -g -# Uncomment this if you want to build a 1:1 threading mode library -# however it is no longer strictly conformed to POSIX # CFLAGS+=-DSYSTEM_SCOPE_ONLY LDFLAGS= -Wl,--version-script=${.CURDIR}/pthread.map From owner-p4-projects@FreeBSD.ORG Wed Jan 5 13:42:26 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 253BE16A4D0; Wed, 5 Jan 2005 13:42:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 018B816A4CE for ; Wed, 5 Jan 2005 13:42:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7F0343D2D for ; Wed, 5 Jan 2005 13:42:25 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05DgPIs012047 for ; Wed, 5 Jan 2005 13:42:25 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05DgPtP012044 for perforce@freebsd.org; Wed, 5 Jan 2005 13:42:25 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 5 Jan 2005 13:42:25 GMT Message-Id: <200501051342.j05DgPtP012044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68316 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 13:42:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=68316 Change 68316 by davidxu@davidxu_tiger on 2005/01/05 13:42:24 Fix pthread.h inclusion, don't include it twice for most files. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#12 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_list.c#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_printf.c#3 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#14 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rtld.c#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spinlock.c#6 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_syscalls.c#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#12 (text+ko) ==== @@ -30,6 +30,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include "thr_private.h" /*#define DEBUG_THREAD_KERN */ ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_list.c#2 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include +#include #include "thr_private.h" #include "libc_private.h" ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_printf.c#3 (text+ko) ==== @@ -30,6 +30,7 @@ #include #include #include +#include #include "thr_private.h" ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#14 (text+ko) ==== @@ -54,8 +54,6 @@ #include #include #include -#include -#include #include "pthread_md.h" ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rtld.c#4 (text+ko) ==== @@ -29,6 +29,7 @@ */ #include #include +#include #include "rtld_lock.h" #include "thr_private.h" ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#6 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include <_semaphore.h> #include "un-namespace.h" -#include "libc_private.h" #include "thr_private.h" ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spinlock.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ #include #include - +#include #include #include "spinlock.h" #include "thr_private.h" ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_syscalls.c#3 (text+ko) ==== @@ -54,10 +54,6 @@ #include #include #include - -#include "namespace.h" -#include "un-namespace.h" - #include #include "thr_private.h" From owner-p4-projects@FreeBSD.ORG Wed Jan 5 13:49:35 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EEF816A4D0; Wed, 5 Jan 2005 13:49:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1FE9816A4CE for ; Wed, 5 Jan 2005 13:49:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E637943D2F for ; Wed, 5 Jan 2005 13:49:34 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05DnYr1012231 for ; Wed, 5 Jan 2005 13:49:34 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05DnYb0012228 for perforce@freebsd.org; Wed, 5 Jan 2005 13:49:34 GMT (envelope-from areisse@nailabs.com) Date: Wed, 5 Jan 2005 13:49:34 GMT Message-Id: <200501051349.j05DnYb0012228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 68317 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 13:49:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=68317 Change 68317 by areisse@areisse_tislabs on 2005/01/05 13:49:08 Policy and pwd_mkdb changes for passwd, vipw, and adduser with sebsd. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/passwd.te#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/useradd.te#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/passwd.fc#5 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/pwd_mkdb/pwd_mkdb.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/passwd.te#5 (text+ko) ==== @@ -71,7 +71,6 @@ base_passwd_domain($1, `auth_write, privowner') # Update /etc/shadow and /etc/passwd file_type_auto_trans($1_t, etc_t, shadow_t, file) -allow $1_t { etc_t shadow_t }:file { relabelfrom relabelto }; can_setfscreate($1_t) ') @@ -130,6 +129,9 @@ # for /etc/alternatives/vi allow sysadm_passwd_t etc_t:lnk_file read; +# access the terminal database +r_dir_file(sysadm_passwd_t, usr_t) + # for nscd lookups dontaudit sysadm_passwd_t var_run_t:dir search; @@ -138,3 +140,33 @@ allow passwd_t userdomain:file read; allow passwd_t userdomain:process getattr; +################################# +# +# Rules for pwd_mkdb +# +type pwdmkdb_t, domain, auth_write, privowner; +type pwdmkdb_exec_t, exec_type, file_type, sysadmfile; + +role system_r types pwdmkdb_t; +role sysadm_r types pwdmkdb_t; + +general_domain_access(pwdmkdb_t); +uses_shlib(pwdmkdb_t); + +rw_dir_file(pwdmkdb_t, etc_t); +allow pwdmkdb_t {shadow_t etc_t}:file unlink; + +allow pwdmkdb_t privfd:fd use; + +file_type_auto_trans(pwdmkdb_t, etc_t, shadow_t, file) + +# Relabel password files. +allow pwdmkdb_t {etc_t shadow_t}:file { relabelfrom relabelto }; + +# passwords are changed from many source domains. +allow pwdmkdb_t {ttyfile ptyfile}:chr_file { write }; + +# passwd/vipw use pwd_mkdb for the actual updates. +domain_auto_trans({passwd_t sysadm_passwd_t}, pwdmkdb_exec_t, pwdmkdb_t) +allow {passwd_t sysadm_passwd_t} sbin_t:dir search; + ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/useradd.te#3 (text+ko) ==== @@ -41,15 +41,18 @@ file_type_auto_trans($1_t, etc_t, shadow_t, file) allow $1_t etc_t:file create_file_perms; +domain_auto_trans($1_t, pwdmkdb_exec_t, pwdmkdb_t) + # some apps ask for these accesses, but seems to work regardless dontaudit $1_t var_run_t:dir search; r_dir_file($1_t, selinux_config_t) +dontaudit $1_t home_root_t:dir setattr; +allow $1_t self:capability linux_immutable; + # Set fscreate context. can_setfscreate($1_t) -allow $1_t { etc_t shadow_t }:file { relabelfrom relabelto }; - read_locale($1_t) # useradd/userdel request read/write for /var/log/lastlog, and read of /dev, @@ -78,6 +81,11 @@ file_type_auto_trans(useradd_t, home_root_t, user_home_dir_t, dir) file_type_auto_trans(useradd_t, user_home_dir_t, user_home_t) +# Access /usr/share/skel +r_dir_file(useradd_t, usr_t) + +allow useradd_t root_t:lnk_file read; + # create/delete mail spool file in /var/mail allow useradd_t var_spool_t:dir search; allow useradd_t mail_spool_t:dir { search write add_name remove_name }; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/passwd.fc#5 (text+ko) ==== @@ -10,3 +10,4 @@ /usr/sbin/pwunconv -- system_u:object_r:admin_passwd_exec_t /usr/sbin/grpconv -- system_u:object_r:admin_passwd_exec_t /usr/sbin/grpunconv -- system_u:object_r:admin_passwd_exec_t +/usr/sbin/pwd_mkdb -- system_u:object_r:pwdmkdb_exec_t ==== //depot/projects/trustedbsd/sebsd/usr.sbin/pwd_mkdb/pwd_mkdb.c#5 (text+ko) ==== @@ -56,6 +56,7 @@ #include #include #include +#include #include "pw_scan.h" @@ -66,6 +67,9 @@ #define LEGACY_VERSION(x) _PW_VERSIONED(x, 3) #define CURRENT_VERSION(x) _PW_VERSIONED(x, 4) +#define SEBSD_INSECURE "sebsd/system_u:object_r:etc_t" +#define SEBSD_SECURE "sebsd/system_u:object_r:shadow_t" + HASHINFO openinfo = { 4096, /* bsize */ 32, /* ffactor */ @@ -86,7 +90,7 @@ void cleanup(void); void error(const char *); void cp(char *, char *, mode_t mode); -void mv(char *, char *); +void mv(char *, char *, const char *label); int scan(FILE *, struct passwd *); static void usage(void); @@ -596,14 +600,14 @@ /* Install as the real password files. */ (void)snprintf(buf, sizeof(buf), "%s/%s.tmp", prefix, _MP_DB); (void)snprintf(buf2, sizeof(buf2), "%s/%s", prefix, _MP_DB); - mv(buf, buf2); + mv(buf, buf2, SEBSD_INSECURE); (void)snprintf(buf, sizeof(buf), "%s/%s.tmp", prefix, _SMP_DB); (void)snprintf(buf2, sizeof(buf2), "%s/%s", prefix, _SMP_DB); - mv(buf, buf2); + mv(buf, buf2, SEBSD_INSECURE); /* XXX getty (etc) use this database incorrectly */ if (makeold) { (void)snprintf(buf2, sizeof(buf2), "%s/%s", prefix, _PASSWD); (void)snprintf(buf, sizeof(buf), "%s.orig", pname); - mv(buf, buf2); + mv(buf, buf2, SEBSD_INSECURE); } /* * Move the master password LAST -- chpass(1), passwd(1) and vipw(8) @@ -612,7 +616,7 @@ * can no longer be accessed. */ (void)snprintf(buf, sizeof(buf), "%s/%s", prefix, _MASTERPASSWD); - mv(pname, buf); + mv(pname, buf, SEBSD_SECURE); /* * Close locked password file after rename() @@ -704,8 +708,9 @@ void -mv(from, to) +mv(from, to, label) char *from, *to; + const char *label; { char buf[MAXPATHLEN]; @@ -715,6 +720,17 @@ errno = sverrno; error(buf); } + if (label) { + mac_t mac; + if (mac_from_text(&mac, label)) { + warn("%s", to); + return; + } + if (mac_set_file(to, mac)) { + warn("%s", to); + return; + } + } } void From owner-p4-projects@FreeBSD.ORG Wed Jan 5 13:57:45 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E8D216A4D0; Wed, 5 Jan 2005 13:57:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4174E16A4CE for ; Wed, 5 Jan 2005 13:57:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F9D643D2D for ; Wed, 5 Jan 2005 13:57:45 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05Dvj6h012471 for ; Wed, 5 Jan 2005 13:57:45 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05DvitV012468 for perforce@freebsd.org; Wed, 5 Jan 2005 13:57:44 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 5 Jan 2005 13:57:44 GMT Message-Id: <200501051357.j05DvitV012468@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68318 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 13:57:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=68318 Change 68318 by davidxu@davidxu_tiger on 2005/01/05 13:57:20 update symbols. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/pthread.map#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/pthread.map#3 (text+ko) ==== @@ -14,6 +14,7 @@ __poll; __pthread_cond_timedwait; __pthread_cond_wait; + __pthread_mutex_init; __pthread_mutex_lock; __pthread_mutex_trylock; __pthread_mutex_timedlock; @@ -144,7 +145,6 @@ _pthread_testcancel; _pthread_yield; _raise; - _sched_yield; _sem_close; _sem_destroy; _sem_getvalue; @@ -156,8 +156,6 @@ _sem_unlink; _sem_wait; _sigaction; - _sigaltstack; - _sigpending; _sigprocmask; _sigsuspend; _sigwait; From owner-p4-projects@FreeBSD.ORG Wed Jan 5 14:15:07 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C11F416A4D0; Wed, 5 Jan 2005 14:15:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98C7816A4CE for ; Wed, 5 Jan 2005 14:15:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 818A243D1F for ; Wed, 5 Jan 2005 14:15:06 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05EF6Mo013043 for ; Wed, 5 Jan 2005 14:15:06 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05EF6Jp013040 for perforce@freebsd.org; Wed, 5 Jan 2005 14:15:06 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 5 Jan 2005 14:15:06 GMT Message-Id: <200501051415.j05EF6Jp013040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 14:15:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=68319 Change 68319 by davidxu@davidxu_tiger on 2005/01/05 14:14:10 Fix styles. add sem_getvalue. Update copyright. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#7 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#7 (text+ko) ==== @@ -1,4 +1,5 @@ /* + * Copyright (C) 2005 David Xu . * Copyright (C) 2000 Jason Evans . * All rights reserved. * @@ -43,6 +44,7 @@ __weak_reference(_sem_init, sem_init); +__weak_reference(_sem_getvalue, sem_getvalue); __weak_reference(_sem_trywait, sem_trywait); __weak_reference(_sem_wait, sem_wait); __weak_reference(_sem_timedwait, sem_timedwait); @@ -108,6 +110,23 @@ } int +_sem_getvalue(sem_t * __restrict sem, int * __restrict sval) +{ + int retval; + + if (sem_check_validity(sem) != 0) + return (-1); + + if ((*sem)->syssem != 0) + retval = ksem_getvalue((*sem)->semid, sval); + else { + *sval = (int)(*sem)->count; + retval = 0; + } + return (retval); +} + +int _sem_trywait(sem_t *sem) { int val; @@ -143,11 +162,11 @@ return (retval); } - pthread_testcancel(); + _pthread_testcancel(); do { while ((val = (*sem)->count) > 0) { - if (atomic_cmpset_acq_int(&(*sem)->count, val, val - 1)) - return (0); + if (atomic_cmpset_acq_int(&(*sem)->count, val, val - 1)) + return (0); } oldcancel = _thr_cancel_enter(curthread); retval = umtx_wait((struct umtx *)&(*sem)->count, 0); @@ -178,11 +197,11 @@ * The timeout argument is only supposed to * be checked if the thread would have blocked. */ - pthread_testcancel(); + _pthread_testcancel(); do { while ((val = (*sem)->count) > 0) { - if (atomic_cmpset_acq_int(&(*sem)->count, val, val-1)) - return (0); + if (atomic_cmpset_acq_int(&(*sem)->count, val, val - 1)) + return (0); } if (abstime == NULL) { errno = EINVAL; From owner-p4-projects@FreeBSD.ORG Wed Jan 5 14:17:10 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE83216A4D0; Wed, 5 Jan 2005 14:17:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8699216A4CE for ; Wed, 5 Jan 2005 14:17:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7516143D1D for ; Wed, 5 Jan 2005 14:17:09 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05EH97r013128 for ; Wed, 5 Jan 2005 14:17:09 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05EH9ul013125 for perforce@freebsd.org; Wed, 5 Jan 2005 14:17:09 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 5 Jan 2005 14:17:09 GMT Message-Id: <200501051417.j05EH9ul013125@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 14:17:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=68320 Change 68320 by davidxu@davidxu_tiger on 2005/01/05 14:16:38 add underscore version pthread_cancel. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#15 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#15 (text+ko) ==== @@ -708,6 +708,7 @@ int _pthread_rwlock_destroy (pthread_rwlock_t *); struct pthread *_pthread_self(void); int _pthread_setspecific(pthread_key_t, const void *); +void _pthread_testcancel(void); void _pthread_yield(void); void _pthread_cleanup_push(void (*routine) (void *), void *routine_arg); void _pthread_cleanup_pop(int execute); From owner-p4-projects@FreeBSD.ORG Wed Jan 5 14:53:56 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20B7716A4D0; Wed, 5 Jan 2005 14:53:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA57316A4CE for ; Wed, 5 Jan 2005 14:53:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E31F43D1F for ; Wed, 5 Jan 2005 14:53:55 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05ErtMX014119 for ; Wed, 5 Jan 2005 14:53:55 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05ErtkX014116 for perforce@freebsd.org; Wed, 5 Jan 2005 14:53:55 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 5 Jan 2005 14:53:55 GMT Message-Id: <200501051453.j05ErtkX014116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68322 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 14:53:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=68322 Change 68322 by davidxu@davidxu_tiger on 2005/01/05 14:53:37 add missing cancellation points. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/pthread.map#4 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#16 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_syscalls.c#4 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/pthread.map#4 (text+ko) ==== @@ -20,7 +20,11 @@ __pthread_mutex_timedlock; __read; __readv; + __recvfrom; + __recvmsg; __select; + __sendmsg; + __sendto; __sigsuspend; __wait4; __write; @@ -298,7 +302,8 @@ raise; read; readv; - sched_yield; + recvfrom; + recvmsg; select; sem_close; sem_destroy; @@ -310,6 +315,8 @@ sem_trywait; sem_unlink; sem_wait; + sendmsg; + sendto; sigaction; sigaltstack; sigpending; ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#16 (text+ko) ==== @@ -794,8 +794,13 @@ #ifdef _SYS_SOCKET_H_ int __sys_accept(int, struct sockaddr *, socklen_t *); int __sys_connect(int, const struct sockaddr *, socklen_t); +ssize_t __sys_recv(int, void *, size_t, int); +ssize_t __sys_recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *); +ssize_t __sys_recvmsg(int, struct msghdr *, int); int __sys_sendfile(int, int, off_t, size_t, struct sf_hdtr *, off_t *, int); +ssize_t __sys_sendmsg(int, const struct msghdr *, int); +ssize_t __sys_sendto(int, const void *,size_t, int, const struct sockaddr *, socklen_t); #endif /* #include */ ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_syscalls.c#4 (text+ko) ==== @@ -363,6 +363,37 @@ return ret; } +__weak_reference(__recvfrom, recvfrom); + +ssize_t +__recvfrom(int s, void *b, size_t l, int f, struct sockaddr *from, + socklen_t *fl) +{ + struct pthread *curthread = _get_curthread(); + int oldcancel; + ssize_t ret; + + oldcancel = _thr_cancel_enter(curthread); + ret = __sys_recvfrom(s, b, l, f, from, fl); + _thr_cancel_leave(curthread, oldcancel); + return (ret); +} + +__weak_reference(__recvmsg, recvmsg); + +ssize_t +__recvmsg(int s, struct msghdr *m, int f) +{ + struct pthread *curthread = _get_curthread(); + ssize_t ret; + int oldcancel; + + oldcancel = _thr_cancel_enter(curthread); + ret = __sys_recvmsg(s, m, f); + _thr_cancel_leave(curthread, oldcancel); + return (ret); +} + __weak_reference(__select, select); int @@ -379,6 +410,37 @@ return ret; } +__weak_reference(__sendmsg, sendmsg); + +ssize_t +__sendmsg(int s, const struct msghdr *m, int f) +{ + struct pthread *curthread = _get_curthread(); + ssize_t ret; + int oldcancel; + + oldcancel = _thr_cancel_enter(curthread); + ret = __sys_sendmsg(s, m, f); + _thr_cancel_leave(curthread, oldcancel); + return (ret); +} + +__weak_reference(__sendto, sendto); + +ssize_t +__sendto(int s, const void *m, size_t l, int f, const struct sockaddr *t, + socklen_t tl) +{ + struct pthread *curthread = _get_curthread(); + ssize_t ret; + int oldcancel; + + oldcancel = _thr_cancel_enter(curthread); + ret = __sys_sendto(s, m, l, f, t, tl); + _thr_cancel_leave(curthread, oldcancel); + return (ret); +} + __weak_reference(_sigaction, sigaction); int From owner-p4-projects@FreeBSD.ORG Wed Jan 5 20:23:45 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DC9616A4D0; Wed, 5 Jan 2005 20:23:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3868E16A4CE for ; Wed, 5 Jan 2005 20:23:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2230F43D2F for ; Wed, 5 Jan 2005 20:23:45 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05KNjZ0032358 for ; Wed, 5 Jan 2005 20:23:45 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05KNiAQ032355 for perforce@freebsd.org; Wed, 5 Jan 2005 20:23:44 GMT (envelope-from areisse@nailabs.com) Date: Wed, 5 Jan 2005 20:23:44 GMT Message-Id: <200501052023.j05KNiAQ032355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 68339 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 20:23:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=68339 Change 68339 by areisse@areisse_tislabs on 2005/01/05 20:23:42 Relabel terminals in newrole. Affected files ... .. //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_newrole/sebsd_newrole.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/usr.sbin/sebsd_newrole/sebsd_newrole.c#3 (text+ko) ==== @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -98,7 +99,8 @@ context_t context; struct passwd *pw; struct passwd pw_copy; - mac_t execlabel; + mac_t execlabel, oldtty, newtty; + char *ttyn; if (!sebsd_enabled()) { fprintf(stderr, "Sorry, sebsd_newrole may only be used when " @@ -201,6 +203,37 @@ exit(1); } + /* + * Handle terminal labelling. + */ + ttyn = ttyname(STDIN_FILENO); + if (ttyn && *ttyn) { + char *oldttys, *newttys, *newttyslabel; + + if (mac_prepare(&oldtty, "sebsd") != 0 || + mac_get_file(ttyn, oldtty) != 0 || + mac_to_text(oldtty, &oldttys) != 0) { + perror(ttyn); + exit(1); + } + if (security_change_context(new_context, oldttys + + sizeof("sebsd/") - 1, SECCLASS_CHR_FILE, + &newttys) != 0 || + asprintf(&newttyslabel, "sebsd/%s", newttys) == -1) { + fprintf(stderr, + "Unable to determine new terminal label for %s\n", + ttyn); + exit(1); + } + free(oldttys); + + if (mac_from_text(&newtty, newttyslabel) != 0 || + mac_set_file(ttyn, newtty) != 0) { + perror(ttyn); + exit(1); + } + } + if (asprintf(&labeltext, "sebsd/%s", new_context) == -1 || mac_from_text(&execlabel, labeltext) != 0) { fprintf(stderr, "Error, failed to create new context\n"); @@ -208,6 +241,15 @@ } free(labeltext); + /* + * restore the old terminal label when the shell exits. + */ + if (ttyn && *ttyn && fork()) { + wait(); + mac_set_file(ttyn, oldtty); + exit(0); + } + if (argc == 0) { char *shell_argv[2]; From owner-p4-projects@FreeBSD.ORG Wed Jan 5 22:21:52 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82A6A16A4D1; Wed, 5 Jan 2005 22:21:52 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D20E16A4CE for ; Wed, 5 Jan 2005 22:21:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B8BD43D58 for ; Wed, 5 Jan 2005 22:21:52 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05MLq6Z043864 for ; Wed, 5 Jan 2005 22:21:52 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05MLp4a043861 for perforce@freebsd.org; Wed, 5 Jan 2005 22:21:51 GMT (envelope-from jhb@freebsd.org) Date: Wed, 5 Jan 2005 22:21:51 GMT Message-Id: <200501052221.j05MLp4a043861@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 68352 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 22:21:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=68352 Change 68352 by jhb@jhb_slimer on 2005/01/05 22:21:05 Committed. Affected files ... .. //depot/projects/smpng/sys/notes#28 edit Differences ... ==== //depot/projects/smpng/sys/notes#28 (text+ko) ==== @@ -47,9 +47,6 @@ buys is being able to swi_sched() from a fast handler, but that doesn't make sense because you can't actually enqueue a task onto its queue from a fast interrupt context -- Optimize spin locks on UP such that they don't do atomic operations - - Untested - - Unbenchmarked - Try to fix problems with stuck IPIs by raising TPR and enabling interrupts in spin loops. Need to perhaps generalize this so that critical sections do this. That really needs to only be done in spinlock_*() (and maybe some From owner-p4-projects@FreeBSD.ORG Wed Jan 5 22:39:23 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34AC916A4D0; Wed, 5 Jan 2005 22:39:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C4C916A4CE for ; Wed, 5 Jan 2005 22:39:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B53243D1D for ; Wed, 5 Jan 2005 22:39:22 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05MdMlt045380 for ; Wed, 5 Jan 2005 22:39:22 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05MdGJu045375 for perforce@freebsd.org; Wed, 5 Jan 2005 22:39:16 GMT (envelope-from jhb@freebsd.org) Date: Wed, 5 Jan 2005 22:39:16 GMT Message-Id: <200501052239.j05MdGJu045375@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 68358 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 22:39:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=68358 Change 68358 by jhb@jhb_slimer on 2005/01/05 22:38:38 IFC @68354. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#24 integrate .. //depot/projects/smpng/sys/alpha/alpha/clock.c#14 integrate .. //depot/projects/smpng/sys/alpha/alpha/clock_if.m#2 integrate .. //depot/projects/smpng/sys/alpha/alpha/cpuconf.c#6 integrate .. //depot/projects/smpng/sys/alpha/alpha/db_disasm.c#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/db_instruction.h#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/db_interface.c#11 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_1000a.c#10 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_2100_a50.c#8 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_2100_a500.c#9 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_3000_300.c#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_3000_500.c#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#9 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_eb164.c#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_eb64plus.c#8 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_kn20aa.c#10 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_kn300.c#9 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_kn8ae.c#5 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_st550.c#10 integrate .. //depot/projects/smpng/sys/alpha/alpha/divrem.m4#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/exception.s#9 integrate .. //depot/projects/smpng/sys/alpha/alpha/gdb_machdep.c#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/in_cksum.c#5 integrate .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#32 integrate .. //depot/projects/smpng/sys/alpha/alpha/locore.s#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#76 integrate .. //depot/projects/smpng/sys/alpha/alpha/pal.s#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#68 integrate .. //depot/projects/smpng/sys/alpha/alpha/prom.c#14 integrate .. //depot/projects/smpng/sys/alpha/alpha/prom_disp.s#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/promcons.c#22 integrate .. //depot/projects/smpng/sys/alpha/alpha/support.s#11 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#56 integrate .. //depot/projects/smpng/sys/alpha/alpha/uio_machdep.c#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#36 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#46 integrate .. //depot/projects/smpng/sys/alpha/include/_limits.h#7 integrate .. //depot/projects/smpng/sys/alpha/include/alpha_cpu.h#7 integrate .. //depot/projects/smpng/sys/alpha/include/asm.h#6 integrate .. //depot/projects/smpng/sys/alpha/include/bootinfo.h#3 integrate .. //depot/projects/smpng/sys/alpha/include/bus.h#15 integrate .. //depot/projects/smpng/sys/alpha/include/bus_memio.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/bus_pio.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/clock.h#3 integrate .. //depot/projects/smpng/sys/alpha/include/clockvar.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/cpu.h#13 integrate .. //depot/projects/smpng/sys/alpha/include/cpuconf.h#3 integrate .. //depot/projects/smpng/sys/alpha/include/db_machdep.h#7 integrate .. //depot/projects/smpng/sys/alpha/include/exec.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/float.h#6 integrate .. //depot/projects/smpng/sys/alpha/include/floatingpoint.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/frame.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/gdb_machdep.h#3 integrate .. //depot/projects/smpng/sys/alpha/include/ieee.h#3 integrate .. //depot/projects/smpng/sys/alpha/include/ieeefp.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/intrcnt.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/kdb.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/limits.h#9 integrate .. //depot/projects/smpng/sys/alpha/include/pal.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/param.h#13 integrate .. //depot/projects/smpng/sys/alpha/include/pc/msdos.h#2 delete .. //depot/projects/smpng/sys/alpha/include/pcb.h#6 integrate .. //depot/projects/smpng/sys/alpha/include/pmap.h#22 integrate .. //depot/projects/smpng/sys/alpha/include/proc.h#8 integrate .. //depot/projects/smpng/sys/alpha/include/profile.h#5 integrate .. //depot/projects/smpng/sys/alpha/include/prom.h#5 integrate .. //depot/projects/smpng/sys/alpha/include/pte.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/ptrace.h#8 integrate .. //depot/projects/smpng/sys/alpha/include/reg.h#6 integrate .. //depot/projects/smpng/sys/alpha/include/reloc.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/resource.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/rpb.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/runq.h#3 integrate .. //depot/projects/smpng/sys/alpha/include/signal.h#7 integrate .. //depot/projects/smpng/sys/alpha/include/smp.h#5 integrate .. //depot/projects/smpng/sys/alpha/include/vmparam.h#5 integrate .. //depot/projects/smpng/sys/alpha/isa/mcclock_isa.c#4 integrate .. //depot/projects/smpng/sys/alpha/mcbus/mcbus.c#5 integrate .. //depot/projects/smpng/sys/alpha/mcbus/mcbusreg.h#2 integrate .. //depot/projects/smpng/sys/alpha/mcbus/mcbusvar.h#3 integrate .. //depot/projects/smpng/sys/alpha/mcbus/mcmem.c#4 integrate .. //depot/projects/smpng/sys/alpha/mcbus/mcpcia.c#21 integrate .. //depot/projects/smpng/sys/alpha/mcbus/mcpciareg.h#2 integrate .. //depot/projects/smpng/sys/alpha/mcbus/mcpciavar.h#3 integrate .. //depot/projects/smpng/sys/alpha/osf1/exec_ecoff.h#2 integrate .. //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#12 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1.h#3 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_ioctl.c#9 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#34 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_mount.c#13 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#25 integrate .. //depot/projects/smpng/sys/alpha/pci/alphapci_if.m#2 integrate .. //depot/projects/smpng/sys/alpha/pci/apecs.c#14 integrate .. //depot/projects/smpng/sys/alpha/pci/apecsreg.h#2 integrate .. //depot/projects/smpng/sys/alpha/pci/cia.c#18 integrate .. //depot/projects/smpng/sys/alpha/pci/cia_pci.c#5 integrate .. //depot/projects/smpng/sys/alpha/pci/ciareg.h#2 integrate .. //depot/projects/smpng/sys/alpha/pci/lcareg.h#2 integrate .. //depot/projects/smpng/sys/alpha/pci/pci_eb164_intr.s#2 integrate .. //depot/projects/smpng/sys/alpha/pci/pci_eb64plus_intr.s#2 integrate .. //depot/projects/smpng/sys/alpha/pci/pcibus.c#7 integrate .. //depot/projects/smpng/sys/alpha/pci/t2.c#20 integrate .. //depot/projects/smpng/sys/alpha/pci/t2reg.h#2 integrate .. //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#15 integrate .. //depot/projects/smpng/sys/alpha/tlsb/dwlpxreg.h#2 integrate .. //depot/projects/smpng/sys/alpha/tlsb/dwlpxvar.h#2 integrate .. //depot/projects/smpng/sys/alpha/tlsb/gbus.c#4 integrate .. //depot/projects/smpng/sys/alpha/tlsb/kftxx.c#4 integrate .. //depot/projects/smpng/sys/alpha/tlsb/kftxxreg.h#2 integrate .. //depot/projects/smpng/sys/alpha/tlsb/mcclock_tlsb.c#4 integrate .. //depot/projects/smpng/sys/alpha/tlsb/tlsb.c#5 integrate .. //depot/projects/smpng/sys/alpha/tlsb/tlsbcpu.c#6 integrate .. //depot/projects/smpng/sys/alpha/tlsb/tlsbmem.c#4 integrate .. //depot/projects/smpng/sys/alpha/tlsb/tlsbreg.h#2 integrate .. //depot/projects/smpng/sys/alpha/tlsb/tlsbvar.h#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_disasm.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_interface.c#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#11 integrate .. //depot/projects/smpng/sys/amd64/amd64/gdb_machdep.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/in_cksum.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#15 integrate .. //depot/projects/smpng/sys/amd64/amd64/uio_machdep.c#4 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#27 integrate .. //depot/projects/smpng/sys/amd64/include/_limits.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/apicreg.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/bus_amd64.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/bus_memio.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/bus_pio.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/clock.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/db_machdep.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/float.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/gdb_machdep.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/limits.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/metadata.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/mptable.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/param.h#13 integrate .. //depot/projects/smpng/sys/amd64/include/pc/display.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/pci_cfgreg.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#17 integrate .. //depot/projects/smpng/sys/amd64/include/proc.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/profile.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/ptrace.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/resource.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/runq.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/signal.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#5 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#12 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_cfgreg.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/bcopy_page.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/bcopyinout.S#5 integrate .. //depot/projects/smpng/sys/arm/arm/bcopyinout_xscale.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/blockio.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/bootconfig.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/bus_space_asm_generic.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#8 integrate .. //depot/projects/smpng/sys/arm/arm/copystr.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm10.S#2 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm3.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm67.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm7tdmi.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm8.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm9.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_armv4.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_ixp12x0.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_sa1.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_sa11x0.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_xscale.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/db_disasm.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/db_interface.c#4 integrate .. //depot/projects/smpng/sys/arm/arm/db_trace.c#11 integrate .. //depot/projects/smpng/sys/arm/arm/disassem.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/exception.S#5 integrate .. //depot/projects/smpng/sys/arm/arm/fiq.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/fiq_subr.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/fusu.S#5 integrate .. //depot/projects/smpng/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/smpng/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/in_cksum_arm.S#4 integrate .. //depot/projects/smpng/sys/arm/arm/intr.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/irq_dispatch.S#4 integrate .. //depot/projects/smpng/sys/arm/arm/locore.S#6 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/nexus.c#4 integrate .. //depot/projects/smpng/sys/arm/arm/nexus_io.c#4 integrate .. //depot/projects/smpng/sys/arm/arm/nexus_io_asm.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#12 integrate .. //depot/projects/smpng/sys/arm/arm/setcpsr.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/setstack.s#2 integrate .. //depot/projects/smpng/sys/arm/arm/swtch.S#7 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/uio_machdep.c#4 integrate .. //depot/projects/smpng/sys/arm/arm/undefined.c#4 integrate .. //depot/projects/smpng/sys/arm/arm/vectors.S#2 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#9 integrate .. //depot/projects/smpng/sys/arm/include/_limits.h#6 integrate .. //depot/projects/smpng/sys/arm/include/armreg.h#2 integrate .. //depot/projects/smpng/sys/arm/include/asm.h#4 integrate .. //depot/projects/smpng/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/smpng/sys/arm/include/atomic.h#5 integrate .. //depot/projects/smpng/sys/arm/include/bootconfig.h#2 integrate .. //depot/projects/smpng/sys/arm/include/bus.h#4 integrate .. //depot/projects/smpng/sys/arm/include/bus_memio.h#2 integrate .. //depot/projects/smpng/sys/arm/include/bus_pio.h#2 integrate .. //depot/projects/smpng/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/smpng/sys/arm/include/cpufunc.h#6 integrate .. //depot/projects/smpng/sys/arm/include/db_machdep.h#4 integrate .. //depot/projects/smpng/sys/arm/include/disassem.h#2 integrate .. //depot/projects/smpng/sys/arm/include/endian.h#7 integrate .. //depot/projects/smpng/sys/arm/include/exec.h#2 integrate .. //depot/projects/smpng/sys/arm/include/fiq.h#2 integrate .. //depot/projects/smpng/sys/arm/include/float.h#3 integrate .. //depot/projects/smpng/sys/arm/include/fp.h#2 integrate .. //depot/projects/smpng/sys/arm/include/frame.h#3 integrate .. //depot/projects/smpng/sys/arm/include/ieee.h#2 integrate .. //depot/projects/smpng/sys/arm/include/ieeefp.h#2 integrate .. //depot/projects/smpng/sys/arm/include/intr.h#3 integrate .. //depot/projects/smpng/sys/arm/include/katelib.h#2 integrate .. //depot/projects/smpng/sys/arm/include/kdb.h#3 integrate .. //depot/projects/smpng/sys/arm/include/limits.h#7 integrate .. //depot/projects/smpng/sys/arm/include/metadata.h#2 integrate .. //depot/projects/smpng/sys/arm/include/pcb.h#5 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#7 integrate .. //depot/projects/smpng/sys/arm/include/proc.h#2 integrate .. //depot/projects/smpng/sys/arm/include/profile.h#6 integrate .. //depot/projects/smpng/sys/arm/include/psl.h#2 integrate .. //depot/projects/smpng/sys/arm/include/pte.h#3 integrate .. //depot/projects/smpng/sys/arm/include/resource.h#2 integrate .. //depot/projects/smpng/sys/arm/include/runq.h#2 integrate .. //depot/projects/smpng/sys/arm/include/signal.h#6 integrate .. //depot/projects/smpng/sys/arm/include/stdarg.h#2 integrate .. //depot/projects/smpng/sys/arm/include/swi.h#2 integrate .. //depot/projects/smpng/sys/arm/include/sysarch.h#2 integrate .. //depot/projects/smpng/sys/arm/include/undefined.h#2 integrate .. //depot/projects/smpng/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#8 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_io.c#4 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_io_asm.S#2 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_irq.S#3 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ost.c#3 integrate .. //depot/projects/smpng/sys/arm/sa11x0/uart_bus_sa1110.c#2 integrate .. //depot/projects/smpng/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/smpng/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/smpng/sys/arm/sa11x0/uart_dev_sa1110.h#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_intr.h#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_mcu.c#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_pci.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321reg.h#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq80321reg.h#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq80321var.h#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/obiovar.h#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/uart_bus_i80321.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/uart_cpu_i80321.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/xscalereg.h#2 integrate .. //depot/projects/smpng/sys/arm/xscale/xscalevar.h#2 integrate .. //depot/projects/smpng/sys/boot/README#2 integrate .. //depot/projects/smpng/sys/boot/efi/include/README#2 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/efiboot.h#7 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/time.c#4 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/conf.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/elf_freebsd.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/pal_stub.S#2 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/sal_stub.c#2 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/start.S#2 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/time.c#2 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/libofw.h#8 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_console.c#5 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#10 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_memory.c#6 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_net.c#8 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_reboot.c#3 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_time.c#4 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.c#10 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.h#8 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/start.c#6 integrate .. //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#9 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/locore.S#3 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#19 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#14 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#14 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#14 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#14 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#14 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#37 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_resource.c#10 integrate .. //depot/projects/smpng/sys/conf/files#132 integrate .. //depot/projects/smpng/sys/conf/files.i386#73 integrate .. //depot/projects/smpng/sys/conf/files.pc98#67 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#48 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/amrr/amrr.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#20 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/ath/if_athioctl.h#8 integrate .. //depot/projects/smpng/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_card.c#8 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_card.h#6 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#41 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#36 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#58 integrate .. //depot/projects/smpng/sys/dev/md/md.c#62 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#48 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#27 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#17 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#19 integrate .. //depot/projects/smpng/sys/dev/twa/twa.c#2 integrate .. //depot/projects/smpng/sys/dev/twa/twa.h#3 integrate .. //depot/projects/smpng/sys/dev/twa/twa_cam.c#3 integrate .. //depot/projects/smpng/sys/dev/twa/twa_externs.h#2 integrate .. //depot/projects/smpng/sys/dev/twa/twa_freebsd.c#5 integrate .. //depot/projects/smpng/sys/dev/twa/twa_fwimg.c#2 integrate .. //depot/projects/smpng/sys/dev/twa/twa_globals.c#2 integrate .. //depot/projects/smpng/sys/dev/twa/twa_reg.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#34 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#71 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#67 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#18 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#16 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.h#6 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror_ctl.c#4 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#13 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.h#6 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3_ctl.c#5 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#60 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#34 integrate .. //depot/projects/smpng/sys/i386/i386/db_disasm.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/db_interface.c#26 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#23 integrate .. //depot/projects/smpng/sys/i386/i386/gdb_machdep.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/mpboot.s#5 integrate .. //depot/projects/smpng/sys/i386/i386/p4tcc.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/uio_machdep.c#5 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#17 integrate .. //depot/projects/smpng/sys/i386/include/pc/msdos.h#3 delete .. //depot/projects/smpng/sys/ia64/ia64/support.S#5 integrate .. //depot/projects/smpng/sys/ia64/ia64/unaligned.c#9 integrate .. //depot/projects/smpng/sys/ia64/include/md_var.h#19 integrate .. //depot/projects/smpng/sys/isa/psm.c#31 integrate .. //depot/projects/smpng/sys/kern/device_if.m#4 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#89 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#91 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#45 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#52 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#53 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#91 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/aicasm/Makefile#4 integrate .. //depot/projects/smpng/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#12 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.c#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.h#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_none.c#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#12 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#5 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#12 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#9 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#9 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_xauth.c#2 integrate .. //depot/projects/smpng/sys/netatalk/ddp_pcb.c#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_hci.h#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_sample.c#9 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#51 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#35 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#61 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#27 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#66 integrate .. //depot/projects/smpng/sys/netipx/README#2 integrate .. //depot/projects/smpng/sys/netipx/ipx.c#9 integrate .. //depot/projects/smpng/sys/netipx/ipx.h#5 integrate .. //depot/projects/smpng/sys/netipx/ipx_cksum.c#4 integrate .. //depot/projects/smpng/sys/netipx/ipx_if.h#4 integrate .. //depot/projects/smpng/sys/netipx/ipx_input.c#12 integrate .. //depot/projects/smpng/sys/netipx/ipx_ip.c#10 integrate .. //depot/projects/smpng/sys/netipx/ipx_outputfl.c#5 integrate .. //depot/projects/smpng/sys/netipx/ipx_pcb.c#15 integrate .. //depot/projects/smpng/sys/netipx/ipx_pcb.h#6 integrate .. //depot/projects/smpng/sys/netipx/ipx_proto.c#4 integrate .. //depot/projects/smpng/sys/netipx/ipx_usrreq.c#19 integrate .. //depot/projects/smpng/sys/netipx/ipx_var.h#7 integrate .. //depot/projects/smpng/sys/netipx/spx.h#3 integrate .. //depot/projects/smpng/sys/netipx/spx_usrreq.c#18 integrate .. //depot/projects/smpng/sys/netncp/ncp_rq.h#4 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#51 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC.hints#11 integrate .. //depot/projects/smpng/sys/pc98/pc98/atapi.c#6 delete .. //depot/projects/smpng/sys/pc98/pc98/atapi.h#2 delete .. //depot/projects/smpng/sys/pc98/pc98/wd.c#18 delete .. //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#18 delete .. //depot/projects/smpng/sys/pc98/pc98/wd_cd.h#4 delete .. //depot/projects/smpng/sys/pc98/pc98/wdreg.h#4 delete .. //depot/projects/smpng/sys/pc98/pc98/wormio.h#2 delete .. //depot/projects/smpng/sys/pci/if_sis.c#45 integrate .. //depot/projects/smpng/sys/pci/if_sisreg.h#12 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#52 integrate .. //depot/projects/smpng/sys/pci/if_xlreg.h#13 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 integrate .. //depot/projects/smpng/sys/sys/bus.h#18 integrate .. //depot/projects/smpng/sys/sys/msgbuf.h#10 integrate .. //depot/projects/smpng/sys/sys/mutex.h#47 integrate .. //depot/projects/smpng/sys/sys/resource.h#14 integrate .. //depot/projects/smpng/sys/sys/syscall.h#51 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#51 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#13 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#53 integrate .. //depot/projects/smpng/sys/sys/wait.h#8 integrate .. //depot/projects/smpng/sys/tools/usbdevs2h.awk#3 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#54 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#61 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#24 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1997 Justin T. Gibbs. * All rights reserved. * @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.46 2004/09/08 04:54:18 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.47 2005/01/05 20:05:48 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1988 University of Utah. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.37 2004/09/07 07:06:36 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.38 2005/01/05 20:05:48 imp Exp $"); #include "opt_clock.h" ==== //depot/projects/smpng/sys/alpha/alpha/clock_if.m#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# +#- # Copyright (c) 1998 Doug Rabson # All rights reserved. # @@ -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/clock_if.m,v 1.5 2000/04/08 14:16:54 dfr Exp $ +# $FreeBSD: src/sys/alpha/alpha/clock_if.m,v 1.6 2005/01/05 20:05:48 imp Exp $ # #include ==== //depot/projects/smpng/sys/alpha/alpha/cpuconf.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.16 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.18 2005/01/05 20:05:48 imp Exp $"); #include "opt_cpu.h" @@ -122,41 +122,46 @@ #endif struct cpuinit cpuinit[] = { - cpu_notsupp("???"), /* 0: ??? */ - cpu_notsupp("ST_ADU"), /* 1: ST_ADU */ - cpu_notsupp("ST_DEC_4000"), /* 2: ST_DEC_4000 */ - cpu_notsupp("ST_DEC_7000"), /* 3: ST_DEC_7000 */ - cpu_notsupp("DEC_3000_500"), /* 4: ST_DEC_3000_500 */ - cpu_notsupp("???"), /* 5: ??? */ - cpu_notsupp("ST_DEC_2000_300"), /* 6: ST_DEC_2000_300 */ - cpu_notsupp("DEC_3000_300"), /* 7: ST_DEC_3000_300 */ - cpu_init(avalon_a12_init,"ST_AVALON_A12"), /* 8: ST_AVALON_A12 */ - cpu_init(dec_2100_a500_init, "ST_DEC_2100_A500"), /* 9: ST_DEC_2100_A500 */ - cpu_notsupp("ST_DEC_APXVME_64"), /* 10: ST_DEC_APXVME_64 */ - cpu_init(dec_axppci_33_init,"DEC_AXPPCI_33"),/* 11: ST_DEC_AXPPCI_33 */ - cpu_init(dec_kn8ae_init,"DEC_KN8AE"), /* 12: ST_DEC_21000 */ - cpu_init(dec_2100_a50_init,"DEC_2100_A50"), /* 13: ST_DEC_2100_A50 */ - cpu_notsupp("ST_DEC_MUSTANG"), /* 14: ST_DEC_MUSTANG */ - cpu_init(dec_kn20aa_init,"DEC_KN20AA"), /* 15: ST_DEC_KN20AA */ - cpu_notsupp("???"), /* 16: ??? */ - cpu_init(dec_1000a_init, "ST_DEC_1000"), /* 17: ST_DEC_1000 */ - cpu_notsupp("???"), /* 18: ??? */ - cpu_notsupp("ST_EB66"), /* 19: ST_EB66 */ - cpu_init(dec_eb64plus_init,"DEC_EB64PLUS"), /* 20: ST_EB64P */ - cpu_notsupp("ST_ALPHABOOK1"), /* 21: ST_ALPHABOOK1 */ - cpu_init(dec_kn300_init,"DEC_KN300"), /* 22: ST_DEC_4100 */ - cpu_notsupp("ST_DEC_EV45_PBP"), /* 23: ST_DEC_EV45_PBP */ - cpu_init(dec_2100_a500_init, "ST_DEC_2100A_A500"), /* 24: ST_DEC_2100A_A500 */ - cpu_notsupp("???"), /* 25: ??? */ - cpu_init(dec_eb164_init,"DEC_EB164"), /* 26: ST_EB164 */ - cpu_init(dec_1000a_init,"ST_DEC_1000A"), /* 27: ST_DEC_1000A */ - cpu_notsupp("ST_DEC_ALPHAVME_224"), /* 28: ST_DEC_ALPHAVME_224 */ - cpu_notsupp("???"), /* 29: ??? */ - cpu_init(st550_init,"DEC_ST550"), /* 30: ST_DEC_550 */ - cpu_notsupp("???"), /* 31: ??? */ - cpu_notsupp("ST_DEC_EV56_PBP"), /* 32: ST_DEC_EV56_PBP */ - cpu_notsupp("ST_DEC_ALPHAVME_320"), /* 33: ST_DEC_ALPHAVME_320 */ - cpu_init(st6600_init, "ST_DEC_ST6600"), /* 34: ST_DEC_6600 */ + cpu_notsupp("???"), /* 0: ??? */ + cpu_notsupp("ST_ADU"), /* 1: ADU */ + cpu_notsupp("ST_DEC_4000"), /* 2: Cobra */ + cpu_notsupp("ST_DEC_7000"), /* 3: Ruby */ + cpu_notsupp("DEC_3000_500"), /* 4: Flamingo */ + cpu_notsupp("???"), /* 5: simulator */ + cpu_notsupp("ST_DEC_2000_300"), /* 6: Jensen */ + cpu_notsupp("DEC_3000_300"), /* 7: Pelican */ + cpu_init(avalon_a12_init,"ST_AVALON_A12"), /* 8: AVALON */ + cpu_init(dec_2100_a500_init, "ST_DEC_2100_A500"), /* 9: Sable */ + cpu_notsupp("ST_DEC_APXVME_64"), /* 10: AXPvme */ + cpu_init(dec_axppci_33_init,"DEC_AXPPCI_33"), /* 11: NoName */ + cpu_init(dec_kn8ae_init,"DEC_KN8AE"), /* 12: Turbolaser */ + cpu_init(dec_2100_a50_init,"DEC_2100_A50"), /* 13: Avanti */ + cpu_notsupp("ST_DEC_MUSTANG"), /* 14: Mustang */ + cpu_init(dec_kn20aa_init,"DEC_KN20AA"), /* 15: Alcor */ + cpu_notsupp("cancelled"), /* 16: cancelled */ + cpu_init(dec_1000a_init, "ST_DEC_1000"), /* 17: Mikasa */ + cpu_notsupp("ST_DEC_EB64"), /* 18: EB64 */ + cpu_notsupp("ST_EB66"), /* 19: EB66 */ + cpu_init(dec_eb64plus_init,"DEC_EB64PLUS"), /* 20: EB64+ */ + cpu_notsupp("ST_ALPHABOOK1"), /* 21: AlphaBook */ + cpu_init(dec_kn300_init,"DEC_KN300"), /* 22: Rawhide */ + cpu_notsupp("ST_DEC_EV45_PBP"), /* 23: K2 */ + cpu_init(dec_2100_a500_init, "ST_DEC_2100A_A500"), /* 24: Lynx */ + cpu_notsupp("ST_DEC_ALPHAXL"), /* 25: AlphaXL */ + cpu_init(dec_eb164_init,"DEC_EB164"), /* 26: EB164 */ + cpu_init(dec_1000a_init,"ST_DEC_1000A"), /* 27: Noritake */ + cpu_notsupp("ST_DEC_ALPHAVME_224"), /* 28: Cortex */ + cpu_notsupp("unused"), /* 29: unused */ + cpu_init(st550_init,"DEC_ST550"), /* 30: Miata */ + cpu_notsupp("ST_DEC_XXM"), /* 31: XXM */ + cpu_notsupp("ST_DEC_EV56_PBP"), /* 32: Takara */ + cpu_notsupp("ST_DEC_ALPHAVME_320"), /* 33: Yukon */ + cpu_init(st6600_init, "ST_DEC_ST6600"), /* 34: Tsunami */ + cpu_notsupp("ST_DEC_WILDFIRE"), /* 35: Wildfire */ + cpu_notsupp("ST_DEC_CUSCO"), /* 36: Cusco */ + cpu_notsupp("ST_DEC_EIGER"), /* 37: Eiger */ + cpu_notsupp("ST_DEC_TITAN"), /* 38: Titan */ + cpu_notsupp("ST_DEC_MARVEL") /* 39: Marvel */ }; int ncpuinit = (sizeof(cpuinit) / sizeof(cpuinit[0])); ==== //depot/projects/smpng/sys/alpha/alpha/db_disasm.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University * All Rights Reserved. @@ -46,7 +46,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.4 1997/09/16 22:52:40 thorpej Exp $"); */ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.10 2004/07/10 23:47:18 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.11 2005/01/05 20:05:48 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/db_instruction.h#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NetBSD: db_instruction.h,v 1.4 1997/09/16 22:53:32 thorpej Exp $ */ -/* +/*- * Mach Operating System * Copyright (c) 1993,1992 Carnegie Mellon University * All Rights Reserved. @@ -25,7 +25,7 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * - * $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.6 2004/01/04 23:30:47 obrien Exp $ + * $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.7 2005/01/05 20:05:48 imp Exp $ */ /* ==== //depot/projects/smpng/sys/alpha/alpha/db_interface.c#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Mach Operating System * Copyright (c) 1992,1991,1990 Carnegie Mellon University * All Rights Reserved. @@ -47,7 +47,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.2 1997/09/16 19:07:19 thorpej Exp $"); */ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.29 2004/07/10 23:47:18 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.30 2005/01/05 20:05:48 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_1000a.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: dec_1000a.c,v 1.5 1999/04/15 22:06:47 thorpej Exp $ */ -/* +/*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. * @@ -37,7 +37,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* +/*- * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. * All rights reserved. * @@ -63,16 +63,16 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. */ -/* +/*- * Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center */ -/* +/*- * Additional Copyright (c) 1999 by Andrew Gallatin * */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.18 2004/07/10 22:29:40 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.19 2005/01/05 20:05:48 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_2100_a50.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: dec_2100_a50.c,v 1.39 1998/04/17 02:45:19 mjacob Exp $ */ -/* +/*- * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. * All rights reserved. * @@ -25,15 +25,15 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. */ -/* +/*- * Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center */ -/* +/*- * Additional Copyright (c) 1998 by Andrew Gallatin for Duke University. */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.19 2004/07/10 22:29:40 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.20 2005/01/05 20:05:48 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_2100_a500.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2000 Andrew Gallatin * All rights reserved. * @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.18 2004/07/10 22:29:40 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.19 2005/01/05 20:05:48 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_3000_300.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1997 by Matthew Jacob * NASA AMES Research Center. * All rights reserved. @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_3000_300.c,v 1.6 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_3000_300.c,v 1.7 2005/01/05 20:05:48 imp Exp $"); #include "opt_cpu.h" ==== //depot/projects/smpng/sys/alpha/alpha/dec_3000_500.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1997 by Matthew Jacob * NASA AMES Research Center. * All rights reserved. @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_3000_500.c,v 1.6 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_3000_500.c,v 1.7 2005/01/05 20:05:48 imp Exp $"); #include "opt_cpu.h" ==== //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: dec_axppci_33.c,v 1.38 1998/07/07 08:49:12 ross Exp $ */ -/* +/*- * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. * All rights reserved. * @@ -25,12 +25,12 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. */ -/* +/*- * Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.22 2004/07/10 22:29:40 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.23 2005/01/05 20:05:48 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_eb164.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: dec_eb164.c,v 1.26 1998/04/17 02:45:19 mjacob Exp $ */ -/* +/*- * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. * All rights reserved. * @@ -25,12 +25,12 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. */ -/* +/*- * Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.20 2004/07/10 22:29:40 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.21 2005/01/05 20:05:48 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_eb64plus.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. * All rights reserved. * @@ -24,7 +24,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. */ -/* +/*- * Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center */ @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.17 2004/07/10 22:29:40 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.18 2005/01/05 20:05:49 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_kn20aa.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: dec_kn20aa.c,v 1.38 1998/04/17 02:45:19 mjacob Exp $ */ -/* +/*- * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. * All rights reserved. * @@ -25,12 +25,12 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. */ -/* +/*- * Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.19 2004/07/10 22:29:40 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.20 2005/01/05 20:05:49 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_kn300.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2000 by Matthew Jacob * NASA AMES Research Center. * All rights reserved. @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.14 2004/07/10 22:29:40 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.15 2005/01/05 20:05:49 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_kn8ae.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: dec_kn8ae.c,v 1.15 1998/02/13 00:12:50 thorpej Exp $ */ -/* +/*- * Copyright (c) 1997 by Matthew Jacob * NASA AMES Research Center. * All rights reserved. @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn8ae.c,v 1.14 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn8ae.c,v 1.15 2005/01/05 20:05:49 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_st550.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. * All rights reserved. * @@ -24,15 +24,15 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. */ -/* +/*- * Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center */ -/* +/*- * Additional Copyright (c) 1998 by Andrew Gallatin for Duke University */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.17 2004/07/10 22:29:40 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.18 2005/01/05 20:05:49 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/divrem.m4#3 (text+ko) ==== @@ -1,7 +1,7 @@ -/* $FreeBSD: src/sys/alpha/alpha/divrem.m4,v 1.4 2004/11/27 20:59:49 peadar Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/divrem.m4,v 1.5 2005/01/05 20:05:49 imp Exp $ */ /* $NetBSD: divrem.m4,v 1.5 1996/10/17 04:26:25 cgd Exp $ */ -/* +/*- * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. * ==== //depot/projects/smpng/sys/alpha/alpha/exception.s#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * All rights reserved. * @@ -24,7 +24,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ - * $FreeBSD: src/sys/alpha/alpha/exception.s,v 1.17 2003/02/17 09:55:08 julian Exp $ + * $FreeBSD: src/sys/alpha/alpha/exception.s,v 1.18 2005/01/05 20:05:49 imp Exp $ */ #include ==== //depot/projects/smpng/sys/alpha/alpha/gdb_machdep.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2004 Marcel Moolenaar * All rights reserved. * @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.2 2004/12/01 06:40:33 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/gdb_machdep.c,v 1.3 2005/01/05 20:05:49 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/in_cksum.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 5 22:41:26 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 482F916A4D0; Wed, 5 Jan 2005 22:41:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2147616A4CE for ; Wed, 5 Jan 2005 22:41:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D5D843D3F for ; Wed, 5 Jan 2005 22:41:25 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j05MfP4G045484 for ; Wed, 5 Jan 2005 22:41:25 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05MfPNh045481 for perforce@freebsd.org; Wed, 5 Jan 2005 22:41:25 GMT (envelope-from jhb@freebsd.org) Date: Wed, 5 Jan 2005 22:41:25 GMT Message-Id: <200501052241.j05MfPNh045481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 68359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 22:41:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=68359 Change 68359 by jhb@jhb_slimer on 2005/01/05 22:41:12 IFC @68356. Affected files ... .. //depot/projects/smpng/sys/cam/cam.c#6 integrate .. //depot/projects/smpng/sys/cam/cam.h#3 integrate .. //depot/projects/smpng/sys/cam/cam_ccb.h#6 integrate .. //depot/projects/smpng/sys/cam/cam_debug.h#2 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#17 integrate .. //depot/projects/smpng/sys/cam/cam_periph.h#5 integrate .. //depot/projects/smpng/sys/cam/cam_queue.c#4 integrate .. //depot/projects/smpng/sys/cam/cam_queue.h#2 integrate .. //depot/projects/smpng/sys/cam/cam_sim.c#4 integrate .. //depot/projects/smpng/sys/cam/cam_sim.h#2 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#24 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/smpng/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/smpng/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#21 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#8 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#24 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#12 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.h#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#56 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.h#4 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_dvcfg.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_iu.h#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low.c#11 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low.h#5 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low_pisa.c#4 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low_pisa.h#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_message.h#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#13 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#12 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#21 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#11 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_targ_bh.c#8 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#16 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_targetio.h#4 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#42 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#35 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.h#11 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.c#12 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.h#11 integrate .. //depot/projects/smpng/sys/compat/ndis/cfg_var.h#2 integrate .. //depot/projects/smpng/sys/compat/ndis/hal_var.h#5 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#19 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#15 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#11 integrate .. //depot/projects/smpng/sys/compat/ndis/pe_var.h#6 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#10 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#21 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#21 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_pe.c#5 integrate .. //depot/projects/smpng/sys/compat/netbsd/dvcfg.h#2 integrate .. //depot/projects/smpng/sys/compat/netbsd/physio_proc.h#2 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#23 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4.h#3 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_acl.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_dirent.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_errno.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_exec.h#5 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#18 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#16 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_filio.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_fuser.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_hrt.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.c#12 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.h#4 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#5 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#38 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_mman.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_resource.c#11 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_resource.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_siginfo.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_signal.c#13 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_signal.h#3 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_socket.c#8 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_socket.h#6 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sockio.c#8 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sockio.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sockmod.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#13 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stat.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_statvfs.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#21 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stropts.h#3 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_systeminfo.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#17 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_termios.c#7 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_termios.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_time.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_timod.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ttold.c#7 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ttold.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_types.h#4 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ucontext.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ulimit.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ustat.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_util.h#5 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_utsname.h#2 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_wait.h#2 integrate .. //depot/projects/smpng/sys/conf/NOTES#89 integrate Differences ... ==== //depot/projects/smpng/sys/cam/cam.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Generic utility routines for the Common Access Method layer. * * Copyright (c) 1997 Justin T. Gibbs. @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.8 2003/06/14 22:17:38 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.9 2005/01/05 22:34:34 imp Exp $"); #include #ifdef _KERNEL ==== //depot/projects/smpng/sys/cam/cam.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Data structures and definitions for the CAM system. * * Copyright (c) 1997 Justin T. Gibbs. @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam.h,v 1.10 2002/01/09 03:38:58 msmith Exp $ + * $FreeBSD: src/sys/cam/cam.h,v 1.11 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_H ==== //depot/projects/smpng/sys/cam/cam_ccb.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Data structures and definitions for CAM Control Blocks (CCBs). * * Copyright (c) 1997, 1998 Justin T. Gibbs. @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.27 2004/06/07 19:12:44 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.28 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_CCB_H ==== //depot/projects/smpng/sys/cam/cam_debug.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Macros for tracing/loging information in the CAM layer * * Copyright (c) 1997 Justin T. Gibbs. @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_debug.h,v 1.7 2001/03/27 05:45:09 ken Exp $ + * $FreeBSD: src/sys/cam/cam_debug.h,v 1.8 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_DEBUG_H #define _CAM_CAM_DEBUG_H 1 ==== //depot/projects/smpng/sys/cam/cam_periph.c#17 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Common functions for CAM "type" (peripheral) drivers. * * Copyright (c) 1997, 1998 Justin T. Gibbs. @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.57 2004/08/30 20:14:21 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.58 2005/01/05 22:34:34 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/cam_periph.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Data structures and definitions for CAM peripheral ("type") drivers. * * Copyright (c) 1997, 1998 Justin T. Gibbs. @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.h,v 1.15 2004/10/05 04:22:20 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_periph.h,v 1.16 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_PERIPH_H ==== //depot/projects/smpng/sys/cam/cam_queue.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * CAM request queue management functions. * * Copyright (c) 1997 Justin T. Gibbs. @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_queue.c,v 1.7 2003/06/10 17:50:20 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_queue.c,v 1.8 2005/01/05 22:34:34 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/cam_queue.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * CAM request queue management definitions. * * Copyright (c) 1997 Justin T. Gibbs. @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_queue.h,v 1.8 2000/05/26 02:01:42 jake Exp $ + * $FreeBSD: src/sys/cam/cam_queue.h,v 1.9 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_QUEUE_H ==== //depot/projects/smpng/sys/cam/cam_sim.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Common functions for SCSI Interface Modules (SIMs). * * Copyright (c) 1997 Justin T. Gibbs. @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.7 2003/06/10 17:50:20 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.8 2005/01/05 22:34:34 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/cam_sim.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Data structures and definitions for SCSI Interface Modules (SIMs). * * Copyright (c) 1997 Justin T. Gibbs. @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_sim.h,v 1.5 2001/01/24 01:46:18 jhb Exp $ + * $FreeBSD: src/sys/cam/cam_sim.h,v 1.6 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_SIM_H ==== //depot/projects/smpng/sys/cam/cam_xpt.c#24 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Implementation of the Common Access Method Transport (XPT) layer. * * Copyright (c) 1997, 1998, 1999 Justin T. Gibbs. @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.145 2004/11/18 07:24:29 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.146 2005/01/05 22:34:34 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/cam_xpt.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ - /* +/*- * Data structures and definitions for dealing with the * Common Access Method Transport (xpt) layer. * @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.4 2001/03/27 05:45:10 ken Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.5 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_XPT_H ==== //depot/projects/smpng/sys/cam/cam_xpt_periph.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ - /* +/*- * Data structures and definitions for dealing with the * Common Access Method Transport (xpt) layer from peripheral * drivers. @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt_periph.h,v 1.3 1999/12/29 04:54:28 peter Exp $ + * $FreeBSD: src/sys/cam/cam_xpt_periph.h,v 1.4 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_XPT_PERIPH_H ==== //depot/projects/smpng/sys/cam/cam_xpt_sim.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ - /* +/*- * Data structures and definitions for dealing with the * Common Access Method Transport (xpt) layer. * @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt_sim.h,v 1.7 2000/01/14 23:08:46 gibbs Exp $ + * $FreeBSD: src/sys/cam/cam_xpt_sim.h,v 1.8 2005/01/05 22:34:34 imp Exp $ */ #ifndef _CAM_CAM_XPT_SIM_H ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.c#21 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Implementation of Utility functions for all SCSI device types. * * Copyright (c) 1997, 1998, 1999 Justin T. Gibbs. @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.45 2004/08/13 18:45:04 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.46 2005/01/05 22:34:34 imp Exp $"); #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Largely written by Julian Elischer (julian@tfs.com) * for TRW Financial Systems. * @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.23 2003/04/30 00:35:22 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.24 2005/01/05 22:34:34 imp Exp $ */ /* ==== //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#24 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1997 Justin T. Gibbs. * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Kenneth D. Merry. * All rights reserved. @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ -/* +/*- * Portions of this driver taken from the original FreeBSD cd driver. * Written by Julian Elischer (julian@tfs.com) * for TRW Financial Systems for use under the MACH(2.5) operating system. @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.90 2004/09/05 21:15:58 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.91 2005/01/05 22:34:34 imp Exp $"); #include "opt_cd.h" ==== //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1997 Justin T. Gibbs. * Copyright (c) 1997, 1998, 1999 Kenneth D. Merry. * All rights reserved. @@ -31,7 +31,7 @@ * $NetBSD: ch.c,v 1.32 1998/01/12 09:49:12 thorpej Exp $ * */ -/* +/*- * Copyright (c) 1996, 1997 Jason R. Thorpe * All rights reserved. * @@ -68,7 +68,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.40 2004/06/16 09:46:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.41 2005/01/05 22:34:34 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_ch.h#3 (text+ko) ==== @@ -1,7 +1,7 @@ -/* $FreeBSD: src/sys/cam/scsi/scsi_ch.h,v 1.4 2003/05/31 16:54:37 phk Exp $ */ +/* $FreeBSD: src/sys/cam/scsi/scsi_ch.h,v 1.5 2005/01/05 22:34:34 imp Exp $ */ /* $NetBSD: scsi_changer.h,v 1.11 1998/02/13 08:28:32 enami Exp $ */ -/* +/*- * Copyright (c) 1996 Jason R. Thorpe * All rights reserved. * @@ -41,7 +41,7 @@ * SCSI changer interface description */ -/* +/*- * Partially derived from software written by Stefan Grefen * (grefen@goofy.zdv.uni-mainz.de soon grefen@convex.com) * based on the SCSI System by written Julian Elischer (julian@tfs.com) ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#56 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Implementation of SCSI Direct Access Peripheral driver for CAM. * * Copyright (c) 1997 Justin T. Gibbs. @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.172 2004/08/29 11:10:09 des Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.173 2005/01/05 22:34:34 imp Exp $"); #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.h#4 (text+ko) ==== @@ -2,7 +2,7 @@ * Structures and definitions for SCSI commands to Direct Access Devices */ -/* +/*- * Some lines of this file come from a file of the name "scsi.h" * distributed by OSF as part of mach2.5, * so the following disclaimer has been kept. @@ -30,7 +30,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* +/*- * Largely written by Julian Elischer (julian@tfs.com) * for TRW Financial Systems. * @@ -46,7 +46,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.7 2004/10/13 09:31:04 bms Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.8 2005/01/05 22:34:34 imp Exp $ */ #ifndef _SCSI_SCSI_DA_H ==== //depot/projects/smpng/sys/cam/scsi/scsi_dvcfg.h#2 (text+ko) ==== @@ -1,8 +1,8 @@ -/* $FreeBSD: src/sys/cam/scsi/scsi_dvcfg.h,v 1.1 2000/10/23 12:55:27 non Exp $ */ +/* $FreeBSD: src/sys/cam/scsi/scsi_dvcfg.h,v 1.2 2005/01/05 22:34:34 imp Exp $ */ /* $NecBSD: scsi_dvcfg.h,v 1.4 1998/03/14 07:05:06 kmatsuda Exp $ */ /* $NetBSD$ */ -/* +/*- * [NetBSD for NEC PC-98 series] * Copyright (c) 1994, 1995, 1996, 1997, 1998 * NetBSD/pc98 porting staff. All rights reserved. ==== //depot/projects/smpng/sys/cam/scsi/scsi_iu.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ -/* +/*- * This file is in the public domain. - * $FreeBSD: src/sys/cam/scsi/scsi_iu.h,v 1.2 2003/01/20 18:05:46 gibbs Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_iu.h,v 1.3 2005/01/05 22:34:34 imp Exp $ */ #ifndef _SCSI_SCSI_IU_H #define _SCSI_SCSI_IU_H 1 ==== //depot/projects/smpng/sys/cam/scsi/scsi_low.c#11 (text+ko) ==== @@ -2,7 +2,7 @@ /* $NetBSD$ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.21 2003/06/14 22:17:38 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.22 2005/01/05 22:34:34 imp Exp $"); #define SCSI_LOW_STATICS #define SCSI_LOW_DEBUG @@ -22,7 +22,7 @@ #define SCSI_LOW_FLAGS_QUIRKS_OK #endif /* __FreeBSD__ */ -/* +/*- * [NetBSD for NEC PC-98 series] * Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001 * NetBSD/pc98 porting staff. All rights reserved. ==== //depot/projects/smpng/sys/cam/scsi/scsi_low.h#5 (text+ko) ==== @@ -1,11 +1,11 @@ -/* $FreeBSD: src/sys/cam/scsi/scsi_low.h,v 1.7 2004/07/10 20:54:01 marcel Exp $ */ +/* $FreeBSD: src/sys/cam/scsi/scsi_low.h,v 1.8 2005/01/05 22:34:34 imp Exp $ */ /* $NecBSD: scsi_low.h,v 1.24.10.5 2001/06/26 07:31:46 honda Exp $ */ /* $NetBSD$ */ #define SCSI_LOW_DIAGNOSTIC #define SCSI_LOW_ALT_QTAG_ALLOCATE -/* +/*- * [NetBSD for NEC PC-98 series] * Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001 * NetBSD/pc98 porting staff. All rights reserved. ==== //depot/projects/smpng/sys/cam/scsi/scsi_low_pisa.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NecBSD: scsi_low_pisa.c,v 1.13.18.1 2001/06/08 06:27:48 honda Exp $ */ /* $NetBSD$ */ -/* +/*- * [NetBSD for NEC PC-98 series] * Copyright (c) 1995, 1996, 1997, 1998 * NetBSD/pc98 porting staff. All rights reserved. @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low_pisa.c,v 1.7 2003/06/10 18:14:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low_pisa.c,v 1.8 2005/01/05 22:34:34 imp Exp $"); #ifdef __NetBSD__ #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_low_pisa.h#3 (text+ko) ==== @@ -1,8 +1,8 @@ -/* $FreeBSD: src/sys/cam/scsi/scsi_low_pisa.h,v 1.4 2002/03/20 08:55:22 alfred Exp $ */ +/* $FreeBSD: src/sys/cam/scsi/scsi_low_pisa.h,v 1.5 2005/01/05 22:34:34 imp Exp $ */ /* $NecBSD: scsi_low_pisa.h,v 1.3.14.1 2001/06/08 06:27:49 honda Exp $ */ /* $NetBSD$ */ -/* +/*- * [NetBSD for NEC PC-98 series] * Copyright (c) 1998 * NetBSD/pc98 porting staff. All rights reserved. ==== //depot/projects/smpng/sys/cam/scsi/scsi_message.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ -/* +/*- * This file is in the public domain. - * $FreeBSD: src/sys/cam/scsi/scsi_message.h,v 1.6 2002/06/05 19:05:01 gibbs Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_message.h,v 1.7 2005/01/05 22:34:34 imp Exp $ */ /* Messages (1 byte) */ /* I/T (M)andatory or (O)ptional */ ==== //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#13 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1997, 1998, 2000 Justin T. Gibbs. * Copyright (c) 1997, 1998, 1999 Kenneth D. Merry. * All rights reserved. @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.41 2004/06/16 09:46:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.42 2005/01/05 22:34:34 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_pass.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1997, 1999 Kenneth D. Merry. * All rights reserved. * @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_pass.h,v 1.4 2001/03/27 05:45:11 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_pass.h,v 1.5 2005/01/05 22:34:34 imp Exp $ */ #ifndef _SCSI_PASS_H ==== //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Implementation of SCSI Processor Target Peripheral driver for CAM. * * Copyright (c) 1998 Justin T. Gibbs. @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.42 2004/06/16 09:46:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.43 2005/01/05 22:34:34 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_pt.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Structure and function declarations for Processor type devices. * * Copyright (c) 1998 Justin T. Gibbs @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_pt.h,v 1.3 2001/01/12 02:49:40 steve Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_pt.h,v 1.4 2005/01/05 22:34:35 imp Exp $ */ #ifndef _SCSI_SCSI_PT_H ==== //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#21 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Implementation of SCSI Sequential Access Peripheral driver for CAM. * * Copyright (c) 1999, 2000 Matthew Jacob @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.101 2004/06/16 09:46:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.102 2005/01/05 22:34:35 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_sa.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Structure and function declarations for the * SCSI Sequential Access Peripheral driver for CAM. * @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_sa.h,v 1.9 2001/01/12 02:49:40 steve Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_sa.h,v 1.10 2005/01/05 22:34:35 imp Exp $ */ #ifndef _SCSI_SCSI_SA_H ==== //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2000 Matthew Jacob * All rights reserved. * @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.29 2004/06/16 09:46:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.30 2005/01/05 22:34:35 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_ses.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $FreeBSD: src/sys/cam/scsi/scsi_ses.h,v 1.2 2000/01/15 22:40:04 mjacob Exp $ */ -/* +/* $FreeBSD: src/sys/cam/scsi/scsi_ses.h,v 1.3 2005/01/05 22:34:35 imp Exp $ */ +/*- * Copyright (c) 2000 by Matthew Jacob * All rights reserved. * ==== //depot/projects/smpng/sys/cam/scsi/scsi_targ_bh.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Implementation of the Target Mode 'Black Hole device' for CAM. * * Copyright (c) 1999 Justin T. Gibbs. @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.20 2003/09/30 08:03:52 simokawa Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.21 2005/01/05 22:34:35 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_target.c#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Generic SCSI Target Kernel Mode Driver * * Copyright (c) 2002 Nate Lawson. @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.63 2004/08/15 06:24:40 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.64 2005/01/05 22:34:35 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/cam/scsi/scsi_targetio.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Ioctl definitions for the SCSI Target Driver * * Copyright (c) 2002 Nate Lawson. @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_targetio.h,v 1.11 2002/11/22 22:55:51 njl Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_targetio.h,v 1.12 2005/01/05 22:34:35 imp Exp $ */ #ifndef _CAM_SCSI_SCSI_TARGETIO_H_ ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#42 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2000 Dag-Erling Coïdan Smørgrav * Copyright (c) 1999 Pierre Beyssac * Copyright (c) 1993 Jan-Simon Pendry @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.86 2004/12/01 21:33:02 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.87 2005/01/05 22:34:35 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#35 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1994-1995 Søren Schmidt * All rights reserved. * @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.121 2004/08/16 07:28:16 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.122 2005/01/05 22:34:35 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/compat/linux/linux_ioctl.h#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1999 Marcel Moolenaar * All rights reserved. * @@ -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/compat/linux/linux_ioctl.h,v 1.21 2004/07/02 15:31:44 netchild Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.22 2005/01/05 22:34:35 imp Exp $ */ #ifndef _LINUX_IOCTL_H_ ==== //depot/projects/smpng/sys/compat/linux/linux_util.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1994 Christos Zoulas * Copyright (c) 1995 Frank van der Linden * Copyright (c) 1995 Scott Bartram @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.26 2004/06/23 06:35:43 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.27 2005/01/05 22:34:35 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/compat/linux/linux_util.h#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1994 Christos Zoulas * Copyright (c) 1995 Frank van der Linden * Copyright (c) 1995 Scott Bartram @@ -28,7 +28,7 @@ * * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp - * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.23 2004/10/10 18:34:30 dwmalone Exp $ + * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.24 2005/01/05 22:34:35 imp Exp $ */ /* ==== //depot/projects/smpng/sys/compat/ndis/cfg_var.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2003 * Bill Paul . All rights reserved. * @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/cfg_var.h,v 1.2 2003/12/18 03:51:21 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/cfg_var.h,v 1.3 2005/01/05 22:34:36 imp Exp $ */ #ifndef _CFG_VAR_H_ ==== //depot/projects/smpng/sys/compat/ndis/hal_var.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2003 * Bill Paul . All rights reserved. * @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/hal_var.h,v 1.4 2004/08/01 20:04:30 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/hal_var.h,v 1.5 2005/01/05 22:34:36 imp Exp $ */ #ifndef _HAL_VAR_H_ ==== //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#19 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2003 * Bill Paul . All rights reserved. * @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.60 2004/08/16 18:50:20 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.61 2005/01/05 22:34:36 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/compat/ndis/ndis_var.h#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2003 * Bill Paul . All rights reserved. * @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.29 2004/08/16 18:50:20 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.30 2005/01/05 22:34:36 imp Exp $ */ #ifndef _NDIS_VAR_H_ ==== //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2003 * Bill Paul . All rights reserved. * @@ -29,7 +29,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 5 22:50:27 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6165316A4D1; Wed, 5 Jan 2005 22:50:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 388E816A4CE for ; Wed, 5 Jan 2005 22:50:27 +0000 (GMT) Received: from mail5.speakeasy.net (mail5.speakeasy.net [216.254.0.205]) by mx1.FreeBSD.org (Postfix) with ESMTP id E9BB143D1D for ; Wed, 5 Jan 2005 22:50:26 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 4220 invoked from network); 5 Jan 2005 22:50:26 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 5 Jan 2005 22:50:26 -0000 Received: from [10.50.41.243] (gw1.twc.weather.com [216.133.140.1]) (authenticated bits=0) by server.baldwin.cx (8.12.11/8.12.11) with ESMTP id j05MoIZj076800; Wed, 5 Jan 2005 17:50:22 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: David Xu Date: Wed, 5 Jan 2005 17:47:18 -0500 User-Agent: KMail/1.6.2 References: <200501041314.j04DEVE3017245@repoman.freebsd.org> In-Reply-To: <200501041314.j04DEVE3017245@repoman.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200501051747.18388.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 68252 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jan 2005 22:50:28 -0000 On Tuesday 04 January 2005 08:14 am, David Xu wrote: > http://perforce.freebsd.org/chv.cgi?CH=68252 > > Change 68252 by davidxu@davidxu_tiger on 2005/01/04 13:14:06 > > insert "pause" instructor for i386. > style fix. You can use 'cpu_spinwait()' for this to be MI. > Affected files ... > > .. > //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_pspinlock.c#7 > edit > > Differences ... > > ==== > //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_pspinlock.c#7 > (text+ko) ==== > > @@ -100,6 +100,10 @@ > else { > count = SPIN_COUNT; > while ((ret = umtx_trylock(&lck->s_lock, self->tid)) != 0) { > +#ifdef __i386__ > + /* tell cpu we are spinning */ > + __asm __volatile("pause"); > +#endif > if (--count <= 0) { > count = SPIN_COUNT; > _pthread_yield(); > @@ -120,7 +124,7 @@ > if (lock == NULL || (lck = *lock) == NULL) > ret = EINVAL; > else { > - ret =umtx_unlock(&lck->s_lock, self->tid); > + ret = umtx_unlock(&lck->s_lock, self->tid); > } > return (ret); > } -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Thu Jan 6 00:02:18 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E11416A4D0; Thu, 6 Jan 2005 00:02:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C939816A4CE; Thu, 6 Jan 2005 00:02:17 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A0F7243D1F; Thu, 6 Jan 2005 00:02:17 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from [127.0.0.1] (davidxu@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j0602Geh006161; Thu, 6 Jan 2005 00:02:17 GMT (envelope-from davidxu@freebsd.org) Message-ID: <41DC8001.9080403@freebsd.org> Date: Thu, 06 Jan 2005 08:02:09 +0800 From: David Xu User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.5) Gecko/20041226 X-Accept-Language: en-us, en MIME-Version: 1.0 To: John Baldwin References: <200501041314.j04DEVE3017245@repoman.freebsd.org> <200501051747.18388.jhb@FreeBSD.org> In-Reply-To: <200501051747.18388.jhb@FreeBSD.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: Perforce Change Reviews Subject: Re: PERFORCE change 68252 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jan 2005 00:02:18 -0000 John Baldwin wrote: >On Tuesday 04 January 2005 08:14 am, David Xu wrote: > > >>http://perforce.freebsd.org/chv.cgi?CH=68252 >> >>Change 68252 by davidxu@davidxu_tiger on 2005/01/04 13:14:06 >> >> insert "pause" instructor for i386. >> style fix. >> >> > >You can use 'cpu_spinwait()' for this to be MI. > > > I know there is header file cpu.h, but it is too kernel oriented, not every arch provides the function to userland, e.g, alpha defined it in #ifdef _KERNEL section, userland can not use it, why isn't it in cpufunc.h ? David From owner-p4-projects@FreeBSD.ORG Thu Jan 6 02:16:51 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F24B716A4D0; Thu, 6 Jan 2005 02:16:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9D7516A4CE for ; Thu, 6 Jan 2005 02:16:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1E1A43D2F for ; Thu, 6 Jan 2005 02:16:50 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j062GoZC065269 for ; Thu, 6 Jan 2005 02:16:50 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j062Go8C065266 for perforce@freebsd.org; Thu, 6 Jan 2005 02:16:50 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 6 Jan 2005 02:16:50 GMT Message-Id: <200501060216.j062Go8C065266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68370 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jan 2005 02:16:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=68370 Change 68370 by davidxu@davidxu_celeron on 2005/01/06 02:16:41 Follow changes of ETIMEDOUT error code made in kernel. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cond.c#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#11 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#8 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cond.c#8 (text+ko) ==== @@ -217,7 +217,7 @@ THR_LOCK_ACQUIRE(curthread, &cv->c_lock); seq = cv->c_seqno; if (abstime != NULL && ret != 0) { - if (ret == EAGAIN || ret == EINTR) + if (ret == EINTR) ret = ETIMEDOUT; break; } ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#11 (text+ko) ==== @@ -529,7 +529,7 @@ * Timed out wait is not restarted if * it was interrupted, not worth to do it. */ - if (ret == EAGAIN || ret == EINTR) + if (ret == EINTR) ret = ETIMEDOUT; } if (ret == 0) { @@ -633,9 +633,7 @@ if (abstime) { ret = umtx_timedwait((struct umtx *)&curthread->cycle, cycle, abstime); - if (ret == EAGAIN) - ret = ETIMEDOUT; - else + if (ret != ETIMEDOUT) ret = 0; } else { umtx_wait((struct umtx *)&curthread->cycle, cycle); @@ -722,9 +720,7 @@ if (abstime) { ret = umtx_timedwait((struct umtx *)&curthread->cycle, cycle, abstime); - if (ret == EAGAIN) - ret = ETIMEDOUT; - else + if (ret != ETIMEDOUT) ret = 0; } else { umtx_wait((struct umtx *)&curthread->cycle, cycle); ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#8 (text+ko) ==== @@ -211,8 +211,6 @@ retval = umtx_timedwait((struct umtx *)&(*sem)->count, 0, abstime); _thr_cancel_leave(curthread, oldcancel); } while (retval == 0); - if (retval == EAGAIN) - retval = ETIMEDOUT; errno = retval; return (-1); } From owner-p4-projects@FreeBSD.ORG Thu Jan 6 05:15:27 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF94216A4D0; Thu, 6 Jan 2005 05:15:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 81DF616A4CE for ; Thu, 6 Jan 2005 05:15:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F29843D39 for ; Thu, 6 Jan 2005 05:15:26 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j065FQAR077749 for ; Thu, 6 Jan 2005 05:15:26 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j065FQsc077746 for perforce@freebsd.org; Thu, 6 Jan 2005 05:15:26 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 6 Jan 2005 05:15:26 GMT Message-Id: <200501060515.j065FQsc077746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68374 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jan 2005 05:15:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=68374 Change 68374 by davidxu@davidxu_celeron on 2005/01/06 05:14:52 Return thread pointer eariler since some code assumes new thread can use the pointer.(new thread may run before orignal thread returns from pthread_create). Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_create.c#4 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_create.c#4 (text+ko) ==== @@ -206,14 +206,14 @@ new_thread->sigmask = curthread->sigmask; /* Add the new thread. */ _thr_link(curthread, new_thread); + /* Return a pointer to the thread structure: */ + (*thread) = new_thread; ret = thr_create(&uc, &new_thread->tid, 0); __sys_sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); if (ret != 0) { _thr_unlink(curthread, new_thread); free_thread(curthread, new_thread); - } else { - /* Return a pointer to the thread structure: */ - (*thread) = new_thread; + (*thread) = 0; } } } From owner-p4-projects@FreeBSD.ORG Thu Jan 6 13:03:46 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8EBE16A4CE; Thu, 6 Jan 2005 13:03:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6865316A4CE for ; Thu, 6 Jan 2005 13:03:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54A6343D2F for ; Thu, 6 Jan 2005 13:03:45 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j06D3jtF012317 for ; Thu, 6 Jan 2005 13:03:45 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j06D3j7S012314 for perforce@freebsd.org; Thu, 6 Jan 2005 13:03:45 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 6 Jan 2005 13:03:45 GMT Message-Id: <200501061303.j06D3j7S012314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jan 2005 13:03:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=68384 Change 68384 by davidxu@davidxu_tiger on 2005/01/06 13:03:37 add sem_destroy. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#9 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#9 (text+ko) ==== @@ -44,6 +44,7 @@ __weak_reference(_sem_init, sem_init); +__weak_reference(_sem_destroy, sem_destroy); __weak_reference(_sem_getvalue, sem_getvalue); __weak_reference(_sem_trywait, sem_trywait); __weak_reference(_sem_wait, sem_wait); @@ -78,6 +79,7 @@ errno = ENOSPC; return (NULL); } + umtx_init((struct umtx *)&sem->lock); /* * Fortunatly count and nwaiters are adjacency, so we can * use umtx_wait to wait on it, umtx_wait needs an address @@ -110,6 +112,29 @@ } int +_sem_destroy(sem_t *sem) +{ + int retval; + + if (sem_check_validity(sem) != 0) + return (-1); + + /* + * If this is a system semaphore let the kernel track it otherwise + * make sure there are no waiters. + */ + if ((*sem)->syssem != 0) + retval = ksem_destroy((*sem)->semid); + else { + retval = 0; + (*sem)->magic = 0; + } + if (retval == 0) + free(*sem); + return (retval); +} + +int _sem_getvalue(sem_t * __restrict sem, int * __restrict sval) { int retval; @@ -208,7 +233,8 @@ return (-1); } oldcancel = _thr_cancel_enter(curthread); - retval = umtx_timedwait((struct umtx *)&(*sem)->count, 0, abstime); + retval = umtx_timedwait((struct umtx *)&(*sem)->count, 0, + abstime); _thr_cancel_leave(curthread, oldcancel); } while (retval == 0); errno = retval; From owner-p4-projects@FreeBSD.ORG Thu Jan 6 17:55:00 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13A6D16A4D6; Thu, 6 Jan 2005 17:55:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BDFE616A4D3 for ; Thu, 6 Jan 2005 17:54:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1209843D31 for ; Thu, 6 Jan 2005 17:54:59 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j06Hsxnr035189 for ; Thu, 6 Jan 2005 17:54:59 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j06HsvOu035186 for perforce@freebsd.org; Thu, 6 Jan 2005 17:54:57 GMT (envelope-from jhb@freebsd.org) Date: Thu, 6 Jan 2005 17:54:57 GMT Message-Id: <200501061754.j06HsvOu035186@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 68393 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jan 2005 17:55:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=68393 Change 68393 by jhb@jhb_slimer on 2005/01/06 17:54:23 IFC @68391. Affected files ... .. //depot/projects/smpng/sys/coda/cnode.h#8 integrate .. //depot/projects/smpng/sys/coda/coda.h#4 integrate .. //depot/projects/smpng/sys/coda/coda_fbsd.c#11 integrate .. //depot/projects/smpng/sys/coda/coda_io.h#3 integrate .. //depot/projects/smpng/sys/coda/coda_kernel.h#2 integrate .. //depot/projects/smpng/sys/coda/coda_namecache.c#9 integrate .. //depot/projects/smpng/sys/coda/coda_namecache.h#5 integrate .. //depot/projects/smpng/sys/coda/coda_opstats.h#2 integrate .. //depot/projects/smpng/sys/coda/coda_pioctl.h#3 integrate .. //depot/projects/smpng/sys/coda/coda_psdev.c#15 integrate .. //depot/projects/smpng/sys/coda/coda_psdev.h#4 integrate .. //depot/projects/smpng/sys/coda/coda_subr.c#13 integrate .. //depot/projects/smpng/sys/coda/coda_subr.h#3 integrate .. //depot/projects/smpng/sys/coda/coda_venus.c#10 integrate .. //depot/projects/smpng/sys/coda/coda_venus.h#4 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.c#20 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.h#5 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.c#18 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.h#9 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#40 integrate .. //depot/projects/smpng/sys/ddb/db_access.c#5 integrate .. //depot/projects/smpng/sys/ddb/db_access.h#3 integrate .. //depot/projects/smpng/sys/ddb/db_break.c#8 integrate .. //depot/projects/smpng/sys/ddb/db_break.h#5 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#21 integrate .. //depot/projects/smpng/sys/ddb/db_command.h#3 integrate .. //depot/projects/smpng/sys/ddb/db_examine.c#6 integrate .. //depot/projects/smpng/sys/ddb/db_expr.c#5 integrate .. //depot/projects/smpng/sys/ddb/db_input.c#8 integrate .. //depot/projects/smpng/sys/ddb/db_lex.c#5 integrate .. //depot/projects/smpng/sys/ddb/db_lex.h#3 integrate .. //depot/projects/smpng/sys/ddb/db_main.c#3 integrate .. //depot/projects/smpng/sys/ddb/db_output.c#15 integrate .. //depot/projects/smpng/sys/ddb/db_output.h#3 integrate .. //depot/projects/smpng/sys/ddb/db_print.c#4 integrate .. //depot/projects/smpng/sys/ddb/db_run.c#9 integrate .. //depot/projects/smpng/sys/ddb/db_sym.c#5 integrate .. //depot/projects/smpng/sys/ddb/db_sym.h#5 integrate .. //depot/projects/smpng/sys/ddb/db_thread.c#5 integrate .. //depot/projects/smpng/sys/ddb/db_variables.c#7 integrate .. //depot/projects/smpng/sys/ddb/db_variables.h#4 integrate .. //depot/projects/smpng/sys/ddb/db_watch.c#5 integrate .. //depot/projects/smpng/sys/ddb/db_watch.h#2 integrate .. //depot/projects/smpng/sys/ddb/db_write_cmd.c#3 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#34 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_if.m#4 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#17 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_eisa.c#7 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/advansys/advansys.c#9 integrate .. //depot/projects/smpng/sys/dev/advansys/advansys.h#2 integrate .. //depot/projects/smpng/sys/dev/advansys/advlib.c#4 integrate .. //depot/projects/smpng/sys/dev/advansys/advlib.h#2 integrate .. //depot/projects/smpng/sys/dev/advansys/advmcode.c#3 integrate .. //depot/projects/smpng/sys/dev/advansys/advmcode.h#3 integrate .. //depot/projects/smpng/sys/dev/advansys/adw_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#10 integrate .. //depot/projects/smpng/sys/dev/advansys/adwlib.c#3 integrate .. //depot/projects/smpng/sys/dev/advansys/adwlib.h#2 integrate .. //depot/projects/smpng/sys/dev/advansys/adwmcode.c#3 integrate .. //depot/projects/smpng/sys/dev/advansys/adwmcode.h#2 integrate .. //depot/projects/smpng/sys/dev/advansys/adwvar.h#2 integrate .. //depot/projects/smpng/sys/dev/aha/aha.c#14 integrate .. //depot/projects/smpng/sys/dev/aha/aha_isa.c#11 integrate .. //depot/projects/smpng/sys/dev/aha/ahareg.h#5 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#11 integrate .. //depot/projects/smpng/sys/dev/ahb/ahbreg.h#2 integrate .. //depot/projects/smpng/sys/dev/aic/aic6360reg.h#3 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_eisa.c#13 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#19 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7770.c#12 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#23 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#20 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.reg#16 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.seq#15 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_inline.h#15 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#17 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#13 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#23 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.h#13 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.reg#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.seq#11 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_93cx6.c#7 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_93cx6.h#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_inline.h#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#16 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#15 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_pci.c#17 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic_osm_lib.c#3 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic_osm_lib.h#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.c#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.h#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_gram.y#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#3 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_scan.l#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#6 integrate .. //depot/projects/smpng/sys/dev/amd/amd.c#13 integrate .. //depot/projects/smpng/sys/dev/amd/amd.h#2 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#25 integrate .. //depot/projects/smpng/sys/dev/amr/amr_cam.c#10 integrate .. //depot/projects/smpng/sys/dev/amr/amr_disk.c#15 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#17 integrate .. //depot/projects/smpng/sys/dev/an/if_aironet_ieee.h#9 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#41 integrate .. //depot/projects/smpng/sys/dev/an/if_an_isa.c#11 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pccard.c#15 integrate .. //depot/projects/smpng/sys/dev/an/if_anreg.h#12 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar.c#16 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar.h#2 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/ar/if_arregs.h#4 integrate .. //depot/projects/smpng/sys/dev/asr/dptalign.h#4 integrate .. //depot/projects/smpng/sys/dev/asr/dptsig.h#5 integrate .. //depot/projects/smpng/sys/dev/asr/i2oadptr.h#4 integrate .. //depot/projects/smpng/sys/dev/asr/i2obscsi.h#4 integrate .. //depot/projects/smpng/sys/dev/asr/i2odep.h#4 integrate .. //depot/projects/smpng/sys/dev/asr/i2odpt.h#4 integrate .. //depot/projects/smpng/sys/dev/asr/i2oexec.h#4 integrate .. //depot/projects/smpng/sys/dev/asr/i2omsg.h#5 integrate .. //depot/projects/smpng/sys/dev/asr/i2otypes.h#4 integrate .. //depot/projects/smpng/sys/dev/asr/i2outil.h#4 integrate .. //depot/projects/smpng/sys/dev/asr/osd_defs.h#5 integrate .. //depot/projects/smpng/sys/dev/asr/osd_unix.h#5 integrate .. //depot/projects/smpng/sys/dev/asr/osd_util.h#6 integrate .. //depot/projects/smpng/sys/dev/asr/sys_info.h#5 integrate .. //depot/projects/smpng/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/smpng/sys/dev/auxio/auxioreg.h#2 integrate .. //depot/projects/smpng/sys/dev/awi/if_awi_pccard.c#14 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#13 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfereg.h#6 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#52 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#27 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_audio.h#3 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_card.h#7 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_core.h#4 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_mem.c#7 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_mem.h#2 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.h#6 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_reg.h#7 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_tuner.h#3 integrate .. //depot/projects/smpng/sys/dev/bktr/ioctl_meteor.h#3 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt.c#13 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_eisa.c#8 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_isa.c#7 integrate .. //depot/projects/smpng/sys/dev/buslogic/btreg.h#3 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#21 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#21 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.h#6 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbusreg.h#4 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbusvar.h#7 integrate .. //depot/projects/smpng/sys/dev/cnw/if_cnwioctl.h#2 integrate .. //depot/projects/smpng/sys/dev/cp/cpddk.c#4 integrate .. //depot/projects/smpng/sys/dev/cp/cpddk.h#4 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#8 integrate .. //depot/projects/smpng/sys/dev/cp/ng_cp.h#2 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs.c#12 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs_pccard.c#10 integrate .. //depot/projects/smpng/sys/dev/cs/if_csreg.h#3 integrate .. //depot/projects/smpng/sys/dev/cs/if_csvar.h#3 integrate .. //depot/projects/smpng/sys/dev/ct/bshw_machdep.c#5 integrate .. //depot/projects/smpng/sys/dev/ct/bshwvar.h#3 integrate .. //depot/projects/smpng/sys/dev/ct/ct.c#7 integrate .. //depot/projects/smpng/sys/dev/ct/ct_isa.c#10 integrate .. //depot/projects/smpng/sys/dev/ct/ct_machdep.h#5 integrate .. //depot/projects/smpng/sys/dev/ct/ctvar.h#3 integrate .. //depot/projects/smpng/sys/dev/ctau/am8530.h#2 integrate .. //depot/projects/smpng/sys/dev/ctau/ctau.c#3 integrate .. //depot/projects/smpng/sys/dev/ctau/ctaureg.h#2 integrate .. //depot/projects/smpng/sys/dev/ctau/ctddk.c#2 integrate .. //depot/projects/smpng/sys/dev/ctau/ctddk.h#2 integrate .. //depot/projects/smpng/sys/dev/ctau/ds2153.h#2 integrate .. //depot/projects/smpng/sys/dev/ctau/hdc64570.h#2 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#11 integrate .. //depot/projects/smpng/sys/dev/ctau/lxt318.h#2 integrate .. //depot/projects/smpng/sys/dev/ctau/ng_ct.h#2 integrate .. //depot/projects/smpng/sys/dev/cx/cronyxfw.h#2 integrate .. //depot/projects/smpng/sys/dev/cx/csigma.c#2 integrate .. //depot/projects/smpng/sys/dev/cx/cxddk.c#2 integrate .. //depot/projects/smpng/sys/dev/cx/cxddk.h#2 integrate .. //depot/projects/smpng/sys/dev/cx/cxreg.h#2 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#16 integrate .. //depot/projects/smpng/sys/dev/cx/machdep.h#4 integrate .. //depot/projects/smpng/sys/dev/cx/ng_cx.h#3 integrate .. //depot/projects/smpng/sys/dev/cy/cy_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons.c#8 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons.h#5 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_crom.c#6 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.h#2 integrate .. //depot/projects/smpng/sys/dev/dec/mc146818reg.h#2 integrate .. //depot/projects/smpng/sys/dev/dec/mcclock.c#4 integrate .. //depot/projects/smpng/sys/dev/dec/mcclock_if.m#2 integrate .. //depot/projects/smpng/sys/dev/dec/mcclockvar.h#2 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt.h#5 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_scsi.c#12 integrate .. //depot/projects/smpng/sys/dev/drm/ati_pcigart.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm.h#7 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#10 integrate .. //depot/projects/smpng/sys/dev/drm/drm_agpsupport.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_auth.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/drm_bufs.h#9 integrate .. //depot/projects/smpng/sys/dev/drm/drm_context.h#7 integrate .. //depot/projects/smpng/sys/dev/drm/drm_dma.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drawable.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.h#20 integrate .. //depot/projects/smpng/sys/dev/drm/drm_fops.h#10 integrate .. //depot/projects/smpng/sys/dev/drm/drm_ioctl.h#7 integrate .. //depot/projects/smpng/sys/dev/drm/drm_irq.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_lock.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/drm_memory.h#9 integrate .. //depot/projects/smpng/sys/dev/drm/drm_memory_debug.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#18 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pci.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sarea.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_scatter.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sysctl.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_vm.h#10 integrate .. //depot/projects/smpng/sys/dev/drm/mga.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/mga_dma.c#9 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drm.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drv.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drv.h#7 integrate .. //depot/projects/smpng/sys/dev/drm/mga_irq.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/mga_state.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/mga_ucode.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/mga_warp.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/r128.h#7 integrate .. //depot/projects/smpng/sys/dev/drm/r128_cce.c#9 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drm.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/r128_irq.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/r128_state.c#9 integrate .. //depot/projects/smpng/sys/dev/drm/radeon.h#10 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#10 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drm.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#10 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_irq.c#5 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_mem.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_state.c#10 integrate .. //depot/projects/smpng/sys/dev/drm/sis.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/sis_drv.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/sis_ds.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/sis_ds.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/sis_mm.c#5 integrate .. //depot/projects/smpng/sys/dev/drm/tdfx.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/tdfx_drv.c#6 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#27 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed98.h#2 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#11 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#25 integrate .. //depot/projects/smpng/sys/dev/ed/if_edreg.h#4 integrate .. //depot/projects/smpng/sys/dev/ed/if_edvar.h#7 integrate .. //depot/projects/smpng/sys/dev/eisa/eisa_if.m#2 integrate .. //depot/projects/smpng/sys/dev/eisa/eisaconf.c#10 integrate .. //depot/projects/smpng/sys/dev/eisa/eisaconf.h#5 integrate .. //depot/projects/smpng/sys/dev/em/LICENSE#3 integrate .. //depot/projects/smpng/sys/dev/en/if_en_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#25 integrate .. //depot/projects/smpng/sys/dev/en/midwayvar.h#8 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#17 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_eisa.c#10 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_isa.c#10 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_pccard.c#15 integrate .. //depot/projects/smpng/sys/dev/ep/if_epreg.h#6 integrate .. //depot/projects/smpng/sys/dev/ep/if_epvar.h#6 integrate .. //depot/projects/smpng/sys/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/smpng/sys/dev/esp/ncr53c9xreg.h#3 integrate .. //depot/projects/smpng/sys/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#15 integrate .. //depot/projects/smpng/sys/dev/ex/if_exreg.h#3 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#13 integrate .. //depot/projects/smpng/sys/dev/exca/excareg.h#5 integrate .. //depot/projects/smpng/sys/dev/exca/excavar.h#7 integrate .. //depot/projects/smpng/sys/dev/fatm/firmware.h#2 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#10 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatm_rate.h#2 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatmreg.h#2 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatmvar.h#4 integrate .. //depot/projects/smpng/sys/dev/fb/gallant12x22.h#3 integrate .. //depot/projects/smpng/sys/dev/fb/gfb.h#3 integrate .. //depot/projects/smpng/sys/dev/fb/tga.h#2 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#16 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_cbus.c#5 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_pccard.c#9 integrate .. //depot/projects/smpng/sys/dev/fe/if_fereg.h#2 integrate .. //depot/projects/smpng/sys/dev/fe/if_fevar.h#3 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#37 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.h#14 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire_phy.h#3 integrate .. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#18 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#19 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdma.c#7 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdma.h#3 integrate .. //depot/projects/smpng/sys/dev/firewire/fwmem.c#19 integrate .. //depot/projects/smpng/sys/dev/firewire/fwmem.h#7 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#34 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#32 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcireg.h#17 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcivar.h#11 integrate .. //depot/projects/smpng/sys/dev/firewire/fwphyreg.h#3 integrate .. //depot/projects/smpng/sys/dev/firewire/iec13213.h#9 integrate .. //depot/projects/smpng/sys/dev/firewire/iec68113.h#6 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#25 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwevar.h#4 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#4 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwipvar.h#2 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#36 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.h#5 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp_targ.c#7 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpreg.h#9 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#14 integrate .. //depot/projects/smpng/sys/dev/fxp/rcvbundl.h#2 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemreg.h#3 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemvar.h#9 integrate .. //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/gfb/gfb_pci.h#2 integrate .. //depot/projects/smpng/sys/dev/harp/if_harp.c#6 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#14 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#9 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_ioctl.c#6 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_rx.c#6 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_tx.c#8 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatmconf.h#2 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatmreg.h#2 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatmvar.h#7 integrate .. //depot/projects/smpng/sys/dev/hfa/fore.h#2 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_aali.h#3 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_command.c#8 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_if.c#5 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_include.h#4 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_init.c#7 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_intr.c#4 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_output.c#9 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_slave.h#3 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_stats.c#5 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_stats.h#2 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_var.h#6 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_vcm.c#4 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#19 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751reg.h#5 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751var.h#6 integrate .. //depot/projects/smpng/sys/dev/hptmv/entry.c#3 integrate .. //depot/projects/smpng/sys/dev/hptmv/global.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/hptintf.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/mv.c#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/mvOs.h#2 integrate .. //depot/projects/smpng/sys/dev/hptmv/osbsd.h#2 integrate .. //depot/projects/smpng/sys/dev/ic/cd180.h#2 integrate .. //depot/projects/smpng/sys/dev/ic/hd64570.h#2 integrate .. //depot/projects/smpng/sys/dev/ic/sab82532.h#2 integrate .. //depot/projects/smpng/sys/dev/ic/wd33c93reg.h#2 integrate .. //depot/projects/smpng/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#7 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_reg.h#2 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_var.h#2 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/smpng/sys/dev/ida/ida_eisa.c#10 integrate .. //depot/projects/smpng/sys/dev/idt/idt.c#8 integrate .. //depot/projects/smpng/sys/dev/idt/idt_harp.c#6 integrate .. //depot/projects/smpng/sys/dev/idt/idt_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/idt/idtreg.h#2 integrate .. //depot/projects/smpng/sys/dev/idt/idtvar.h#3 integrate .. //depot/projects/smpng/sys/dev/ie/if_iee16.h#3 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#22 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#5 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#11 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbb_if.m#3 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/smpng/sys/dev/iir/iir.c#12 integrate .. //depot/projects/smpng/sys/dev/iir/iir.h#10 integrate .. //depot/projects/smpng/sys/dev/iir/iir_ctrl.c#12 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#34 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#32 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#23 integrate .. //depot/projects/smpng/sys/dev/isp/isp_inline.h#12 integrate .. //depot/projects/smpng/sys/dev/isp/isp_ioctl.h#11 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.c#13 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.h#8 integrate .. //depot/projects/smpng/sys/dev/isp/isp_tpublic.h#5 integrate .. //depot/projects/smpng/sys/dev/isp/ispmbox.h#16 integrate .. //depot/projects/smpng/sys/dev/isp/ispreg.h#5 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#23 integrate .. //depot/projects/smpng/sys/dev/ispfw/asm_1000.h#2 integrate .. //depot/projects/smpng/sys/dev/ispfw/asm_1040.h#2 integrate .. //depot/projects/smpng/sys/dev/ispfw/asm_1080.h#2 integrate .. //depot/projects/smpng/sys/dev/ispfw/asm_12160.h#4 integrate .. //depot/projects/smpng/sys/dev/ispfw/asm_2100.h#4 integrate .. //depot/projects/smpng/sys/dev/ispfw/asm_2200.h#5 integrate .. //depot/projects/smpng/sys/dev/ispfw/asm_2300.h#7 integrate .. //depot/projects/smpng/sys/dev/ixgb/LICENSE#2 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#4 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb_osdep.h#2 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#25 integrate .. //depot/projects/smpng/sys/dev/lge/if_lgereg.h#3 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_cbus.c#8 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/matcd/creativeif.h#2 integrate .. //depot/projects/smpng/sys/dev/matcd/matcd.c#6 integrate .. //depot/projects/smpng/sys/dev/matcd/matcd_data.h#3 integrate .. //depot/projects/smpng/sys/dev/matcd/matcd_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/matcd/matcddrv.h#2 integrate .. //depot/projects/smpng/sys/dev/matcd/options.h#2 integrate .. //depot/projects/smpng/sys/dev/mc146818/mc146818.c#2 integrate .. //depot/projects/smpng/sys/dev/mc146818/mc146818reg.h#4 integrate .. //depot/projects/smpng/sys/dev/mc146818/mc146818var.h#2 integrate .. //depot/projects/smpng/sys/dev/mcd/mcd.c#11 integrate .. //depot/projects/smpng/sys/dev/mcd/mcdreg.h#3 integrate .. //depot/projects/smpng/sys/dev/md/md.c#63 integrate .. //depot/projects/smpng/sys/dev/mii/acphy.c#12 integrate .. //depot/projects/smpng/sys/dev/mii/amphy.c#11 integrate .. //depot/projects/smpng/sys/dev/mii/amphyreg.h#2 integrate .. //depot/projects/smpng/sys/dev/mii/bmtphy.c#8 integrate .. //depot/projects/smpng/sys/dev/mii/bmtphyreg.h#2 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#23 integrate .. //depot/projects/smpng/sys/dev/mii/brgphyreg.h#5 integrate .. //depot/projects/smpng/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/smpng/sys/dev/mii/ciphyreg.h#2 integrate .. //depot/projects/smpng/sys/dev/mii/dcphy.c#13 integrate .. //depot/projects/smpng/sys/dev/mii/e1000phy.c#11 integrate .. //depot/projects/smpng/sys/dev/mii/e1000phyreg.h#3 integrate .. //depot/projects/smpng/sys/dev/mii/exphy.c#11 integrate .. //depot/projects/smpng/sys/dev/mii/lxtphy.c#12 integrate .. //depot/projects/smpng/sys/dev/mii/mii.h#3 integrate .. //depot/projects/smpng/sys/dev/mii/mlphy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/nsgphy.c#13 integrate .. //depot/projects/smpng/sys/dev/mii/nsgphyreg.h#3 integrate .. //depot/projects/smpng/sys/dev/mii/nsphy.c#11 integrate .. //depot/projects/smpng/sys/dev/mii/pnaphy.c#12 integrate .. //depot/projects/smpng/sys/dev/mii/qsphy.c#12 integrate .. //depot/projects/smpng/sys/dev/mii/rgephy.c#4 integrate .. //depot/projects/smpng/sys/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/smpng/sys/dev/mii/rlphy.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/tdkphy.c#13 integrate .. //depot/projects/smpng/sys/dev/mii/tdkphyreg.h#2 integrate .. //depot/projects/smpng/sys/dev/mii/tlphy.c#13 integrate .. //depot/projects/smpng/sys/dev/mii/tlphyreg.h#2 integrate .. //depot/projects/smpng/sys/dev/mii/ukphy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/xmphy.c#13 integrate .. //depot/projects/smpng/sys/dev/mii/xmphyreg.h#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/fc_log.h#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi.h#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_cnfg.h#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_fc.h#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_init.h#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_ioc.h#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_lan.h#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_raid.h#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_targ.h#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_type.h#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.c#7 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_debug.c#6 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_freebsd.c#12 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_freebsd.h#5 integrate .. //depot/projects/smpng/sys/dev/mse/mse.c#2 integrate .. //depot/projects/smpng/sys/dev/mse/mse_cbus.c#2 integrate .. //depot/projects/smpng/sys/dev/mse/mse_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/mse/msevar.h#2 integrate .. //depot/projects/smpng/sys/dev/my/if_myreg.h#2 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500.c#8 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500_pccard.c#15 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500hw.h#3 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500hwtab.h#2 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500reg.h#2 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500var.h#6 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#37 integrate .. //depot/projects/smpng/sys/dev/nge/if_ngereg.h#8 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#25 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp.c#9 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp_pccard.c#12 integrate .. //depot/projects/smpng/sys/dev/nsp/nspreg.h#2 integrate .. //depot/projects/smpng/sys/dev/nsp/nspvar.h#6 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_bus_if.m#2 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#22 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#15 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.c#9 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.h#7 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirmio.c#11 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirmio.h#5 integrate .. //depot/projects/smpng/sys/dev/owi/if_owi.c#8 integrate .. //depot/projects/smpng/sys/dev/owi/if_owi_pccard.c#3 integrate .. //depot/projects/smpng/sys/dev/owi/if_wireg.h#2 integrate .. //depot/projects/smpng/sys/dev/owi/if_wivar.h#3 integrate .. //depot/projects/smpng/sys/dev/patm/genrtab/genrtab.c#2 integrate .. //depot/projects/smpng/sys/dev/patm/idt77252reg.h#2 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm.c#6 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_attach.c#6 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_intr.c#4 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_ioctl.c#6 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_rx.c#6 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_tx.c#6 integrate .. //depot/projects/smpng/sys/dev/patm/if_patmvar.h#3 integrate .. //depot/projects/smpng/sys/dev/pbio/pbio.c#3 integrate .. //depot/projects/smpng/sys/dev/pbio/pbioio.h#2 integrate .. //depot/projects/smpng/sys/dev/pccard/card_if.m#11 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#29 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard_cis.c#15 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard_cis.h#2 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard_cis_quirks.c#7 integrate .. //depot/projects/smpng/sys/dev/pccard/pccardreg.h#3 integrate .. //depot/projects/smpng/sys/dev/pccard/pccardvar.h#19 integrate .. //depot/projects/smpng/sys/dev/pccard/power_if.m#2 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#47 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbdevid.h#14 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbreg.h#9 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#14 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#49 integrate .. //depot/projects/smpng/sys/dev/pci/pci_if.m#4 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#11 integrate .. //depot/projects/smpng/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#6 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#13 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpt.c#12 integrate .. //depot/projects/smpng/sys/dev/ppbus/lptio.h#2 integrate .. //depot/projects/smpng/sys/dev/ppbus/pcfclock.c#12 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppbus_if.m#2 integrate .. //depot/projects/smpng/sys/dev/ppbus/pps.c#16 integrate .. //depot/projects/smpng/sys/dev/ppc/ppcvar.h#2 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#19 integrate .. //depot/projects/smpng/sys/dev/puc/puc_ebus.c#4 integrate .. //depot/projects/smpng/sys/dev/puc/puc_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/puc/puc_sbus.c#6 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#28 integrate .. //depot/projects/smpng/sys/dev/puc/pucvar.h#12 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#16 integrate .. //depot/projects/smpng/sys/dev/ray/if_raydbg.h#3 integrate .. //depot/projects/smpng/sys/dev/ray/if_raymib.h#3 integrate .. //depot/projects/smpng/sys/dev/ray/if_rayreg.h#2 integrate .. //depot/projects/smpng/sys/dev/ray/if_rayvar.h#4 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#15 integrate .. //depot/projects/smpng/sys/dev/rc/rcreg.h#2 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#18 integrate .. //depot/projects/smpng/sys/dev/rndtest/rndtest.c#4 integrate .. //depot/projects/smpng/sys/dev/rndtest/rndtest.h#2 integrate .. //depot/projects/smpng/sys/dev/rp/rp.c#19 integrate .. //depot/projects/smpng/sys/dev/rp/rp_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/rp/rpreg.h#3 integrate .. //depot/projects/smpng/sys/dev/rp/rpvar.h#5 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#24 integrate .. //depot/projects/smpng/sys/dev/sab/sab82532reg.h#2 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#17 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni_isa.c#10 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbnireg.h#2 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbnivar.h#4 integrate .. //depot/projects/smpng/sys/dev/sbsh/if_sbshreg.h#2 integrate .. //depot/projects/smpng/sys/dev/si/si.c#19 integrate .. //depot/projects/smpng/sys/dev/si/si.h#5 integrate .. //depot/projects/smpng/sys/dev/si/si2_z280.c#3 integrate .. //depot/projects/smpng/sys/dev/si/si3_t225.c#3 integrate .. //depot/projects/smpng/sys/dev/si/si_eisa.c#5 integrate .. //depot/projects/smpng/sys/dev/si/si_isa.c#7 integrate .. //depot/projects/smpng/sys/dev/si/sireg.h#2 integrate .. //depot/projects/smpng/sys/dev/si/sivar.h#3 integrate .. //depot/projects/smpng/sys/dev/sio/sio_isa.c#14 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pccard.c#10 integrate .. //depot/projects/smpng/sys/dev/smbus/smbus_if.m#2 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#18 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/sn/if_snreg.h#3 integrate .. //depot/projects/smpng/sys/dev/sn/if_snvar.h#3 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932.c#11 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932reg.h#2 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932subr.c#5 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932subr.h#3 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932var.h#4 integrate .. //depot/projects/smpng/sys/dev/snc/if_snc.c#5 integrate .. //depot/projects/smpng/sys/dev/snc/if_snc_cbus.c#5 integrate .. //depot/projects/smpng/sys/dev/snc/if_snc_pccard.c#5 integrate .. //depot/projects/smpng/sys/dev/snc/if_sncreg.h#2 integrate .. //depot/projects/smpng/sys/dev/snc/if_sncvar.h#3 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#21 integrate .. //depot/projects/smpng/sys/dev/sound/driver.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/isa/es1888.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ess.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/isa/gusc.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#21 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb8.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sbc.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sndbuf_dma.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/als4000.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/pci/als4000.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/aureal.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pci/aureal.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#23 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmireg.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cs4281.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cs4281.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csa.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csapcm.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ds1-fw.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ds1.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#23 integrate .. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/pci/es137x.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#32 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.h#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/neomagic-coeff.h#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/neomagic.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pci/neomagic.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/solo.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#20 integrate .. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.h#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.h#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#20 integrate .. //depot/projects/smpng/sys/dev/sound/pci/vibes.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pci/vibes.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#24 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.h#8 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97_if.m#3 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97_patch.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97_patch.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.h#7 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#28 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.h#11 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel_if.m#2 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#23 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.h#5 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/fake.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.h#6 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_fmt.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_if.m#3 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_rate.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.h#5 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer_if.m#3 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#25 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#19 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/vchan.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/vchan.h#4 integrate .. //depot/projects/smpng/sys/dev/sound/sbus/apcdmareg.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/smpng/sys/dev/sound/sbus/cs4231.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio_pcm.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudioreg.h#4 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr.c#17 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr.h#2 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/sr/if_srregs.h#4 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30.c#9 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_isa.c#7 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_pccard.c#13 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_subr.c#4 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30reg.h#2 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30var.h#6 integrate .. //depot/projects/smpng/sys/dev/streams/streams.c#21 integrate .. //depot/projects/smpng/sys/dev/sx/cd1865.h#2 integrate .. //depot/projects/smpng/sys/dev/sx/sx.c#6 integrate .. //depot/projects/smpng/sys/dev/sx/sx.h#5 integrate .. //depot/projects/smpng/sys/dev/sx/sx_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/sx/sx_util.c#2 integrate .. //depot/projects/smpng/sys/dev/sx/sx_util.h#2 integrate .. //depot/projects/smpng/sys/dev/sx/sxvar.h#2 integrate .. //depot/projects/smpng/sys/dev/sym/README.sym#3 integrate .. //depot/projects/smpng/sys/dev/sym/sym_conf.h#3 integrate .. //depot/projects/smpng/sys/dev/sym/sym_defs.h#4 integrate .. //depot/projects/smpng/sys/dev/sym/sym_fw.h#4 integrate .. //depot/projects/smpng/sys/dev/sym/sym_fw1.h#4 integrate .. //depot/projects/smpng/sys/dev/sym/sym_fw2.h#4 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_io.h#2 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_linux.h#2 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.h#2 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_vars.h#5 integrate .. //depot/projects/smpng/sys/dev/tga/tga_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/tga/tga_pci.h#2 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#19 integrate .. //depot/projects/smpng/sys/dev/trm/trm.h#5 integrate .. //depot/projects/smpng/sys/dev/txp/3c990img.h#2 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#23 integrate .. //depot/projects/smpng/sys/dev/txp/if_txpreg.h#2 integrate .. //depot/projects/smpng/sys/dev/uart/uart.h#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus.h#7 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_acpi.c#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_pccard.c#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#7 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu.h#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_alpha.c#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_amd64.c#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_i386.c#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_ia64.c#7 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_pc98.c#7 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_sparc64.c#10 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dbg.c#2 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#9 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_sab82532.c#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_z8530.c#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_if.m#2 integrate .. //depot/projects/smpng/sys/dev/uart/uart_kbd_sun.h#2 integrate .. //depot/projects/smpng/sys/dev/uart/uart_subr.c#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#12 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#17 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsecreg.h#5 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsecvar.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/dsbr100io.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/ehcireg.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/ehcivar.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/hid.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/hid.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/if_auereg.h#8 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/if_axereg.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/if_cuereg.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/if_kue.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/if_kuereg.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/if_udav.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/if_udavreg.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/kue_fw.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#35 integrate .. //depot/projects/smpng/sys/dev/usb/ohcireg.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/ohcivar.h#11 integrate .. //depot/projects/smpng/sys/dev/usb/rio500_usb.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/ubsa.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/ubser.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/ubser.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/ucomvar.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/udbp.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/udbp.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/ufm.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#34 integrate .. //depot/projects/smpng/sys/dev/usb/ugraphire_rdesc.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#36 integrate .. //depot/projects/smpng/sys/dev/usb/uhcireg.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/uhcivar.h#11 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/ulpt.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/umodem.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/urio.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/usb.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/usb.h#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_if.m#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_mem.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_mem.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/usb_port.h#23 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#28 integrate .. //depot/projects/smpng/sys/dev/usb/usbcdc.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#72 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.h#14 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi_util.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi_util.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/usbdivar.h#14 integrate .. //depot/projects/smpng/sys/dev/usb/usbhid.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/uvisor.c#14 integrate .. //depot/projects/smpng/sys/dev/utopia/idtphy.h#3 integrate .. //depot/projects/smpng/sys/dev/utopia/suni.h#2 integrate .. //depot/projects/smpng/sys/dev/utopia/utopia.c#7 integrate .. //depot/projects/smpng/sys/dev/utopia/utopia.h#3 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/smpng/sys/dev/vge/if_vgereg.h#2 integrate .. //depot/projects/smpng/sys/dev/vge/if_vgevar.h#2 integrate .. //depot/projects/smpng/sys/dev/vkbd/vkbd.c#3 integrate .. //depot/projects/smpng/sys/dev/vkbd/vkbd_var.h#2 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#17 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_eisa.c#9 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/vx/if_vxreg.h#5 integrate .. //depot/projects/smpng/sys/dev/vx/if_vxvar.h#4 integrate .. //depot/projects/smpng/sys/dev/wds/wd7000.c#6 integrate .. //depot/projects/smpng/sys/dev/wi/if_wavelan_ieee.h#13 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#68 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#30 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/wi/if_wireg.h#21 integrate .. //depot/projects/smpng/sys/dev/wi/if_wivar.h#20 integrate .. //depot/projects/smpng/sys/dev/wi/spectrum24t_cf.h#2 integrate .. //depot/projects/smpng/sys/dev/wl/if_wl.c#22 integrate .. //depot/projects/smpng/sys/dev/wl/if_wl.h#4 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#20 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe_pccard.c#15 integrate .. //depot/projects/smpng/sys/dev/zs/z8530reg.h#4 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#16 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#30 integrate Differences ... ==== //depot/projects/smpng/sys/coda/cnode.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * * Coda: an Experimental Distributed File System * Release 3.1 @@ -27,11 +27,11 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/cnode.h,v 1.15 2004/09/01 01:19:51 brooks Exp $ + * $FreeBSD: src/sys/coda/cnode.h,v 1.16 2005/01/05 23:35:00 imp Exp $ * */ -/* +/*- * Mach Operating System * Copyright (c) 1990 Carnegie-Mellon University * Copyright (c) 1989 Carnegie-Mellon University ==== //depot/projects/smpng/sys/coda/coda.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * * Coda: an Experimental Distributed File System * Release 3.1 @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda.h,v 1.12 2004/06/17 17:16:40 phk Exp $ + * $FreeBSD: src/sys/coda/coda.h,v 1.13 2005/01/05 23:35:00 imp Exp $ * */ ==== //depot/projects/smpng/sys/coda/coda_fbsd.c#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Coda: an Experimental Distributed File System * Release 3.1 * @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.38 2004/09/01 01:19:51 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.39 2005/01/05 23:35:00 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/coda/coda_io.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * * Coda: an Experimental Distributed File System * Release 3.1 @@ -27,11 +27,11 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_io.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_io.h,v 1.7 2002/05/16 21:25:34 trhodes Exp $ + * $FreeBSD: src/sys/coda/coda_io.h,v 1.8 2005/01/05 23:35:00 imp Exp $ * */ -/* +/*- * Mach Operating System * Copyright (c) 1990 Carnegie-Mellon University * Copyright (c) 1989 Carnegie-Mellon University ==== //depot/projects/smpng/sys/coda/coda_kernel.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * * Coda: an Experimental Distributed File System * Release 3.1 @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_kernel.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_kernel.h,v 1.4 1999/08/28 00:40:53 peter Exp $ + * $FreeBSD: src/sys/coda/coda_kernel.h,v 1.5 2005/01/05 23:35:00 imp Exp $ * */ ==== //depot/projects/smpng/sys/coda/coda_namecache.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Coda: an Experimental Distributed File System * Release 3.1 * @@ -27,7 +27,7 @@ * * @(#) src/sys/coda/coda_namecache.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ */ -/* +/*- * Mach Operating System * Copyright (c) 1990 Carnegie-Mellon University * Copyright (c) 1989 Carnegie-Mellon University @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_namecache.c,v 1.20 2003/09/07 07:43:09 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_namecache.c,v 1.21 2005/01/05 23:35:00 imp Exp $"); #include #include ==== //depot/projects/smpng/sys/coda/coda_namecache.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * * Coda: an Experimental Distributed File System * Release 3.1 @@ -27,11 +27,11 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_namecache.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_namecache.h,v 1.9 2003/09/07 07:43:09 tjr Exp $ + * $FreeBSD: src/sys/coda/coda_namecache.h,v 1.10 2005/01/05 23:35:00 imp Exp $ * */ -/* +/*- * Mach Operating System * Copyright (c) 1990 Carnegie-Mellon University * Copyright (c) 1989 Carnegie-Mellon University ==== //depot/projects/smpng/sys/coda/coda_opstats.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * * Coda: an Experimental Distributed File System * Release 3.1 @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_opstats.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_opstats.h,v 1.5 1999/08/28 00:40:54 peter Exp $ + * $FreeBSD: src/sys/coda/coda_opstats.h,v 1.6 2005/01/05 23:35:00 imp Exp $ * */ ==== //depot/projects/smpng/sys/coda/coda_pioctl.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 6 17:58:04 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0436716A4D0; Thu, 6 Jan 2005 17:58:04 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D376416A4CE for ; Thu, 6 Jan 2005 17:58:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA6A443D49 for ; Thu, 6 Jan 2005 17:58:03 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j06Hw3q1035417 for ; Thu, 6 Jan 2005 17:58:03 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j06Hw394035414 for perforce@freebsd.org; Thu, 6 Jan 2005 17:58:03 GMT (envelope-from jhb@freebsd.org) Date: Thu, 6 Jan 2005 17:58:03 GMT Message-Id: <200501061758.j06Hw394035414@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 68395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jan 2005 17:58:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=68395 Change 68395 by jhb@jhb_slimer on 2005/01/06 17:57:06 IFC @68392. Affected files ... .. //depot/projects/smpng/sys/netgraph/ng_base.c#30 integrate .. //depot/projects/smpng/sys/sys/kernel.h#29 integrate Differences ... ==== //depot/projects/smpng/sys/netgraph/ng_base.c#30 (text+ko) ==== @@ -36,7 +36,7 @@ * Authors: Julian Elischer * Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.90 2004/12/23 13:09:37 glebius Exp $ + * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.91 2005/01/06 17:45:02 emax Exp $ * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $ */ @@ -2991,7 +2991,7 @@ ngb_mod_event, (NULL) }; -DECLARE_MODULE(netgraph, netgraph_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE); +DECLARE_MODULE(netgraph, netgraph_mod, SI_SUB_NETGRAPH, SI_ORDER_MIDDLE); SYSCTL_NODE(_net, OID_AUTO, graph, CTLFLAG_RW, 0, "netgraph Family"); SYSCTL_INT(_net_graph, OID_AUTO, abi_version, CTLFLAG_RD, 0, NG_ABI_VERSION,""); SYSCTL_INT(_net_graph, OID_AUTO, msg_version, CTLFLAG_RD, 0, NG_VERSION, ""); ==== //depot/projects/smpng/sys/sys/kernel.h#29 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)kernel.h 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/sys/kernel.h,v 1.122 2004/12/06 11:28:02 pjd Exp $ + * $FreeBSD: src/sys/sys/kernel.h,v 1.123 2005/01/06 17:45:03 emax Exp $ */ #ifndef _SYS_KERNEL_H_ @@ -132,6 +132,7 @@ SI_SUB_SOFTINTR = 0x2800001, /* start soft interrupt thread */ SI_SUB_DEVFS = 0x2F00000, /* devfs ready for devices */ SI_SUB_INIT_IF = 0x3000000, /* prep for net interfaces */ + SI_SUB_NETGRAPH = 0x3010000, /* Let Netgraph initialize */ SI_SUB_DRIVERS = 0x3100000, /* Let Drivers initialize */ SI_SUB_CONFIGURE = 0x3800000, /* Configure devices */ SI_SUB_VFS = 0x4000000, /* virtual filesystem*/ From owner-p4-projects@FreeBSD.ORG Thu Jan 6 18:46:28 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B96AE16A4D1; Thu, 6 Jan 2005 18:46:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 918D516A4CE for ; Thu, 6 Jan 2005 18:46:27 +0000 (GMT) Received: from mail5.speakeasy.net (mail5.speakeasy.net [216.254.0.205]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4770C43D39 for ; Thu, 6 Jan 2005 18:46:27 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 23969 invoked from network); 6 Jan 2005 18:46:27 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 6 Jan 2005 18:46:26 -0000 Received: from [10.50.41.243] (gw1.twc.weather.com [216.133.140.1]) (authenticated bits=0) by server.baldwin.cx (8.12.11/8.12.11) with ESMTP id j06IkLoE082922; Thu, 6 Jan 2005 13:46:23 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: David Xu Date: Thu, 6 Jan 2005 13:30:05 -0500 User-Agent: KMail/1.6.2 References: <200501041314.j04DEVE3017245@repoman.freebsd.org> <200501051747.18388.jhb@FreeBSD.org> <41DC8001.9080403@freebsd.org> In-Reply-To: <41DC8001.9080403@freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200501061330.05074.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 68252 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jan 2005 18:46:28 -0000 On Wednesday 05 January 2005 07:02 pm, David Xu wrote: > John Baldwin wrote: > >On Tuesday 04 January 2005 08:14 am, David Xu wrote: > >>http://perforce.freebsd.org/chv.cgi?CH=68252 > >> > >>Change 68252 by davidxu@davidxu_tiger on 2005/01/04 13:14:06 > >> > >> insert "pause" instructor for i386. > >> style fix. > > > >You can use 'cpu_spinwait()' for this to be MI. > > I know there is header file cpu.h, but it is too kernel oriented, > not every arch provides the function to userland, e.g, > alpha defined it in #ifdef _KERNEL section, userland can not > use it, why isn't it in cpufunc.h ? That should be fixed then. I think cpu_spinwait() should be ok for userland use, so I think it can be moved to cpufunc.h. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Fri Jan 7 03:17:07 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 956AD16A4D0; Fri, 7 Jan 2005 03:17:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E20816A4CE for ; Fri, 7 Jan 2005 03:17:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D32C43D1F for ; Fri, 7 Jan 2005 03:17:06 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j073H6wt084333 for ; Fri, 7 Jan 2005 03:17:06 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j073H5Jo084330 for perforce@freebsd.org; Fri, 7 Jan 2005 03:17:05 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 7 Jan 2005 03:17:05 GMT Message-Id: <200501070317.j073H5Jo084330@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68446 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2005 03:17:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=68446 Change 68446 by davidxu@davidxu_celeron on 2005/01/07 03:16:19 use atomic operation, remove static initializing lock. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#12 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#12 (text+ko) ==== @@ -90,21 +90,19 @@ PTHREAD_MUTEXATTR_STATIC_INITIALIZER; static pthread_mutexattr_t static_mattr = &static_mutex_attr; -/* Single underscore versions provided for libc internal usage: */ +__weak_reference(__pthread_mutex_init, pthread_mutex_init); __weak_reference(__pthread_mutex_lock, pthread_mutex_lock); __weak_reference(__pthread_mutex_timedlock, pthread_mutex_timedlock); __weak_reference(__pthread_mutex_trylock, pthread_mutex_trylock); +/* Single underscore versions provided for libc internal usage: */ /* No difference between libc and application usage of these: */ -__weak_reference(_pthread_mutex_init, pthread_mutex_init); __weak_reference(_pthread_mutex_destroy, pthread_mutex_destroy); __weak_reference(_pthread_mutex_unlock, pthread_mutex_unlock); - - -int -__pthread_mutex_init(pthread_mutex_t *mutex, - const pthread_mutexattr_t *mutex_attr) +static int +mutex_init(pthread_mutex_t *mutex, + const pthread_mutexattr_t *mutex_attr, int private) { struct pthread_mutex *pmutex; enum pthread_mutextype type; @@ -113,11 +111,8 @@ int flags; int ret = 0; - if (mutex == NULL) - ret = EINVAL; - /* Check if default mutex attributes: */ - else if (mutex_attr == NULL || *mutex_attr == NULL) { + if (mutex_attr == NULL || *mutex_attr == NULL) { /* Default to a (error checking) POSIX mutex: */ type = PTHREAD_MUTEX_ERRORCHECK; protocol = PTHREAD_PRIO_NONE; @@ -179,6 +174,8 @@ /* Initialise the rest of the mutex: */ TAILQ_INIT(&pmutex->m_queue); pmutex->m_flags |= MUTEX_FLAGS_INITED; + if (private) + pmutex->m_flags |= MUTEX_FLAGS_PRIVATE; pmutex->m_owner = NULL; pmutex->m_type = type; pmutex->m_protocol = protocol; @@ -189,7 +186,8 @@ pmutex->m_prio = -1; pmutex->m_saved_prio = 0; MUTEX_INIT_LINK(pmutex); - *mutex = pmutex; + if (!atomic_cmpset_acq_ptr(mutex, NULL, pmutex)) + MUTEX_DESTROY(pmutex); } else { /* Free the mutex lock structure: */ MUTEX_DESTROY(pmutex); @@ -205,16 +203,16 @@ _pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *mutex_attr) { - struct pthread_mutex_attr mattr, *mattrp; + *mutex = NULL; + return mutex_init(mutex, mutex_attr, 1); +} - if ((mutex_attr == NULL) || (*mutex_attr == NULL)) - return (__pthread_mutex_init(mutex, &static_mattr)); - else { - mattr = **mutex_attr; - mattr.m_flags |= MUTEX_FLAGS_PRIVATE; - mattrp = &mattr; - return (__pthread_mutex_init(mutex, &mattrp)); - } +int +__pthread_mutex_init(pthread_mutex_t *mutex, + const pthread_mutexattr_t *mutex_attr) +{ + *mutex = NULL; + return mutex_init(mutex, mutex_attr, 0); } int @@ -284,40 +282,6 @@ } static int -init_static(struct pthread *thread, pthread_mutex_t *mutex) -{ - int ret; - - THR_LOCK_ACQUIRE(thread, &_mutex_static_lock); - - if (*mutex == NULL) - ret = pthread_mutex_init(mutex, NULL); - else - ret = 0; - - THR_LOCK_RELEASE(thread, &_mutex_static_lock); - - return (ret); -} - -static int -init_static_private(struct pthread *thread, pthread_mutex_t *mutex) -{ - int ret; - - THR_LOCK_ACQUIRE(thread, &_mutex_static_lock); - - if (*mutex == NULL) - ret = _pthread_mutex_init(mutex, &static_mattr); - else - ret = 0; - - THR_LOCK_RELEASE(thread, &_mutex_static_lock); - - return (ret); -} - -static int mutex_trylock_common(struct pthread *curthread, pthread_mutex_t *mutex) { int ret = 0; @@ -462,7 +426,7 @@ * initialization: */ else if ((*mutex != NULL) || - ((ret = init_static(curthread, mutex)) == 0)) + ((ret = mutex_init(mutex, NULL, 0)) == 0)) ret = mutex_trylock_common(curthread, mutex); return (ret); @@ -482,7 +446,7 @@ * initialization marking the mutex private (delete safe): */ else if ((*mutex != NULL) || - ((ret = init_static_private(curthread, mutex)) == 0)) + ((ret = mutex_init(mutex, NULL, 1)) == 0)) ret = mutex_trylock_common(curthread, mutex); return (ret); @@ -781,7 +745,7 @@ * If the mutex is statically initialized, perform the dynamic * initialization: */ - else if ((*m != NULL) || ((ret = init_static(curthread, m)) == 0)) + else if ((*m != NULL) || ((ret = mutex_init(m, NULL, 0)) == 0)) ret = mutex_lock_common(curthread, m, NULL); return (ret); @@ -807,7 +771,7 @@ * initialization marking it private (delete safe): */ else if ((*m != NULL) || - ((ret = init_static_private(curthread, m)) == 0)) + ((ret = mutex_init(m, NULL, 1)) == 0)) ret = mutex_lock_common(curthread, m, NULL); return (ret); @@ -830,7 +794,7 @@ * If the mutex is statically initialized, perform the dynamic * initialization: */ - else if ((*m != NULL) || ((ret = init_static(curthread, m)) == 0)) + else if ((*m != NULL) || ((ret = mutex_init(m, NULL, 0)) == 0)) ret = mutex_lock_common(curthread, m, abs_timeout); return (ret); @@ -855,7 +819,7 @@ * initialization marking it private (delete safe): */ else if ((*m != NULL) || - ((ret = init_static_private(curthread, m)) == 0)) + ((ret = mutex_init(m, NULL, 1)) == 0)) ret = mutex_lock_common(curthread, m, abs_timeout); return (ret); From owner-p4-projects@FreeBSD.ORG Fri Jan 7 04:16:20 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 459DC16A4DA; Fri, 7 Jan 2005 04:16:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 016FF16A4CE for ; Fri, 7 Jan 2005 04:16:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB23743D39 for ; Fri, 7 Jan 2005 04:16:19 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j074GJGH086172 for ; Fri, 7 Jan 2005 04:16:19 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j074GJWH086169 for perforce@freebsd.org; Fri, 7 Jan 2005 04:16:19 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 7 Jan 2005 04:16:19 GMT Message-Id: <200501070416.j074GJWH086169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2005 04:16:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=68450 Change 68450 by davidxu@davidxu_celeron on 2005/01/07 04:15:21 use atomic operation, remove static initializing lock. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cond.c#9 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cond.c#9 (text+ko) ==== @@ -37,10 +37,10 @@ /* * Prototypes */ -static int init_static(struct pthread *thread, pthread_cond_t *cond); -static int cond_wait_common(pthread_cond_t *cond, pthread_mutex_t *mutex, +static int cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr); +static int cond_wait_common(pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec *abstime, int cancel); -static int cond_signal_common(pthread_cond_t *cond, int broadcast); +static int cond_signal_common(pthread_cond_t *cond, int broadcast); /* * Double underscore versions are cancellation points. Single underscore @@ -55,47 +55,36 @@ __weak_reference(_pthread_cond_signal, pthread_cond_signal); __weak_reference(_pthread_cond_broadcast, pthread_cond_broadcast); -int -_pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *cond_attr) +static int +cond_init(pthread_cond_t *cond, const pthread_condattr_t *cond_attr) { pthread_cond_t pcond; int rval = 0; - if (cond == NULL) - rval = EINVAL; - else { - if ((pcond = (pthread_cond_t) - malloc(sizeof(struct pthread_cond))) == NULL) { - rval = ENOMEM; - } else { - /* - * Initialise the condition variable structure: - */ - umtx_init(&pcond->c_lock); - pcond->c_seqno = 0; - pcond->c_waiters = 0; - pcond->c_wakeups = 0; - pcond->c_flags = 0; - *cond = pcond; - } + if ((pcond = (pthread_cond_t) + malloc(sizeof(struct pthread_cond))) == NULL) { + rval = ENOMEM; + } else { + /* + * Initialise the condition variable structure: + */ + umtx_init(&pcond->c_lock); + pcond->c_seqno = 0; + pcond->c_waiters = 0; + pcond->c_wakeups = 0; + pcond->c_flags = 0; + if (!atomic_cmpset_acq_ptr(cond, NULL, pcond)) + free(pcond); } /* Return the completion status: */ return (rval); } -static int -init_static(struct pthread *thread, pthread_cond_t *cond) +int +_pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *cond_attr) { - int ret; - - THR_LOCK_ACQUIRE(thread, &_cond_static_lock); - if (*cond == NULL) - ret = pthread_cond_init(cond, NULL); - else - ret = 0; - THR_LOCK_RELEASE(thread, &_cond_static_lock); - - return (ret); + *cond = NULL; + return cond_init(cond, cond_attr); } int @@ -105,7 +94,7 @@ struct pthread *curthread = _get_curthread(); int rval = 0; - if (cond == NULL || *cond == NULL) + if (*cond == NULL) rval = EINVAL; else { /* Lock the condition variable structure: */ @@ -184,7 +173,7 @@ * perform the dynamic initialization: */ if (__predict_false(*cond == NULL && - (ret = init_static(curthread, cond)) != 0)) + (ret = cond_init(cond, NULL)) != 0)) return (ret); cv = *cond; @@ -284,15 +273,15 @@ { struct pthread *curthread = _get_curthread(); pthread_cond_t cv; - int rval = 0; + int ret = 0; /* * If the condition variable is statically initialized, perform dynamic * initialization. */ if (__predict_false(*cond == NULL && - (rval = init_static(curthread, cond)) != 0)) - return (rval); + (ret = cond_init(cond, NULL)) != 0)) + return (ret); cv = *cond; /* Lock the condition variable structure. */ @@ -311,7 +300,7 @@ } } THR_LOCK_RELEASE(curthread, &cv->c_lock); - return (rval); + return (ret); } int From owner-p4-projects@FreeBSD.ORG Fri Jan 7 05:14:32 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 521B116A4D0; Fri, 7 Jan 2005 05:14:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1622016A4CE for ; Fri, 7 Jan 2005 05:14:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F244E43D45 for ; Fri, 7 Jan 2005 05:14:31 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j075EVHQ094559 for ; Fri, 7 Jan 2005 05:14:31 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j075EV6h094556 for perforce@freebsd.org; Fri, 7 Jan 2005 05:14:31 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 7 Jan 2005 05:14:31 GMT Message-Id: <200501070514.j075EV6h094556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2005 05:14:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=68455 Change 68455 by davidxu@davidxu_celeron on 2005/01/07 05:13:46 use atomic operation, remove static initializing lock. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rwlock.c#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_rwlock.c#3 (text+ko) ==== @@ -51,52 +51,9 @@ /* * Prototypes */ -static int init_static(pthread_rwlock_t *rwlock); - static int -init_static(pthread_rwlock_t *rwlock) -{ - struct pthread *thread = _get_curthread(); - int ret; - - THR_LOCK_ACQUIRE(thread, &_rwlock_static_lock); - - if (*rwlock == NULL) - ret = _pthread_rwlock_init(rwlock, NULL); - else - ret = 0; - - THR_LOCK_RELEASE(thread, &_rwlock_static_lock); - return (ret); -} - -int -_pthread_rwlock_destroy (pthread_rwlock_t *rwlock) -{ - int ret; - - if (rwlock == NULL) - ret = EINVAL; - else { - pthread_rwlock_t prwlock; - - prwlock = *rwlock; - - _pthread_mutex_destroy(&prwlock->lock); - _pthread_cond_destroy(&prwlock->read_signal); - _pthread_cond_destroy(&prwlock->write_signal); - free(prwlock); - - *rwlock = NULL; - - ret = 0; - } - return (ret); -} - -int -_pthread_rwlock_init (pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr) +rwlock_init(pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr) { pthread_rwlock_t prwlock; int ret; @@ -129,8 +86,12 @@ /* success */ prwlock->state = 0; prwlock->blocked_writers = 0; - - *rwlock = prwlock; + if (!atomic_cmpset_acq_ptr(rwlock, NULL, prwlock)) { + /* we lost a race, it was already initialized */ + _pthread_cond_destroy(&prwlock->read_signal); + _pthread_mutex_destroy(&prwlock->lock); + free(prwlock); + } } } } @@ -138,6 +99,37 @@ return (ret); } +int +_pthread_rwlock_destroy (pthread_rwlock_t *rwlock) +{ + int ret; + + if (rwlock == NULL) + ret = EINVAL; + else { + pthread_rwlock_t prwlock; + + prwlock = *rwlock; + + _pthread_mutex_destroy(&prwlock->lock); + _pthread_cond_destroy(&prwlock->read_signal); + _pthread_cond_destroy(&prwlock->write_signal); + free(prwlock); + + *rwlock = NULL; + + ret = 0; + } + return (ret); +} + +int +_pthread_rwlock_init (pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr) +{ + *rwlock = NULL; + return (rwlock_init(rwlock, attr)); +} + static int rwlock_rdlock_common (pthread_rwlock_t *rwlock, const struct timespec *abstime) { @@ -152,7 +144,7 @@ /* check for static initialization */ if (prwlock == NULL) { - if ((ret = init_static(rwlock)) != 0) + if ((ret = rwlock_init(rwlock, NULL)) != 0) return (ret); prwlock = *rwlock; @@ -244,7 +236,7 @@ /* check for static initialization */ if (prwlock == NULL) { - if ((ret = init_static(rwlock)) != 0) + if ((ret = rwlock_init(rwlock, NULL)) != 0) return (ret); prwlock = *rwlock; @@ -289,7 +281,7 @@ /* check for static initialization */ if (prwlock == NULL) { - if ((ret = init_static(rwlock)) != 0) + if ((ret = rwlock_init(rwlock, NULL)) != 0) return (ret); prwlock = *rwlock; @@ -367,7 +359,7 @@ /* check for static initialization */ if (prwlock == NULL) { - if ((ret = init_static(rwlock)) != 0) + if ((ret = rwlock_init(rwlock, NULL)) != 0) return (ret); prwlock = *rwlock; From owner-p4-projects@FreeBSD.ORG Fri Jan 7 18:06:07 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF98B16A4D0; Fri, 7 Jan 2005 18:06:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 99EB816A4CE for ; Fri, 7 Jan 2005 18:06:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 149EB43D31 for ; Fri, 7 Jan 2005 18:06:06 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j07I657b056108 for ; Fri, 7 Jan 2005 18:06:05 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j07I63xV056105 for perforce@freebsd.org; Fri, 7 Jan 2005 18:06:03 GMT (envelope-from jhb@freebsd.org) Date: Fri, 7 Jan 2005 18:06:03 GMT Message-Id: <200501071806.j07I63xV056105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 68479 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2005 18:06:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=68479 Change 68479 by jhb@jhb_slimer on 2005/01/07 18:05:05 IFC @68478. More copyrights. Affected files ... .. //depot/projects/smpng/sys/alpha/conf/gethints.awk#2 delete .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#17 integrate .. //depot/projects/smpng/sys/amd64/conf/gethints.awk#3 delete .. //depot/projects/smpng/sys/amd64/include/bus_dma.h#9 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#35 integrate .. //depot/projects/smpng/sys/dev/drm/sis_mm.c#6 integrate .. //depot/projects/smpng/sys/fs/deadfs/dead_vnops.c#11 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#13 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#19 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#38 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc.h#6 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#17 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#19 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo.h#5 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#32 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_hash.c#9 integrate .. //depot/projects/smpng/sys/fs/msdosfs/bootsect.h#5 integrate .. //depot/projects/smpng/sys/fs/msdosfs/bpb.h#4 integrate .. //depot/projects/smpng/sys/fs/msdosfs/denode.h#9 integrate .. //depot/projects/smpng/sys/fs/msdosfs/direntry.h#6 integrate .. //depot/projects/smpng/sys/fs/msdosfs/fat.h#5 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_conv.c#9 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#19 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_fat.c#9 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_lookup.c#8 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#37 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#29 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfsmount.h#12 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_ihash.c#7 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#19 integrate .. //depot/projects/smpng/sys/fs/nullfs/null.h#7 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_subr.c#11 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#16 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#17 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs.h#5 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_io.c#15 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_ioctl.c#4 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_mount.h#3 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_node.c#12 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_node.h#3 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_subr.c#6 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_subr.h#3 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#19 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vnops.c#11 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal.h#4 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#17 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#20 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs.c#11 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs.h#12 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#21 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_map.c#8 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_mem.c#10 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_rlimit.c#5 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_status.c#22 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_type.c#6 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs.h#9 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#19 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#17 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.h#7 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_smb.c#12 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_subr.c#5 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_subr.h#4 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#27 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#28 integrate .. //depot/projects/smpng/sys/fs/udf/osta.c#4 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap.h#5 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_subr.c#9 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#21 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vnops.c#9 integrate .. //depot/projects/smpng/sys/fs/unionfs/union.h#11 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#21 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#24 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#21 integrate .. //depot/projects/smpng/sys/gdb/gdb.h#2 integrate .. //depot/projects/smpng/sys/gdb/gdb_int.h#2 integrate .. //depot/projects/smpng/sys/gdb/gdb_main.c#4 integrate .. //depot/projects/smpng/sys/gdb/gdb_packet.c#2 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#16 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_lock.c#12 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_work.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_aes.c#15 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#37 integrate .. //depot/projects/smpng/sys/geom/geom_bsd_enc.c#4 integrate .. //depot/projects/smpng/sys/geom/geom_ccd.c#12 integrate .. //depot/projects/smpng/sys/geom/geom_fox.c#7 integrate .. //depot/projects/smpng/sys/geom/geom_mbr_enc.c#3 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel_enc.c#4 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#10 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_list.c#3 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_raid5.h#6 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_rm.c#5 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_var.h#6 integrate .. //depot/projects/smpng/sys/gnu/dev/sound/pci/csaimg.h#2 integrate .. //depot/projects/smpng/sys/gnu/dev/sound/pci/emu10k1-alsa.h#3 integrate .. //depot/projects/smpng/sys/gnu/dev/sound/pci/emu10k1.h#4 integrate .. //depot/projects/smpng/sys/gnu/dev/sound/pci/maestro3_dsp.h#2 integrate .. //depot/projects/smpng/sys/gnu/dev/sound/pci/maestro3_reg.h#2 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_alloc.c#8 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_balloc.c#6 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_bmap.c#9 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_extern.h#11 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_fs.h#6 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_fs_sb.h#3 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_ihash.c#7 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode.c#15 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode_cnv.c#4 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_linux_balloc.c#6 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_linux_ialloc.c#5 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_lookup.c#14 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_mount.h#7 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_readwrite.c#9 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_subr.c#10 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#40 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#28 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/fs.h#8 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/i386-bitops.h#2 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/inode.h#5 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/sparc64-bitops.h#2 integrate .. //depot/projects/smpng/sys/i386/bios/apm.c#10 integrate .. //depot/projects/smpng/sys/i386/bios/apm.h#4 integrate .. //depot/projects/smpng/sys/i386/conf/OLDCARD#10 delete .. //depot/projects/smpng/sys/i386/conf/gethints.awk#2 delete .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#35 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_dirent.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_errno.c#3 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_errno.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_fcntl.c#11 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_fcntl.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ioctl.c#13 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.c#6 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.h#3 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#18 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_mount.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_msg.c#4 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_other.c#6 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_poll.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_signal.c#12 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_signal.h#3 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#12 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.h#4 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_stat.c#12 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_stat.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_statfs.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_stropts.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysvec.c#7 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_termios.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_time.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_types.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_unistd.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ustat.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_util.c#8 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_util.h#6 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_utime.h#2 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_utsname.h#2 integrate .. //depot/projects/smpng/sys/i386/include/_limits.h#6 integrate .. //depot/projects/smpng/sys/i386/include/apicreg.h#4 integrate .. //depot/projects/smpng/sys/i386/include/apm_bios.h#3 integrate .. //depot/projects/smpng/sys/i386/include/apm_segments.h#2 integrate .. //depot/projects/smpng/sys/i386/include/bus_at386.h#11 integrate .. //depot/projects/smpng/sys/i386/include/bus_dma.h#11 integrate .. //depot/projects/smpng/sys/i386/include/bus_memio.h#2 integrate .. //depot/projects/smpng/sys/i386/include/bus_pc98.h#10 integrate .. //depot/projects/smpng/sys/i386/include/bus_pio.h#2 integrate .. //depot/projects/smpng/sys/i386/include/clock.h#9 integrate .. //depot/projects/smpng/sys/i386/include/comstats.h#2 delete .. //depot/projects/smpng/sys/i386/include/cputypes.h#5 integrate .. //depot/projects/smpng/sys/i386/include/cserial.h#2 integrate .. //depot/projects/smpng/sys/i386/include/db_machdep.h#5 integrate .. //depot/projects/smpng/sys/i386/include/elan_mmcr.h#2 integrate .. //depot/projects/smpng/sys/i386/include/float.h#8 integrate .. //depot/projects/smpng/sys/i386/include/gdb_machdep.h#3 integrate .. //depot/projects/smpng/sys/i386/include/i4b_cause.h#3 integrate .. //depot/projects/smpng/sys/i386/include/i4b_debug.h#4 integrate .. //depot/projects/smpng/sys/i386/include/i4b_ioctl.h#10 integrate .. //depot/projects/smpng/sys/i386/include/i4b_rbch_ioctl.h#3 integrate .. //depot/projects/smpng/sys/i386/include/i4b_tel_ioctl.h#4 integrate .. //depot/projects/smpng/sys/i386/include/i4b_trace.h#3 integrate .. //depot/projects/smpng/sys/i386/include/if_wl_wavelan.h#3 integrate .. //depot/projects/smpng/sys/i386/include/kdb.h#2 integrate .. //depot/projects/smpng/sys/i386/include/limits.h#9 integrate .. //depot/projects/smpng/sys/i386/include/metadata.h#2 integrate .. //depot/projects/smpng/sys/i386/include/mptable.h#3 integrate .. //depot/projects/smpng/sys/i386/include/mtpr.h#2 delete .. //depot/projects/smpng/sys/i386/include/pci_cfgreg.h#8 integrate .. //depot/projects/smpng/sys/i386/include/pcvt_ioctl.h#3 integrate .. //depot/projects/smpng/sys/i386/include/perfmon.h#3 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#26 integrate .. //depot/projects/smpng/sys/i386/include/proc.h#14 integrate .. //depot/projects/smpng/sys/i386/include/profile.h#13 integrate .. //depot/projects/smpng/sys/i386/include/ptrace.h#5 integrate .. //depot/projects/smpng/sys/i386/include/resource.h#2 integrate .. //depot/projects/smpng/sys/i386/include/runq.h#3 integrate .. //depot/projects/smpng/sys/i386/include/signal.h#10 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#14 integrate .. //depot/projects/smpng/sys/i386/include/smptests.h#7 integrate .. //depot/projects/smpng/sys/i386/isa/ccbque.h#3 integrate .. //depot/projects/smpng/sys/i386/isa/elink.c#4 integrate .. //depot/projects/smpng/sys/i386/isa/elink.h#4 integrate .. //depot/projects/smpng/sys/i386/isa/ic/if_wl_i82586.h#2 integrate .. //depot/projects/smpng/sys/i386/isa/ic/mb86960.h#2 integrate .. //depot/projects/smpng/sys/i386/isa/if_el.c#12 integrate .. //depot/projects/smpng/sys/i386/isa/if_elreg.h#2 integrate .. //depot/projects/smpng/sys/i386/isa/isa.c#10 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_conf.h#2 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#17 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_ext.c#14 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_hdr.h#8 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_kbd.c#6 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_kbd.h#2 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_out.c#4 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_sup.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_tbl.h#2 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_vtf.c#3 integrate .. //depot/projects/smpng/sys/i386/isa/spic.c#12 integrate .. //depot/projects/smpng/sys/i386/isa/spicreg.h#4 integrate .. //depot/projects/smpng/sys/i386/isa/spkr.c#15 integrate .. //depot/projects/smpng/sys/i386/linux/linux_ptrace.c#11 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#25 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#28 integrate .. //depot/projects/smpng/sys/i386/pci/pci_pir.c#6 integrate .. //depot/projects/smpng/sys/i386/svr4/svr4_machdep.c#15 integrate .. //depot/projects/smpng/sys/i386/svr4/svr4_machdep.h#4 integrate .. //depot/projects/smpng/sys/i4b/capi/capi.h#2 integrate .. //depot/projects/smpng/sys/i4b/capi/capi_l4if.c#8 integrate .. //depot/projects/smpng/sys/i4b/capi/capi_llif.c#4 integrate .. //depot/projects/smpng/sys/i4b/capi/capi_msgs.c#5 integrate .. //depot/projects/smpng/sys/i4b/capi/capi_msgs.h#2 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc.h#3 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_card.c#5 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_isa.c#10 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_lli.c#8 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_pci.c#11 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ctl.c#10 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ing.c#12 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#20 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_isppp.c#12 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_rbch.c#16 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_tel.c#14 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_trace.c#15 integrate .. //depot/projects/smpng/sys/i4b/include/i4b_global.h#5 integrate .. //depot/projects/smpng/sys/i4b/include/i4b_isdnq931.h#3 integrate .. //depot/projects/smpng/sys/i4b/include/i4b_l1l2.h#3 integrate .. //depot/projects/smpng/sys/i4b/include/i4b_l2l3.h#3 integrate .. //depot/projects/smpng/sys/i4b/include/i4b_l3l4.h#6 integrate .. //depot/projects/smpng/sys/i4b/include/i4b_mbuf.h#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/i4b_hdlc.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/i4b_hdlc.h#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/i4b_l1.h#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/i4b_l1dmux.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/i4b_l1lib.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#12 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#14 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#9 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#9 integrate .. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_avm_a1.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_bchan.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_ctx_s0P.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_diva.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_drn_ngo.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_dynalink.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#9 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_hscx.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_hscx.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_ipac.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isac.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isac.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic_ext.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic_isa.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic_pnp.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_itk_ix1.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_l1.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_l1fsm.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_siemens_isurf.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_sws.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s016.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s0163.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s08.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_usr_sti.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_hdlc.h#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_ext.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_isac.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_l1.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#13 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_ext.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_pci.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_w6692.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_iframe.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_l2.c#9 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_l2.h#3 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_l2fsm.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_l2fsm.h#3 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_l2timer.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_lme.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_mbuf.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_sframe.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_tei.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_uframe.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_util.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l2if.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l3.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l3fsm.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l3fsm.h#3 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l3timer.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l4if.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_q931.c#9 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_q931.h#5 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_q932fac.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_q932fac.h#3 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#20 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_l4.c#9 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_l4.h#3 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_l4mgmt.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_l4timer.c#5 integrate .. //depot/projects/smpng/sys/ia64/disasm/disasm.h#2 integrate .. //depot/projects/smpng/sys/ia64/disasm/disasm_decode.c#3 integrate .. //depot/projects/smpng/sys/ia64/disasm/disasm_extract.c#2 integrate .. //depot/projects/smpng/sys/ia64/disasm/disasm_format.c#2 integrate .. //depot/projects/smpng/sys/ia64/disasm/disasm_int.h#2 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#22 integrate .. //depot/projects/smpng/sys/ia64/ia64/clock.c#15 integrate .. //depot/projects/smpng/sys/ia64/ia64/clock_if.m#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/context.S#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/db_interface.c#19 integrate .. //depot/projects/smpng/sys/ia64/ia64/dump_machdep.c#7 integrate .. //depot/projects/smpng/sys/ia64/ia64/gdb_machdep.c#4 integrate .. //depot/projects/smpng/sys/ia64/ia64/in_cksum.c#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#27 integrate .. //depot/projects/smpng/sys/ia64/ia64/mca.c#7 integrate .. //depot/projects/smpng/sys/ia64/ia64/nexus.c#9 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#68 integrate .. //depot/projects/smpng/sys/ia64/ia64/ptrace_machdep.c#4 integrate .. //depot/projects/smpng/sys/ia64/ia64/setjmp.S#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/sscdisk.c#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/support.S#6 integrate .. //depot/projects/smpng/sys/ia64/ia64/syscall.S#10 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#71 integrate .. //depot/projects/smpng/sys/ia64/ia64/uio_machdep.c#4 integrate .. //depot/projects/smpng/sys/ia64/ia64/uma_machdep.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/unwind.c#13 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#43 integrate .. //depot/projects/smpng/sys/ia64/include/_limits.h#6 integrate .. //depot/projects/smpng/sys/ia64/include/_regset.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/asm.h#9 integrate .. //depot/projects/smpng/sys/ia64/include/bootinfo.h#7 integrate .. //depot/projects/smpng/sys/ia64/include/bus.h#15 integrate .. //depot/projects/smpng/sys/ia64/include/bus_memio.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/bus_pio.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/clock.h#6 integrate .. //depot/projects/smpng/sys/ia64/include/clockvar.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/cpu.h#24 integrate .. //depot/projects/smpng/sys/ia64/include/db_machdep.h#9 integrate .. //depot/projects/smpng/sys/ia64/include/dig64.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/efi.h#5 integrate .. //depot/projects/smpng/sys/ia64/include/exec.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/float.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/floatingpoint.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/gdb_machdep.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/ieee.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/intrcnt.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/kdb.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/limits.h#9 integrate .. //depot/projects/smpng/sys/ia64/include/mca.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/param.h#15 integrate .. //depot/projects/smpng/sys/ia64/include/pci_cfgreg.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/pmap.h#21 integrate .. //depot/projects/smpng/sys/ia64/include/proc.h#9 integrate .. //depot/projects/smpng/sys/ia64/include/profile.h#9 integrate .. //depot/projects/smpng/sys/ia64/include/ptrace.h#6 integrate .. //depot/projects/smpng/sys/ia64/include/reloc.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/resource.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/runq.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/signal.h#9 integrate .. //depot/projects/smpng/sys/ia64/include/unwind.h#7 integrate .. //depot/projects/smpng/sys/ia64/include/vmparam.h#9 integrate .. //depot/projects/smpng/sys/isa/isa_if.m#2 integrate .. //depot/projects/smpng/sys/isa/pnpreg.h#3 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_mount.h#4 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#11 integrate .. //depot/projects/smpng/sys/kern/clock_if.m#2 integrate .. //depot/projects/smpng/sys/kern/device_if.m#5 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#25 integrate .. //depot/projects/smpng/sys/kern/imgact_gzip.c#10 integrate .. //depot/projects/smpng/sys/kern/imgact_shell.c#7 integrate .. //depot/projects/smpng/sys/kern/init_main.c#53 integrate .. //depot/projects/smpng/sys/kern/kern_alq.c#7 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#74 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#81 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#90 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#90 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_kthread.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_lockf.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_mtxpool.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_ntptime.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_physio.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#71 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#85 integrate .. //depot/projects/smpng/sys/kern/kern_sema.c#7 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#102 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#76 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_uuid.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_xxx.c#17 integrate .. //depot/projects/smpng/sys/kern/linker_if.m#4 integrate .. //depot/projects/smpng/sys/kern/md4c.c#3 integrate .. //depot/projects/smpng/sys/kern/md5c.c#6 integrate .. //depot/projects/smpng/sys/kern/subr_autoconf.c#6 integrate .. //depot/projects/smpng/sys/kern/subr_clock.c#6 integrate .. //depot/projects/smpng/sys/kern/subr_devstat.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_disk.c#24 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#8 integrate .. //depot/projects/smpng/sys/kern/subr_log.c#16 integrate .. //depot/projects/smpng/sys/kern/subr_mbpool.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_mchain.c#13 integrate .. //depot/projects/smpng/sys/kern/subr_msgbuf.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_param.c#19 integrate .. //depot/projects/smpng/sys/kern/subr_pcpu.c#6 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#18 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#13 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#39 integrate .. //depot/projects/smpng/sys/kern/subr_unit.c#3 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#37 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#50 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#42 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#21 integrate .. //depot/projects/smpng/sys/kern/sysv_ipc.c#14 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#25 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#29 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#27 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#32 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#37 integrate .. //depot/projects/smpng/sys/kern/tty_subr.c#8 integrate .. //depot/projects/smpng/sys/kern/uipc_accf.c#5 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#18 integrate .. //depot/projects/smpng/sys/kern/uipc_domain.c#14 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#33 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf2.c#18 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#12 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#64 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#40 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#63 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#45 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#53 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#22 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#33 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#16 integrate .. //depot/projects/smpng/sys/kern/vfs_init.c#19 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#21 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#42 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#92 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#79 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#55 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#20 integrate .. //depot/projects/smpng/sys/libkern/alpha/bswap16.S#2 integrate .. //depot/projects/smpng/sys/libkern/alpha/bswap32.S#2 integrate .. //depot/projects/smpng/sys/libkern/alpha/byte_swap_2.S#4 integrate .. //depot/projects/smpng/sys/libkern/alpha/byte_swap_4.S#4 integrate .. //depot/projects/smpng/sys/libkern/arm/divsi3.S#4 integrate .. //depot/projects/smpng/sys/libkern/arm/ffs.S#3 integrate .. //depot/projects/smpng/sys/libkern/bcd.c#3 integrate .. //depot/projects/smpng/sys/libkern/bcmp.c#6 integrate .. //depot/projects/smpng/sys/libkern/bsearch.c#7 integrate .. //depot/projects/smpng/sys/libkern/crc32.c#3 integrate .. //depot/projects/smpng/sys/libkern/fnmatch.c#4 integrate .. //depot/projects/smpng/sys/libkern/ia64/__divdi3.S#2 integrate .. //depot/projects/smpng/sys/libkern/ia64/__divsi3.S#2 integrate .. //depot/projects/smpng/sys/libkern/ia64/__moddi3.S#4 integrate .. //depot/projects/smpng/sys/libkern/ia64/__modsi3.S#2 integrate .. //depot/projects/smpng/sys/libkern/ia64/__udivdi3.S#2 integrate .. //depot/projects/smpng/sys/libkern/ia64/__udivsi3.S#2 integrate .. //depot/projects/smpng/sys/libkern/ia64/__umoddi3.S#4 integrate .. //depot/projects/smpng/sys/libkern/ia64/__umodsi3.S#2 integrate .. //depot/projects/smpng/sys/libkern/ia64/bswap16.S#2 integrate .. //depot/projects/smpng/sys/libkern/ia64/bswap32.S#2 integrate .. //depot/projects/smpng/sys/libkern/ia64/byte_swap_2.S#5 integrate .. //depot/projects/smpng/sys/libkern/ia64/byte_swap_4.S#5 integrate .. //depot/projects/smpng/sys/libkern/iconv.c#8 integrate .. //depot/projects/smpng/sys/libkern/iconv_converter_if.m#3 integrate .. //depot/projects/smpng/sys/libkern/inet_ntoa.c#3 integrate .. //depot/projects/smpng/sys/libkern/qsort_r.c#2 integrate .. //depot/projects/smpng/sys/libkern/rindex.c#4 integrate .. //depot/projects/smpng/sys/libkern/strcat.c#6 integrate .. //depot/projects/smpng/sys/libkern/strcpy.c#6 integrate .. //depot/projects/smpng/sys/libkern/strlcat.c#3 integrate .. //depot/projects/smpng/sys/libkern/strlcpy.c#3 integrate .. //depot/projects/smpng/sys/libkern/strncmp.c#5 integrate .. //depot/projects/smpng/sys/net/bpf.c#45 integrate .. //depot/projects/smpng/sys/net/bpf.h#13 integrate .. //depot/projects/smpng/sys/net/bpf_filter.c#7 integrate .. //depot/projects/smpng/sys/net/bpfdesc.h#11 integrate .. //depot/projects/smpng/sys/net/bridge.c#32 integrate .. //depot/projects/smpng/sys/net/bridge.h#8 integrate .. //depot/projects/smpng/sys/net/bsd_comp.c#9 integrate .. //depot/projects/smpng/sys/net/fddi.h#5 integrate .. //depot/projects/smpng/sys/net/if.c#59 integrate .. //depot/projects/smpng/sys/net/if.h#23 integrate .. //depot/projects/smpng/sys/net/if_arc.h#7 integrate .. //depot/projects/smpng/sys/net/if_arcsubr.c#17 integrate .. //depot/projects/smpng/sys/net/if_arp.h#7 integrate .. //depot/projects/smpng/sys/net/if_atm.h#11 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#17 integrate .. //depot/projects/smpng/sys/net/if_clone.c#4 integrate .. //depot/projects/smpng/sys/net/if_clone.h#2 integrate .. //depot/projects/smpng/sys/net/if_disc.c#16 integrate .. //depot/projects/smpng/sys/net/if_dl.h#5 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#54 integrate .. //depot/projects/smpng/sys/net/if_faith.c#24 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#22 integrate .. //depot/projects/smpng/sys/net/if_fwsubr.c#4 integrate .. //depot/projects/smpng/sys/net/if_gif.c#24 integrate .. //depot/projects/smpng/sys/net/if_gif.h#10 integrate .. //depot/projects/smpng/sys/net/if_gre.c#21 integrate .. //depot/projects/smpng/sys/net/if_gre.h#8 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#20 integrate .. //depot/projects/smpng/sys/net/if_llc.h#5 integrate .. //depot/projects/smpng/sys/net/if_loop.c#34 integrate .. //depot/projects/smpng/sys/net/if_media.c#6 integrate .. //depot/projects/smpng/sys/net/if_media.h#14 integrate .. //depot/projects/smpng/sys/net/if_mib.c#5 integrate .. //depot/projects/smpng/sys/net/if_mib.h#2 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#31 integrate .. //depot/projects/smpng/sys/net/if_ppp.h#2 integrate .. //depot/projects/smpng/sys/net/if_pppvar.h#8 integrate .. //depot/projects/smpng/sys/net/if_sl.c#27 integrate .. //depot/projects/smpng/sys/net/if_sppp.h#5 integrate .. //depot/projects/smpng/sys/net/if_spppfr.c#2 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#24 integrate .. //depot/projects/smpng/sys/net/if_stf.c#28 integrate .. //depot/projects/smpng/sys/net/if_stf.h#5 integrate .. //depot/projects/smpng/sys/net/if_tap.c#32 integrate .. //depot/projects/smpng/sys/net/if_tap.h#2 integrate .. //depot/projects/smpng/sys/net/if_tapvar.h#7 integrate .. //depot/projects/smpng/sys/net/if_tun.c#39 integrate .. //depot/projects/smpng/sys/net/if_tun.h#2 integrate .. //depot/projects/smpng/sys/net/if_types.h#5 integrate .. //depot/projects/smpng/sys/net/if_var.h#35 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#32 integrate .. //depot/projects/smpng/sys/net/if_vlan_var.h#12 integrate .. //depot/projects/smpng/sys/net/iso88025.h#5 integrate .. //depot/projects/smpng/sys/net/net_osdep.h#11 integrate .. //depot/projects/smpng/sys/net/netisr.h#9 integrate .. //depot/projects/smpng/sys/net/pfil.c#8 integrate .. //depot/projects/smpng/sys/net/pfil.h#8 integrate .. //depot/projects/smpng/sys/net/pfkeyv2.h#7 integrate .. //depot/projects/smpng/sys/net/ppp_comp.h#4 integrate .. //depot/projects/smpng/sys/net/ppp_deflate.c#7 integrate .. //depot/projects/smpng/sys/net/ppp_defs.h#2 integrate .. //depot/projects/smpng/sys/net/ppp_tty.c#17 integrate .. //depot/projects/smpng/sys/net/radix.c#12 integrate .. //depot/projects/smpng/sys/net/radix.h#8 integrate .. //depot/projects/smpng/sys/net/raw_cb.c#11 integrate .. //depot/projects/smpng/sys/net/raw_cb.h#6 integrate .. //depot/projects/smpng/sys/net/raw_usrreq.c#19 integrate .. //depot/projects/smpng/sys/net/route.c#25 integrate .. //depot/projects/smpng/sys/net/route.h#21 integrate .. //depot/projects/smpng/sys/net/rtsock.c#42 integrate .. //depot/projects/smpng/sys/net/slcompress.h#4 integrate .. //depot/projects/smpng/sys/net/zlib.c#9 integrate .. //depot/projects/smpng/sys/net/zlib.h#4 integrate .. //depot/projects/smpng/sys/netatalk/COPYRIGHT#2 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#16 integrate .. //depot/projects/smpng/sys/netatalk/aarp.h#2 integrate .. //depot/projects/smpng/sys/netatalk/at.h#3 integrate .. //depot/projects/smpng/sys/netatalk/at_control.c#12 integrate .. //depot/projects/smpng/sys/netatalk/at_extern.h#6 integrate .. //depot/projects/smpng/sys/netatalk/at_proto.c#2 integrate .. //depot/projects/smpng/sys/netatalk/at_rmx.c#4 integrate .. //depot/projects/smpng/sys/netatalk/at_var.h#4 integrate .. //depot/projects/smpng/sys/netatalk/ddp.h#2 integrate .. //depot/projects/smpng/sys/netatalk/ddp_input.c#14 integrate .. //depot/projects/smpng/sys/netatalk/ddp_output.c#8 integrate .. //depot/projects/smpng/sys/netatalk/ddp_pcb.c#6 integrate .. //depot/projects/smpng/sys/netatalk/ddp_pcb.h#3 integrate .. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#22 integrate .. //depot/projects/smpng/sys/netatalk/ddp_var.h#4 integrate .. //depot/projects/smpng/sys/netatalk/endian.h#2 integrate .. //depot/projects/smpng/sys/netatalk/phase2.h#2 integrate .. //depot/projects/smpng/sys/netatm/atm.h#3 integrate .. //depot/projects/smpng/sys/netatm/atm_aal5.c#12 integrate .. //depot/projects/smpng/sys/netatm/atm_cm.c#13 integrate .. //depot/projects/smpng/sys/netatm/atm_cm.h#6 integrate .. //depot/projects/smpng/sys/netatm/atm_device.c#10 integrate .. //depot/projects/smpng/sys/netatm/atm_if.c#13 integrate .. //depot/projects/smpng/sys/netatm/atm_if.h#10 integrate .. //depot/projects/smpng/sys/netatm/atm_ioctl.h#7 integrate .. //depot/projects/smpng/sys/netatm/atm_pcb.h#2 integrate .. //depot/projects/smpng/sys/netatm/atm_proto.c#6 integrate .. //depot/projects/smpng/sys/netatm/atm_sap.h#2 integrate .. //depot/projects/smpng/sys/netatm/atm_sigmgr.h#3 integrate .. //depot/projects/smpng/sys/netatm/atm_signal.c#6 integrate .. //depot/projects/smpng/sys/netatm/atm_socket.c#13 integrate .. //depot/projects/smpng/sys/netatm/atm_stack.h#4 integrate .. //depot/projects/smpng/sys/netatm/atm_subr.c#17 integrate .. //depot/projects/smpng/sys/netatm/atm_sys.h#5 integrate .. //depot/projects/smpng/sys/netatm/atm_usrreq.c#14 integrate .. //depot/projects/smpng/sys/netatm/atm_var.h#13 integrate .. //depot/projects/smpng/sys/netatm/atm_vc.h#3 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm.h#2 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_event.c#3 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_if.c#9 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_input.c#7 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_load.c#7 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_output.c#5 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_serv.h#3 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_usrreq.c#7 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_var.h#6 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_vcm.c#8 integrate .. //depot/projects/smpng/sys/netatm/port.h#8 integrate .. //depot/projects/smpng/sys/netatm/queue.h#2 integrate .. //depot/projects/smpng/sys/netatm/sigpvc/sigpvc_if.c#7 integrate .. //depot/projects/smpng/sys/netatm/sigpvc/sigpvc_subr.c#6 integrate .. //depot/projects/smpng/sys/netatm/sigpvc/sigpvc_var.h#3 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_arp.c#9 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_cls.c#8 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_cls.h#2 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_if.c#7 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_kxdr.c#9 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_kxdr.h#3 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_msg.c#9 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_print.c#4 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_proto.c#8 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_subr.c#5 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_util.c#5 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_var.h#6 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_xdr.x#3 integrate .. //depot/projects/smpng/sys/netatm/uni/q2110_sigaa.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/q2110_sigcpcs.c#6 integrate .. //depot/projects/smpng/sys/netatm/uni/q2110_subr.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/qsaal1_sigaa.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/qsaal1_sigcpcs.c#6 integrate .. //depot/projects/smpng/sys/netatm/uni/qsaal1_subr.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni.c#8 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni.h#2 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni_lower.c#6 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni_upper.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni_var.h#5 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop.c#8 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop.h#2 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_lower.c#7 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_misc.h#2 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_pdu.c#7 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_pdu.h#2 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_sigaa.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_sigcpcs.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_subr.c#7 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_timer.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_upper.c#6 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_var.h#6 integrate .. //depot/projects/smpng/sys/netatm/uni/uni.h#2 integrate .. //depot/projects/smpng/sys/netatm/uni/uni_load.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp.c#9 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_cache.c#7 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_input.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_output.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_timer.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_vcm.c#6 integrate .. //depot/projects/smpng/sys/netatm/uni/uniip.c#9 integrate .. //depot/projects/smpng/sys/netatm/uni/uniip_var.h#5 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig.h#2 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_decode.c#9 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_decode.h#3 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_encode.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_if.c#7 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_mbuf.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_mbuf.h#2 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_msg.c#7 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_msg.h#2 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_print.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_print.h#2 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_proto.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_sigmgr_state.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_subr.c#8 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_util.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_var.h#6 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_vc_state.c#8 integrate .. //depot/projects/smpng/sys/netgraph/atm/atmpif/ng_atmpif.c#3 integrate .. //depot/projects/smpng/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#3 integrate .. //depot/projects/smpng/sys/netgraph/atm/atmpif/ng_atmpif_var.h#2 integrate .. //depot/projects/smpng/sys/netgraph/atm/ccatm/ng_ccatm.c#2 integrate .. //depot/projects/smpng/sys/netgraph/atm/ccatm/ng_ccatm_cust.h#2 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_atm.c#10 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_atm.h#5 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_atmpif.h#2 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_ccatm.h#2 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_sscfu.h#2 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_sscop.h#3 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_uni.h#2 integrate .. //depot/projects/smpng/sys/netgraph/atm/ngatmbase.c#3 integrate .. //depot/projects/smpng/sys/netgraph/atm/ngatmbase.h#3 integrate .. //depot/projects/smpng/sys/netgraph/atm/sscfu/ng_sscfu.c#4 integrate .. //depot/projects/smpng/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#2 integrate .. //depot/projects/smpng/sys/netgraph/atm/sscop/ng_sscop.c#3 integrate .. //depot/projects/smpng/sys/netgraph/atm/sscop/ng_sscop_cust.h#5 integrate .. //depot/projects/smpng/sys/netgraph/atm/uni/ng_uni.c#4 integrate .. //depot/projects/smpng/sys/netgraph/atm/uni/ng_uni_cust.h#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/common/ng_bluetooth.c#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#8 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#9 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#14 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#6 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#6 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_cmds.h#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#7 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_evnt.h#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_main.c#6 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_misc.c#9 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_misc.h#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_prse.h#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#7 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_var.h#6 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_bluetooth.h#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_bt3c.h#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket.h#7 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_h4.h#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_hci.h#6 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_l2cap.h#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_ubt.h#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#7 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#7 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#9 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#6 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket.c#10 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#15 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#13 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#12 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#8 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#15 integrate .. //depot/projects/smpng/sys/netgraph/ng_UI.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_UI.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_async.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_async.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_atmllc.c#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_atmllc.h#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#31 integrate .. //depot/projects/smpng/sys/netgraph/ng_bpf.c#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_bpf.h#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.c#17 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_cisco.c#12 integrate .. //depot/projects/smpng/sys/netgraph/ng_cisco.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.h#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_echo.c#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_echo.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.h#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_etf.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_etf.h#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#20 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_frame_relay.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_frame_relay.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif.c#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif_demux.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif_demux.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_hole.c#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_hole.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#17 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.h#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_ip_input.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_ip_input.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#24 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.h#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_l2tp.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_lmi.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_lmi.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_message.h#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_mppc.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_mppc.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_one2many.c#12 integrate .. //depot/projects/smpng/sys/netgraph/ng_one2many.h#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_parse.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_parse.h#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#17 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#24 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.h#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#15 integrate .. //depot/projects/smpng/sys/netgraph/ng_pptpgre.h#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_rfc1490.c#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_rfc1490.h#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_sample.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_sample.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#27 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_socketvar.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_split.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_sppp.c#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_sppp.h#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_tee.c#12 integrate .. //depot/projects/smpng/sys/netgraph/ng_tee.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_tty.c#15 integrate .. //depot/projects/smpng/sys/netgraph/ng_tty.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_vjc.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_vjc.h#4 integrate .. //depot/projects/smpng/sys/netinet/accf_http.c#8 integrate .. //depot/projects/smpng/sys/netinet/icmp6.h#9 integrate .. //depot/projects/smpng/sys/netinet/icmp_var.h#8 integrate .. //depot/projects/smpng/sys/netinet/if_atm.c#8 integrate .. //depot/projects/smpng/sys/netinet/if_atm.h#5 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#32 integrate .. //depot/projects/smpng/sys/netinet/if_ether.h#7 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#13 integrate .. //depot/projects/smpng/sys/netinet/igmp.h#4 integrate .. //depot/projects/smpng/sys/netinet/igmp_var.h#5 integrate .. //depot/projects/smpng/sys/netinet/in.c#24 integrate .. //depot/projects/smpng/sys/netinet/in.h#29 integrate .. //depot/projects/smpng/sys/netinet/in_cksum.c#3 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#13 integrate .. //depot/projects/smpng/sys/netinet/in_gif.h#7 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#52 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#36 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#18 integrate .. //depot/projects/smpng/sys/netinet/in_rmx.c#11 integrate .. //depot/projects/smpng/sys/netinet/in_systm.h#4 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#13 integrate .. //depot/projects/smpng/sys/netinet/ip.h#11 integrate .. //depot/projects/smpng/sys/netinet/ip6.h#6 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#43 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#34 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#15 integrate .. //depot/projects/smpng/sys/netinet/ip_ecn.c#4 integrate .. //depot/projects/smpng/sys/netinet/ip_ecn.h#4 integrate .. //depot/projects/smpng/sys/netinet/ip_encap.c#13 integrate .. //depot/projects/smpng/sys/netinet/ip_encap.h#4 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#15 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#25 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#46 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#8 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.c#14 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.h#4 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#33 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.h#8 integrate .. //depot/projects/smpng/sys/netinet/ip_id.c#6 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#62 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.h#8 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#69 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#28 integrate .. //depot/projects/smpng/sys/netinet/ipprotosw.h#5 integrate .. //depot/projects/smpng/sys/netinet/pim.h#3 integrate .. //depot/projects/smpng/sys/netinet/pim_var.h#2 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#47 integrate .. //depot/projects/smpng/sys/netinet/tcp.h#11 integrate .. //depot/projects/smpng/sys/netinet/tcp_debug.c#7 integrate .. //depot/projects/smpng/sys/netinet/tcp_debug.h#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_fsm.h#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#8 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#67 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#34 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_seq.h#9 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#62 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#23 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.h#9 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#36 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#32 integrate .. //depot/projects/smpng/sys/netinet/tcpip.h#4 integrate .. //depot/projects/smpng/sys/netinet/udp.h#3 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#53 integrate .. //depot/projects/smpng/sys/netinet/udp_var.h#7 integrate .. //depot/projects/smpng/sys/netinet6/ah.h#6 integrate .. //depot/projects/smpng/sys/netinet6/ah6.h#3 integrate .. //depot/projects/smpng/sys/netinet6/ah_aesxcbcmac.c#2 integrate .. //depot/projects/smpng/sys/netinet6/ah_aesxcbcmac.h#2 integrate .. //depot/projects/smpng/sys/netinet6/ah_core.c#9 integrate .. //depot/projects/smpng/sys/netinet6/ah_input.c#13 integrate .. //depot/projects/smpng/sys/netinet6/ah_output.c#6 integrate .. //depot/projects/smpng/sys/netinet6/dest6.c#4 integrate .. //depot/projects/smpng/sys/netinet6/esp.h#5 integrate .. //depot/projects/smpng/sys/netinet6/esp6.h#2 integrate .. //depot/projects/smpng/sys/netinet6/esp_aesctr.c#2 integrate .. //depot/projects/smpng/sys/netinet6/esp_aesctr.h#2 integrate .. //depot/projects/smpng/sys/netinet6/esp_core.c#10 integrate .. //depot/projects/smpng/sys/netinet6/esp_input.c#18 integrate .. //depot/projects/smpng/sys/netinet6/esp_output.c#7 integrate .. //depot/projects/smpng/sys/netinet6/esp_rijndael.c#5 integrate .. //depot/projects/smpng/sys/netinet6/esp_rijndael.h#4 integrate .. //depot/projects/smpng/sys/netinet6/frag6.c#8 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#24 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#23 integrate .. //depot/projects/smpng/sys/netinet6/in6.h#15 integrate .. //depot/projects/smpng/sys/netinet6/in6_cksum.c#7 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#8 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.h#4 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#12 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.h#3 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#36 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.h#11 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#10 integrate .. //depot/projects/smpng/sys/netinet6/in6_rmx.c#8 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#19 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#10 integrate .. //depot/projects/smpng/sys/netinet6/ip6_ecn.h#3 integrate .. //depot/projects/smpng/sys/netinet6/ip6_forward.c#13 integrate .. //depot/projects/smpng/sys/netinet6/ip6_fw.c#18 integrate .. //depot/projects/smpng/sys/netinet6/ip6_fw.h#5 integrate .. //depot/projects/smpng/sys/netinet6/ip6_id.c#3 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#38 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#18 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.h#3 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#37 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#14 integrate .. //depot/projects/smpng/sys/netinet6/ip6protosw.h#7 integrate .. //depot/projects/smpng/sys/netinet6/ipcomp.h#4 integrate .. //depot/projects/smpng/sys/netinet6/ipcomp6.h#2 integrate .. //depot/projects/smpng/sys/netinet6/ipcomp_core.c#7 integrate .. //depot/projects/smpng/sys/netinet6/ipcomp_input.c#6 integrate .. //depot/projects/smpng/sys/netinet6/ipcomp_output.c#6 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#19 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.h#11 integrate .. //depot/projects/smpng/sys/netinet6/ipsec6.h#6 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#10 integrate .. //depot/projects/smpng/sys/netinet6/mld6_var.h#4 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#24 integrate .. //depot/projects/smpng/sys/netinet6/nd6.h#9 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#13 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#12 integrate .. //depot/projects/smpng/sys/netinet6/pim6.h#2 integrate .. //depot/projects/smpng/sys/netinet6/pim6_var.h#2 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#31 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.h#2 integrate .. //depot/projects/smpng/sys/netinet6/route6.c#7 integrate .. //depot/projects/smpng/sys/netinet6/scope6.c#6 integrate .. //depot/projects/smpng/sys/netinet6/scope6_var.h#3 integrate .. //depot/projects/smpng/sys/netinet6/tcp6_var.h#4 integrate .. //depot/projects/smpng/sys/netinet6/udp6_output.c#17 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#32 integrate .. //depot/projects/smpng/sys/netinet6/udp6_var.h#4 integrate .. //depot/projects/smpng/sys/netipsec/ah.h#2 integrate .. //depot/projects/smpng/sys/netipsec/ah_var.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 7 23:56:31 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA6F516A4D0; Fri, 7 Jan 2005 23:56:30 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A80C016A4CE for ; Fri, 7 Jan 2005 23:56:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 989DF43D48 for ; Fri, 7 Jan 2005 23:56:30 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j07NuU4e077330 for ; Fri, 7 Jan 2005 23:56:30 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j07NuU8i077327 for perforce@freebsd.org; Fri, 7 Jan 2005 23:56:30 GMT (envelope-from sam@freebsd.org) Date: Fri, 7 Jan 2005 23:56:30 GMT Message-Id: <200501072356.j07NuU8i077327@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 68502 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2005 23:56:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=68502 Change 68502 by sam@sam_ebb on 2005/01/07 23:55:34 add parens so we can specify a|b for debug masks Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#56 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#56 (text+ko) ==== @@ -226,10 +226,10 @@ ATH_DEBUG_ANY = 0xffffffff }; #define IFF_DUMPPKTS(sc, m) \ - ((sc->sc_debug & m) || \ + ((sc->sc_debug & (m)) || \ (sc->sc_if.if_flags & (IFF_DEBUG|IFF_LINK2)) == (IFF_DEBUG|IFF_LINK2)) #define DPRINTF(sc, m, fmt, ...) do { \ - if (sc->sc_debug & m) \ + if (sc->sc_debug & (m)) \ printf(fmt, __VA_ARGS__); \ } while (0) #define KEYPRINTF(sc, ix, hk, mac) do { \ From owner-p4-projects@FreeBSD.ORG Fri Jan 7 23:57:33 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC76016A4D0; Fri, 7 Jan 2005 23:57:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B883816A4CE for ; Fri, 7 Jan 2005 23:57:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4CD443D31 for ; Fri, 7 Jan 2005 23:57:32 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j07NvWMD077356 for ; Fri, 7 Jan 2005 23:57:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j07NvWdl077353 for perforce@freebsd.org; Fri, 7 Jan 2005 23:57:32 GMT (envelope-from sam@freebsd.org) Date: Fri, 7 Jan 2005 23:57:32 GMT Message-Id: <200501072357.j07NvWdl077353@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 68504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2005 23:57:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=68504 Change 68504 by sam@sam_ebb on 2005/01/07 23:56:54 beacon interval must be kept in TU's, not ms's; adjust here and net80211 later Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#57 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#57 (text+ko) ==== @@ -1993,7 +1993,7 @@ nexttbtt = (LE_READ_4(ni->ni_tstamp.data + 4) << 22) | (LE_READ_4(ni->ni_tstamp.data) >> 10); - intval = MS_TO_TU(ni->ni_intval) & HAL_BEACON_PERIOD; + intval = ni->ni_intval & HAL_BEACON_PERIOD; if (nexttbtt == 0) /* e.g. for ap mode */ nexttbtt = intval; else if (intval) /* NB: can be 0 for monitor mode */ @@ -2002,7 +2002,6 @@ __func__, nexttbtt, intval, ni->ni_intval); if (ic->ic_opmode == IEEE80211_M_STA) { HAL_BEACON_STATE bs; - u_int32_t bmisstime; /* NB: no PCF support right now */ memset(&bs, 0, sizeof(bs)); @@ -2025,8 +2024,7 @@ * TU's and then calculate based on the beacon interval. * Note that we clamp the result to at most 10 beacons. */ - bmisstime = MS_TO_TU(ic->ic_bmisstimeout); - bs.bs_bmissthreshold = howmany(bmisstime, intval); + bs.bs_bmissthreshold = howmany(ic->ic_bmisstimeout, intval); if (bs.bs_bmissthreshold > 10) bs.bs_bmissthreshold = 10; else if (bs.bs_bmissthreshold <= 0) From owner-p4-projects@FreeBSD.ORG Fri Jan 7 23:59:36 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D01DF16A4D0; Fri, 7 Jan 2005 23:59:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC0CD16A4CE for ; Fri, 7 Jan 2005 23:59:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9ACD043D1F for ; Fri, 7 Jan 2005 23:59:35 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j07NxZun077457 for ; Fri, 7 Jan 2005 23:59:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j07NxZ49077454 for perforce@freebsd.org; Fri, 7 Jan 2005 23:59:35 GMT (envelope-from sam@freebsd.org) Date: Fri, 7 Jan 2005 23:59:35 GMT Message-Id: <200501072359.j07NxZ49077454@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 68505 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Jan 2005 23:59:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=68505 Change 68505 by sam@sam_ebb on 2005/01/07 23:59:16 o correct comment o add missing stat for frame marked w/ no ack Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#58 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#58 (text+ko) ==== @@ -3119,13 +3119,15 @@ &rix, &try0, &txrate); sc->sc_txrate = txrate; /* for LED blinking */ /* - * Default all non-QoS traffic to the background queue. + * Default all non-QoS traffic to the best-effort queue. */ if (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS) { u_int pri = M_WME_GETAC(m0); txq = sc->sc_ac2q[pri]; - if (ic->ic_wme.wme_wmeChanParams.cap_wmeParams[pri].wmep_noackPolicy) + if (ic->ic_wme.wme_wmeChanParams.cap_wmeParams[pri].wmep_noackPolicy) { flags |= HAL_TXDESC_NOACK; + sc->sc_stats.ast_tx_noack++; + } } else txq = sc->sc_ac2q[WME_AC_BE]; break; From owner-p4-projects@FreeBSD.ORG Sat Jan 8 00:03:41 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42F4D16A4D0; Sat, 8 Jan 2005 00:03:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1DD5216A4CE for ; Sat, 8 Jan 2005 00:03:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0864643D1D for ; Sat, 8 Jan 2005 00:03:41 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0803euW077581 for ; Sat, 8 Jan 2005 00:03:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0803ecq077578 for perforce@freebsd.org; Sat, 8 Jan 2005 00:03:40 GMT (envelope-from sam@freebsd.org) Date: Sat, 8 Jan 2005 00:03:40 GMT Message-Id: <200501080003.j0803ecq077578@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 68506 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2005 00:03:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=68506 Change 68506 by sam@sam_ebb on 2005/01/08 00:02:56 o use m_defrag when packet is too fragmented for pre-allocated tx descriptor space o don't panic if m_defrag gives us back a packet w/ >1 segment [m_defrag is too expensive for our needs; it blindly copies everything to compact, need to roll our own or make m_defrag smarer--e.g. supply max frags permitted] Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#59 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#59 (text+ko) ==== @@ -2926,7 +2926,6 @@ u_int8_t cix = 0xff; /* NB: silence compiler */ struct ath_desc *ds, *ds0; struct ath_txq *txq; - struct mbuf *m; struct ieee80211_frame *wh; u_int subtype, flags, ctsduration; HAL_PKT_TYPE atype; @@ -3007,24 +3006,12 @@ */ if (bf->bf_nseg > ATH_TXDESC) { /* too many desc's, linearize */ sc->sc_stats.ast_tx_linear++; - MGETHDR(m, M_DONTWAIT, MT_DATA); - if (m == NULL) { + m0 = m_defrag(m0, M_DONTWAIT); + if (m0 == NULL) { sc->sc_stats.ast_tx_nombuf++; m_freem(m0); return ENOMEM; } - M_MOVE_PKTHDR(m, m0); - MCLGET(m, M_DONTWAIT); - if ((m->m_flags & M_EXT) == 0) { - sc->sc_stats.ast_tx_nomcl++; - m_freem(m0); - m_free(m); - return ENOMEM; - } - m_copydata(m0, 0, m0->m_pkthdr.len, mtod(m, caddr_t)); - m_freem(m0); - m->m_len = m->m_pkthdr.len; - m0 = m; error = bus_dmamap_load_mbuf(sc->sc_dmat, bf->bf_dmamap, m0, ath_mbuf_load_cb, bf, BUS_DMA_NOWAIT); @@ -3033,8 +3020,8 @@ m_freem(m0); return error; } - KASSERT(bf->bf_nseg == 1, - ("packet not one segment; nseg %u", bf->bf_nseg)); + KASSERT(bf->bf_nseg <= ATH_TXDESC, + ("too many segments after defrag; nseg %u", bf->bf_nseg)); } else if (bf->bf_nseg == 0) { /* null packet, discard */ sc->sc_stats.ast_tx_nodata++; m_freem(m0); From owner-p4-projects@FreeBSD.ORG Sat Jan 8 00:05:44 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8457916A4D0; Sat, 8 Jan 2005 00:05:44 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47BC116A4CE for ; Sat, 8 Jan 2005 00:05:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 148AD43D31 for ; Sat, 8 Jan 2005 00:05:44 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0805hUj077678 for ; Sat, 8 Jan 2005 00:05:43 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0805hhA077675 for perforce@freebsd.org; Sat, 8 Jan 2005 00:05:43 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 8 Jan 2005 00:05:43 GMT Message-Id: <200501080005.j0805hhA077675@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68507 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2005 00:05:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=68507 Change 68507 by davidxu@davidxu_tiger on 2005/01/08 00:05:04 Use low level lock for libc spinlocks, this saves some memory overhead. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spinlock.c#7 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_spinlock.c#7 (text+ko) ==== @@ -40,20 +40,23 @@ #include "spinlock.h" #include "thr_private.h" -#define MAX_SPINLOCKS 5 +#define MAX_SPINLOCKS 20 +/* + * These data structures are used to trace all spinlocks + * in libc. + */ struct spinlock_extra { spinlock_t *owner; - pthread_mutex_t lock; }; +static struct umtx spinlock_static_lock; +static struct spinlock_extra extra[MAX_SPINLOCKS]; +static int spinlock_count; +static int initialized; + static void init_spinlock(spinlock_t *lck); -static pthread_mutex_t spinlock_static_lock; -static struct spinlock_extra extra[MAX_SPINLOCKS]; -static int spinlock_count = 0; -static int initialized = 0; - /* * These are for compatability only. Spinlocks of this type * are deprecated. @@ -62,47 +65,21 @@ void _spinunlock(spinlock_t *lck) { - struct spinlock_extra *extra; - - extra = (struct spinlock_extra *)lck->fname; - _pthread_mutex_unlock(&extra->lock); + THR_UMTX_UNLOCK(_get_curthread(), &lck->access_lock); } -/* - * Lock a location for the running thread. Yield to allow other - * threads to run if this thread is blocked because the lock is - * not available. Note that this function does not sleep. It - * assumes that the lock will be available very soon. - */ void _spinlock(spinlock_t *lck) { - struct spinlock_extra *extra; - if (!__isthreaded) PANIC("Spinlock called when not threaded."); if (!initialized) PANIC("Spinlocks not initialized."); - /* - * Try to grab the lock and loop if another thread grabs - * it before we do. - */ if (lck->fname == NULL) init_spinlock(lck); - extra = (struct spinlock_extra *)lck->fname; - _pthread_mutex_lock(&extra->lock); + THR_UMTX_LOCK(_get_curthread(), &lck->access_lock); } -/* - * Lock a location for the running thread. Yield to allow other - * threads to run if this thread is blocked because the lock is - * not available. Note that this function does not sleep. It - * assumes that the lock will be available very soon. - * - * This function checks if the running thread has already locked the - * location, warns if this occurs and creates a thread dump before - * returning. - */ void _spinlock_debug(spinlock_t *lck, char *fname, int lineno) { @@ -112,15 +89,17 @@ static void init_spinlock(spinlock_t *lck) { - _pthread_mutex_lock(&spinlock_static_lock); + static int count = 0; + + THR_UMTX_LOCK(_get_curthread(), &spinlock_static_lock); if ((lck->fname == NULL) && (spinlock_count < MAX_SPINLOCKS)) { lck->fname = (char *)&extra[spinlock_count]; extra[spinlock_count].owner = lck; spinlock_count++; } - _pthread_mutex_unlock(&spinlock_static_lock); - if (lck->fname == NULL) - PANIC("Exceeded max spinlocks"); + THR_UMTX_UNLOCK(_get_curthread(), &spinlock_static_lock); + if (lck->fname == NULL && ++count < 5) + stderr_debug("Warning: exceeded max spinlocks"); } void @@ -128,17 +107,19 @@ { int i; + umtx_init(&spinlock_static_lock); if (initialized != 0) { - _mutex_reinit(&spinlock_static_lock); + /* + * called after fork() to reset state of libc spin locks, + * it is not quite right since libc may be in inconsistent + * state, resetting the locks to allow current thread to be + * able to hold them may not help things too much, but + * anyway, we do our best. + * it is better to do pthread_atfork in libc. + */ for (i = 0; i < spinlock_count; i++) - _mutex_reinit(&extra[i].lock); + umtx_init((struct umtx *)&extra[i].owner->access_lock); } else { - if (_pthread_mutex_init(&spinlock_static_lock, NULL)) - PANIC("Cannot initialize spinlock_static_lock"); - for (i = 0; i < MAX_SPINLOCKS; i++) { - if (_pthread_mutex_init(&extra[i].lock, NULL)) - PANIC("Cannot initialize spinlock extra"); - } initialized = 1; } } From owner-p4-projects@FreeBSD.ORG Sat Jan 8 00:07:47 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D53716A4D0; Sat, 8 Jan 2005 00:07:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3899816A4CE for ; Sat, 8 Jan 2005 00:07:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AC7943D31 for ; Sat, 8 Jan 2005 00:07:47 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0807k1n077734 for ; Sat, 8 Jan 2005 00:07:46 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0807kuB077731 for perforce@freebsd.org; Sat, 8 Jan 2005 00:07:46 GMT (envelope-from sam@freebsd.org) Date: Sat, 8 Jan 2005 00:07:46 GMT Message-Id: <200501080007.j0807kuB077731@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 68508 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2005 00:07:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=68508 Change 68508 by sam@sam_ebb on 2005/01/08 00:07:04 check if a txq generated an interrupt before processing it Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#60 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#24 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#60 (text+ko) ==== @@ -3464,6 +3464,14 @@ } } +static __inline int +txqactive(struct ath_hal *ah, int qnum) +{ + u_int32_t txqs = 1<sc_if; - ath_tx_processq(sc, &sc->sc_txq[0]); - ath_tx_processq(sc, sc->sc_cabq); + if (txqactive(sc->sc_ah, 0)) + ath_tx_processq(sc, &sc->sc_txq[0]); + if (txqactive(sc->sc_ah, sc->sc_cabq->axq_qnum)) + ath_tx_processq(sc, sc->sc_cabq); ifp->if_flags &= ~IFF_OACTIVE; sc->sc_tx_timer = 0; @@ -3498,11 +3508,16 @@ /* * Process each active queue. */ - ath_tx_processq(sc, &sc->sc_txq[0]); - ath_tx_processq(sc, &sc->sc_txq[1]); - ath_tx_processq(sc, &sc->sc_txq[2]); - ath_tx_processq(sc, &sc->sc_txq[3]); - ath_tx_processq(sc, sc->sc_cabq); + if (txqactive(sc->sc_ah, 0)) + ath_tx_processq(sc, &sc->sc_txq[0]); + if (txqactive(sc->sc_ah, 1)) + ath_tx_processq(sc, &sc->sc_txq[1]); + if (txqactive(sc->sc_ah, 2)) + ath_tx_processq(sc, &sc->sc_txq[2]); + if (txqactive(sc->sc_ah, 3)) + ath_tx_processq(sc, &sc->sc_txq[3]); + if (txqactive(sc->sc_ah, sc->sc_cabq->axq_qnum)) + ath_tx_processq(sc, sc->sc_cabq); ifp->if_flags &= ~IFF_OACTIVE; sc->sc_tx_timer = 0; @@ -3526,9 +3541,8 @@ /* * Process each active queue. */ - /* XXX faster to read ISR_S0_S and ISR_S1_S to determine q's? */ for (i = 0; i < HAL_NUM_TX_QUEUES; i++) - if (ATH_TXQ_SETUP(sc, i)) + if (ATH_TXQ_SETUP(sc, i) && qactive(sc->sc_ah, i)) ath_tx_processq(sc, &sc->sc_txq[i]); ifp->if_flags &= ~IFF_OACTIVE; ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#24 (text+ko) ==== @@ -481,6 +481,8 @@ ((*(_ah)->ah_fillTxDesc)((_ah), (_ds), (_l), (_first), (_last), (_ds0))) #define ath_hal_txprocdesc(_ah, _ds) \ ((*(_ah)->ah_procTxDesc)((_ah), (_ds))) +#define ath_hal_gettxintrtxqs(_ah, _txqs) \ + ((*(_ah)->ah_getTxIntrQueue)((_ah), (_txqs))) #define ath_hal_updateCTSForBursting(_ah, _ds, _prevds, _prevdsWithCTS, \ _gatingds, _txOpLimit, _ctsDuration) \ ((*(_ah)->ah_updateCTSForBursting)((_ah), (_ds), (_prevds), \ From owner-p4-projects@FreeBSD.ORG Sat Jan 8 00:15:59 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FB9D16A4D0; Sat, 8 Jan 2005 00:15:58 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A78816A4CE for ; Sat, 8 Jan 2005 00:15:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2105F43D3F for ; Sat, 8 Jan 2005 00:15:58 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j080Fw5v078035 for ; Sat, 8 Jan 2005 00:15:58 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j080Fwkx078032 for perforce@freebsd.org; Sat, 8 Jan 2005 00:15:58 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 8 Jan 2005 00:15:58 GMT Message-Id: <200501080015.j080Fwkx078032@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68509 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2005 00:15:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=68509 Change 68509 by davidxu@davidxu_tiger on 2005/01/08 00:15:00 Link owned simple mutex, so after fork, we can fix the ownership of the mutex, for simple mutex, umtx owner id is thread id, but after fork, in child process, current thread is a new kernel thread, its thread id is different than it is in parent process. POSIX spec about pthread_atfork implies that mutex may be inherited from parent process, but it is not said in fork() spec, indeed, David R.Butenhof's book has such example program does call pthread_unlock after fork() in child process. Broken POSIX Specification! Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/Makefile.inc#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_atfork.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cond.c#10 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_create.c#5 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_fork.c#7 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_init.c#8 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#13 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#17 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/Makefile.inc#5 (text+ko) ==== @@ -4,7 +4,6 @@ .PATH: ${.CURDIR}/thread SRCS+= \ - thr_atfork.c \ thr_attr.c \ thr_autoinit.c \ thr_barrier.c \ ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_atfork.c#5 (text+ko) ==== @@ -37,6 +37,7 @@ _pthread_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) { + struct pthread *curthread; struct pthread_atfork *af; _thr_check_init(); @@ -44,12 +45,12 @@ if ((af = malloc(sizeof(struct pthread_atfork))) == NULL) return (ENOMEM); + curthread = _get_curthread(); af->prepare = prepare; af->parent = parent; af->child = child; - _pthread_mutex_lock(&_thr_atfork_mutex); + THR_UMTX_LOCK(curthread, &_thr_atfork_lock); TAILQ_INSERT_TAIL(&_thr_atfork_list, af, qe); - _pthread_mutex_unlock(&_thr_atfork_mutex); + THR_UMTX_UNLOCK(curthread, &_thr_atfork_lock); return (0); } - ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cond.c#10 (text+ko) ==== @@ -98,9 +98,9 @@ rval = EINVAL; else { /* Lock the condition variable structure: */ - THR_LOCK_ACQUIRE(curthread, &(*cond)->c_lock); + THR_UMTX_LOCK(curthread, &(*cond)->c_lock); if ((*cond)->c_waiters + (*cond)->c_wakeups != 0) { - THR_LOCK_RELEASE(curthread, &(*cond)->c_lock); + THR_UMTX_UNLOCK(curthread, &(*cond)->c_lock); return (EBUSY); } @@ -112,7 +112,7 @@ *cond = NULL; /* Unlock the condition variable structure: */ - THR_LOCK_RELEASE(curthread, &cv->c_lock); + THR_UMTX_UNLOCK(curthread, &cv->c_lock); /* Free the cond lock structure: */ @@ -142,7 +142,7 @@ pthread_cond_t cv; cv = *(cci->cond); - THR_LOCK_ACQUIRE(curthread, &cv->c_lock); + THR_UMTX_LOCK(curthread, &cv->c_lock); if (cv->c_seqno != cci->seqno && cv->c_wakeups != 0) { if (cv->c_waiters > 0) { cv->c_seqno++; @@ -152,7 +152,7 @@ } else { cv->c_waiters--; } - THR_LOCK_RELEASE(curthread, &cv->c_lock); + THR_UMTX_UNLOCK(curthread, &cv->c_lock); _mutex_cv_lock(cci->mutex); } @@ -177,10 +177,10 @@ return (ret); cv = *cond; - THR_LOCK_ACQUIRE(curthread, &cv->c_lock); + THR_UMTX_LOCK(curthread, &cv->c_lock); ret = _mutex_cv_unlock(mutex); if (ret) { - THR_LOCK_RELEASE(curthread, &cv->c_lock); + THR_UMTX_UNLOCK(curthread, &cv->c_lock); return (ret); } oldseq = seq = cv->c_seqno; @@ -192,18 +192,18 @@ do { if (cancel) { THR_CLEANUP_PUSH(curthread, cond_cancel_handler, &cci); - THR_LOCK_RELEASE(curthread, &cv->c_lock); + THR_UMTX_UNLOCK(curthread, &cv->c_lock); oldcancel = _thr_cancel_enter(curthread); ret = umtx_timedwait((struct umtx *)&cv->c_seqno, seq, abstime); _thr_cancel_leave(curthread, oldcancel); THR_CLEANUP_POP(curthread, 0); } else { - THR_LOCK_RELEASE(curthread, &cv->c_lock); + THR_UMTX_UNLOCK(curthread, &cv->c_lock); ret = umtx_timedwait((struct umtx *)&cv->c_seqno, seq, abstime); } - THR_LOCK_ACQUIRE(curthread, &cv->c_lock); + THR_UMTX_LOCK(curthread, &cv->c_lock); seq = cv->c_seqno; if (abstime != NULL && ret != 0) { if (ret == EINTR) @@ -222,7 +222,7 @@ } else { cv->c_waiters--; } - THR_LOCK_RELEASE(curthread, &cv->c_lock); + THR_UMTX_UNLOCK(curthread, &cv->c_lock); _mutex_cv_lock(mutex); return (ret); } @@ -285,7 +285,7 @@ cv = *cond; /* Lock the condition variable structure. */ - THR_LOCK_ACQUIRE(curthread, &cv->c_lock); + THR_UMTX_LOCK(curthread, &cv->c_lock); if (cv->c_waiters) { if (!broadcast) { cv->c_wakeups++; @@ -299,7 +299,7 @@ umtx_wake((struct umtx *)&cv->c_seqno, INT_MAX); } } - THR_LOCK_RELEASE(curthread, &cv->c_lock); + THR_UMTX_UNLOCK(curthread, &cv->c_lock); return (ret); } ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_create.c#5 (text+ko) ==== @@ -173,6 +173,7 @@ /* Initialize the mutex queue: */ TAILQ_INIT(&new_thread->mutexq); + TAILQ_INIT(&new_thread->pri_mutexq); /* Initialise hooks in the thread structure: */ new_thread->specific = NULL; ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_fork.c#7 (text+ko) ==== @@ -43,6 +43,30 @@ #include "libc_private.h" #include "thr_private.h" +__weak_reference(_pthread_atfork, pthread_atfork); + +int +_pthread_atfork(void (*prepare)(void), void (*parent)(void), + void (*child)(void)) +{ + struct pthread *curthread; + struct pthread_atfork *af; + + _thr_check_init(); + + if ((af = malloc(sizeof(struct pthread_atfork))) == NULL) + return (ENOMEM); + + curthread = _get_curthread(); + af->prepare = prepare; + af->parent = parent; + af->child = child; + THR_UMTX_LOCK(curthread, &_thr_atfork_lock); + TAILQ_INSERT_TAIL(&_thr_atfork_list, af, qe); + THR_UMTX_UNLOCK(curthread, &_thr_atfork_lock); + return (0); +} + /* * For a while, allow libpthread to work with a libc that doesn't * export the malloc lock. @@ -54,11 +78,14 @@ pid_t _fork(void) { + static long inprogress, waiters; + sigset_t sigset, oldset; struct pthread *curthread; struct pthread_atfork *af; pid_t ret; - int errsave; + long tmp; + int errsave, unlock_malloc; if (!_thr_is_inited()) return (__sys_fork()); @@ -71,7 +98,19 @@ SIGFILLSET(sigset); __sys_sigprocmask(SIG_SETMASK, &sigset, &oldset); - _pthread_mutex_lock(&_thr_atfork_mutex); + /* We allow new hook to be added when executing hooks. */ + THR_UMTX_LOCK(curthread, &_thr_atfork_lock); + tmp = inprogress; + while (tmp) { + waiters++; + THR_UMTX_UNLOCK(curthread, &_thr_atfork_lock); + umtx_wait((struct umtx *)&inprogress, tmp); + THR_UMTX_LOCK(curthread, &_thr_atfork_lock); + waiters--; + tmp = inprogress; + } + inprogress = 1; + THR_UMTX_UNLOCK(curthread, &_thr_atfork_lock); /* Run down atfork prepare handlers. */ TAILQ_FOREACH_REVERSE(af, &_thr_atfork_list, atfork_head, qe) { @@ -79,28 +118,39 @@ af->prepare(); } - /* Fork a new process: */ - if ((_thr_isthreaded() != 0) && (__malloc_lock != NULL)) + /* + * Try our best to protect memory from being corrupted in + * child process because another thread in malloc code will + * simply be kill by fork(). + */ + if ((_thr_isthreaded() != 0) && (__malloc_lock != NULL)) { + unlock_malloc = 1; _spinlock(__malloc_lock); + } else { + unlock_malloc = 0; + } + /* Fork a new process: */ if ((ret = __sys_fork()) == 0) { /* Child process */ errsave = errno; + inprogress = 0; curthread->cancelflags &= ~THR_CANCEL_NEEDED; curthread->critical_count = 0; curthread->locklevel = 0; + thr_self(&curthread->tid); + /* clear other threads locked us. */ umtx_init(&curthread->lock); - thr_self(&curthread->tid); + umtx_init(&_thr_atfork_lock); _thr_setthreaded(0); - _mutex_reinit(&_thr_atfork_mutex); - /* reinitialize libc spinlocks, this includes __malloc_lock. */ _thr_spinlock_init(); - TAILQ_INIT(&curthread->mutexq); + _mutex_fork(curthread); + curthread->priority_mutex_count = 0; /* reinit library. */ @@ -118,7 +168,7 @@ /* Parent process */ errsave = errno; - if ((_thr_isthreaded() != 0) && (__malloc_lock != NULL)) + if (unlock_malloc) _spinunlock(__malloc_lock); /* Restore signal mask. */ @@ -129,7 +179,12 @@ if (af->parent != NULL) af->parent(); } - _pthread_mutex_unlock(&_thr_atfork_mutex); + + THR_UMTX_LOCK(curthread, &_thr_atfork_lock); + inprogress = 0; + if (waiters) + umtx_wake((struct umtx *)&inprogress, waiters); + THR_UMTX_UNLOCK(curthread, &_thr_atfork_lock); } errno = errsave; ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_init.c#8 (text+ko) ==== @@ -348,6 +348,7 @@ /* Initialize the mutex queue: */ TAILQ_INIT(&thread->mutexq); + TAILQ_INIT(&thread->pri_mutexq); /* Initialize hooks in the thread structure: */ thread->specific = NULL; @@ -365,6 +366,10 @@ size_t len; int mib[2]; + umtx_init(&_thread_signal_lock); + umtx_init(&_keytable_lock); + umtx_init(&_thr_atfork_lock); + _thr_spinlock_init(); _thr_list_init(); /* @@ -383,25 +388,6 @@ _pthread_attr_default.guardsize_attr = _thr_guard_default; TAILQ_INIT(&_thr_atfork_list); - - umtx_init(&_thread_signal_lock); - umtx_init(&_mutex_static_lock); - umtx_init(&_cond_static_lock); - umtx_init(&_rwlock_static_lock); - umtx_init(&_keytable_lock); - _thr_spinlock_init(); - _pthread_mutex_init(&_thr_atfork_mutex, NULL); - } else { - umtx_init(&_thread_signal_lock); - umtx_init(&_mutex_static_lock); - umtx_init(&_cond_static_lock); - umtx_init(&_rwlock_static_lock); - umtx_init(&_keytable_lock); - /* reinitialized in thr_fork.c */ -#if 0 - _thr_spinlock_init(); - _mutex_reinit(&_thr_atfork_mutex); -#endif } #ifdef SYSTEM_SCOPE_ONLY ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#13 (text+ko) ==== @@ -86,10 +86,6 @@ static inline void mutex_queue_enq(pthread_mutex_t, pthread_t); static void mutex_lock_backout(void *arg); -static struct pthread_mutex_attr static_mutex_attr = - PTHREAD_MUTEXATTR_STATIC_INITIALIZER; -static pthread_mutexattr_t static_mattr = &static_mutex_attr; - __weak_reference(__pthread_mutex_init, pthread_mutex_init); __weak_reference(__pthread_mutex_lock, pthread_mutex_lock); __weak_reference(__pthread_mutex_timedlock, pthread_mutex_timedlock); @@ -215,6 +211,7 @@ return mutex_init(mutex, mutex_attr, 0); } +/* used to reinitialize mutex after fork() */ int _mutex_reinit(pthread_mutex_t *mutex) { @@ -229,6 +226,24 @@ return (0); } +void +_mutex_fork(struct pthread *curthread) +{ + struct pthread_mutex *m; + + /* After fork, tid was changed, fix ownership. */ + TAILQ_FOREACH(m, &curthread->mutexq, m_qe) { + m->m_lock.u_owner = (void *)curthread->tid; + } + + /* Clear contender for priority mutexes */ + TAILQ_FOREACH(m, &curthread->pri_mutexq, m_qe) { + /* clear another thread locked us */ + umtx_init(&m->m_lock); + TAILQ_INIT(&m->m_queue); + } +} + int _pthread_mutex_destroy(pthread_mutex_t *mutex) { @@ -299,12 +314,10 @@ * owned mutex, separated it from priority * mutex list */ -#if 0 /* Add to the list of owned mutexes: */ MUTEX_ASSERT_NOT_OWNED(*mutex); TAILQ_INSERT_TAIL(&curthread->mutexq, (*mutex), m_qe); -#endif } else if (umtx_owner(&(*mutex)->m_lock) == curthread->tid) { ret = mutex_self_trylock(curthread, *mutex); } /* else {} */ @@ -352,7 +365,7 @@ /* Add to the list of owned mutexes: */ MUTEX_ASSERT_NOT_OWNED(*mutex); - TAILQ_INSERT_TAIL(&curthread->mutexq, + TAILQ_INSERT_TAIL(&curthread->pri_mutexq, (*mutex), m_qe); } else if ((*mutex)->m_owner == curthread) ret = mutex_self_trylock(curthread, *mutex); @@ -389,7 +402,7 @@ THR_UNLOCK(curthread); /* Add to the list of owned mutexes: */ MUTEX_ASSERT_NOT_OWNED(*mutex); - TAILQ_INSERT_TAIL(&curthread->mutexq, + TAILQ_INSERT_TAIL(&curthread->pri_mutexq, (*mutex), m_qe); } else if ((*mutex)->m_owner == curthread) ret = mutex_self_trylock(curthread, *mutex); @@ -474,12 +487,10 @@ * owned mutex, separated it from priority * mutex list */ -#if 0 /* Add to the list of owned mutexes: */ MUTEX_ASSERT_NOT_OWNED(*m); TAILQ_INSERT_TAIL(&curthread->mutexq, (*m), m_qe); -#endif } else if (umtx_owner(&(*m)->m_lock) == curthread->tid) { ret = mutex_self_lock(curthread, *m, abstime); } else { @@ -498,12 +509,10 @@ } if (ret == 0) { (*m)->m_owner = curthread; -#if 0 /* Add to the list of owned mutexes: */ MUTEX_ASSERT_NOT_OWNED(*m); TAILQ_INSERT_TAIL(&curthread->mutexq, (*m), m_qe); -#endif } } return (ret); @@ -564,7 +573,7 @@ /* Add to the list of owned mutexes: */ MUTEX_ASSERT_NOT_OWNED(*m); - TAILQ_INSERT_TAIL(&curthread->mutexq, + TAILQ_INSERT_TAIL(&curthread->pri_mutexq, (*m), m_qe); /* Unlock the mutex structure: */ @@ -652,7 +661,7 @@ /* Add to the list of owned mutexes: */ MUTEX_ASSERT_NOT_OWNED(*m); - TAILQ_INSERT_TAIL(&curthread->mutexq, + TAILQ_INSERT_TAIL(&curthread->pri_mutexq, (*m), m_qe); /* Unlock the mutex structure: */ @@ -976,13 +985,10 @@ * for owned mutex, separated it from * priority mutex list */ -#if 0 /* Remove the mutex from the threads queue. */ MUTEX_ASSERT_IS_OWNED(*m); - TAILQ_REMOVE(&(*m)->m_owner->mutexq, - (*m), m_qe); + TAILQ_REMOVE(&curthread->mutexq, (*m), m_qe); MUTEX_INIT_LINK(*m); -#endif if (add_reference) (*m)->m_refcount++; /* @@ -1041,7 +1047,7 @@ /* Remove the mutex from the threads queue. */ MUTEX_ASSERT_IS_OWNED(*m); - TAILQ_REMOVE(&(*m)->m_owner->mutexq, + TAILQ_REMOVE(&(*m)->m_owner->pri_mutexq, (*m), m_qe); MUTEX_INIT_LINK(*m); @@ -1093,7 +1099,7 @@ /* Remove the mutex from the threads queue. */ MUTEX_ASSERT_IS_OWNED(*m); - TAILQ_REMOVE(&(*m)->m_owner->mutexq, + TAILQ_REMOVE(&(*m)->m_owner->pri_mutexq, (*m), m_qe); MUTEX_INIT_LINK(*m); @@ -1153,13 +1159,13 @@ * simultaneous call to change the threads priority * and from the owning thread releasing the mutex. */ - m = TAILQ_FIRST(&pthread->mutexq); + m = TAILQ_FIRST(&pthread->pri_mutexq); if (m != NULL) { THR_LOCK_ACQUIRE(curthread, &m->m_lock); /* * Make sure the thread still owns the lock. */ - if (m == TAILQ_FIRST(&pthread->mutexq)) + if (m == TAILQ_FIRST(&pthread->pri_mutexq)) mutex_rescan_owned(curthread, pthread, /* rescan all owned */ NULL); THR_LOCK_RELEASE(curthread, &m->m_lock); @@ -1379,7 +1385,7 @@ * A null mutex means start at the beginning of the owned * mutex list. */ - m = TAILQ_FIRST(&pthread->mutexq); + m = TAILQ_FIRST(&pthread->pri_mutexq); /* There is no inherited priority yet. */ inherited_prio = 0; @@ -1477,7 +1483,7 @@ { struct pthread_mutex *m, *m_next; - for (m = TAILQ_FIRST(&pthread->mutexq); m != NULL; m = m_next) { + for (m = TAILQ_FIRST(&pthread->pri_mutexq); m != NULL; m = m_next) { m_next = TAILQ_NEXT(m, m_qe); if ((m->m_flags & MUTEX_FLAGS_PRIVATE) != 0) pthread_mutex_unlock(&m); @@ -1573,7 +1579,7 @@ * thread's list of owned mutexes. */ mutex->m_owner = pthread; - TAILQ_INSERT_TAIL(&pthread->mutexq, mutex, m_qe); + TAILQ_INSERT_TAIL(&pthread->pri_mutexq, mutex, m_qe); break; case PTHREAD_PRIO_INHERIT: @@ -1582,7 +1588,7 @@ * thread's list of owned mutexes. */ mutex->m_owner = pthread; - TAILQ_INSERT_TAIL(&pthread->mutexq, mutex, m_qe); + TAILQ_INSERT_TAIL(&pthread->pri_mutexq, mutex, m_qe); /* Track number of priority mutexes owned: */ pthread->priority_mutex_count++; @@ -1621,7 +1627,7 @@ * to the thread's list of owned mutexes. */ mutex->m_owner = pthread; - TAILQ_INSERT_TAIL(&pthread->mutexq, + TAILQ_INSERT_TAIL(&pthread->pri_mutexq, mutex, m_qe); /* Track number of priority mutexes owned: */ ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#17 (text+ko) ==== @@ -502,11 +502,12 @@ /* Number of priority ceiling or protection mutexes owned. */ int priority_mutex_count; - /* - * Queue of currently owned mutexes. - */ + /* Queue of currently owned simple type mutexes. */ TAILQ_HEAD(, pthread_mutex) mutexq; + /* Queue of currently owned priority type mutexs. */ + TAILQ_HEAD(, pthread_mutex) pri_mutexq; + void *ret; struct pthread_specific_elem *specific; int specific_data_count; @@ -531,6 +532,21 @@ ; \ } while (0) +#define THR_UMTX_TRYLOCK(thrd, lck) \ + umtx_trylock((struct umtx *)(lck), (thrd)->tid) + +#define THR_UMTX_LOCK(thrd, lck) \ + UMTX_LOCK((struct umtx *)(lck), (thrd)->tid) \ + +#define THR_UMTX_UNLOCK(thrd, lck) \ + umtx_unlock((struct umtx *)(lck), (thrd)->tid) + +#define THR_UMTX_TIMEDLOCK(thrd, lck, abstime) \ + umtx_timedlock((struct umtx *)(lck), (thrd)->tid, (abstime)) + +#define THR_UMTX_OWNED(thrd, lck) \ + (umtx_owner((struct umtx *)lck) == (thrd)->tid) + /* * Critical regions can also be detected by looking at the threads * current lock level. Ensure these macros increment and decrement @@ -552,13 +568,13 @@ #define THR_LOCK_ACQUIRE(thrd, lck) \ do { \ (thrd)->locklevel++; \ - UMTX_LOCK((lck), (thrd)->tid); \ + UMTX_LOCK((struct umtx *)(lck), (thrd)->tid); \ } while (0) #define THR_LOCK_RELEASE(thrd, lck) \ do { \ if ((thrd)->locklevel > 0) { \ - umtx_unlock((lck), (thrd)->tid); \ + umtx_unlock((struct umtx *)(lck), (thrd)->tid); \ (thrd)->locklevel--; \ THR_CRITICAL_CHECK(thrd); \ } else { \ @@ -641,7 +657,7 @@ SCLASS int _thread_active_threads SCLASS_PRESET(1); SCLASS TAILQ_HEAD(atfork_head, pthread_atfork) _thr_atfork_list; -SCLASS pthread_mutex_t _thr_atfork_mutex; +SCLASS struct umtx _thr_atfork_lock; /* Default thread attributes: */ SCLASS struct pthread_attr _pthread_attr_default @@ -668,9 +684,6 @@ /* Garbage thread count. */ SCLASS int _gc_count SCLASS_PRESET(0); -SCLASS struct umtx _mutex_static_lock; -SCLASS struct umtx _cond_static_lock; -SCLASS struct umtx _rwlock_static_lock; SCLASS struct umtx _keytable_lock; SCLASS struct umtx _thread_list_lock; SCLASS struct umtx _thread_signal_lock; @@ -690,6 +703,7 @@ int _mutex_cv_unlock(pthread_mutex_t *); void _mutex_notify_priochange(struct pthread *, struct pthread *, int); int _mutex_reinit(pthread_mutex_t *); +void _mutex_fork(struct pthread *curthread); void _mutex_unlock_private(struct pthread *); void _libpthread_init(struct pthread *); void *_pthread_getspecific(pthread_key_t); From owner-p4-projects@FreeBSD.ORG Sat Jan 8 00:17:00 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5133116A4D0; Sat, 8 Jan 2005 00:17:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2ACDE16A4CE for ; Sat, 8 Jan 2005 00:17:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD73343D2F for ; Sat, 8 Jan 2005 00:16:59 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j080GxLb078060 for ; Sat, 8 Jan 2005 00:16:59 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j080GxBT078057 for perforce@freebsd.org; Sat, 8 Jan 2005 00:16:59 GMT (envelope-from sam@freebsd.org) Date: Sat, 8 Jan 2005 00:16:59 GMT Message-Id: <200501080016.j080GxBT078057@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 68510 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2005 00:17:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=68510 Change 68510 by sam@sam_ebb on 2005/01/08 00:16:43 checkpoint SuperG WIP Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#35 edit .. //depot/projects/wifi/sys/dev/ath/if_ath.c#61 edit .. //depot/projects/wifi/sys/dev/ath/if_athioctl.h#7 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#25 edit .. //depot/projects/wifi/sys/net80211/ieee80211.h#8 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#12 edit .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#36 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#33 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#21 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#34 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#18 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#31 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#15 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#22 edit .. //depot/projects/wifi/tools/tools/ath/80211debug.c#5 edit .. //depot/projects/wifi/tools/tools/ath/athdebug.c#4 edit .. //depot/projects/wifi/tools/tools/ath/athstats.c#7 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#35 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.12 2004/12/12 04:32:44 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.15 2004/12/31 19:46:27 sam Exp $ */ /*- @@ -410,6 +410,18 @@ } static void +set80211fastframes(const char *val, int d, int s, const struct afswtch *rafp) +{ + set80211(s, IEEE80211_IOC_FF, d, 0, NULL); +} + +static void +set80211turbo(const char *val, int d, int s, const struct afswtch *rafp) +{ + set80211(s, IEEE80211_IOC_TURBOP, d, 0, NULL); +} + +static void set80211chanlist(const char *val, int d, int s, const struct afswtch *rafp) { struct ieee80211req_chanlist chanlist; @@ -1006,7 +1018,7 @@ } #define IEEE80211_C_BITS \ -"\020\1WEP\2TKIP\3AES\4AES_CCM\6CKIP\11IBSS\12PMGT\13HOSTAP\14AHDEMO" \ +"\020\1WEP\2TKIP\3AES\4AES_CCM\6CKIP\7FF\10TURBOP\11IBSS\12PMGT\13HOSTAP\14AHDEMO" \ "\15SWRETRY\16TXPMGT\17SHSLOT\20SHPREAMBLE\21MONITOR\22TKIPMIC\30WPA1" \ "\31WPA2\32BURST\33WME" @@ -1532,6 +1544,22 @@ } else wme = 0; + ireq.i_type = IEEE80211_IOC_FF; + if (ioctl(s, SIOCG80211, &ireq) != -1) { + if (ireq.i_val) + LINE_CHECK("%cff", spacer); + else if (verbose) + LINE_CHECK("%c-ff", spacer); + } + + ireq.i_type = IEEE80211_IOC_TURBOP; + if (ioctl(s, SIOCG80211, &ireq) != -1) { + if (ireq.i_val) + LINE_CHECK("%cturbo", spacer); + else if (verbose) + LINE_CHECK("%c-turbo", spacer); + } + if (opmode == IEEE80211_M_HOSTAP) { ireq.i_type = IEEE80211_IOC_HIDESSID; if (ioctl(s, SIOCG80211, &ireq) != -1) { @@ -1788,6 +1816,10 @@ #if 0 DEF_CMD_ARG("mac:kick", set80211kickmac), #endif + DEF_CMD("ff", 1, set80211fastframes), + DEF_CMD("-ff", 0, set80211fastframes), + DEF_CMD("turbo", 1, set80211turbo), + DEF_CMD("-turbo", 0, set80211turbo), }; static struct afswtch af_ieee80211 = { .af_name = "af_ieee80211", ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#61 (text+ko) ==== @@ -222,6 +222,7 @@ ATH_DEBUG_STATE = 0x00040000, /* 802.11 state transitions */ ATH_DEBUG_NODE = 0x00080000, /* node management */ ATH_DEBUG_LED = 0x00100000, /* led management */ + ATH_DEBUG_FF = 0x00200000, /* fast frames */ ATH_DEBUG_FATAL = 0x80000000, /* fatal errors */ ATH_DEBUG_ANY = 0xffffffff }; @@ -529,10 +530,16 @@ if (sc->sc_ac2q[WME_AC_BE] != sc->sc_ac2q[WME_AC_BK]) ic->ic_caps |= IEEE80211_C_WME; /* - * Check for frame bursting capability. + * Check for misc other capabilities. */ if (ath_hal_hasbursting(ah)) ic->ic_caps |= IEEE80211_C_BURST; + if (ath_hal_hasfastframes(ah)) + ic->ic_caps |= IEEE80211_C_FF; +#ifdef notyet + if (ath_hal_getwirelessmodes(ah) & (HAL_MODE_108G|HAL_MODE_TURBO)) + ic->ic_caps |= IEEE80211_C_TURBOP; +#endif /* * Indicate we need the 802.11 header padded to a @@ -1033,6 +1040,315 @@ return 0; } +static int +ath_ff_always(struct ath_txq *txq, struct ath_buf *bf) +{ + return 0; +} + +#if 0 +static int +ath_ff_ageflushtestdone(struct ath_txq *txq, struct ath_buf *bf) +{ + return (txq->axq_curage - bf->bf_age) < ATH_FF_STAGEMAX; +} +#endif + +/* + * Flush FF staging queue. + */ +static void +ath_ff_stageq_flush(struct ath_softc *sc, struct ath_txq *txq, + int (*ath_ff_flushdonetest)(struct ath_txq *txq, struct ath_buf *bf)) +{ + struct ath_buf *bf; + struct ieee80211_node *ni; + int pktlen, pri; + + for (;;) { + ATH_TXQ_LOCK(txq); + /* + * Go from the back (oldest) to front so we can + * stop early based on the age of the entry. + */ + bf = TAILQ_LAST(&txq->axq_stageq, axq_headtype); + if (bf == NULL || ath_ff_flushdonetest(txq, bf)) { + ATH_TXQ_UNLOCK(txq); + break; + } + + ni = bf->bf_node; + pri = M_WME_GETAC(bf->bf_m); + KASSERT(ATH_NODE(ni)->an_ff_buf[pri], + ("no bf on staging queue %p", bf)); + ATH_NODE(ni)->an_ff_buf[pri] = NULL; + TAILQ_REMOVE(&txq->axq_stageq, bf, bf_stagelist); + + ATH_TXQ_UNLOCK(txq); + + DPRINTF(sc, ATH_DEBUG_FF, "%s: flush frame, age %u\n", + __func__, bf->bf_age); + + sc->sc_stats.ast_ff_flush++; + + /* encap and xmit */ + bf->bf_m = ieee80211_encap(&sc->sc_ic, bf->bf_m, ni); + if (bf->bf_m == NULL) { + DPRINTF(sc, ATH_DEBUG_XMIT | ATH_DEBUG_FF, + "%s: discard, encapsulation failure\n", + __func__); + sc->sc_stats.ast_tx_encap++; + goto bad; + } + pktlen = bf->bf_m->m_pkthdr.len; /* NB: don't reference below */ + if (ath_tx_start(sc, ni, bf, bf->bf_m) == 0) { +#if 0 /*XXX*/ + ifp->if_opackets++; +#endif + continue; + } + bad: + if (ni != NULL) + ieee80211_free_node(ni); + if (bf->bf_m != NULL) + m_freem(bf->bf_m); + if (bf != NULL) { + ATH_TXBUF_LOCK(sc); + STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); + ATH_TXBUF_UNLOCK(sc); + } + } +} + +static __inline u_int32_t +ath_ff_approx_txtime(struct ath_softc *sc, struct ath_node *an, struct mbuf *m) +{ + u_int32_t framelen; + struct ath_buf *bf; + + /* + * Approximate the frame length to be transmitted. A swag to add + * the following maximal values to the skb payload: + * - 32: 802.11 encap + CRC + * - 24: encryption overhead (if wep bit) + * - 4 + 6: fast-frame header and padding + * - 16: 2 LLC FF tunnel headers + * - 14: 1 802.3 FF tunnel header (skb already accounts for 2nd) + */ + framelen = m->m_pkthdr.len + 32 + 4 + 6 + 16 + 14; + if (sc->sc_ic.ic_flags & IEEE80211_F_PRIVACY) + framelen += 24; + bf = an->an_ff_buf[M_WME_GETAC(m)]; + if (bf != NULL) + framelen += bf->bf_m->m_pkthdr.len; + return ath_hal_computetxtime(sc->sc_ah, sc->sc_currates, framelen, + sc->sc_lastdatarix, AH_FALSE); +} + +/* + * Determine if a data frame may be aggregated via ff tunnelling. + * Note the caller is responsible for checking if the destination + * supports fast frames. + * + * NB: allowing EAPOL frames to be aggregated with other unicast traffic. + * Do 802.1x EAPOL frames proceed in the clear? Then they couldn't + * be aggregated with other types of frames when encryption is on? + * + * NB: assumes lock on an_ff_buf effectively held by txq lock mechanism. + */ +static __inline int +ath_ff_can_aggregate(struct ath_softc *sc, + struct ath_node *an, struct mbuf *m, int *flushq) +{ + struct ieee80211com *ic = &sc->sc_ic; + struct ath_txq *txq; + u_int32_t txoplimit; + u_int pri; + + *flushq = 0; + + /* + * If there is no frame to combine with and the txq has + * fewer frames than the minimum required; then do not + * attempt to aggregate this frame. + */ + pri = M_WME_GETAC(m); + txq = sc->sc_ac2q[pri]; + if (an->an_ff_buf[pri] == NULL && txq->axq_depth < sc->sc_fftxqmin) + return 0; + /* + * When not in station mode never aggregate a multicast + * frame; this insures, for example, that a combined frame + * does not require multiple encryption keys when using + * 802.1x/WPA. + */ + if (ic->ic_opmode != IEEE80211_M_STA && + ETHER_IS_MULTICAST(mtod(m, struct ether_header *)->ether_dhost)) + return 0; + /* + * Consult the max bursting interval to insure a combined + * frame fits within the TxOp window. + */ + txoplimit = IEEE80211_TXOP_TO_US( + ic->ic_wme.wme_chanParams.cap_wmeParams[pri].wmep_txopLimit); + if (txoplimit != 0 && ath_ff_approx_txtime(sc, an, m) > txoplimit) { + DPRINTF(sc, ATH_DEBUG_XMIT | ATH_DEBUG_FF, + "%s: FF TxOp violation\n", __func__); + if (an->an_ff_buf[pri] != NULL) + *flushq = 1; + return 0; + } + return 1; /* try to aggregate */ +} + +/* + * Check if the supplied frame can be partnered with an existing + * or pending frame. Return a reference to any frame that should be + * sent on return; otherwise return NULL. + */ +static struct mbuf * +ath_ff_check(struct ath_softc *sc, struct ath_txq *txq, + struct ath_buf *bf, struct mbuf *m, struct ieee80211_node *ni) +{ + struct ieee80211com *ic = ni->ni_ic; + struct ath_node *an = ATH_NODE(ni); + struct ath_buf *bfstaged; + int ff_flush, pri; + + /* + * Check if the supplied frame can be aggregated. + * + * NB: we use the txq lock to protect references to + * an->an_ff_txbuf in ath_ff_can_aggregate(). + */ + ATH_TXQ_LOCK(txq); + pri = M_WME_GETAC(m); + if (ath_ff_can_aggregate(sc, an, m, &ff_flush)) { + struct ath_buf *bfstaged = an->an_ff_buf[pri]; + if (bfstaged != NULL) { + /* + * A frame is available for partnering; remove + * it, chain it to this one, and encapsulate. + */ + an->an_ff_buf[pri] = NULL; + TAILQ_REMOVE(&txq->axq_stageq, bfstaged, bf_stagelist); + ATH_TXQ_UNLOCK(txq); + + /* + * Chain mbufs and add FF magic. + */ + DPRINTF(sc, ATH_DEBUG_FF, + "[%s] aggregate fast-frame, age %u\n", + ether_sprintf(ni->ni_macaddr), txq->axq_curage); + m->m_nextpkt = NULL; + bfstaged->bf_m->m_nextpkt = m; + m = bfstaged->bf_m; + m->m_flags |= M_FF; + /* + * Release the node reference held while + * the packet sat on an_ff_buf[] + */ + ieee80211_free_node(ni); + + /* + * Return bfstaged to the free list. + */ + ATH_TXBUF_LOCK(sc); + STAILQ_INSERT_TAIL(&sc->sc_txbuf, bfstaged, bf_list); + ATH_TXBUF_UNLOCK(sc); + + return m; /* ready to go */ + } else { + /* + * No frame available, queue this frame to wait + * for a partner. Note that we hold the buffer + * and a reference to the node; we need the + * buffer in particular so we're certain we + * can flush the frame at a later time. + */ + DPRINTF(sc, ATH_DEBUG_FF, + "[%s] stage fast-frame, age %u\n", + ether_sprintf(ni->ni_macaddr), txq->axq_curage); + + bf->bf_m = m; + bf->bf_node = ni; /* NB: held reference */ + bf->bf_age = txq->axq_curage; + an->an_ff_buf[pri] = bf; + TAILQ_INSERT_HEAD(&txq->axq_stageq, bf, bf_stagelist); + ATH_TXQ_UNLOCK(txq); + + return NULL; /* consumed */ + } + } + /* + * Frame could not be aggregated, it needs to be returned + * to the caller for immediate transmission. In addition + * we check if we should first flush a frame from the + * staging queue before sending this one. + * + * NB: ath_ff_can_aggregate only marks ff_flush if a frame + * is present to flush. + */ + if (ff_flush) { + int pktlen; + + bfstaged = an->an_ff_buf[pri]; + an->an_ff_buf[pri] = NULL; + TAILQ_REMOVE(&txq->axq_stageq, bfstaged, bf_stagelist); + ATH_TXQ_UNLOCK(txq); + + DPRINTF(sc, ATH_DEBUG_FF, "[%s] flush staged frame\n", + ether_sprintf(an->an_node.ni_macaddr)); + + /* encap and xmit */ + bfstaged->bf_m = ieee80211_encap(ic, bfstaged->bf_m, ni); + if (bfstaged->bf_m == NULL) { + DPRINTF(sc, ATH_DEBUG_XMIT | ATH_DEBUG_FF, + "%s: discard, encap failure\n", __func__); + sc->sc_stats.ast_tx_encap++; + goto ff_flushbad; + } + pktlen = bfstaged->bf_m->m_pkthdr.len; + if (ath_tx_start(sc, ni, bfstaged, bfstaged->bf_m)) { + DPRINTF(sc, ATH_DEBUG_XMIT, + "%s: discard, xmit failure\n", __func__); + ff_flushbad: + /* + * Unable to transmit frame that was on the staging + * queue. Reclaim the node reference and other + * resources. + */ + if (ni != NULL) + ieee80211_free_node(ni); + if (bfstaged->bf_m != NULL) + m_freem(bfstaged->bf_m); + if (bfstaged != NULL) { + ATH_TXBUF_LOCK(sc); + STAILQ_INSERT_TAIL(&sc->sc_txbuf, + bfstaged, bf_list); + ATH_TXBUF_UNLOCK(sc); + } + } else { +#if 0 + ifp->if_opackets++; +#endif + } + } else { + if (an->an_ff_buf[pri] != NULL) { + /* + * XXX: out-of-order condition only occurs for AP + * mode and multicast. There may be no valid way + * to get this condition. + */ + DPRINTF(sc, ATH_DEBUG_FF, "[%s] out-of-order frame\n", + ether_sprintf(an->an_node.ni_macaddr)); + /* XXX stat */ + } + ATH_TXQ_UNLOCK(txq); + } + return m; +} + static void ath_start(struct ifnet *ifp) { @@ -1044,6 +1360,8 @@ struct mbuf *m; struct ieee80211_frame *wh; struct ether_header *eh; + struct ath_txq *txq; + int pri; if ((ifp->if_flags & IFF_RUNNING) == 0 || sc->sc_invalid) return; @@ -1122,6 +1440,28 @@ __func__); goto bad; } + pri = M_WME_GETAC(m); + txq = sc->sc_ac2q[pri]; + if (ni->ni_flags & IEEE80211_NODE_FF) { + /* + * Check queue length; if too deep drop this + * frame (tail drop considered good). + */ + if (txq->axq_depth >= sc->sc_fftxqmax) { + DPRINTF(sc, ATH_DEBUG_FF, + "[%s] tail drop on q %u depth %u\n", + ether_sprintf(ni->ni_macaddr), + txq->axq_qnum, txq->axq_depth); + sc->sc_stats.ast_tx_qfull++; + m_freem(m); + goto reclaim; + } + m = ath_ff_check(sc, txq, bf, m, ni); + if (m == NULL) { + /* NB: ni ref & bf held on stageq */ + continue; + } + } ifp->if_opackets++; BPF_MTAP(ifp, m); /* @@ -1179,6 +1519,13 @@ sc->sc_tx_timer = 5; ifp->if_timer = 1; +#if 0 + /* + * Flush stale frames from the fast-frame staging queue. + */ + if (ic->ic_opmode != IEEE80211_M_STA) + ath_ff_stageq_flush(sc, txq, ath_ff_ageflushtestdone); +#endif } } @@ -2806,6 +3153,8 @@ txq->axq_link = NULL; STAILQ_INIT(&txq->axq_q); ATH_TXQ_LOCK_INIT(sc, txq); + TAILQ_INIT(&txq->axq_stageq); + txq->axq_curage = 0; sc->sc_txqsetup |= 1<sc_txq[qnum]; @@ -3105,6 +3454,7 @@ ath_rate_findrate(sc, an, shortPreamble, pktlen, &rix, &try0, &txrate); sc->sc_txrate = txrate; /* for LED blinking */ + sc->sc_lastdatarix = rix; /* for fast frames */ /* * Default all non-QoS traffic to the best-effort queue. */ @@ -3112,7 +3462,7 @@ u_int pri = M_WME_GETAC(m0); txq = sc->sc_ac2q[pri]; if (ic->ic_wme.wme_wmeChanParams.cap_wmeParams[pri].wmep_noackPolicy) { - flags |= HAL_TXDESC_NOACK; + flags |= HAL_TXDESC_NOACK; sc->sc_stats.ast_tx_noack++; } } else @@ -3142,7 +3492,8 @@ if (ismcast) { flags |= HAL_TXDESC_NOACK; /* no ack on broad/multicast */ sc->sc_stats.ast_tx_noack++; - } else if (pktlen > ic->ic_rtsthreshold) { + } else if (pktlen > ic->ic_rtsthreshold && + (ni->ni_flags & IEEE80211_NODE_FF) == 0) { flags |= HAL_TXDESC_RTSENA; /* RTS based on frame length */ cix = rt->info[rix].controlRate; sc->sc_stats.ast_tx_rts++; @@ -3422,6 +3773,8 @@ ds->ds_txstat.ts_rssi; ATH_RSSI_LPF(an->an_halstats.ns_avgtxrssi, ds->ds_txstat.ts_rssi); + if (bf->bf_m->m_flags & M_FF) + sc->sc_stats.ast_ff_txok++; pri = M_WME_GETAC(bf->bf_m); if (pri >= WME_AC_VO) ic->ic_wme.wme_hipri_traffic++; @@ -3433,6 +3786,8 @@ sc->sc_stats.ast_tx_fifoerr++; if (ds->ds_txstat.ts_status & HAL_TXERR_FILT) sc->sc_stats.ast_tx_filtered++; + if (bf->bf_m->m_flags & M_FF) + sc->sc_stats.ast_ff_txerr++; } sr = ds->ds_txstat.ts_shortretry; lr = ds->ds_txstat.ts_longretry; @@ -3462,6 +3817,11 @@ STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); } + /* + * Flush fast-frame staging queue when traffic slows. + */ + if (txq->axq_depth <= 1) + ath_ff_stageq_flush(sc, txq, ath_ff_always); } static __inline int @@ -4615,6 +4975,16 @@ SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tpc", CTLTYPE_INT | CTLFLAG_RW, sc, 0, ath_sysctl_tpc, "I", "enable/disable per-packet TPC"); + if (ath_hal_hasfastframes(sc->sc_ah)) { + sc->sc_fftxqmin = ATH_FF_TXQMIN; + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "fftxqmin", CTLFLAG_RW, &sc->sc_fftxqmin, 0, + "min frames before fast-frame staging"); + sc->sc_fftxqmax = ATH_FF_TXQMAX; + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "fftxqmax", CTLFLAG_RW, &sc->sc_fftxqmax, 0, + "max queued frames before tail drop"); + } } static void ==== //depot/projects/wifi/sys/dev/ath/if_athioctl.h#7 (text+ko) ==== @@ -103,6 +103,11 @@ u_int32_t ast_ant_txswitch;/* tx antenna switches */ u_int32_t ast_ant_rx[8]; /* rx frames with antenna */ u_int32_t ast_ant_tx[8]; /* tx frames with antenna */ + u_int32_t ast_ff_txok; /* fast frames tx'd successfully */ + u_int32_t ast_ff_txerr; /* fast frames tx'd w/ error */ + u_int32_t ast_ff_rx; /* fast frames rx'd */ + u_int32_t ast_ff_flush; /* fast frames flushed from staging q */ + u_int32_t ast_tx_qfull; /* tx dropped 'cuz of queue limit */ }; #define SIOCGATHSTATS _IOWR('i', 137, struct ifreq) ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#25 (text+ko) ==== @@ -52,11 +52,17 @@ #define ATH_TIMEOUT 1000 #define ATH_RXBUF 40 /* number of RX buffers */ -#define ATH_TXBUF 60 /* number of TX buffers */ +#define ATH_TXBUF 100 /* number of TX buffers */ #define ATH_TXDESC 8 /* number of descriptors per buffer */ #define ATH_TXMAXTRY 11 /* max number of transmit attempts */ #define ATH_TXINTR_PERIOD 5 /* max number of batched tx descriptors */ +#define ATH_FF_TXQMIN 2 /* min txq depth for staging */ +#define ATH_FF_TXQMAX 50 /* maximum # of queued frames allowed */ +#define ATH_FF_STAGEMAX 5 /* max waiting period for staged frame*/ + +struct ath_buf; + /* driver-specific node state */ struct ath_node { struct ieee80211_node an_node; /* base class */ @@ -64,6 +70,7 @@ u_int8_t an_tx_mgtratesp;/* short preamble h/w rate for " " */ u_int32_t an_avgrssi; /* average rssi over all rx frames */ HAL_NODE_STATS an_halstats; /* rssi statistics used by hal */ + struct ath_buf *an_ff_buf[WME_NUM_AC]; /* ff staging area */ /* variable-length rate control state follows */ }; #define ATH_NODE(ni) ((struct ath_node *)(ni)) @@ -82,6 +89,8 @@ struct ath_buf { STAILQ_ENTRY(ath_buf) bf_list; + TAILQ_ENTRY(ath_buf) bf_stagelist; /* stage queue list */ + u_int32_t bf_age; /* age when placed on stageq */ int bf_nseg; struct ath_desc *bf_desc; /* virtual addr of desc */ bus_addr_t bf_daddr; /* physical addr of desc */ @@ -124,6 +133,26 @@ u_int32_t *axq_link; /* link ptr in last TX desc */ STAILQ_HEAD(, ath_buf) axq_q; /* transmit queue */ struct mtx axq_lock; /* lock on q and link */ + /* + * State for patching up CTS when bursting. + */ + struct ath_buf *axq_linkbuf; /* va of last buffer */ + struct ath_desc *axq_lastdsWithCTS; + /* first desc of last descriptor + * that contains CTS + */ + struct ath_desc *axq_gatingds; /* final desc of the gating desc + * that determines whether + * lastdsWithCTS has been DMA'ed + * or not + */ + /* + * Fast-frame state. The staging queue holds awaiting + * a fast-frame pairing. Buffers on this queue are + * assigned an ``age'' and flushed when they wait too long. + */ + TAILQ_HEAD(axq_headtype, ath_buf) axq_stageq; + u_int32_t axq_curage; /* queue age */ }; #define ATH_TXQ_LOCK_INIT(_sc, _tq) \ @@ -137,6 +166,8 @@ #define ATH_TXQ_INSERT_TAIL(_tq, _elm, _field) do { \ STAILQ_INSERT_TAIL(&(_tq)->axq_q, (_elm), _field); \ (_tq)->axq_depth++; \ + (_tq)->axq_curage++; \ + (_tq)->axq_linkbuf = (_elm); \ } while (0) #define ATH_TXQ_REMOVE_HEAD(_tq, _field) do { \ STAILQ_REMOVE_HEAD(&(_tq)->axq_q, _field); \ @@ -190,6 +221,9 @@ u_int16_t ledoff; /* softled off time */ } sc_hwmap[32]; /* h/w rate ix mappings */ u_int8_t sc_protrix; /* protection rate index */ + u_int8_t sc_lastdatarix; /* last data frame rate index */ + u_int sc_fftxqmin; /* min frames before staging */ + u_int sc_fftxqmax; /* max frames before drop */ u_int sc_txantenna; /* tx antenna (fixed or auto) */ HAL_INT sc_imask; /* interrupt mask copy */ u_int sc_keymax; /* size of key cache */ @@ -462,6 +496,8 @@ ath_hal_setcapability(_ah, HAL_CAP_TPC, 1, _v, NULL) #define ath_hal_hasbursting(_ah) \ (ath_hal_getcapability(_ah, HAL_CAP_BURST, 0, NULL) == HAL_OK) +#define ath_hal_hasfastframes(_ah) \ + (ath_hal_getcapability(_ah, HAL_CAP_FASTFRAME, 0, NULL) == HAL_OK) #define ath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \ ((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq))) ==== //depot/projects/wifi/sys/net80211/ieee80211.h#8 (text+ko) ==== @@ -431,6 +431,25 @@ } band[4] __packed; /* up to 4 sub bands */ } __packed; +/* + * Atheros advanced capability information element. + */ +struct ieee80211_ath_ie { + u_int8_t ath_id; /* IEEE80211_ELEMID_VENDOR */ + u_int8_t ath_len; /* length in bytes */ + u_int8_t ath_oui[3]; /* 0x00, 0x03, 0x7f */ + u_int8_t ath_oui_type; /* OUI type */ + u_int8_t ath_oui_subtype; /* OUI subtype */ + u_int8_t ath_version; /* spec revision */ + u_int8_t ath_capability; /* capability info */ +#define ATHEROS_CAP_TURBO_PRIME 0x01 /* dynamic turbo--aka Turbo' */ +#define ATHEROS_CAP_COMPRESSION 0x02 /* data compression */ +#define ATHEROS_CAP_FAST_FRAME 0x04 /* fast (jumbo) frames */ +/* bits 3-6 reserved */ +#define ATHEROS_CAP_BOOST 0x80 /* use turbo/!turbo mode */ + u_int8_t ath_defkeyix[2]; +} __packed; + #define IEEE80211_CHALLENGE_LEN 128 #define IEEE80211_RATE_BASIC 0x80 @@ -441,16 +460,10 @@ #define IEEE80211_ERP_USE_PROTECTION 0x02 #define IEEE80211_ERP_LONG_PREAMBLE 0x04 -/* Atheros private advanced capabilities info */ -#define ATHEROS_CAP_TURBO_PRIME 0x01 -#define ATHEROS_CAP_COMPRESSION 0x02 -#define ATHEROS_CAP_FAST_FRAME 0x04 -/* bits 3-6 reserved */ -#define ATHEROS_CAP_BOOST 0x80 - #define ATH_OUI 0x7f0300 /* Atheros OUI */ #define ATH_OUI_TYPE 0x01 -#define ATH_OUI_VERSION 0x01 +#define ATH_OUI_SUBTYPE 0x01 +#define ATH_OUI_VERSION 0x00 #define WPA_OUI 0xf25000 #define WPA_OUI_TYPE 0x01 @@ -634,4 +647,33 @@ #define IEEE80211_RTS_MIN 1 #define IEEE80211_RTS_MAX IEEE80211_MAX_LEN +/* + * Atheros fast-frame encapsulation format. + * FF max payload: + * 802.2 + FFHDR + HPAD + 802.3 + 802.2 + 1500 + SPAD + 802.3 + 802.2 + 1500: + * 8 + 4 + 4 + 14 + 8 + 1500 + 6 + 14 + 8 + 1500 + * = 3066 + */ +/* fast frame header is 32-bits */ +#define ATH_FF_PROTO 0x0000003f /* protocol */ +#define ATH_FF_PROTO_S 0 +#define ATH_FF_FTYPE 0x000000c0 /* frame type */ +#define ATH_FF_FTYPE_S 6 +#define ATH_FF_HLEN32 0x00000300 /* optional hdr length */ +#define ATH_FF_HLEN32_S 8 +#define ATH_FF_SEQNUM 0x001ffc00 /* sequence number */ +#define ATH_FF_SEQNUM_S 10 +#define ATH_FF_OFFSET 0xffe00000 /* offset to 2nd payload */ +#define ATH_FF_OFFSET_S 21 + +#define ATH_FF_MAX_HDR_PAD 4 +#define ATH_FF_MAX_SEP_PAD 6 +#define ATH_FF_MAX_HDR 30 + +#define ATH_FF_PROTO_L2TUNNEL 0 /* L2 tunnel protocol */ +#define ATH_FF_ETH_TYPE 0x88bd /* Ether type for encapsulated frames */ +#define ATH_FF_SNAP_ORGCODE_0 0x00 +#define ATH_FF_SNAP_ORGCODE_1 0x03 +#define ATH_FF_SNAP_ORGCODE_2 0x7f + #endif /* _NET80211_IEEE80211_H_ */ ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#12 (text+ko) ==== @@ -148,6 +148,7 @@ extern struct mbuf *ieee80211_getmgtframe(u_int8_t **frm, u_int pktlen); #define M_LINK0 M_PROTO1 /* WEP requested */ #define M_PWR_SAV M_PROTO4 /* bypass PS handling */ +#define M_FF M_PROTO5 /* fast-frame */ /* * Encode WME access control bits in the PROTO flags. * This is safe since it's passed directly in to the ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#36 (text+ko) ==== @@ -1611,6 +1611,40 @@ #undef MS } +static int +ieee80211_parse_athparams(struct ieee80211_node *ni, u_int8_t *frm, + const struct ieee80211_frame *wh) +{ + struct ieee80211com *ic = ni->ni_ic; + const struct ieee80211_ath_ie *ath; + u_int len = frm[1]; + int caps; + + if (len < sizeof(struct ieee80211_ath_ie)-2) { + IEEE80211_DISCARD_IE(ic, + IEEE80211_MSG_ELEMID | IEEE80211_MSG_SUPERG, + wh, "Atheros", "too short, len %u", len); + return -1; + } + ath = (const struct ieee80211_ath_ie *)frm; + caps = 0; + if ((ath->ath_capability & ATHEROS_CAP_TURBO_PRIME) && + (ic->ic_flags & IEEE80211_F_TURBOP)) + caps |= IEEE80211_NODE_TURBOP; + if ((ath->ath_capability & ATHEROS_CAP_FAST_FRAME) && + (ic->ic_flags & IEEE80211_F_FF)) + caps |= IEEE80211_NODE_FF; + if ((ni->ni_flags ^ caps) & IEEE80211_NODE_ATH) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_SUPERG, + "[%s] ath ie: caps 0x%x defkeyix 0x%x, use 0x%x\n", + ether_sprintf(ni->ni_macaddr), + ath->ath_capability, LE_READ_2(ath->ath_defkeyix), caps); + ni->ni_flags = (ni->ni_flags &~ IEEE80211_NODE_ATH) | caps; + return 1; + } else + return 0; /* NB: no change */ +} + static void ieee80211_saveie(u_int8_t **iep, const u_int8_t *ie) { @@ -1669,7 +1703,7 @@ #define ISREASSOC(_st) ((_st) == IEEE80211_FC0_SUBTYPE_REASSOC_RESP) struct ieee80211_frame *wh; u_int8_t *frm, *efrm; - u_int8_t *ssid, *rates, *xrates, *wpa, *wme; + u_int8_t *ssid, *rates, *xrates, *wpa, *wme, *ath; int reassoc, resp, allocbs; wh = mtod(m0, struct ieee80211_frame *); @@ -1710,12 +1744,13 @@ * [tlv] extended supported rates * [tlv] WME * [tlv] WPA or RSN + * [tlv] Atheros capabilities */ IEEE80211_VERIFY_LENGTH(efrm - frm, 12); tstamp = frm; frm += 8; bintval = le16toh(*(u_int16_t *)frm); frm += 2; capinfo = le16toh(*(u_int16_t *)frm); frm += 2; - ssid = rates = xrates = country = wpa = wme = NULL; + ssid = rates = xrates = country = wpa = wme = ath = NULL; bchan = ieee80211_chan2ieee(ic, ic->ic_bss->ni_chan); chan = bchan; fhdwell = 0; @@ -1775,7 +1810,8 @@ wpa = frm; else if (iswmeparam(frm) || iswmeinfo(frm)) wme = frm; - /* XXX Atheros OUI support */ + else if (isatherosoui(frm)) + ath = frm; break; default: IEEE80211_DISCARD_IE(ic, IEEE80211_MSG_ELEMID, @@ -1867,6 +1903,8 @@ if (wme != NULL && ieee80211_parse_wmeparams(ic, wme, wh) > 0) ieee80211_wme_updateparams(ic); + if (ath != NULL) + ieee80211_parse_athparams(ni, ath, wh); /* NB: don't need the rest of this */ if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) return; @@ -1942,6 +1980,10 @@ ieee80211_saveie(&ni->ni_wme_ie, wme); if (wpa != NULL) ieee80211_saveie(&ni->ni_wpa_ie, wpa); + if (ath != NULL) { + ieee80211_saveie(&ni->ni_ath_ie, ath); + (void) ieee80211_parse_athparams(ni, ath, wh); + } /* NB: must be after ni_chan is setup */ ieee80211_setup_rates(ic, ni, rates, xrates, IEEE80211_F_DOSORT); break; @@ -1966,8 +2008,9 @@ * [tlv] ssid * [tlv] supported rates * [tlv] extended supported rates + * [tlv] Atheros capabilities */ - ssid = rates = xrates = NULL; + ssid = rates = xrates = ath = NULL; while (frm < efrm) { switch (*frm) { case IEEE80211_ELEMID_SSID: @@ -1979,6 +2022,10 @@ case IEEE80211_ELEMID_XRATES: xrates = frm; break; + case IEEE80211_ELEMID_VENDOR: + if (isatherosoui(frm)) + ath = frm; + break; } frm += frm[1] + 2; } @@ -2007,6 +2054,10 @@ "[%s] recv probe req\n", ether_sprintf(wh->i_addr2)); ni->ni_rssi = rssi; ni->ni_rstamp = rstamp; + if (ath != NULL) { + ieee80211_saveie(&ni->ni_ath_ie, ath); + (void) ieee80211_parse_athparams(ni, ath, wh); + } rate = ieee80211_setup_rates(ic, ni, rates, xrates, IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | IEEE80211_F_DONEGO | IEEE80211_F_DODEL); @@ -2113,6 +2164,7 @@ * [tlv] supported rates * [tlv] extended supported rates * [tlv] WPA or RSN + * [tlv] Atheros capabilities */ IEEE80211_VERIFY_LENGTH(efrm - frm, (reassoc ? 10 : 4)); if (!IEEE80211_ADDR_EQ(wh->i_addr3, ic->ic_bss->ni_bssid)) { @@ -2127,7 +2179,7 @@ bintval = le16toh(*(u_int16_t *)frm); frm += 2; if (reassoc) frm += 6; /* ignore current AP info */ - ssid = rates = xrates = wpa = wme = NULL; + ssid = rates = xrates = wpa = wme = ath = NULL; while (frm < efrm) { switch (*frm) { case IEEE80211_ELEMID_SSID: @@ -2149,7 +2201,8 @@ wpa = frm; } else if (iswmeinfo(frm)) wme = frm; - /* XXX Atheros OUI support */ + else if (isatherosoui(frm)) + ath = frm; break; } frm += frm[1] + 2; @@ -2276,6 +2329,23 @@ ni->ni_wme_ie = NULL; ni->ni_flags &= ~IEEE80211_NODE_QOS; } + if (ath != NULL) { + /* + * Record ATH parameters for station, mark + * node with appropriate capabilities, and + * record the information element for + * applications that require it. + */ + ieee80211_saveie(&ni->ni_ath_ie, ath); + (void) ieee80211_parse_athparams(ni, ath, wh); + } else if (ni->ni_ath_ie != NULL) { + /* + * Flush any state from a previous association. + */ + FREE(ni->ni_ath_ie, M_DEVBUF); + ni->ni_ath_ie = NULL; + ni->ni_flags &= ~IEEE80211_NODE_ATH; + } ieee80211_node_join(ic, ni, resp); break; } @@ -2319,7 +2389,7 @@ associd = le16toh(*(u_int16_t *)frm); frm += 2; - rates = xrates = wpa = wme = NULL; + rates = xrates = wme = NULL; while (frm < efrm) { switch (*frm) { case IEEE80211_ELEMID_RATES: @@ -2387,13 +2457,15 @@ else ic->ic_flags &= ~IEEE80211_F_USEPROT; IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, - "[%s] %sassoc success: %s preamble, %s slot time%s%s\n", + "[%s] %sassoc success: %s preamble, %s slot time%s%s%s%s\n", ether_sprintf(wh->i_addr2), ISREASSOC(subtype) ? "re" : "", ic->ic_flags&IEEE80211_F_SHPREAMBLE ? "short" : "long", ic->ic_flags&IEEE80211_F_SHSLOT ? "short" : "long", ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "", - ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "" + ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "", + ni->ni_flags & IEEE80211_NODE_FF ? ", fast-frames" : "", + ni->ni_flags & IEEE80211_NODE_TURBOP ? ", turbo'" : "" ); ieee80211_new_state(ic, IEEE80211_S_RUN, subtype); break; ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#33 (text+ko) ==== @@ -1015,6 +1015,8 @@ sr->isr_ie_len += 2+ni->ni_wpa_ie[1]; if (ni->ni_wme_ie != NULL) sr->isr_ie_len += 2+ni->ni_wme_ie[1]; + if (ni->ni_ath_ie != NULL) + sr->isr_ie_len += 2+ni->ni_ath_ie[1]; sr->isr_len = sizeof(*sr) + sr->isr_ssid_len + sr->isr_ie_len; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 8 00:18:02 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E80DB16A4D0; Sat, 8 Jan 2005 00:18:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AEE1816A4CE for ; Sat, 8 Jan 2005 00:18:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F51143D46 for ; Sat, 8 Jan 2005 00:18:01 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j080I1rn078084 for ; Sat, 8 Jan 2005 00:18:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j080I1WN078081 for perforce@freebsd.org; Sat, 8 Jan 2005 00:18:01 GMT (envelope-from sam@freebsd.org) Date: Sat, 8 Jan 2005 00:18:01 GMT Message-Id: <200501080018.j080I1WN078081@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 68511 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2005 00:18:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=68511 Change 68511 by sam@sam_ebb on 2005/01/08 00:17:59 save untested fix for adhoc mode Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#62 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#62 (text+ko) ==== @@ -2798,8 +2798,18 @@ * is determined by the tsf. */ if (le64toh(ni->ni_tstamp.tsf) >= tsf && - ieee80211_ibss_merge(ic, ni)) + ieee80211_ibss_merge(ic, ni)) { + /* + * XXX rather than handle this here it's + * probably better to do it at the 802.11 + * layer through the state machine so, + * we can switch channel, etc. + */ + /* XXX adopt beacon interval and ATIM window */ ath_hal_setassocid(ah, ic->ic_bss->ni_bssid, 0); + ath_hal_stoptxdma(ah, sc->sc_bhalq); + ath_beacon_config(sc); + } } break; } From owner-p4-projects@FreeBSD.ORG Sat Jan 8 00:39:28 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3B2016A4D0; Sat, 8 Jan 2005 00:39:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D140416A4CE for ; Sat, 8 Jan 2005 00:39:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF12143D2D for ; Sat, 8 Jan 2005 00:39:27 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j080dRlt078734 for ; Sat, 8 Jan 2005 00:39:27 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j080dRS1078731 for perforce@freebsd.org; Sat, 8 Jan 2005 00:39:27 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 8 Jan 2005 00:39:27 GMT Message-Id: <200501080039.j080dRS1078731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2005 00:39:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=68512 Change 68512 by davidxu@davidxu_tiger on 2005/01/08 00:39:10 remove stale comments. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#14 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_mutex.c#14 (text+ko) ==== @@ -309,11 +309,6 @@ ret = umtx_trylock(&(*mutex)->m_lock, curthread->tid); if (ret == 0) { (*mutex)->m_owner = curthread; - /* - * XXX there should be a separated list for - * owned mutex, separated it from priority - * mutex list - */ /* Add to the list of owned mutexes: */ MUTEX_ASSERT_NOT_OWNED(*mutex); TAILQ_INSERT_TAIL(&curthread->mutexq, @@ -482,11 +477,6 @@ ret = umtx_trylock(&(*m)->m_lock, curthread->tid); if (ret == 0) { (*m)->m_owner = curthread; - /* - * XXX there should be a separated list for - * owned mutex, separated it from priority - * mutex list - */ /* Add to the list of owned mutexes: */ MUTEX_ASSERT_NOT_OWNED(*m); TAILQ_INSERT_TAIL(&curthread->mutexq, @@ -980,11 +970,6 @@ */ (*m)->m_count = 0; (*m)->m_owner = NULL; - /* - * XXX there should be a separated list - * for owned mutex, separated it from - * priority mutex list - */ /* Remove the mutex from the threads queue. */ MUTEX_ASSERT_IS_OWNED(*m); TAILQ_REMOVE(&curthread->mutexq, (*m), m_qe); From owner-p4-projects@FreeBSD.ORG Sat Jan 8 00:40:30 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B204016A4D0; Sat, 8 Jan 2005 00:40:29 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F02216A4CE for ; Sat, 8 Jan 2005 00:40:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FD2443D31 for ; Sat, 8 Jan 2005 00:40:29 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j080eTrR078783 for ; Sat, 8 Jan 2005 00:40:29 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j080eT8p078780 for perforce@freebsd.org; Sat, 8 Jan 2005 00:40:29 GMT (envelope-from davidxu@freebsd.org) Date: Sat, 8 Jan 2005 00:40:29 GMT Message-Id: <200501080040.j080eT8p078780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 68513 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2005 00:40:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=68513 Change 68513 by davidxu@davidxu_tiger on 2005/01/08 00:39:42 remove some code left over. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_fork.c#8 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_fork.c#8 (text+ko) ==== @@ -137,8 +137,6 @@ inprogress = 0; curthread->cancelflags &= ~THR_CANCEL_NEEDED; - curthread->critical_count = 0; - curthread->locklevel = 0; thr_self(&curthread->tid); @@ -151,8 +149,6 @@ _thr_spinlock_init(); _mutex_fork(curthread); - curthread->priority_mutex_count = 0; - /* reinit library. */ _libpthread_init(curthread); From owner-p4-projects@FreeBSD.ORG Sat Jan 8 18:28:40 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B71AF16A4CE; Sat, 8 Jan 2005 18:28:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8934016A4CE for ; Sat, 8 Jan 2005 18:28:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6271243D45 for ; Sat, 8 Jan 2005 18:28:39 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j08ISdRD095659 for ; Sat, 8 Jan 2005 18:28:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j08ISd4E095656 for perforce@freebsd.org; Sat, 8 Jan 2005 18:28:39 GMT (envelope-from sam@freebsd.org) Date: Sat, 8 Jan 2005 18:28:39 GMT Message-Id: <200501081828.j08ISd4E095656@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 68550 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2005 18:28:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=68550 Change 68550 by sam@sam_ebb on 2005/01/08 18:28:08 typo Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#63 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#63 (text+ko) ==== @@ -3912,7 +3912,7 @@ * Process each active queue. */ for (i = 0; i < HAL_NUM_TX_QUEUES; i++) - if (ATH_TXQ_SETUP(sc, i) && qactive(sc->sc_ah, i)) + if (ATH_TXQ_SETUP(sc, i) && txqactive(sc->sc_ah, i)) ath_tx_processq(sc, &sc->sc_txq[i]); ifp->if_flags &= ~IFF_OACTIVE; From owner-p4-projects@FreeBSD.ORG Sat Jan 8 19:13:46 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46B2F16A522; Sat, 8 Jan 2005 19:13:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17BC316A4FC for ; Sat, 8 Jan 2005 19:13:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65ECD43D31 for ; Sat, 8 Jan 2005 19:13:45 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j08JDjrE097676 for ; Sat, 8 Jan 2005 19:13:45 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j08JDKOc097589 for perforce@freebsd.org; Sat, 8 Jan 2005 19:13:20 GMT (envelope-from marcel@freebsd.org) Date: Sat, 8 Jan 2005 19:13:20 GMT Message-Id: <200501081913.j08JDKOc097589@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 68552 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2005 19:13:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=68552 Change 68552 by marcel@marcel_nfs on 2005/01/08 19:12:28 IFC @68548 Affected files ... .. //depot/projects/uart/alpha/alpha/busdma_machdep.c#5 integrate .. //depot/projects/uart/alpha/alpha/clock.c#4 integrate .. //depot/projects/uart/alpha/alpha/clock_if.m#2 integrate .. //depot/projects/uart/alpha/alpha/cpuconf.c#3 integrate .. //depot/projects/uart/alpha/alpha/db_disasm.c#4 integrate .. //depot/projects/uart/alpha/alpha/db_instruction.h#3 integrate .. //depot/projects/uart/alpha/alpha/db_interface.c#4 integrate .. //depot/projects/uart/alpha/alpha/db_trace.c#5 integrate .. //depot/projects/uart/alpha/alpha/dec_1000a.c#7 integrate .. //depot/projects/uart/alpha/alpha/dec_2100_a50.c#7 integrate .. //depot/projects/uart/alpha/alpha/dec_2100_a500.c#7 integrate .. //depot/projects/uart/alpha/alpha/dec_3000_300.c#3 integrate .. //depot/projects/uart/alpha/alpha/dec_3000_500.c#3 integrate .. //depot/projects/uart/alpha/alpha/dec_axppci_33.c#7 integrate .. //depot/projects/uart/alpha/alpha/dec_eb164.c#6 integrate .. //depot/projects/uart/alpha/alpha/dec_eb64plus.c#7 integrate .. //depot/projects/uart/alpha/alpha/dec_kn20aa.c#7 integrate .. //depot/projects/uart/alpha/alpha/dec_kn300.c#7 integrate .. //depot/projects/uart/alpha/alpha/dec_kn8ae.c#3 integrate .. //depot/projects/uart/alpha/alpha/dec_st550.c#7 integrate .. //depot/projects/uart/alpha/alpha/divrem.m4#2 integrate .. //depot/projects/uart/alpha/alpha/exception.s#2 integrate .. //depot/projects/uart/alpha/alpha/fp_emulate.c#4 integrate .. //depot/projects/uart/alpha/alpha/gdb_machdep.c#2 integrate .. //depot/projects/uart/alpha/alpha/in_cksum.c#3 integrate .. //depot/projects/uart/alpha/alpha/interrupt.c#5 integrate .. //depot/projects/uart/alpha/alpha/locore.s#2 integrate .. //depot/projects/uart/alpha/alpha/machdep.c#12 integrate .. //depot/projects/uart/alpha/alpha/mp_machdep.c#11 integrate .. //depot/projects/uart/alpha/alpha/pal.s#2 integrate .. //depot/projects/uart/alpha/alpha/pmap.c#15 integrate .. //depot/projects/uart/alpha/alpha/prom.c#3 integrate .. //depot/projects/uart/alpha/alpha/prom_disp.s#2 integrate .. //depot/projects/uart/alpha/alpha/promcons.c#5 integrate .. //depot/projects/uart/alpha/alpha/support.s#5 integrate .. //depot/projects/uart/alpha/alpha/sys_machdep.c#4 integrate .. //depot/projects/uart/alpha/alpha/trap.c#5 integrate .. //depot/projects/uart/alpha/alpha/uio_machdep.c#2 integrate .. //depot/projects/uart/alpha/alpha/vm_machdep.c#8 integrate .. //depot/projects/uart/alpha/conf/GENERIC#7 integrate .. //depot/projects/uart/alpha/conf/gethints.awk#2 delete .. //depot/projects/uart/alpha/include/_limits.h#3 integrate .. //depot/projects/uart/alpha/include/alpha_cpu.h#3 integrate .. //depot/projects/uart/alpha/include/asm.h#2 integrate .. //depot/projects/uart/alpha/include/bootinfo.h#2 integrate .. //depot/projects/uart/alpha/include/bus.h#6 integrate .. //depot/projects/uart/alpha/include/bus_memio.h#2 integrate .. //depot/projects/uart/alpha/include/bus_pio.h#2 integrate .. //depot/projects/uart/alpha/include/clock.h#2 integrate .. //depot/projects/uart/alpha/include/clockvar.h#2 integrate .. //depot/projects/uart/alpha/include/cpu.h#4 integrate .. //depot/projects/uart/alpha/include/cpuconf.h#2 integrate .. //depot/projects/uart/alpha/include/db_machdep.h#4 integrate .. //depot/projects/uart/alpha/include/exec.h#2 integrate .. //depot/projects/uart/alpha/include/float.h#3 integrate .. //depot/projects/uart/alpha/include/floatingpoint.h#2 integrate .. //depot/projects/uart/alpha/include/frame.h#2 integrate .. //depot/projects/uart/alpha/include/gdb_machdep.h#2 integrate .. //depot/projects/uart/alpha/include/ieee.h#3 integrate .. //depot/projects/uart/alpha/include/ieeefp.h#2 integrate .. //depot/projects/uart/alpha/include/intrcnt.h#2 integrate .. //depot/projects/uart/alpha/include/kdb.h#2 integrate .. //depot/projects/uart/alpha/include/limits.h#3 integrate .. //depot/projects/uart/alpha/include/pal.h#2 integrate .. //depot/projects/uart/alpha/include/param.h#5 integrate .. //depot/projects/uart/alpha/include/pc/msdos.h#2 delete .. //depot/projects/uart/alpha/include/pcb.h#4 integrate .. //depot/projects/uart/alpha/include/pmap.h#4 integrate .. //depot/projects/uart/alpha/include/proc.h#2 integrate .. //depot/projects/uart/alpha/include/profile.h#3 integrate .. //depot/projects/uart/alpha/include/prom.h#2 integrate .. //depot/projects/uart/alpha/include/pte.h#2 integrate .. //depot/projects/uart/alpha/include/ptrace.h#3 integrate .. //depot/projects/uart/alpha/include/reg.h#2 integrate .. //depot/projects/uart/alpha/include/reloc.h#2 integrate .. //depot/projects/uart/alpha/include/resource.h#2 integrate .. //depot/projects/uart/alpha/include/rpb.h#2 integrate .. //depot/projects/uart/alpha/include/runq.h#2 integrate .. //depot/projects/uart/alpha/include/signal.h#2 integrate .. //depot/projects/uart/alpha/include/smp.h#3 integrate .. //depot/projects/uart/alpha/include/vmparam.h#3 integrate .. //depot/projects/uart/alpha/isa/mcclock_isa.c#3 integrate .. //depot/projects/uart/alpha/linux/linux_machdep.c#4 integrate .. //depot/projects/uart/alpha/mcbus/mcbus.c#3 integrate .. //depot/projects/uart/alpha/mcbus/mcbusreg.h#2 integrate .. //depot/projects/uart/alpha/mcbus/mcbusvar.h#2 integrate .. //depot/projects/uart/alpha/mcbus/mcmem.c#3 integrate .. //depot/projects/uart/alpha/mcbus/mcpcia.c#4 integrate .. //depot/projects/uart/alpha/mcbus/mcpciareg.h#2 integrate .. //depot/projects/uart/alpha/mcbus/mcpciavar.h#2 integrate .. //depot/projects/uart/alpha/osf1/exec_ecoff.h#2 integrate .. //depot/projects/uart/alpha/osf1/imgact_osf1.c#3 integrate .. //depot/projects/uart/alpha/osf1/osf1.h#2 integrate .. //depot/projects/uart/alpha/osf1/osf1_ioctl.c#4 integrate .. //depot/projects/uart/alpha/osf1/osf1_misc.c#4 integrate .. //depot/projects/uart/alpha/osf1/osf1_mount.c#4 integrate .. //depot/projects/uart/alpha/osf1/osf1_signal.c#4 integrate .. //depot/projects/uart/alpha/pci/alphapci_if.m#2 integrate .. //depot/projects/uart/alpha/pci/apecs.c#4 integrate .. //depot/projects/uart/alpha/pci/apecsreg.h#2 integrate .. //depot/projects/uart/alpha/pci/cia.c#4 integrate .. //depot/projects/uart/alpha/pci/cia_pci.c#3 integrate .. //depot/projects/uart/alpha/pci/ciareg.h#2 integrate .. //depot/projects/uart/alpha/pci/lcareg.h#2 integrate .. //depot/projects/uart/alpha/pci/pci_eb164_intr.s#2 integrate .. //depot/projects/uart/alpha/pci/pci_eb64plus_intr.s#2 integrate .. //depot/projects/uart/alpha/pci/pcibus.c#4 integrate .. //depot/projects/uart/alpha/pci/t2.c#5 integrate .. //depot/projects/uart/alpha/pci/t2reg.h#2 integrate .. //depot/projects/uart/alpha/tlsb/dwlpx.c#4 integrate .. //depot/projects/uart/alpha/tlsb/dwlpxreg.h#2 integrate .. //depot/projects/uart/alpha/tlsb/dwlpxvar.h#2 integrate .. //depot/projects/uart/alpha/tlsb/gbus.c#3 integrate .. //depot/projects/uart/alpha/tlsb/kftxx.c#3 integrate .. //depot/projects/uart/alpha/tlsb/kftxxreg.h#2 integrate .. //depot/projects/uart/alpha/tlsb/mcclock_tlsb.c#3 integrate .. //depot/projects/uart/alpha/tlsb/tlsb.c#3 integrate .. //depot/projects/uart/alpha/tlsb/tlsbcpu.c#3 integrate .. //depot/projects/uart/alpha/tlsb/tlsbmem.c#3 integrate .. //depot/projects/uart/alpha/tlsb/tlsbreg.h#2 integrate .. //depot/projects/uart/alpha/tlsb/tlsbvar.h#2 integrate .. //depot/projects/uart/amd64/amd64/busdma_machdep.c#10 integrate .. //depot/projects/uart/amd64/amd64/db_disasm.c#3 integrate .. //depot/projects/uart/amd64/amd64/db_interface.c#4 integrate .. //depot/projects/uart/amd64/amd64/db_trace.c#5 integrate .. //depot/projects/uart/amd64/amd64/fpu.c#2 integrate .. //depot/projects/uart/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/uart/amd64/amd64/in_cksum.c#3 integrate .. //depot/projects/uart/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/uart/amd64/amd64/machdep.c#11 integrate .. //depot/projects/uart/amd64/amd64/nexus.c#4 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#22 integrate .. //depot/projects/uart/amd64/amd64/uio_machdep.c#2 integrate .. //depot/projects/uart/amd64/amd64/vm_machdep.c#7 integrate .. //depot/projects/uart/amd64/conf/GENERIC#8 integrate .. //depot/projects/uart/amd64/conf/gethints.awk#3 delete .. //depot/projects/uart/amd64/include/_limits.h#3 integrate .. //depot/projects/uart/amd64/include/apicreg.h#2 integrate .. //depot/projects/uart/amd64/include/bus_amd64.h#3 integrate .. //depot/projects/uart/amd64/include/bus_dma.h#5 integrate .. //depot/projects/uart/amd64/include/bus_memio.h#2 integrate .. //depot/projects/uart/amd64/include/bus_pio.h#2 integrate .. //depot/projects/uart/amd64/include/clock.h#5 integrate .. //depot/projects/uart/amd64/include/cputypes.h#3 integrate .. //depot/projects/uart/amd64/include/db_machdep.h#3 integrate .. //depot/projects/uart/amd64/include/float.h#3 integrate .. //depot/projects/uart/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/uart/amd64/include/kdb.h#2 integrate .. //depot/projects/uart/amd64/include/limits.h#3 integrate .. //depot/projects/uart/amd64/include/metadata.h#2 integrate .. //depot/projects/uart/amd64/include/mptable.h#2 integrate .. //depot/projects/uart/amd64/include/param.h#5 integrate .. //depot/projects/uart/amd64/include/pc/display.h#2 integrate .. //depot/projects/uart/amd64/include/pci_cfgreg.h#4 integrate .. //depot/projects/uart/amd64/include/pmap.h#6 integrate .. //depot/projects/uart/amd64/include/proc.h#3 integrate .. //depot/projects/uart/amd64/include/profile.h#3 integrate .. //depot/projects/uart/amd64/include/ptrace.h#3 integrate .. //depot/projects/uart/amd64/include/resource.h#2 integrate .. //depot/projects/uart/amd64/include/runq.h#3 integrate .. //depot/projects/uart/amd64/include/signal.h#5 integrate .. //depot/projects/uart/amd64/include/smp.h#3 integrate .. //depot/projects/uart/amd64/isa/isa.c#4 integrate .. //depot/projects/uart/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/uart/amd64/pci/pci_bus.c#8 integrate .. //depot/projects/uart/amd64/pci/pci_cfgreg.c#4 integrate .. //depot/projects/uart/arm/arm/bcopy_page.S#3 integrate .. //depot/projects/uart/arm/arm/bcopyinout.S#3 integrate .. //depot/projects/uart/arm/arm/bcopyinout_xscale.S#3 integrate .. //depot/projects/uart/arm/arm/blockio.S#3 integrate .. //depot/projects/uart/arm/arm/bootconfig.c#2 integrate .. //depot/projects/uart/arm/arm/bus_space_asm_generic.S#3 integrate .. //depot/projects/uart/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/uart/arm/arm/copystr.S#3 integrate .. //depot/projects/uart/arm/arm/cpufunc.c#3 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm.S#3 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_arm10.S#2 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_arm3.S#3 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_arm67.S#3 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_arm7tdmi.S#3 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_arm8.S#3 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_arm9.S#3 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_armv4.S#3 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_ixp12x0.S#3 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_sa1.S#3 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_sa11x0.S#3 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_xscale.S#3 integrate .. //depot/projects/uart/arm/arm/db_disasm.c#2 integrate .. //depot/projects/uart/arm/arm/db_interface.c#3 integrate .. //depot/projects/uart/arm/arm/db_trace.c#4 integrate .. //depot/projects/uart/arm/arm/disassem.c#2 integrate .. //depot/projects/uart/arm/arm/exception.S#3 integrate .. //depot/projects/uart/arm/arm/fiq.c#2 integrate .. //depot/projects/uart/arm/arm/fiq_subr.S#3 integrate .. //depot/projects/uart/arm/arm/fusu.S#3 integrate .. //depot/projects/uart/arm/arm/identcpu.c#3 integrate .. //depot/projects/uart/arm/arm/in_cksum.c#2 integrate .. //depot/projects/uart/arm/arm/in_cksum_arm.S#3 integrate .. //depot/projects/uart/arm/arm/intr.c#4 integrate .. //depot/projects/uart/arm/arm/irq_dispatch.S#3 integrate .. //depot/projects/uart/arm/arm/locore.S#3 integrate .. //depot/projects/uart/arm/arm/machdep.c#3 integrate .. //depot/projects/uart/arm/arm/nexus.c#2 integrate .. //depot/projects/uart/arm/arm/nexus_io.c#2 integrate .. //depot/projects/uart/arm/arm/nexus_io_asm.S#3 integrate .. //depot/projects/uart/arm/arm/pmap.c#5 integrate .. //depot/projects/uart/arm/arm/setcpsr.S#3 integrate .. //depot/projects/uart/arm/arm/setstack.s#2 integrate .. //depot/projects/uart/arm/arm/swtch.S#4 integrate .. //depot/projects/uart/arm/arm/trap.c#4 integrate .. //depot/projects/uart/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/uart/arm/arm/undefined.c#4 integrate .. //depot/projects/uart/arm/arm/vectors.S#2 integrate .. //depot/projects/uart/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/uart/arm/conf/SIMICS#4 integrate .. //depot/projects/uart/arm/include/_limits.h#3 integrate .. //depot/projects/uart/arm/include/armreg.h#2 integrate .. //depot/projects/uart/arm/include/asm.h#3 integrate .. //depot/projects/uart/arm/include/asmacros.h#2 integrate .. //depot/projects/uart/arm/include/atomic.h#3 integrate .. //depot/projects/uart/arm/include/bootconfig.h#2 integrate .. //depot/projects/uart/arm/include/bus.h#2 integrate .. //depot/projects/uart/arm/include/bus_memio.h#2 integrate .. //depot/projects/uart/arm/include/bus_pio.h#2 integrate .. //depot/projects/uart/arm/include/cpuconf.h#3 integrate .. //depot/projects/uart/arm/include/cpufunc.h#4 integrate .. //depot/projects/uart/arm/include/db_machdep.h#4 integrate .. //depot/projects/uart/arm/include/disassem.h#2 integrate .. //depot/projects/uart/arm/include/endian.h#5 integrate .. //depot/projects/uart/arm/include/exec.h#2 integrate .. //depot/projects/uart/arm/include/fiq.h#2 integrate .. //depot/projects/uart/arm/include/float.h#2 integrate .. //depot/projects/uart/arm/include/fp.h#2 integrate .. //depot/projects/uart/arm/include/frame.h#2 integrate .. //depot/projects/uart/arm/include/ieee.h#2 integrate .. //depot/projects/uart/arm/include/ieeefp.h#2 integrate .. //depot/projects/uart/arm/include/intr.h#2 integrate .. //depot/projects/uart/arm/include/katelib.h#2 integrate .. //depot/projects/uart/arm/include/kdb.h#3 integrate .. //depot/projects/uart/arm/include/limits.h#3 integrate .. //depot/projects/uart/arm/include/metadata.h#2 integrate .. //depot/projects/uart/arm/include/pcb.h#2 integrate .. //depot/projects/uart/arm/include/pmap.h#3 integrate .. //depot/projects/uart/arm/include/proc.h#2 integrate .. //depot/projects/uart/arm/include/profile.h#2 integrate .. //depot/projects/uart/arm/include/psl.h#2 integrate .. //depot/projects/uart/arm/include/pte.h#2 integrate .. //depot/projects/uart/arm/include/resource.h#2 integrate .. //depot/projects/uart/arm/include/runq.h#2 integrate .. //depot/projects/uart/arm/include/signal.h#3 integrate .. //depot/projects/uart/arm/include/stdarg.h#2 integrate .. //depot/projects/uart/arm/include/swi.h#2 integrate .. //depot/projects/uart/arm/include/sysarch.h#2 integrate .. //depot/projects/uart/arm/include/undefined.h#2 integrate .. //depot/projects/uart/arm/include/vmparam.h#2 integrate .. //depot/projects/uart/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/uart/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/uart/arm/sa11x0/sa11x0_io_asm.S#2 integrate .. //depot/projects/uart/arm/sa11x0/sa11x0_irq.S#2 integrate .. //depot/projects/uart/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/uart/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/uart/arm/sa11x0/uart_bus_sa1110.c#2 integrate .. //depot/projects/uart/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/uart/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/uart/arm/sa11x0/uart_dev_sa1110.h#2 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321.c#3 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_intr.h#2 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_mcu.c#2 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321reg.h#2 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/uart/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/uart/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/uart/arm/xscale/i80321/iq80321reg.h#2 integrate .. //depot/projects/uart/arm/xscale/i80321/iq80321var.h#2 integrate .. //depot/projects/uart/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/uart/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/uart/arm/xscale/i80321/obiovar.h#2 integrate .. //depot/projects/uart/arm/xscale/i80321/uart_bus_i80321.c#3 integrate .. //depot/projects/uart/arm/xscale/i80321/uart_cpu_i80321.c#3 integrate .. //depot/projects/uart/arm/xscale/xscalereg.h#2 integrate .. //depot/projects/uart/arm/xscale/xscalevar.h#2 integrate .. //depot/projects/uart/boot/Makefile#5 integrate .. //depot/projects/uart/boot/README#2 integrate .. //depot/projects/uart/boot/alpha/boot1/Makefile#3 integrate .. //depot/projects/uart/boot/alpha/cdboot/Makefile#3 integrate .. //depot/projects/uart/boot/alpha/common/Makefile.common#3 integrate .. //depot/projects/uart/boot/alpha/netboot/Makefile#3 integrate .. //depot/projects/uart/boot/arc/loader/Makefile#2 integrate .. //depot/projects/uart/boot/common/loader.8#4 integrate .. //depot/projects/uart/boot/efi/include/README#2 integrate .. //depot/projects/uart/boot/efi/include/efilib.h#2 integrate .. //depot/projects/uart/boot/efi/libefi/Makefile#4 integrate .. //depot/projects/uart/boot/efi/libefi/bootinfo.c#3 integrate .. //depot/projects/uart/boot/efi/libefi/copy.c#2 integrate .. //depot/projects/uart/boot/efi/libefi/efiboot.h#3 integrate .. //depot/projects/uart/boot/efi/libefi/time.c#2 integrate .. //depot/projects/uart/boot/ficl/ficl.h#2 integrate .. //depot/projects/uart/boot/ficl/loader.c#3 integrate .. //depot/projects/uart/boot/forth/beastie.4th#5 integrate .. //depot/projects/uart/boot/forth/loader.conf#5 integrate .. //depot/projects/uart/boot/forth/loader.rc#2 integrate .. //depot/projects/uart/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/uart/boot/i386/btx/btx/Makefile#3 integrate .. //depot/projects/uart/boot/i386/btx/btxldr/Makefile#3 integrate .. //depot/projects/uart/boot/i386/btx/lib/Makefile#4 integrate .. //depot/projects/uart/boot/i386/cdboot/Makefile#3 integrate .. //depot/projects/uart/boot/i386/kgzldr/Makefile#4 integrate .. //depot/projects/uart/boot/i386/libi386/bootinfo.c#3 integrate .. //depot/projects/uart/boot/i386/loader/Makefile#3 integrate .. //depot/projects/uart/boot/i386/loader/help.i386#3 integrate .. //depot/projects/uart/boot/i386/loader/loader.rc#3 delete .. //depot/projects/uart/boot/i386/mbr/Makefile#3 integrate .. //depot/projects/uart/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/uart/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/uart/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/uart/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/uart/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/uart/boot/ia64/ski/bootinfo.c#2 integrate .. //depot/projects/uart/boot/ia64/ski/conf.c#2 integrate .. //depot/projects/uart/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/uart/boot/ia64/ski/elf_freebsd.c#2 integrate .. //depot/projects/uart/boot/ia64/ski/pal_stub.S#2 integrate .. //depot/projects/uart/boot/ia64/ski/sal_stub.c#2 integrate .. //depot/projects/uart/boot/ia64/ski/start.S#2 integrate .. //depot/projects/uart/boot/ia64/ski/time.c#2 integrate .. //depot/projects/uart/boot/ofw/libofw/libofw.h#3 integrate .. //depot/projects/uart/boot/ofw/libofw/ofw_console.c#3 integrate .. //depot/projects/uart/boot/ofw/libofw/ofw_disk.c#3 integrate .. //depot/projects/uart/boot/ofw/libofw/ofw_memory.c#3 integrate .. //depot/projects/uart/boot/ofw/libofw/ofw_net.c#3 integrate .. //depot/projects/uart/boot/ofw/libofw/ofw_reboot.c#3 integrate .. //depot/projects/uart/boot/ofw/libofw/ofw_time.c#3 integrate .. //depot/projects/uart/boot/ofw/libofw/openfirm.c#3 integrate .. //depot/projects/uart/boot/ofw/libofw/openfirm.h#3 integrate .. //depot/projects/uart/boot/pc98/boot0.5/Makefile#3 integrate .. //depot/projects/uart/boot/pc98/boot0/Makefile#3 integrate .. //depot/projects/uart/boot/pc98/boot2/Makefile#3 integrate .. //depot/projects/uart/boot/pc98/boot2/boot.c#3 integrate .. //depot/projects/uart/boot/pc98/btx/btx/Makefile#3 integrate .. //depot/projects/uart/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/uart/boot/pc98/btx/btxldr/Makefile#3 integrate .. //depot/projects/uart/boot/pc98/btx/lib/Makefile#4 integrate .. //depot/projects/uart/boot/pc98/kgzldr/Makefile#4 integrate .. //depot/projects/uart/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/uart/boot/pc98/loader/help.pc98#3 integrate .. //depot/projects/uart/boot/powerpc/loader/Makefile#4 integrate .. //depot/projects/uart/boot/powerpc/loader/metadata.c#3 integrate .. //depot/projects/uart/boot/powerpc/loader/start.c#4 integrate .. //depot/projects/uart/boot/sparc64/boot1/Makefile#3 integrate .. //depot/projects/uart/boot/sparc64/boot1/boot1.c#3 integrate .. //depot/projects/uart/boot/sparc64/loader/Makefile#3 integrate .. //depot/projects/uart/boot/sparc64/loader/locore.S#2 integrate .. //depot/projects/uart/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/uart/boot/sparc64/loader/metadata.c#3 integrate .. //depot/projects/uart/cam/cam.c#2 integrate .. //depot/projects/uart/cam/cam.h#2 integrate .. //depot/projects/uart/cam/cam_ccb.h#4 integrate .. //depot/projects/uart/cam/cam_debug.h#2 integrate .. //depot/projects/uart/cam/cam_periph.c#6 integrate .. //depot/projects/uart/cam/cam_periph.h#3 integrate .. //depot/projects/uart/cam/cam_queue.c#2 integrate .. //depot/projects/uart/cam/cam_queue.h#2 integrate .. //depot/projects/uart/cam/cam_sim.c#2 integrate .. //depot/projects/uart/cam/cam_sim.h#2 integrate .. //depot/projects/uart/cam/cam_xpt.c#4 integrate .. //depot/projects/uart/cam/cam_xpt.h#2 integrate .. //depot/projects/uart/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/uart/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/uart/cam/scsi/scsi_all.c#4 integrate .. //depot/projects/uart/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/uart/cam/scsi/scsi_cd.c#8 integrate .. //depot/projects/uart/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/uart/cam/scsi/scsi_ch.h#2 integrate .. //depot/projects/uart/cam/scsi/scsi_da.c#11 integrate .. //depot/projects/uart/cam/scsi/scsi_da.h#3 integrate .. //depot/projects/uart/cam/scsi/scsi_dvcfg.h#2 integrate .. //depot/projects/uart/cam/scsi/scsi_iu.h#2 integrate .. //depot/projects/uart/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/uart/cam/scsi/scsi_low.h#3 integrate .. //depot/projects/uart/cam/scsi/scsi_low_pisa.c#2 integrate .. //depot/projects/uart/cam/scsi/scsi_low_pisa.h#2 integrate .. //depot/projects/uart/cam/scsi/scsi_message.h#2 integrate .. //depot/projects/uart/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/uart/cam/scsi/scsi_pass.h#2 integrate .. //depot/projects/uart/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/uart/cam/scsi/scsi_pt.h#2 integrate .. //depot/projects/uart/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/uart/cam/scsi/scsi_sa.h#2 integrate .. //depot/projects/uart/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/uart/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/uart/cam/scsi/scsi_targ_bh.c#4 integrate .. //depot/projects/uart/cam/scsi/scsi_target.c#5 integrate .. //depot/projects/uart/cam/scsi/scsi_targetio.h#2 integrate .. //depot/projects/uart/coda/cnode.h#4 integrate .. //depot/projects/uart/coda/coda.h#4 integrate .. //depot/projects/uart/coda/coda_fbsd.c#4 integrate .. //depot/projects/uart/coda/coda_io.h#2 integrate .. //depot/projects/uart/coda/coda_kernel.h#2 integrate .. //depot/projects/uart/coda/coda_namecache.c#3 integrate .. //depot/projects/uart/coda/coda_namecache.h#3 integrate .. //depot/projects/uart/coda/coda_opstats.h#2 integrate .. //depot/projects/uart/coda/coda_pioctl.h#2 integrate .. //depot/projects/uart/coda/coda_psdev.c#4 integrate .. //depot/projects/uart/coda/coda_psdev.h#3 integrate .. //depot/projects/uart/coda/coda_subr.c#5 integrate .. //depot/projects/uart/coda/coda_subr.h#3 integrate .. //depot/projects/uart/coda/coda_venus.c#4 integrate .. //depot/projects/uart/coda/coda_venus.h#4 integrate .. //depot/projects/uart/coda/coda_vfsops.c#5 integrate .. //depot/projects/uart/coda/coda_vfsops.h#3 integrate .. //depot/projects/uart/coda/coda_vnops.c#6 integrate .. //depot/projects/uart/coda/coda_vnops.h#3 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/uart/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/uart/compat/linux/linux_file.c#3 integrate .. //depot/projects/uart/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/uart/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/uart/compat/linux/linux_util.c#3 integrate .. //depot/projects/uart/compat/linux/linux_util.h#3 integrate .. //depot/projects/uart/compat/ndis/cfg_var.h#2 integrate .. //depot/projects/uart/compat/ndis/hal_var.h#2 integrate .. //depot/projects/uart/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/uart/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/uart/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/uart/compat/ndis/pe_var.h#2 integrate .. //depot/projects/uart/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/uart/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/uart/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/uart/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/uart/compat/netbsd/dvcfg.h#2 integrate .. //depot/projects/uart/compat/netbsd/physio_proc.h#2 integrate .. //depot/projects/uart/compat/pecoff/imgact_pecoff.c#5 integrate .. //depot/projects/uart/compat/pecoff/imgact_pecoff.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_acl.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_dirent.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_errno.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_exec.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/uart/compat/svr4/svr4_fcntl.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_filio.c#5 integrate .. //depot/projects/uart/compat/svr4/svr4_filio.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_fuser.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_hrt.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_ioctl.c#3 integrate .. //depot/projects/uart/compat/svr4/svr4_ioctl.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/uart/compat/svr4/svr4_ipc.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/uart/compat/svr4/svr4_mman.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_resource.c#3 integrate .. //depot/projects/uart/compat/svr4/svr4_resource.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_siginfo.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_signal.c#3 integrate .. //depot/projects/uart/compat/svr4/svr4_signal.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_socket.c#3 integrate .. //depot/projects/uart/compat/svr4/svr4_socket.h#3 integrate .. //depot/projects/uart/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/uart/compat/svr4/svr4_sockio.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_sockmod.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/uart/compat/svr4/svr4_stat.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_statvfs.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/uart/compat/svr4/svr4_stropts.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_systeminfo.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/uart/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/uart/compat/svr4/svr4_termios.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_time.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_timod.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_ttold.c#3 integrate .. //depot/projects/uart/compat/svr4/svr4_ttold.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_types.h#3 integrate .. //depot/projects/uart/compat/svr4/svr4_ucontext.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_ulimit.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_ustat.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_util.h#3 integrate .. //depot/projects/uart/compat/svr4/svr4_utsname.h#2 integrate .. //depot/projects/uart/compat/svr4/svr4_wait.h#2 integrate .. //depot/projects/uart/conf/NOTES#22 integrate .. //depot/projects/uart/conf/files#39 integrate .. //depot/projects/uart/conf/files.amd64#10 integrate .. //depot/projects/uart/conf/files.i386#14 integrate .. //depot/projects/uart/conf/files.pc98#11 integrate .. //depot/projects/uart/conf/kern.post.mk#6 integrate .. //depot/projects/uart/conf/kmod.mk#11 integrate .. //depot/projects/uart/conf/majors#7 integrate .. //depot/projects/uart/conf/options#16 integrate .. //depot/projects/uart/contrib/dev/acpica/CHANGES.txt#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acconfig.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acdebug.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acenv.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/acevents.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acexcep.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acglobal.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/achware.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acinterp.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/aclocal.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acmacros.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acobject.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acoutput.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/acpiosxf.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acpixf.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/actbl2.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/actypes.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acutils.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/amlcode.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/amlresrc.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/common/adisasm.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslanalyze.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslcodegen.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslopcodes.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslopt.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/asltransform.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/dbcmds.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/dbexec.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dbinput.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dbutils.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dmwalk.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dsmethod.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dsmthdat.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dsutils.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/dswexec.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dswload.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/dswstate.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/evgpe.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/evgpeblk.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/evmisc.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/evregion.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/evrgnini.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/evxface.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/exconfig.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/exconvrt.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/exdump.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/exfldio.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/exmisc.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/exoparg1.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/exoparg2.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/exprep.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/exregion.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/exresolv.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/exresop.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/exstore.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/exsystem.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/exutils.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/hwgpe.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/hwregs.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/hwsleep.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/hwtimer.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/nsaccess.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/nsalloc.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/nsdump.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/nsdumpdv.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/nseval.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/nsinit.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/nsload.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/nsnames.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/nssearch.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/nsutils.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/nswalk.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/osunixxf.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/psopcode.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/psparse.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/psutils.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/rscalc.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/rsxface.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/tbconvrt.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/tbget.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/tbinstal.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/tbrsdt.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/tbxfroot.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/utalloc.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/utclib.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/utcopy.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/utdelete.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/uteval.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/utglobal.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/utmath.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/utmisc.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/utobject.c#4 integrate .. //depot/projects/uart/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/uart/contrib/dev/ath/README#3 integrate .. //depot/projects/uart/contrib/dev/ath/ah.h#4 integrate .. //depot/projects/uart/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/ah_devid.h#3 integrate .. //depot/projects/uart/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/uart/contrib/dev/ath/freebsd/ah_osdep.c#4 integrate .. //depot/projects/uart/contrib/dev/ath/freebsd/ah_osdep.h#4 integrate .. //depot/projects/uart/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#5 delete .. //depot/projects/uart/contrib/dev/ath/freebsd/opt_ah.h#2 delete .. //depot/projects/uart/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/arm9-le-thumb-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/armv4-be-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/armv4-le-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/i386-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/i386-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/i386-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mips-be-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mips-be-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mips-be-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mips-le-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mips-le-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mips-le-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mips1-be-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mips1-le-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-be-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-le-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/powerpc-be-eabi.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/powerpc-le-eabi.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/sh4-le-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/x86_64-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/x86_64-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/x86_64-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/xscale-be-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/xscale-le-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/version.h#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_fil.c#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_fil.h#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_frag.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_nat.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_nat.h#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_state.h#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/uart/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/uart/contrib/pf/net/pf.c#4 integrate .. //depot/projects/uart/crypto/rijndael/Makefile#2 integrate .. //depot/projects/uart/ddb/db_access.c#4 integrate .. //depot/projects/uart/ddb/db_access.h#2 integrate .. //depot/projects/uart/ddb/db_break.c#3 integrate .. //depot/projects/uart/ddb/db_break.h#2 integrate .. //depot/projects/uart/ddb/db_command.c#6 integrate .. //depot/projects/uart/ddb/db_command.h#2 integrate .. //depot/projects/uart/ddb/db_examine.c#2 integrate .. //depot/projects/uart/ddb/db_expr.c#2 integrate .. //depot/projects/uart/ddb/db_input.c#2 integrate .. //depot/projects/uart/ddb/db_lex.c#2 integrate .. //depot/projects/uart/ddb/db_lex.h#2 integrate .. //depot/projects/uart/ddb/db_main.c#2 integrate .. //depot/projects/uart/ddb/db_output.c#5 integrate .. //depot/projects/uart/ddb/db_output.h#2 integrate .. //depot/projects/uart/ddb/db_print.c#3 integrate .. //depot/projects/uart/ddb/db_run.c#4 integrate .. //depot/projects/uart/ddb/db_sym.c#3 integrate .. //depot/projects/uart/ddb/db_sym.h#2 integrate .. //depot/projects/uart/ddb/db_thread.c#4 integrate .. //depot/projects/uart/ddb/db_variables.c#4 integrate .. //depot/projects/uart/ddb/db_variables.h#3 integrate .. //depot/projects/uart/ddb/db_watch.c#2 integrate .. //depot/projects/uart/ddb/db_watch.h#2 integrate .. //depot/projects/uart/ddb/db_write_cmd.c#2 integrate .. //depot/projects/uart/dev/aac/aac.c#12 integrate .. //depot/projects/uart/dev/aac/aac_cam.c#5 integrate .. //depot/projects/uart/dev/aac/aac_debug.c#4 integrate .. //depot/projects/uart/dev/aac/aac_disk.c#6 integrate .. //depot/projects/uart/dev/aac/aac_ioctl.h#3 delete .. //depot/projects/uart/dev/aac/aac_pci.c#8 integrate .. //depot/projects/uart/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/uart/dev/acpi_support/acpi_ibm.c#1 branch .. //depot/projects/uart/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/uart/dev/acpi_support/acpi_sony.c#3 integrate .. //depot/projects/uart/dev/acpi_support/acpi_toshiba.c#3 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdInterrupt.c#3 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdSchedule.c#5 integrate .. //depot/projects/uart/dev/acpica/acpi.c#15 integrate .. //depot/projects/uart/dev/acpica/acpi_acad.c#7 integrate .. //depot/projects/uart/dev/acpica/acpi_cmbat.c#8 integrate .. //depot/projects/uart/dev/acpica/acpi_ec.c#12 integrate .. //depot/projects/uart/dev/acpica/acpi_if.m#2 integrate .. //depot/projects/uart/dev/acpica/acpi_pci.c#6 integrate .. //depot/projects/uart/dev/acpica/acpi_pci_link.c#6 integrate .. //depot/projects/uart/dev/acpica/acpi_pcib.c#8 integrate .. //depot/projects/uart/dev/acpica/acpi_pcib_pci.c#6 integrate .. //depot/projects/uart/dev/acpica/acpi_powerres.c#5 integrate .. //depot/projects/uart/dev/acpica/acpi_resource.c#7 integrate .. //depot/projects/uart/dev/acpica/acpivar.h#7 integrate .. //depot/projects/uart/dev/advansys/adv_eisa.c#5 integrate .. //depot/projects/uart/dev/advansys/adv_isa.c#5 integrate .. //depot/projects/uart/dev/advansys/adv_pci.c#7 integrate .. //depot/projects/uart/dev/advansys/advansys.c#4 integrate .. //depot/projects/uart/dev/advansys/advansys.h#2 integrate .. //depot/projects/uart/dev/advansys/advlib.c#3 integrate .. //depot/projects/uart/dev/advansys/advlib.h#2 integrate .. //depot/projects/uart/dev/advansys/advmcode.c#3 integrate .. //depot/projects/uart/dev/advansys/advmcode.h#3 integrate .. //depot/projects/uart/dev/advansys/adw_pci.c#7 integrate .. //depot/projects/uart/dev/advansys/adwcam.c#4 integrate .. //depot/projects/uart/dev/advansys/adwlib.c#3 integrate .. //depot/projects/uart/dev/advansys/adwlib.h#2 integrate .. //depot/projects/uart/dev/advansys/adwmcode.c#3 integrate .. //depot/projects/uart/dev/advansys/adwmcode.h#2 integrate .. //depot/projects/uart/dev/advansys/adwvar.h#2 integrate .. //depot/projects/uart/dev/aha/aha.c#5 integrate .. //depot/projects/uart/dev/aha/aha_isa.c#6 integrate .. //depot/projects/uart/dev/aha/ahareg.h#3 integrate .. //depot/projects/uart/dev/ahb/ahb.c#5 integrate .. //depot/projects/uart/dev/ahb/ahbreg.h#2 integrate .. //depot/projects/uart/dev/aic/aic6360reg.h#2 integrate .. //depot/projects/uart/dev/aic7xxx/ahc_eisa.c#5 integrate .. //depot/projects/uart/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/uart/dev/aic7xxx/ahc_pci.c#6 integrate .. //depot/projects/uart/dev/aic7xxx/ahd_pci.c#6 integrate .. //depot/projects/uart/dev/aic7xxx/aic7770.c#4 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx.c#5 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx.h#5 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx.reg#3 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx.seq#3 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx_inline.h#3 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx_osm.c#4 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx_osm.h#5 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx_pci.c#5 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx.c#5 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx.h#3 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx.reg#3 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx.seq#3 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_93cx6.c#4 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_93cx6.h#2 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_inline.h#3 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_osm.c#4 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_osm.h#5 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_pci.c#6 integrate .. //depot/projects/uart/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/uart/dev/aic7xxx/aic_osm_lib.h#3 integrate .. //depot/projects/uart/dev/aic7xxx/aicasm/Makefile#3 integrate .. //depot/projects/uart/dev/aic7xxx/aicasm/aicasm.c#3 integrate .. //depot/projects/uart/dev/aic7xxx/aicasm/aicasm.h#2 integrate .. //depot/projects/uart/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate .. //depot/projects/uart/dev/aic7xxx/aicasm/aicasm_insformat.h#2 integrate .. //depot/projects/uart/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/uart/dev/aic7xxx/aicasm/aicasm_macro_scan.l#3 integrate .. //depot/projects/uart/dev/aic7xxx/aicasm/aicasm_scan.l#3 integrate .. //depot/projects/uart/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate .. //depot/projects/uart/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate .. //depot/projects/uart/dev/amd/amd.c#7 integrate .. //depot/projects/uart/dev/amd/amd.h#2 integrate .. //depot/projects/uart/dev/amr/amr.c#6 integrate .. //depot/projects/uart/dev/amr/amr_cam.c#3 integrate .. //depot/projects/uart/dev/amr/amr_disk.c#5 integrate .. //depot/projects/uart/dev/amr/amr_pci.c#7 integrate .. //depot/projects/uart/dev/amr/amrvar.h#4 integrate .. //depot/projects/uart/dev/an/if_aironet_ieee.h#5 integrate .. //depot/projects/uart/dev/an/if_an.c#6 integrate .. //depot/projects/uart/dev/an/if_an_isa.c#4 integrate .. //depot/projects/uart/dev/an/if_an_pccard.c#5 integrate .. //depot/projects/uart/dev/an/if_anreg.h#5 integrate .. //depot/projects/uart/dev/ar/if_ar.c#4 integrate .. //depot/projects/uart/dev/ar/if_ar.h#2 integrate .. //depot/projects/uart/dev/ar/if_ar_isa.c#3 integrate .. //depot/projects/uart/dev/ar/if_arregs.h#2 integrate .. //depot/projects/uart/dev/asr/dptalign.h#2 integrate .. //depot/projects/uart/dev/asr/dptsig.h#2 integrate .. //depot/projects/uart/dev/asr/i2oadptr.h#2 integrate .. //depot/projects/uart/dev/asr/i2obscsi.h#2 integrate .. //depot/projects/uart/dev/asr/i2odep.h#2 integrate .. //depot/projects/uart/dev/asr/i2odpt.h#2 integrate .. //depot/projects/uart/dev/asr/i2oexec.h#2 integrate .. //depot/projects/uart/dev/asr/i2omsg.h#2 integrate .. //depot/projects/uart/dev/asr/i2otypes.h#2 integrate .. //depot/projects/uart/dev/asr/i2outil.h#2 integrate .. //depot/projects/uart/dev/asr/osd_defs.h#2 integrate .. //depot/projects/uart/dev/asr/osd_unix.h#2 integrate .. //depot/projects/uart/dev/asr/osd_util.h#2 integrate .. //depot/projects/uart/dev/asr/sys_info.h#2 integrate .. //depot/projects/uart/dev/ata/ata-all.h#5 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/uart/dev/ata/ata-disk.c#6 integrate .. //depot/projects/uart/dev/ata/ata-lowlevel.c#14 integrate .. //depot/projects/uart/dev/ata/ata-pci.c#7 integrate .. //depot/projects/uart/dev/ata/ata-pci.h#8 integrate .. //depot/projects/uart/dev/ata/ata-queue.c#7 integrate .. //depot/projects/uart/dev/ata/atapi-cd.c#11 integrate .. //depot/projects/uart/dev/ath/ath_rate/amrr/amrr.c#1 branch .. //depot/projects/uart/dev/ath/ath_rate/amrr/amrr.h#1 branch .. //depot/projects/uart/dev/ath/ath_rate/onoe/onoe.c#1 branch .. //depot/projects/uart/dev/ath/ath_rate/onoe/onoe.h#1 branch .. //depot/projects/uart/dev/ath/if_ath.c#13 integrate .. //depot/projects/uart/dev/ath/if_ath_pci.c#6 integrate .. //depot/projects/uart/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/uart/dev/ath/if_athrate.h#1 branch .. //depot/projects/uart/dev/ath/if_athvar.h#9 integrate .. //depot/projects/uart/dev/auxio/auxio.c#2 integrate .. //depot/projects/uart/dev/auxio/auxioreg.h#2 integrate .. //depot/projects/uart/dev/awi/awi.c#4 integrate .. //depot/projects/uart/dev/awi/awivar.h#3 integrate .. //depot/projects/uart/dev/awi/if_awi_pccard.c#4 integrate .. //depot/projects/uart/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/uart/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/uart/dev/bge/if_bge.c#15 integrate .. //depot/projects/uart/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/uart/dev/bktr/CHANGELOG.TXT#2 integrate .. //depot/projects/uart/dev/bktr/bktr_audio.h#3 integrate .. //depot/projects/uart/dev/bktr/bktr_card.c#5 integrate .. //depot/projects/uart/dev/bktr/bktr_card.h#3 integrate .. //depot/projects/uart/dev/bktr/bktr_core.h#3 integrate .. //depot/projects/uart/dev/bktr/bktr_mem.c#4 integrate .. //depot/projects/uart/dev/bktr/bktr_mem.h#2 integrate .. //depot/projects/uart/dev/bktr/bktr_os.h#3 integrate .. //depot/projects/uart/dev/bktr/bktr_reg.h#4 integrate .. //depot/projects/uart/dev/bktr/bktr_tuner.c#5 integrate .. //depot/projects/uart/dev/bktr/bktr_tuner.h#2 integrate .. //depot/projects/uart/dev/bktr/ioctl_meteor.h#2 integrate .. //depot/projects/uart/dev/bktr/msp34xx.c#3 integrate .. //depot/projects/uart/dev/buslogic/bt.c#6 integrate .. //depot/projects/uart/dev/buslogic/bt_eisa.c#5 integrate .. //depot/projects/uart/dev/buslogic/bt_isa.c#5 integrate .. //depot/projects/uart/dev/buslogic/btreg.h#2 integrate .. //depot/projects/uart/dev/cardbus/cardbus.c#6 integrate .. //depot/projects/uart/dev/cardbus/cardbus_cis.c#6 integrate .. //depot/projects/uart/dev/cardbus/cardbus_cis.h#3 integrate .. //depot/projects/uart/dev/cardbus/cardbusreg.h#2 integrate .. //depot/projects/uart/dev/cardbus/cardbusvar.h#2 integrate .. //depot/projects/uart/dev/cnw/if_cnwioctl.h#2 integrate .. //depot/projects/uart/dev/cp/cpddk.c#2 integrate .. //depot/projects/uart/dev/cp/cpddk.h#2 integrate .. //depot/projects/uart/dev/cp/if_cp.c#2 integrate .. //depot/projects/uart/dev/cp/ng_cp.h#2 integrate .. //depot/projects/uart/dev/cs/if_cs.c#4 integrate .. //depot/projects/uart/dev/cs/if_cs_isa.c#4 integrate .. //depot/projects/uart/dev/cs/if_cs_pccard.c#4 integrate .. //depot/projects/uart/dev/cs/if_csreg.h#3 integrate .. //depot/projects/uart/dev/cs/if_csvar.h#3 integrate .. //depot/projects/uart/dev/ct/bshw_machdep.c#4 integrate .. //depot/projects/uart/dev/ct/bshwvar.h#2 integrate .. //depot/projects/uart/dev/ct/ct.c#5 integrate .. //depot/projects/uart/dev/ct/ct_isa.c#5 integrate .. //depot/projects/uart/dev/ct/ct_machdep.h#2 integrate .. //depot/projects/uart/dev/ct/ctvar.h#2 integrate .. //depot/projects/uart/dev/ctau/am8530.h#2 integrate .. //depot/projects/uart/dev/ctau/ctau.c#2 integrate .. //depot/projects/uart/dev/ctau/ctaureg.h#2 integrate .. //depot/projects/uart/dev/ctau/ctddk.c#2 integrate .. //depot/projects/uart/dev/ctau/ctddk.h#2 integrate .. //depot/projects/uart/dev/ctau/ds2153.h#2 integrate .. //depot/projects/uart/dev/ctau/hdc64570.h#2 integrate .. //depot/projects/uart/dev/ctau/if_ct.c#2 integrate .. //depot/projects/uart/dev/ctau/lxt318.h#2 integrate .. //depot/projects/uart/dev/ctau/ng_ct.h#2 integrate .. //depot/projects/uart/dev/cx/cronyxfw.h#2 integrate .. //depot/projects/uart/dev/cx/csigma.c#2 integrate .. //depot/projects/uart/dev/cx/cxddk.c#2 integrate .. //depot/projects/uart/dev/cx/cxddk.h#2 integrate .. //depot/projects/uart/dev/cx/cxreg.h#2 integrate .. //depot/projects/uart/dev/cx/if_cx.c#2 integrate .. //depot/projects/uart/dev/cx/machdep.h#2 integrate .. //depot/projects/uart/dev/cx/ng_cx.h#2 integrate .. //depot/projects/uart/dev/cy/cy_pci.c#2 integrate .. //depot/projects/uart/dev/dcons/dcons.c#2 integrate .. //depot/projects/uart/dev/dcons/dcons.h#2 integrate .. //depot/projects/uart/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/uart/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/uart/dev/dcons/dcons_os.h#2 integrate .. //depot/projects/uart/dev/dec/mc146818reg.h#2 integrate .. //depot/projects/uart/dev/dec/mcclock.c#3 integrate .. //depot/projects/uart/dev/dec/mcclock_if.m#2 integrate .. //depot/projects/uart/dev/dec/mcclockvar.h#2 integrate .. //depot/projects/uart/dev/dpt/dpt.h#3 integrate .. //depot/projects/uart/dev/dpt/dpt_scsi.c#5 integrate .. //depot/projects/uart/dev/drm/ati_pcigart.h#4 integrate .. //depot/projects/uart/dev/drm/drm.h#4 integrate .. //depot/projects/uart/dev/drm/drmP.h#5 integrate .. //depot/projects/uart/dev/drm/drm_agpsupport.h#3 integrate .. //depot/projects/uart/dev/drm/drm_auth.h#4 integrate .. //depot/projects/uart/dev/drm/drm_bufs.h#4 integrate .. //depot/projects/uart/dev/drm/drm_context.h#5 integrate .. //depot/projects/uart/dev/drm/drm_dma.h#4 integrate .. //depot/projects/uart/dev/drm/drm_drawable.h#3 integrate .. //depot/projects/uart/dev/drm/drm_drv.h#4 integrate .. //depot/projects/uart/dev/drm/drm_fops.h#4 integrate .. //depot/projects/uart/dev/drm/drm_ioctl.h#4 integrate .. //depot/projects/uart/dev/drm/drm_irq.h#2 integrate .. //depot/projects/uart/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/uart/dev/drm/drm_lock.h#3 integrate .. //depot/projects/uart/dev/drm/drm_memory.h#5 integrate .. //depot/projects/uart/dev/drm/drm_memory_debug.h#3 integrate .. //depot/projects/uart/dev/drm/drm_os_freebsd.h#5 integrate .. //depot/projects/uart/dev/drm/drm_pci.h#3 integrate .. //depot/projects/uart/dev/drm/drm_sarea.h#4 integrate .. //depot/projects/uart/dev/drm/drm_scatter.h#3 integrate .. //depot/projects/uart/dev/drm/drm_sysctl.h#4 integrate .. //depot/projects/uart/dev/drm/drm_vm.h#4 integrate .. //depot/projects/uart/dev/drm/mga.h#4 integrate .. //depot/projects/uart/dev/drm/mga_dma.c#4 integrate .. //depot/projects/uart/dev/drm/mga_drm.h#3 integrate .. //depot/projects/uart/dev/drm/mga_drv.c#4 integrate .. //depot/projects/uart/dev/drm/mga_drv.h#4 integrate .. //depot/projects/uart/dev/drm/mga_irq.c#4 integrate .. //depot/projects/uart/dev/drm/mga_state.c#3 integrate .. //depot/projects/uart/dev/drm/mga_ucode.h#2 integrate .. //depot/projects/uart/dev/drm/mga_warp.c#3 integrate .. //depot/projects/uart/dev/drm/r128.h#4 integrate .. //depot/projects/uart/dev/drm/r128_cce.c#4 integrate .. //depot/projects/uart/dev/drm/r128_drm.h#4 integrate .. //depot/projects/uart/dev/drm/r128_drv.c#4 integrate .. //depot/projects/uart/dev/drm/r128_drv.h#4 integrate .. //depot/projects/uart/dev/drm/r128_irq.c#4 integrate .. //depot/projects/uart/dev/drm/r128_state.c#4 integrate .. //depot/projects/uart/dev/drm/radeon.h#5 integrate .. //depot/projects/uart/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/uart/dev/drm/radeon_drm.h#5 integrate .. //depot/projects/uart/dev/drm/radeon_drv.c#5 integrate .. //depot/projects/uart/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/uart/dev/drm/radeon_irq.c#4 integrate .. //depot/projects/uart/dev/drm/radeon_mem.c#5 integrate .. //depot/projects/uart/dev/drm/radeon_state.c#5 integrate .. //depot/projects/uart/dev/drm/sis.h#3 integrate .. //depot/projects/uart/dev/drm/sis_drv.c#3 integrate .. //depot/projects/uart/dev/drm/sis_drv.h#2 integrate .. //depot/projects/uart/dev/drm/sis_ds.c#2 integrate .. //depot/projects/uart/dev/drm/sis_ds.h#3 integrate .. //depot/projects/uart/dev/drm/sis_mm.c#3 integrate .. //depot/projects/uart/dev/drm/tdfx.h#4 integrate .. //depot/projects/uart/dev/drm/tdfx_drv.c#4 integrate .. //depot/projects/uart/dev/ed/if_ed.c#7 integrate .. //depot/projects/uart/dev/ed/if_ed98.h#2 integrate .. //depot/projects/uart/dev/ed/if_ed_cbus.c#6 integrate .. //depot/projects/uart/dev/ed/if_ed_isa.c#5 integrate .. //depot/projects/uart/dev/ed/if_ed_pccard.c#8 integrate .. //depot/projects/uart/dev/ed/if_edreg.h#3 integrate .. //depot/projects/uart/dev/ed/if_edvar.h#4 integrate .. //depot/projects/uart/dev/eisa/eisa_if.m#2 integrate .. //depot/projects/uart/dev/eisa/eisaconf.c#4 integrate .. //depot/projects/uart/dev/eisa/eisaconf.h#3 integrate .. //depot/projects/uart/dev/em/LICENSE#2 integrate .. //depot/projects/uart/dev/em/if_em.c#11 integrate .. //depot/projects/uart/dev/en/if_en_pci.c#6 integrate .. //depot/projects/uart/dev/en/midway.c#7 integrate .. //depot/projects/uart/dev/en/midwayvar.h#3 integrate .. //depot/projects/uart/dev/ep/if_ep.c#8 integrate .. //depot/projects/uart/dev/ep/if_ep_eisa.c#6 integrate .. //depot/projects/uart/dev/ep/if_ep_isa.c#7 integrate .. //depot/projects/uart/dev/ep/if_ep_pccard.c#7 integrate .. //depot/projects/uart/dev/ep/if_epreg.h#5 integrate .. //depot/projects/uart/dev/ep/if_epvar.h#5 integrate .. //depot/projects/uart/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/uart/dev/esp/ncr53c9xreg.h#2 integrate .. //depot/projects/uart/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/uart/dev/ex/if_ex.c#4 integrate .. //depot/projects/uart/dev/ex/if_exreg.h#2 integrate .. //depot/projects/uart/dev/exca/exca.c#8 integrate .. //depot/projects/uart/dev/exca/excareg.h#2 integrate .. //depot/projects/uart/dev/exca/excavar.h#3 integrate .. //depot/projects/uart/dev/fatm/firmware.h#2 integrate .. //depot/projects/uart/dev/fatm/if_fatm.c#10 integrate .. //depot/projects/uart/dev/fatm/if_fatm_rate.h#2 integrate .. //depot/projects/uart/dev/fatm/if_fatmreg.h#2 integrate .. //depot/projects/uart/dev/fatm/if_fatmvar.h#4 integrate .. //depot/projects/uart/dev/fb/gallant12x22.h#3 integrate .. //depot/projects/uart/dev/fb/gfb.h#3 integrate .. //depot/projects/uart/dev/fb/tga.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 8 19:54:58 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90D5216A4D0; Sat, 8 Jan 2005 19:54:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B41B16A4CE for ; Sat, 8 Jan 2005 19:54:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC6F143D31 for ; Sat, 8 Jan 2005 19:54:56 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j08JsuwK099191 for ; Sat, 8 Jan 2005 19:54:56 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j08Jsfur099188 for perforce@freebsd.org; Sat, 8 Jan 2005 19:54:41 GMT (envelope-from marcel@freebsd.org) Date: Sat, 8 Jan 2005 19:54:41 GMT Message-Id: <200501081954.j08Jsfur099188@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 68553 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 08 Jan 2005 19:54:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=68553 Change 68553 by marcel@marcel_nfs on 2005/01/08 19:54:05 IFC @68548 Affected files ... .. //depot/projects/ia64/bin/sh/sh.1#28 integrate .. //depot/projects/ia64/contrib/telnet/telnet/commands.c#3 integrate .. //depot/projects/ia64/contrib/telnet/telnet/main.c#2 integrate .. //depot/projects/ia64/contrib/telnet/telnetd/telnetd.8#2 integrate .. //depot/projects/ia64/contrib/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/ia64/etc/defaults/periodic.conf#15 integrate .. //depot/projects/ia64/etc/devd.conf#17 integrate .. //depot/projects/ia64/etc/pccard_ether#15 integrate .. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#15 integrate .. //depot/projects/ia64/gnu/lib/libdialog/checklist.c#3 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/categories#7 integrate .. //depot/projects/ia64/include/fts.h#5 integrate .. //depot/projects/ia64/include/pthread.h#10 integrate .. //depot/projects/ia64/include/uuid.h#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/ia64/lib/libbluetooth/bluetooth.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/fts.3#10 integrate .. //depot/projects/ia64/lib/libc/gen/utime.3#3 integrate .. //depot/projects/ia64/lib/libc/net/getaddrinfo.c#18 integrate .. //depot/projects/ia64/lib/libc/net/gethostbyht.c#3 integrate .. //depot/projects/ia64/lib/libc/net/getnetbyht.c#3 integrate .. //depot/projects/ia64/lib/libc/net/getprotoent.c#3 integrate .. //depot/projects/ia64/lib/libc/net/getservent.c#6 integrate .. //depot/projects/ia64/lib/libc/uuid/uuid_compare.c#3 integrate .. //depot/projects/ia64/lib/libc/uuid/uuid_equal.c#3 integrate .. //depot/projects/ia64/lib/libc/uuid/uuid_hash.c#3 integrate .. //depot/projects/ia64/lib/libc/uuid/uuid_is_nil.c#3 integrate .. //depot/projects/ia64/lib/libc/uuid/uuid_to_string.c#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_mattr_init.c#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_mattr_kind_np.c#2 integrate .. //depot/projects/ia64/lib/libdisk/create_chunk.c#18 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#33 integrate .. //depot/projects/ia64/sbin/badsect/badsect.c#12 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#17 integrate .. //depot/projects/ia64/sbin/ffsinfo/ffsinfo.c#5 integrate .. //depot/projects/ia64/sbin/ipf/Makefile#6 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#40 integrate .. //depot/projects/ia64/sbin/newfs/newfs.c#28 integrate .. //depot/projects/ia64/share/man/man4/Makefile#81 integrate .. //depot/projects/ia64/share/man/man4/aac.4#10 integrate .. //depot/projects/ia64/share/man/man4/amr.4#9 integrate .. //depot/projects/ia64/share/man/man4/em.4#12 integrate .. //depot/projects/ia64/share/man/man4/lomac.4#6 delete .. //depot/projects/ia64/share/man/man4/man4.i386/Makefile#24 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/wd.4#4 delete .. //depot/projects/ia64/share/man/man4/xl.4#7 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#59 integrate .. //depot/projects/ia64/share/man/man5/style.Makefile.5#7 integrate .. //depot/projects/ia64/share/man/man7/tuning.7#25 integrate .. //depot/projects/ia64/share/man/man9/BUF_LOCKINIT.9#3 integrate .. //depot/projects/ia64/share/man/man9/BUS_CONFIG_INTR.9#4 integrate .. //depot/projects/ia64/share/man/man9/BUS_PRINT_CHILD.9#3 integrate .. //depot/projects/ia64/share/man/man9/BUS_SETUP_INTR.9#9 integrate .. //depot/projects/ia64/share/man/man9/DECLARE_GEOM_CLASS.9#3 integrate .. //depot/projects/ia64/share/man/man9/DECLARE_MODULE.9#5 integrate .. //depot/projects/ia64/share/man/man9/DEVICE_ATTACH.9#3 integrate .. //depot/projects/ia64/share/man/man9/DEVICE_DETACH.9#4 integrate .. //depot/projects/ia64/share/man/man9/DEVICE_PROBE.9#8 integrate .. //depot/projects/ia64/share/man/man9/DEVICE_SHUTDOWN.9#2 integrate .. //depot/projects/ia64/share/man/man9/EVENTHANDLER.9#2 integrate .. //depot/projects/ia64/share/man/man9/MODULE_DEPEND.9#3 integrate .. //depot/projects/ia64/share/man/man9/MUTEX_PROFILING.9#3 integrate .. //depot/projects/ia64/share/man/man9/Makefile#50 integrate .. //depot/projects/ia64/share/man/man9/SYSCALL_MODULE.9#4 integrate .. //depot/projects/ia64/share/man/man9/VFS_CHECKEXP.9#6 integrate .. //depot/projects/ia64/share/man/man9/VFS_FHTOVP.9#5 integrate .. //depot/projects/ia64/share/man/man9/VFS_INIT.9#4 delete .. //depot/projects/ia64/share/man/man9/VFS_MOUNT.9#6 integrate .. //depot/projects/ia64/share/man/man9/VFS_SET.9#7 integrate .. //depot/projects/ia64/share/man/man9/VFS_START.9#6 integrate .. //depot/projects/ia64/share/man/man9/VFS_STATFS.9#6 integrate .. //depot/projects/ia64/share/man/man9/VFS_SYNC.9#6 integrate .. //depot/projects/ia64/share/man/man9/VFS_UNMOUNT.9#6 integrate .. //depot/projects/ia64/share/man/man9/VFS_VGET.9#8 integrate .. //depot/projects/ia64/share/man/man9/mutex.9#15 integrate .. //depot/projects/ia64/share/man/man9/sleep.9#11 integrate .. //depot/projects/ia64/share/man/man9/style.9#27 integrate .. //depot/projects/ia64/share/man/man9/sx.9#12 integrate .. //depot/projects/ia64/share/mk/bsd.dep.mk#16 integrate .. //depot/projects/ia64/share/mk/bsd.info.mk#9 integrate .. //depot/projects/ia64/share/mk/bsd.libnames.mk#29 integrate .. //depot/projects/ia64/share/mk/bsd.man.mk#12 integrate .. //depot/projects/ia64/share/mk/bsd.obj.mk#12 integrate .. //depot/projects/ia64/share/mk/bsd.own.mk#10 integrate .. //depot/projects/ia64/share/mk/bsd.subdir.mk#10 integrate .. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#23 integrate .. //depot/projects/ia64/sys/alpha/alpha/clock.c#13 integrate .. //depot/projects/ia64/sys/alpha/alpha/clock_if.m#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/cpuconf.c#7 integrate .. //depot/projects/ia64/sys/alpha/alpha/db_disasm.c#7 integrate .. //depot/projects/ia64/sys/alpha/alpha/db_instruction.h#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/db_interface.c#9 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_1000a.c#11 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_2100_a50.c#12 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_2100_a500.c#12 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_3000_300.c#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_3000_500.c#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_axppci_33.c#13 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_eb164.c#10 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_eb64plus.c#12 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_kn20aa.c#11 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_kn300.c#12 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_kn8ae.c#5 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_st550.c#11 integrate .. //depot/projects/ia64/sys/alpha/alpha/divrem.m4#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/exception.s#6 integrate .. //depot/projects/ia64/sys/alpha/alpha/gdb_machdep.c#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/in_cksum.c#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/interrupt.c#19 integrate .. //depot/projects/ia64/sys/alpha/alpha/locore.s#5 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#48 integrate .. //depot/projects/ia64/sys/alpha/alpha/pal.s#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#54 integrate .. //depot/projects/ia64/sys/alpha/alpha/prom.c#11 integrate .. //depot/projects/ia64/sys/alpha/alpha/prom_disp.s#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/promcons.c#15 integrate .. //depot/projects/ia64/sys/alpha/alpha/support.s#11 integrate .. //depot/projects/ia64/sys/alpha/alpha/trap.c#34 integrate .. //depot/projects/ia64/sys/alpha/alpha/uio_machdep.c#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#33 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC#34 integrate .. //depot/projects/ia64/sys/alpha/conf/gethints.awk#2 delete .. //depot/projects/ia64/sys/alpha/include/_limits.h#7 integrate .. //depot/projects/ia64/sys/alpha/include/alpha_cpu.h#4 integrate .. //depot/projects/ia64/sys/alpha/include/asm.h#6 integrate .. //depot/projects/ia64/sys/alpha/include/bootinfo.h#3 integrate .. //depot/projects/ia64/sys/alpha/include/bus.h#16 integrate .. //depot/projects/ia64/sys/alpha/include/bus_memio.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/bus_pio.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/clock.h#3 integrate .. //depot/projects/ia64/sys/alpha/include/clockvar.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/cpu.h#9 integrate .. //depot/projects/ia64/sys/alpha/include/cpuconf.h#3 integrate .. //depot/projects/ia64/sys/alpha/include/db_machdep.h#7 integrate .. //depot/projects/ia64/sys/alpha/include/exec.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/float.h#5 integrate .. //depot/projects/ia64/sys/alpha/include/floatingpoint.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/frame.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/gdb_machdep.h#3 integrate .. //depot/projects/ia64/sys/alpha/include/ieee.h#3 integrate .. //depot/projects/ia64/sys/alpha/include/ieeefp.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/intrcnt.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/kdb.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/limits.h#8 integrate .. //depot/projects/ia64/sys/alpha/include/pal.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/param.h#11 integrate .. //depot/projects/ia64/sys/alpha/include/pc/msdos.h#2 delete .. //depot/projects/ia64/sys/alpha/include/pcb.h#6 integrate .. //depot/projects/ia64/sys/alpha/include/pmap.h#14 integrate .. //depot/projects/ia64/sys/alpha/include/proc.h#6 integrate .. //depot/projects/ia64/sys/alpha/include/profile.h#5 integrate .. //depot/projects/ia64/sys/alpha/include/prom.h#4 integrate .. //depot/projects/ia64/sys/alpha/include/pte.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/ptrace.h#5 integrate .. //depot/projects/ia64/sys/alpha/include/reg.h#4 integrate .. //depot/projects/ia64/sys/alpha/include/reloc.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/resource.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/rpb.h#3 integrate .. //depot/projects/ia64/sys/alpha/include/runq.h#3 integrate .. //depot/projects/ia64/sys/alpha/include/signal.h#5 integrate .. //depot/projects/ia64/sys/alpha/include/smp.h#3 integrate .. //depot/projects/ia64/sys/alpha/include/vmparam.h#4 integrate .. //depot/projects/ia64/sys/alpha/isa/mcclock_isa.c#4 integrate .. //depot/projects/ia64/sys/alpha/mcbus/mcbus.c#5 integrate .. //depot/projects/ia64/sys/alpha/mcbus/mcbusreg.h#2 integrate .. //depot/projects/ia64/sys/alpha/mcbus/mcbusvar.h#3 integrate .. //depot/projects/ia64/sys/alpha/mcbus/mcmem.c#4 integrate .. //depot/projects/ia64/sys/alpha/mcbus/mcpcia.c#11 integrate .. //depot/projects/ia64/sys/alpha/mcbus/mcpciareg.h#2 integrate .. //depot/projects/ia64/sys/alpha/mcbus/mcpciavar.h#3 integrate .. //depot/projects/ia64/sys/alpha/osf1/exec_ecoff.h#2 integrate .. //depot/projects/ia64/sys/alpha/osf1/imgact_osf1.c#13 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1.h#3 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_ioctl.c#6 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#25 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_mount.c#12 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_signal.c#20 integrate .. //depot/projects/ia64/sys/alpha/pci/alphapci_if.m#2 integrate .. //depot/projects/ia64/sys/alpha/pci/apecs.c#8 integrate .. //depot/projects/ia64/sys/alpha/pci/apecsreg.h#2 integrate .. //depot/projects/ia64/sys/alpha/pci/cia.c#8 integrate .. //depot/projects/ia64/sys/alpha/pci/cia_pci.c#5 integrate .. //depot/projects/ia64/sys/alpha/pci/ciareg.h#2 integrate .. //depot/projects/ia64/sys/alpha/pci/lcareg.h#2 integrate .. //depot/projects/ia64/sys/alpha/pci/pci_eb164_intr.s#2 integrate .. //depot/projects/ia64/sys/alpha/pci/pci_eb64plus_intr.s#2 integrate .. //depot/projects/ia64/sys/alpha/pci/pcibus.c#7 integrate .. //depot/projects/ia64/sys/alpha/pci/t2.c#9 integrate .. //depot/projects/ia64/sys/alpha/pci/t2reg.h#2 integrate .. //depot/projects/ia64/sys/alpha/tlsb/dwlpx.c#8 integrate .. //depot/projects/ia64/sys/alpha/tlsb/dwlpxreg.h#2 integrate .. //depot/projects/ia64/sys/alpha/tlsb/dwlpxvar.h#2 integrate .. //depot/projects/ia64/sys/alpha/tlsb/gbus.c#4 integrate .. //depot/projects/ia64/sys/alpha/tlsb/kftxx.c#4 integrate .. //depot/projects/ia64/sys/alpha/tlsb/kftxxreg.h#2 integrate .. //depot/projects/ia64/sys/alpha/tlsb/mcclock_tlsb.c#4 integrate .. //depot/projects/ia64/sys/alpha/tlsb/tlsb.c#5 integrate .. //depot/projects/ia64/sys/alpha/tlsb/tlsbcpu.c#4 integrate .. //depot/projects/ia64/sys/alpha/tlsb/tlsbmem.c#4 integrate .. //depot/projects/ia64/sys/alpha/tlsb/tlsbreg.h#2 integrate .. //depot/projects/ia64/sys/alpha/tlsb/tlsbvar.h#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#14 integrate .. //depot/projects/ia64/sys/amd64/amd64/db_disasm.c#3 integrate .. //depot/projects/ia64/sys/amd64/amd64/db_interface.c#7 integrate .. //depot/projects/ia64/sys/amd64/amd64/db_trace.c#9 integrate .. //depot/projects/ia64/sys/amd64/amd64/gdb_machdep.c#3 integrate .. //depot/projects/ia64/sys/amd64/amd64/in_cksum.c#3 integrate .. //depot/projects/ia64/sys/amd64/amd64/nexus.c#13 integrate .. //depot/projects/ia64/sys/amd64/amd64/uio_machdep.c#4 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#23 integrate .. //depot/projects/ia64/sys/amd64/conf/gethints.awk#3 delete .. //depot/projects/ia64/sys/amd64/include/_limits.h#6 integrate .. //depot/projects/ia64/sys/amd64/include/apicreg.h#3 integrate .. //depot/projects/ia64/sys/amd64/include/bus_amd64.h#4 integrate .. //depot/projects/ia64/sys/amd64/include/bus_dma.h#10 integrate .. //depot/projects/ia64/sys/amd64/include/bus_memio.h#3 integrate .. //depot/projects/ia64/sys/amd64/include/bus_pio.h#3 integrate .. //depot/projects/ia64/sys/amd64/include/clock.h#5 integrate .. //depot/projects/ia64/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/ia64/sys/amd64/include/db_machdep.h#5 integrate .. //depot/projects/ia64/sys/amd64/include/float.h#4 integrate .. //depot/projects/ia64/sys/amd64/include/gdb_machdep.h#3 integrate .. //depot/projects/ia64/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/ia64/sys/amd64/include/limits.h#5 integrate .. //depot/projects/ia64/sys/amd64/include/metadata.h#2 integrate .. //depot/projects/ia64/sys/amd64/include/mptable.h#2 integrate .. //depot/projects/ia64/sys/amd64/include/param.h#12 integrate .. //depot/projects/ia64/sys/amd64/include/pc/display.h#2 integrate .. //depot/projects/ia64/sys/amd64/include/pci_cfgreg.h#4 integrate .. //depot/projects/ia64/sys/amd64/include/pmap.h#16 integrate .. //depot/projects/ia64/sys/amd64/include/proc.h#4 integrate .. //depot/projects/ia64/sys/amd64/include/profile.h#8 integrate .. //depot/projects/ia64/sys/amd64/include/ptrace.h#3 integrate .. //depot/projects/ia64/sys/amd64/include/resource.h#2 integrate .. //depot/projects/ia64/sys/amd64/include/runq.h#3 integrate .. //depot/projects/ia64/sys/amd64/include/signal.h#6 integrate .. //depot/projects/ia64/sys/amd64/include/smp.h#5 integrate .. //depot/projects/ia64/sys/amd64/pci/pci_bus.c#12 integrate .. //depot/projects/ia64/sys/amd64/pci/pci_cfgreg.c#6 integrate .. //depot/projects/ia64/sys/arm/arm/bcopy_page.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/bcopyinout.S#5 integrate .. //depot/projects/ia64/sys/arm/arm/bcopyinout_xscale.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/blockio.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/bootconfig.c#2 integrate .. //depot/projects/ia64/sys/arm/arm/bus_space_asm_generic.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/busdma_machdep.c#8 integrate .. //depot/projects/ia64/sys/arm/arm/copystr.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_arm10.S#2 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_arm3.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_arm67.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_arm7tdmi.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_arm8.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_arm9.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_armv4.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_ixp12x0.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_sa1.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_sa11x0.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/cpufunc_asm_xscale.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/db_disasm.c#2 integrate .. //depot/projects/ia64/sys/arm/arm/db_interface.c#4 integrate .. //depot/projects/ia64/sys/arm/arm/db_trace.c#7 integrate .. //depot/projects/ia64/sys/arm/arm/disassem.c#2 integrate .. //depot/projects/ia64/sys/arm/arm/exception.S#5 integrate .. //depot/projects/ia64/sys/arm/arm/fiq.c#2 integrate .. //depot/projects/ia64/sys/arm/arm/fiq_subr.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/fusu.S#4 integrate .. //depot/projects/ia64/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/ia64/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/ia64/sys/arm/arm/in_cksum_arm.S#4 integrate .. //depot/projects/ia64/sys/arm/arm/intr.c#6 integrate .. //depot/projects/ia64/sys/arm/arm/irq_dispatch.S#4 integrate .. //depot/projects/ia64/sys/arm/arm/locore.S#6 integrate .. //depot/projects/ia64/sys/arm/arm/machdep.c#5 integrate .. //depot/projects/ia64/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/ia64/sys/arm/arm/nexus_io.c#4 integrate .. //depot/projects/ia64/sys/arm/arm/nexus_io_asm.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/ia64/sys/arm/arm/setcpsr.S#3 integrate .. //depot/projects/ia64/sys/arm/arm/setstack.s#2 integrate .. //depot/projects/ia64/sys/arm/arm/swtch.S#7 integrate .. //depot/projects/ia64/sys/arm/arm/trap.c#7 integrate .. //depot/projects/ia64/sys/arm/arm/uio_machdep.c#3 integrate .. //depot/projects/ia64/sys/arm/arm/undefined.c#5 integrate .. //depot/projects/ia64/sys/arm/arm/vectors.S#2 integrate .. //depot/projects/ia64/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/ia64/sys/arm/include/_limits.h#6 integrate .. //depot/projects/ia64/sys/arm/include/armreg.h#2 integrate .. //depot/projects/ia64/sys/arm/include/asm.h#4 integrate .. //depot/projects/ia64/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/ia64/sys/arm/include/atomic.h#4 integrate .. //depot/projects/ia64/sys/arm/include/bootconfig.h#2 integrate .. //depot/projects/ia64/sys/arm/include/bus.h#4 integrate .. //depot/projects/ia64/sys/arm/include/bus_memio.h#2 integrate .. //depot/projects/ia64/sys/arm/include/bus_pio.h#2 integrate .. //depot/projects/ia64/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/ia64/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/ia64/sys/arm/include/db_machdep.h#4 integrate .. //depot/projects/ia64/sys/arm/include/disassem.h#2 integrate .. //depot/projects/ia64/sys/arm/include/endian.h#7 integrate .. //depot/projects/ia64/sys/arm/include/exec.h#2 integrate .. //depot/projects/ia64/sys/arm/include/fiq.h#2 integrate .. //depot/projects/ia64/sys/arm/include/float.h#3 integrate .. //depot/projects/ia64/sys/arm/include/fp.h#2 integrate .. //depot/projects/ia64/sys/arm/include/frame.h#3 integrate .. //depot/projects/ia64/sys/arm/include/ieee.h#2 integrate .. //depot/projects/ia64/sys/arm/include/ieeefp.h#2 integrate .. //depot/projects/ia64/sys/arm/include/intr.h#3 integrate .. //depot/projects/ia64/sys/arm/include/katelib.h#2 integrate .. //depot/projects/ia64/sys/arm/include/kdb.h#3 integrate .. //depot/projects/ia64/sys/arm/include/limits.h#7 integrate .. //depot/projects/ia64/sys/arm/include/metadata.h#2 integrate .. //depot/projects/ia64/sys/arm/include/pcb.h#4 integrate .. //depot/projects/ia64/sys/arm/include/pmap.h#6 integrate .. //depot/projects/ia64/sys/arm/include/proc.h#2 integrate .. //depot/projects/ia64/sys/arm/include/profile.h#5 integrate .. //depot/projects/ia64/sys/arm/include/psl.h#2 integrate .. //depot/projects/ia64/sys/arm/include/pte.h#3 integrate .. //depot/projects/ia64/sys/arm/include/resource.h#2 integrate .. //depot/projects/ia64/sys/arm/include/runq.h#2 integrate .. //depot/projects/ia64/sys/arm/include/signal.h#6 integrate .. //depot/projects/ia64/sys/arm/include/stdarg.h#2 integrate .. //depot/projects/ia64/sys/arm/include/swi.h#2 integrate .. //depot/projects/ia64/sys/arm/include/sysarch.h#2 integrate .. //depot/projects/ia64/sys/arm/include/undefined.h#2 integrate .. //depot/projects/ia64/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/ia64/sys/arm/sa11x0/assabet_machdep.c#8 integrate .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_io.c#4 integrate .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_io_asm.S#2 integrate .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_irq.S#3 integrate .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_ost.c#3 integrate .. //depot/projects/ia64/sys/arm/sa11x0/uart_bus_sa1110.c#2 integrate .. //depot/projects/ia64/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/ia64/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/ia64/sys/arm/sa11x0/uart_dev_sa1110.h#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/i80321.c#3 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/i80321_intr.h#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/i80321_mcu.c#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/i80321_pci.c#3 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/i80321reg.h#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/iq80321reg.h#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/iq80321var.h#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/obiovar.h#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/uart_bus_i80321.c#3 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/uart_cpu_i80321.c#3 integrate .. //depot/projects/ia64/sys/arm/xscale/xscalereg.h#2 integrate .. //depot/projects/ia64/sys/arm/xscale/xscalevar.h#2 integrate .. //depot/projects/ia64/sys/boot/README#2 integrate .. //depot/projects/ia64/sys/boot/efi/include/README#2 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/efiboot.h#6 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/time.c#3 integrate .. //depot/projects/ia64/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/conf.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/pal_stub.S#2 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/sal_stub.c#2 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/start.S#2 integrate .. //depot/projects/ia64/sys/boot/ia64/ski/time.c#2 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/libofw.h#6 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_console.c#5 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_disk.c#8 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_memory.c#5 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_net.c#6 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_reboot.c#3 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_time.c#3 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/openfirm.c#6 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/openfirm.h#5 integrate .. //depot/projects/ia64/sys/boot/powerpc/loader/start.c#5 integrate .. //depot/projects/ia64/sys/boot/sparc64/boot1/boot1.c#9 integrate .. //depot/projects/ia64/sys/boot/sparc64/loader/locore.S#3 integrate .. //depot/projects/ia64/sys/boot/sparc64/loader/main.c#18 integrate .. //depot/projects/ia64/sys/cam/cam.c#6 integrate .. //depot/projects/ia64/sys/cam/cam.h#3 integrate .. //depot/projects/ia64/sys/cam/cam_ccb.h#7 integrate .. //depot/projects/ia64/sys/cam/cam_debug.h#2 integrate .. //depot/projects/ia64/sys/cam/cam_periph.c#18 integrate .. //depot/projects/ia64/sys/cam/cam_periph.h#5 integrate .. //depot/projects/ia64/sys/cam/cam_queue.c#4 integrate .. //depot/projects/ia64/sys/cam/cam_queue.h#2 integrate .. //depot/projects/ia64/sys/cam/cam_sim.c#5 integrate .. //depot/projects/ia64/sys/cam/cam_sim.h#2 integrate .. //depot/projects/ia64/sys/cam/cam_xpt.c#22 integrate .. //depot/projects/ia64/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/ia64/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/ia64/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.c#18 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.h#7 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#26 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ch.c#12 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ch.h#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#60 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.h#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_dvcfg.h#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_iu.h#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_low.c#13 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_low.h#5 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_low_pisa.c#4 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_low_pisa.h#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_message.h#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pass.c#10 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pass.h#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pt.c#11 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pt.h#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#20 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.h#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ses.c#10 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_targ_bh.c#9 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_target.c#16 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_targetio.h#3 integrate .. //depot/projects/ia64/sys/coda/cnode.h#9 integrate .. //depot/projects/ia64/sys/coda/coda.h#4 integrate .. //depot/projects/ia64/sys/coda/coda_fbsd.c#12 integrate .. //depot/projects/ia64/sys/coda/coda_io.h#3 integrate .. //depot/projects/ia64/sys/coda/coda_kernel.h#2 integrate .. //depot/projects/ia64/sys/coda/coda_namecache.c#7 integrate .. //depot/projects/ia64/sys/coda/coda_namecache.h#5 integrate .. //depot/projects/ia64/sys/coda/coda_opstats.h#2 integrate .. //depot/projects/ia64/sys/coda/coda_pioctl.h#3 integrate .. //depot/projects/ia64/sys/coda/coda_psdev.c#12 integrate .. //depot/projects/ia64/sys/coda/coda_psdev.h#3 integrate .. //depot/projects/ia64/sys/coda/coda_subr.c#11 integrate .. //depot/projects/ia64/sys/coda/coda_subr.h#3 integrate .. //depot/projects/ia64/sys/coda/coda_venus.c#9 integrate .. //depot/projects/ia64/sys/coda/coda_venus.h#4 integrate .. //depot/projects/ia64/sys/coda/coda_vfsops.c#16 integrate .. //depot/projects/ia64/sys/coda/coda_vfsops.h#4 integrate .. //depot/projects/ia64/sys/coda/coda_vnops.c#16 integrate .. //depot/projects/ia64/sys/coda/coda_vnops.h#8 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_proto.h#10 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate .. //depot/projects/ia64/sys/compat/freebsd32/syscalls.master#10 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#34 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#30 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.h#10 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.c#10 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.h#9 integrate .. //depot/projects/ia64/sys/compat/ndis/cfg_var.h#3 integrate .. //depot/projects/ia64/sys/compat/ndis/hal_var.h#5 integrate .. //depot/projects/ia64/sys/compat/ndis/kern_ndis.c#8 integrate .. //depot/projects/ia64/sys/compat/ndis/ndis_var.h#7 integrate .. //depot/projects/ia64/sys/compat/ndis/ntoskrnl_var.h#7 integrate .. //depot/projects/ia64/sys/compat/ndis/pe_var.h#6 integrate .. //depot/projects/ia64/sys/compat/ndis/subr_hal.c#7 integrate .. //depot/projects/ia64/sys/compat/ndis/subr_ndis.c#9 integrate .. //depot/projects/ia64/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/ia64/sys/compat/ndis/subr_pe.c#4 integrate .. //depot/projects/ia64/sys/compat/netbsd/dvcfg.h#2 integrate .. //depot/projects/ia64/sys/compat/netbsd/physio_proc.h#2 integrate .. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#21 integrate .. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4.h#3 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_acl.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_dirent.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_errno.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_exec.h#4 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_fcntl.c#12 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_fcntl.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_filio.c#17 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_filio.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_fuser.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_hrt.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_ioctl.c#10 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_ioctl.h#3 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_ipc.c#5 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_ipc.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#31 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_mman.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_resource.c#7 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_resource.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_siginfo.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_signal.c#11 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_signal.h#3 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_socket.c#9 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_socket.h#5 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sockio.c#7 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sockio.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sockmod.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_stat.c#9 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_stat.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_statvfs.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_stream.c#18 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_stropts.h#3 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_systeminfo.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#19 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_termios.c#5 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_termios.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_time.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_timod.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_ttold.c#6 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_ttold.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_types.h#4 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_ucontext.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_ulimit.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_ustat.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_util.h#4 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_utsname.h#2 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_wait.h#2 integrate .. //depot/projects/ia64/sys/conf/NOTES#86 integrate .. //depot/projects/ia64/sys/conf/files#125 integrate .. //depot/projects/ia64/sys/conf/files.i386#61 integrate .. //depot/projects/ia64/sys/conf/files.pc98#50 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#41 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/fil.c#14 integrate .. //depot/projects/ia64/sys/ddb/db_access.c#5 integrate .. //depot/projects/ia64/sys/ddb/db_access.h#3 integrate .. //depot/projects/ia64/sys/ddb/db_break.c#7 integrate .. //depot/projects/ia64/sys/ddb/db_break.h#4 integrate .. //depot/projects/ia64/sys/ddb/db_command.c#19 integrate .. //depot/projects/ia64/sys/ddb/db_command.h#3 integrate .. //depot/projects/ia64/sys/ddb/db_examine.c#6 integrate .. //depot/projects/ia64/sys/ddb/db_expr.c#5 integrate .. //depot/projects/ia64/sys/ddb/db_input.c#8 integrate .. //depot/projects/ia64/sys/ddb/db_lex.c#5 integrate .. //depot/projects/ia64/sys/ddb/db_lex.h#3 integrate .. //depot/projects/ia64/sys/ddb/db_main.c#2 integrate .. //depot/projects/ia64/sys/ddb/db_output.c#8 integrate .. //depot/projects/ia64/sys/ddb/db_output.h#3 integrate .. //depot/projects/ia64/sys/ddb/db_print.c#4 integrate .. //depot/projects/ia64/sys/ddb/db_run.c#7 integrate .. //depot/projects/ia64/sys/ddb/db_sym.c#5 integrate .. //depot/projects/ia64/sys/ddb/db_sym.h#5 integrate .. //depot/projects/ia64/sys/ddb/db_thread.c#3 integrate .. //depot/projects/ia64/sys/ddb/db_variables.c#6 integrate .. //depot/projects/ia64/sys/ddb/db_variables.h#4 integrate .. //depot/projects/ia64/sys/ddb/db_watch.c#7 integrate .. //depot/projects/ia64/sys/ddb/db_watch.h#2 integrate .. //depot/projects/ia64/sys/ddb/db_write_cmd.c#3 integrate .. //depot/projects/ia64/sys/dev/aac/aac_cam.c#16 integrate .. //depot/projects/ia64/sys/dev/aac/aac_pci.c#32 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#58 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#26 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_if.m#3 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci.c#13 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_eisa.c#7 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_isa.c#8 integrate .. //depot/projects/ia64/sys/dev/advansys/adv_pci.c#10 integrate .. //depot/projects/ia64/sys/dev/advansys/advansys.c#9 integrate .. //depot/projects/ia64/sys/dev/advansys/advansys.h#2 integrate .. //depot/projects/ia64/sys/dev/advansys/advlib.c#5 integrate .. //depot/projects/ia64/sys/dev/advansys/advlib.h#2 integrate .. //depot/projects/ia64/sys/dev/advansys/advmcode.c#3 integrate .. //depot/projects/ia64/sys/dev/advansys/advmcode.h#3 integrate .. //depot/projects/ia64/sys/dev/advansys/adw_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/advansys/adwcam.c#10 integrate .. //depot/projects/ia64/sys/dev/advansys/adwlib.c#3 integrate .. //depot/projects/ia64/sys/dev/advansys/adwlib.h#2 integrate .. //depot/projects/ia64/sys/dev/advansys/adwmcode.c#3 integrate .. //depot/projects/ia64/sys/dev/advansys/adwmcode.h#2 integrate .. //depot/projects/ia64/sys/dev/advansys/adwvar.h#2 integrate .. //depot/projects/ia64/sys/dev/aha/aha.c#12 integrate .. //depot/projects/ia64/sys/dev/aha/aha_isa.c#9 integrate .. //depot/projects/ia64/sys/dev/aha/ahareg.h#3 integrate .. //depot/projects/ia64/sys/dev/ahb/ahb.c#11 integrate .. //depot/projects/ia64/sys/dev/ahb/ahbreg.h#2 integrate .. //depot/projects/ia64/sys/dev/aic/aic6360reg.h#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_eisa.c#14 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_isa.c#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_pci.c#19 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahd_pci.c#15 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7770.c#11 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#22 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.h#19 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.reg#16 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.seq#15 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_inline.h#15 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#16 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.h#14 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_pci.c#20 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.c#20 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.h#12 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.reg#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.seq#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_93cx6.c#6 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_93cx6.h#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_inline.h#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.c#16 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.h#16 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_pci.c#15 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic_osm_lib.c#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic_osm_lib.h#5 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm.c#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm.h#5 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_gram.y#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#6 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#5 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_scan.l#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#6 integrate .. //depot/projects/ia64/sys/dev/amd/amd.c#13 integrate .. //depot/projects/ia64/sys/dev/amd/amd.h#2 integrate .. //depot/projects/ia64/sys/dev/amr/amr.c#25 integrate .. //depot/projects/ia64/sys/dev/amr/amr_cam.c#10 integrate .. //depot/projects/ia64/sys/dev/amr/amr_disk.c#14 integrate .. //depot/projects/ia64/sys/dev/amr/amr_pci.c#18 integrate .. //depot/projects/ia64/sys/dev/an/if_aironet_ieee.h#8 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#32 integrate .. //depot/projects/ia64/sys/dev/an/if_an_isa.c#10 integrate .. //depot/projects/ia64/sys/dev/an/if_an_pccard.c#13 integrate .. //depot/projects/ia64/sys/dev/an/if_anreg.h#12 integrate .. //depot/projects/ia64/sys/dev/ar/if_ar.c#16 integrate .. //depot/projects/ia64/sys/dev/ar/if_ar.h#2 integrate .. //depot/projects/ia64/sys/dev/ar/if_ar_isa.c#6 integrate .. //depot/projects/ia64/sys/dev/ar/if_arregs.h#4 integrate .. //depot/projects/ia64/sys/dev/asr/dptalign.h#4 integrate .. //depot/projects/ia64/sys/dev/asr/dptsig.h#4 integrate .. //depot/projects/ia64/sys/dev/asr/i2oadptr.h#4 integrate .. //depot/projects/ia64/sys/dev/asr/i2obscsi.h#4 integrate .. //depot/projects/ia64/sys/dev/asr/i2odep.h#4 integrate .. //depot/projects/ia64/sys/dev/asr/i2odpt.h#4 integrate .. //depot/projects/ia64/sys/dev/asr/i2oexec.h#4 integrate .. //depot/projects/ia64/sys/dev/asr/i2omsg.h#4 integrate .. //depot/projects/ia64/sys/dev/asr/i2otypes.h#4 integrate .. //depot/projects/ia64/sys/dev/asr/i2outil.h#4 integrate .. //depot/projects/ia64/sys/dev/asr/osd_defs.h#4 integrate .. //depot/projects/ia64/sys/dev/asr/osd_unix.h#4 integrate .. //depot/projects/ia64/sys/dev/asr/osd_util.h#5 integrate .. //depot/projects/ia64/sys/dev/asr/sys_info.h#4 integrate .. //depot/projects/ia64/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/ia64/sys/dev/auxio/auxioreg.h#2 integrate .. //depot/projects/ia64/sys/dev/awi/if_awi_pccard.c#13 integrate .. //depot/projects/ia64/sys/dev/bfe/if_bfe.c#8 integrate .. //depot/projects/ia64/sys/dev/bfe/if_bfereg.h#6 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#57 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#29 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_audio.h#3 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_card.h#6 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_core.h#3 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_mem.c#6 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_mem.h#2 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_os.h#4 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_reg.h#6 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_tuner.h#3 integrate .. //depot/projects/ia64/sys/dev/bktr/ioctl_meteor.h#3 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt.c#14 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_eisa.c#8 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt_isa.c#7 integrate .. //depot/projects/ia64/sys/dev/buslogic/btreg.h#2 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus.c#22 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus_cis.c#21 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus_cis.h#5 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbusreg.h#3 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbusvar.h#6 integrate .. //depot/projects/ia64/sys/dev/cnw/if_cnwioctl.h#2 integrate .. //depot/projects/ia64/sys/dev/cp/cpddk.c#4 integrate .. //depot/projects/ia64/sys/dev/cp/cpddk.h#4 integrate .. //depot/projects/ia64/sys/dev/cp/if_cp.c#7 integrate .. //depot/projects/ia64/sys/dev/cp/ng_cp.h#2 integrate .. //depot/projects/ia64/sys/dev/cs/if_cs.c#12 integrate .. //depot/projects/ia64/sys/dev/cs/if_cs_isa.c#5 integrate .. //depot/projects/ia64/sys/dev/cs/if_cs_pccard.c#9 integrate .. //depot/projects/ia64/sys/dev/cs/if_csreg.h#3 integrate .. //depot/projects/ia64/sys/dev/cs/if_csvar.h#3 integrate .. //depot/projects/ia64/sys/dev/ct/bshw_machdep.c#5 integrate .. //depot/projects/ia64/sys/dev/ct/bshwvar.h#3 integrate .. //depot/projects/ia64/sys/dev/ct/ct.c#7 integrate .. //depot/projects/ia64/sys/dev/ct/ct_isa.c#8 integrate .. //depot/projects/ia64/sys/dev/ct/ct_machdep.h#4 integrate .. //depot/projects/ia64/sys/dev/ct/ctvar.h#3 integrate .. //depot/projects/ia64/sys/dev/ctau/am8530.h#2 integrate .. //depot/projects/ia64/sys/dev/ctau/ctau.c#3 integrate .. //depot/projects/ia64/sys/dev/ctau/ctaureg.h#2 integrate .. //depot/projects/ia64/sys/dev/ctau/ctddk.c#2 integrate .. //depot/projects/ia64/sys/dev/ctau/ctddk.h#2 integrate .. //depot/projects/ia64/sys/dev/ctau/ds2153.h#2 integrate .. //depot/projects/ia64/sys/dev/ctau/hdc64570.h#2 integrate .. //depot/projects/ia64/sys/dev/ctau/if_ct.c#10 integrate .. //depot/projects/ia64/sys/dev/ctau/lxt318.h#2 integrate .. //depot/projects/ia64/sys/dev/ctau/ng_ct.h#2 integrate .. //depot/projects/ia64/sys/dev/cx/cronyxfw.h#2 integrate .. //depot/projects/ia64/sys/dev/cx/csigma.c#2 integrate .. //depot/projects/ia64/sys/dev/cx/cxddk.c#2 integrate .. //depot/projects/ia64/sys/dev/cx/cxddk.h#2 integrate .. //depot/projects/ia64/sys/dev/cx/cxreg.h#2 integrate .. //depot/projects/ia64/sys/dev/cx/if_cx.c#12 integrate .. //depot/projects/ia64/sys/dev/cx/machdep.h#4 integrate .. //depot/projects/ia64/sys/dev/cx/ng_cx.h#3 integrate .. //depot/projects/ia64/sys/dev/cy/cy_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/dcons/dcons.c#8 integrate .. //depot/projects/ia64/sys/dev/dcons/dcons.h#4 integrate .. //depot/projects/ia64/sys/dev/dcons/dcons_crom.c#5 integrate .. //depot/projects/ia64/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/ia64/sys/dev/dcons/dcons_os.h#2 integrate .. //depot/projects/ia64/sys/dev/dec/mc146818reg.h#2 integrate .. //depot/projects/ia64/sys/dev/dec/mcclock.c#4 integrate .. //depot/projects/ia64/sys/dev/dec/mcclock_if.m#2 integrate .. //depot/projects/ia64/sys/dev/dec/mcclockvar.h#2 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt.h#5 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_scsi.c#14 integrate .. //depot/projects/ia64/sys/dev/drm/ati_pcigart.h#4 integrate .. //depot/projects/ia64/sys/dev/drm/drm.h#6 integrate .. //depot/projects/ia64/sys/dev/drm/drmP.h#9 integrate .. //depot/projects/ia64/sys/dev/drm/drm_agpsupport.h#4 integrate .. //depot/projects/ia64/sys/dev/drm/drm_auth.h#5 integrate .. //depot/projects/ia64/sys/dev/drm/drm_bufs.h#7 integrate .. //depot/projects/ia64/sys/dev/drm/drm_context.h#7 integrate .. //depot/projects/ia64/sys/dev/drm/drm_dma.h#8 integrate .. //depot/projects/ia64/sys/dev/drm/drm_drawable.h#4 integrate .. //depot/projects/ia64/sys/dev/drm/drm_drv.h#17 integrate .. //depot/projects/ia64/sys/dev/drm/drm_fops.h#9 integrate .. //depot/projects/ia64/sys/dev/drm/drm_ioctl.h#6 integrate .. //depot/projects/ia64/sys/dev/drm/drm_irq.h#3 integrate .. //depot/projects/ia64/sys/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_lock.h#5 integrate .. //depot/projects/ia64/sys/dev/drm/drm_memory.h#11 integrate .. //depot/projects/ia64/sys/dev/drm/drm_memory_debug.h#3 integrate .. //depot/projects/ia64/sys/dev/drm/drm_os_freebsd.h#17 integrate .. //depot/projects/ia64/sys/dev/drm/drm_pci.h#3 integrate .. //depot/projects/ia64/sys/dev/drm/drm_sarea.h#4 integrate .. //depot/projects/ia64/sys/dev/drm/drm_scatter.h#5 integrate .. //depot/projects/ia64/sys/dev/drm/drm_sysctl.h#8 integrate .. //depot/projects/ia64/sys/dev/drm/drm_vm.h#10 integrate .. //depot/projects/ia64/sys/dev/drm/mga.h#6 integrate .. //depot/projects/ia64/sys/dev/drm/mga_dma.c#8 integrate .. //depot/projects/ia64/sys/dev/drm/mga_drm.h#4 integrate .. //depot/projects/ia64/sys/dev/drm/mga_drv.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/mga_drv.h#7 integrate .. //depot/projects/ia64/sys/dev/drm/mga_irq.c#4 integrate .. //depot/projects/ia64/sys/dev/drm/mga_state.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/mga_ucode.h#2 integrate .. //depot/projects/ia64/sys/dev/drm/mga_warp.c#4 integrate .. //depot/projects/ia64/sys/dev/drm/r128.h#7 integrate .. //depot/projects/ia64/sys/dev/drm/r128_cce.c#8 integrate .. //depot/projects/ia64/sys/dev/drm/r128_drm.h#5 integrate .. //depot/projects/ia64/sys/dev/drm/r128_drv.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/r128_drv.h#8 integrate .. //depot/projects/ia64/sys/dev/drm/r128_irq.c#4 integrate .. //depot/projects/ia64/sys/dev/drm/r128_state.c#9 integrate .. //depot/projects/ia64/sys/dev/drm/radeon.h#9 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_cp.c#9 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_drm.h#8 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_drv.c#9 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_drv.h#10 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_irq.c#5 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_mem.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_state.c#10 integrate .. //depot/projects/ia64/sys/dev/drm/sis.h#4 integrate .. //depot/projects/ia64/sys/dev/drm/sis_drv.c#4 integrate .. //depot/projects/ia64/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/ia64/sys/dev/drm/sis_ds.c#2 integrate .. //depot/projects/ia64/sys/dev/drm/sis_ds.h#3 integrate .. //depot/projects/ia64/sys/dev/drm/sis_mm.c#5 integrate .. //depot/projects/ia64/sys/dev/drm/tdfx.h#5 integrate .. //depot/projects/ia64/sys/dev/drm/tdfx_drv.c#6 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed.c#22 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed98.h#2 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_cbus.c#11 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_isa.c#8 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#24 integrate .. //depot/projects/ia64/sys/dev/ed/if_edreg.h#3 integrate .. //depot/projects/ia64/sys/dev/ed/if_edvar.h#6 integrate .. //depot/projects/ia64/sys/dev/eisa/eisa_if.m#2 integrate .. //depot/projects/ia64/sys/dev/eisa/eisaconf.c#8 integrate .. //depot/projects/ia64/sys/dev/eisa/eisaconf.h#5 integrate .. //depot/projects/ia64/sys/dev/em/LICENSE#3 integrate .. //depot/projects/ia64/sys/dev/en/if_en_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/en/midway.c#26 integrate .. //depot/projects/ia64/sys/dev/en/midwayvar.h#10 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep.c#17 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_eisa.c#10 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_isa.c#11 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_pccard.c#14 integrate .. //depot/projects/ia64/sys/dev/ep/if_epreg.h#5 integrate .. //depot/projects/ia64/sys/dev/ep/if_epvar.h#6 integrate .. //depot/projects/ia64/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/ia64/sys/dev/esp/ncr53c9xreg.h#2 integrate .. //depot/projects/ia64/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/ia64/sys/dev/ex/if_ex.c#14 integrate .. //depot/projects/ia64/sys/dev/ex/if_exreg.h#3 integrate .. //depot/projects/ia64/sys/dev/exca/exca.c#14 integrate .. //depot/projects/ia64/sys/dev/exca/excareg.h#5 integrate .. //depot/projects/ia64/sys/dev/exca/excavar.h#7 integrate .. //depot/projects/ia64/sys/dev/fatm/firmware.h#2 integrate .. //depot/projects/ia64/sys/dev/fatm/if_fatm.c#13 integrate .. //depot/projects/ia64/sys/dev/fatm/if_fatm_rate.h#2 integrate .. //depot/projects/ia64/sys/dev/fatm/if_fatmreg.h#2 integrate .. //depot/projects/ia64/sys/dev/fatm/if_fatmvar.h#4 integrate .. //depot/projects/ia64/sys/dev/fb/gallant12x22.h#3 integrate .. //depot/projects/ia64/sys/dev/fb/gfb.h#3 integrate .. //depot/projects/ia64/sys/dev/fb/tga.h#2 integrate .. //depot/projects/ia64/sys/dev/fe/if_fe.c#14 integrate .. //depot/projects/ia64/sys/dev/fe/if_fe_cbus.c#4 integrate .. //depot/projects/ia64/sys/dev/fe/if_fe_isa.c#3 integrate .. //depot/projects/ia64/sys/dev/fe/if_fe_pccard.c#8 integrate .. //depot/projects/ia64/sys/dev/fe/if_fereg.h#2 integrate .. //depot/projects/ia64/sys/dev/fe/if_fevar.h#3 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#45 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.h#17 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire_phy.h#3 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#28 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#26 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdma.c#7 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdma.h#3 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.c#22 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.h#7 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#42 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#33 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcireg.h#17 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcivar.h#13 integrate .. //depot/projects/ia64/sys/dev/firewire/fwphyreg.h#3 integrate .. //depot/projects/ia64/sys/dev/firewire/iec13213.h#11 integrate .. //depot/projects/ia64/sys/dev/firewire/iec68113.h#7 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#25 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwevar.h#4 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwipvar.h#2 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#51 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.h#5 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp_targ.c#8 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#55 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxpreg.h#7 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxpvar.h#13 integrate .. //depot/projects/ia64/sys/dev/fxp/rcvbundl.h#2 integrate .. //depot/projects/ia64/sys/dev/gem/if_gem_pci.c#17 integrate .. //depot/projects/ia64/sys/dev/gem/if_gemreg.h#3 integrate .. //depot/projects/ia64/sys/dev/gem/if_gemvar.h#9 integrate .. //depot/projects/ia64/sys/dev/gfb/gfb_pci.c#13 integrate .. //depot/projects/ia64/sys/dev/gfb/gfb_pci.h#2 integrate .. //depot/projects/ia64/sys/dev/harp/if_harp.c#6 integrate .. //depot/projects/ia64/sys/dev/hatm/if_hatm.c#11 integrate .. //depot/projects/ia64/sys/dev/hatm/if_hatm_intr.c#7 integrate .. //depot/projects/ia64/sys/dev/hatm/if_hatm_ioctl.c#8 integrate .. //depot/projects/ia64/sys/dev/hatm/if_hatm_rx.c#6 integrate .. //depot/projects/ia64/sys/dev/hatm/if_hatm_tx.c#8 integrate .. //depot/projects/ia64/sys/dev/hatm/if_hatmconf.h#2 integrate .. //depot/projects/ia64/sys/dev/hatm/if_hatmreg.h#2 integrate .. //depot/projects/ia64/sys/dev/hatm/if_hatmvar.h#7 integrate .. //depot/projects/ia64/sys/dev/hfa/fore.h#2 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_aali.h#3 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_command.c#8 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_if.c#5 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_include.h#4 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_init.c#7 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_intr.c#4 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_output.c#9 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_slave.h#3 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_stats.c#6 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_stats.h#2 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_var.h#6 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_vcm.c#4 integrate .. //depot/projects/ia64/sys/dev/hifn/hifn7751.c#24 integrate .. //depot/projects/ia64/sys/dev/hifn/hifn7751reg.h#5 integrate .. //depot/projects/ia64/sys/dev/hifn/hifn7751var.h#6 integrate .. //depot/projects/ia64/sys/dev/hptmv/entry.c#3 integrate .. //depot/projects/ia64/sys/dev/hptmv/global.h#2 integrate .. //depot/projects/ia64/sys/dev/hptmv/hptintf.h#2 integrate .. //depot/projects/ia64/sys/dev/hptmv/mv.c#2 integrate .. //depot/projects/ia64/sys/dev/hptmv/mvOs.h#2 integrate .. //depot/projects/ia64/sys/dev/hptmv/osbsd.h#2 integrate .. //depot/projects/ia64/sys/dev/ic/cd180.h#2 integrate .. //depot/projects/ia64/sys/dev/ic/hd64570.h#2 integrate .. //depot/projects/ia64/sys/dev/ic/sab82532.h#2 integrate .. //depot/projects/ia64/sys/dev/ic/wd33c93reg.h#2 integrate .. //depot/projects/ia64/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/ia64/sys/dev/ichsmb/ichsmb.c#6 integrate .. //depot/projects/ia64/sys/dev/ichsmb/ichsmb_reg.h#2 integrate .. //depot/projects/ia64/sys/dev/ichsmb/ichsmb_var.h#2 integrate .. //depot/projects/ia64/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/ia64/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/ia64/sys/dev/ida/ida_eisa.c#10 integrate .. //depot/projects/ia64/sys/dev/idt/idt.c#9 integrate .. //depot/projects/ia64/sys/dev/idt/idt_harp.c#6 integrate .. //depot/projects/ia64/sys/dev/idt/idt_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/idt/idtreg.h#2 integrate .. //depot/projects/ia64/sys/dev/idt/idtvar.h#3 integrate .. //depot/projects/ia64/sys/dev/ie/if_iee16.h#3 integrate .. //depot/projects/ia64/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/ia64/sys/dev/if_ndis/if_ndis_pccard.c#5 integrate .. //depot/projects/ia64/sys/dev/if_ndis/if_ndis_pci.c#5 integrate .. //depot/projects/ia64/sys/dev/if_ndis/if_ndisvar.h#9 integrate .. //depot/projects/ia64/sys/dev/iicbus/iicbb_if.m#3 integrate .. //depot/projects/ia64/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/ia64/sys/dev/iir/iir.c#12 integrate .. //depot/projects/ia64/sys/dev/iir/iir.h#9 integrate .. //depot/projects/ia64/sys/dev/iir/iir_ctrl.c#14 integrate .. //depot/projects/ia64/sys/dev/isp/isp.c#23 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#23 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#19 integrate .. //depot/projects/ia64/sys/dev/isp/isp_inline.h#11 integrate .. //depot/projects/ia64/sys/dev/isp/isp_ioctl.h#7 integrate .. //depot/projects/ia64/sys/dev/isp/isp_target.c#12 integrate .. //depot/projects/ia64/sys/dev/isp/isp_target.h#7 integrate .. //depot/projects/ia64/sys/dev/isp/isp_tpublic.h#4 integrate .. //depot/projects/ia64/sys/dev/isp/ispmbox.h#11 integrate .. //depot/projects/ia64/sys/dev/isp/ispreg.h#3 integrate .. //depot/projects/ia64/sys/dev/isp/ispvar.h#16 integrate .. //depot/projects/ia64/sys/dev/ispfw/asm_1000.h#2 integrate .. //depot/projects/ia64/sys/dev/ispfw/asm_1040.h#2 integrate .. //depot/projects/ia64/sys/dev/ispfw/asm_1080.h#2 integrate .. //depot/projects/ia64/sys/dev/ispfw/asm_12160.h#3 integrate .. //depot/projects/ia64/sys/dev/ispfw/asm_2100.h#4 integrate .. //depot/projects/ia64/sys/dev/ispfw/asm_2200.h#5 integrate .. //depot/projects/ia64/sys/dev/ispfw/asm_2300.h#7 integrate .. //depot/projects/ia64/sys/dev/ixgb/LICENSE#2 integrate .. //depot/projects/ia64/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/ia64/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/ia64/sys/dev/ixgb/if_ixgb_osdep.h#2 integrate .. //depot/projects/ia64/sys/dev/lge/if_lge.c#22 integrate .. //depot/projects/ia64/sys/dev/lge/if_lgereg.h#3 integrate .. //depot/projects/ia64/sys/dev/lnc/if_lnc_cbus.c#8 integrate .. //depot/projects/ia64/sys/dev/lnc/if_lnc_isa.c#8 integrate .. //depot/projects/ia64/sys/dev/matcd/creativeif.h#2 integrate .. //depot/projects/ia64/sys/dev/matcd/matcd.c#6 integrate .. //depot/projects/ia64/sys/dev/matcd/matcd_data.h#3 integrate .. //depot/projects/ia64/sys/dev/matcd/matcd_isa.c#4 integrate .. //depot/projects/ia64/sys/dev/matcd/matcddrv.h#2 integrate .. //depot/projects/ia64/sys/dev/matcd/options.h#2 integrate .. //depot/projects/ia64/sys/dev/mc146818/mc146818.c#2 integrate .. //depot/projects/ia64/sys/dev/mc146818/mc146818reg.h#2 integrate .. //depot/projects/ia64/sys/dev/mc146818/mc146818var.h#2 integrate .. //depot/projects/ia64/sys/dev/mcd/mcd.c#12 integrate .. //depot/projects/ia64/sys/dev/mcd/mcdreg.h#3 integrate .. //depot/projects/ia64/sys/dev/md/md.c#49 integrate .. //depot/projects/ia64/sys/dev/mii/acphy.c#12 integrate .. //depot/projects/ia64/sys/dev/mii/amphy.c#10 integrate .. //depot/projects/ia64/sys/dev/mii/amphyreg.h#2 integrate .. //depot/projects/ia64/sys/dev/mii/bmtphy.c#8 integrate .. //depot/projects/ia64/sys/dev/mii/bmtphyreg.h#2 integrate .. //depot/projects/ia64/sys/dev/mii/brgphy.c#22 integrate .. //depot/projects/ia64/sys/dev/mii/brgphyreg.h#3 integrate .. //depot/projects/ia64/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/ia64/sys/dev/mii/ciphyreg.h#2 integrate .. //depot/projects/ia64/sys/dev/mii/dcphy.c#13 integrate .. //depot/projects/ia64/sys/dev/mii/e1000phy.c#9 integrate .. //depot/projects/ia64/sys/dev/mii/e1000phyreg.h#3 integrate .. //depot/projects/ia64/sys/dev/mii/exphy.c#10 integrate .. //depot/projects/ia64/sys/dev/mii/lxtphy.c#11 integrate .. //depot/projects/ia64/sys/dev/mii/mii.h#3 integrate .. //depot/projects/ia64/sys/dev/mii/mlphy.c#9 integrate .. //depot/projects/ia64/sys/dev/mii/nsgphy.c#12 integrate .. //depot/projects/ia64/sys/dev/mii/nsgphyreg.h#3 integrate .. //depot/projects/ia64/sys/dev/mii/nsphy.c#10 integrate .. //depot/projects/ia64/sys/dev/mii/pnaphy.c#11 integrate .. //depot/projects/ia64/sys/dev/mii/qsphy.c#11 integrate .. //depot/projects/ia64/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/ia64/sys/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/ia64/sys/dev/mii/rlphy.c#14 integrate .. //depot/projects/ia64/sys/dev/mii/tdkphy.c#11 integrate .. //depot/projects/ia64/sys/dev/mii/tdkphyreg.h#2 integrate .. //depot/projects/ia64/sys/dev/mii/tlphy.c#10 integrate .. //depot/projects/ia64/sys/dev/mii/tlphyreg.h#2 integrate .. //depot/projects/ia64/sys/dev/mii/ukphy.c#9 integrate .. //depot/projects/ia64/sys/dev/mii/xmphy.c#11 integrate .. //depot/projects/ia64/sys/dev/mii/xmphyreg.h#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/fc_log.h#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi.h#4 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_cnfg.h#4 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_fc.h#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_init.h#4 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_ioc.h#4 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_lan.h#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_raid.h#4 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_targ.h#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_type.h#4 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.c#8 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_debug.c#7 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.c#14 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.h#6 integrate .. //depot/projects/ia64/sys/dev/mse/mse.c#2 integrate .. //depot/projects/ia64/sys/dev/mse/mse_cbus.c#2 integrate .. //depot/projects/ia64/sys/dev/mse/mse_isa.c#2 integrate .. //depot/projects/ia64/sys/dev/mse/msevar.h#2 integrate .. //depot/projects/ia64/sys/dev/my/if_myreg.h#2 integrate .. //depot/projects/ia64/sys/dev/ncv/ncr53c500.c#8 integrate .. //depot/projects/ia64/sys/dev/ncv/ncr53c500_pccard.c#13 integrate .. //depot/projects/ia64/sys/dev/ncv/ncr53c500hw.h#3 integrate .. //depot/projects/ia64/sys/dev/ncv/ncr53c500hwtab.h#2 integrate .. //depot/projects/ia64/sys/dev/ncv/ncr53c500reg.h#2 integrate .. //depot/projects/ia64/sys/dev/ncv/ncr53c500var.h#5 integrate .. //depot/projects/ia64/sys/dev/nge/if_nge.c#32 integrate .. //depot/projects/ia64/sys/dev/nge/if_ngereg.h#7 integrate .. //depot/projects/ia64/sys/dev/nmdm/nmdm.c#18 integrate .. //depot/projects/ia64/sys/dev/nsp/nsp.c#8 integrate .. //depot/projects/ia64/sys/dev/nsp/nsp_pccard.c#10 integrate .. //depot/projects/ia64/sys/dev/nsp/nspreg.h#2 integrate .. //depot/projects/ia64/sys/dev/nsp/nspvar.h#5 integrate .. //depot/projects/ia64/sys/dev/ofw/ofw_bus_if.m#2 integrate .. //depot/projects/ia64/sys/dev/ofw/ofw_console.c#17 integrate .. //depot/projects/ia64/sys/dev/ofw/ofw_disk.c#13 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<<