From owner-p4-projects@FreeBSD.ORG Sun Jan 9 18:59:55 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7C5A16A4D0; Sun, 9 Jan 2005 18:59: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 95C1116A4CE for ; Sun, 9 Jan 2005 18:59:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8479743D39 for ; Sun, 9 Jan 2005 18:59:54 +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 j09Ixs2L093968 for ; Sun, 9 Jan 2005 18:59:54 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j09Ixs3H093962 for perforce@freebsd.org; Sun, 9 Jan 2005 18:59:54 GMT (envelope-from sam@freebsd.org) Date: Sun, 9 Jan 2005 18:59:54 GMT Message-Id: <200501091859.j09Ixs3H093962@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 68596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Jan 2005 18:59:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=68596 Change 68596 by sam@sam_ebb on 2005/01/09 18:59:37 fix comment Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#35 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#35 (text+ko) ==== @@ -595,7 +595,7 @@ * The passive scan to look for existing AP's completed, * select a channel to camp on. Identify the channels * that already have one or more AP's and try to locate - * an unnoccupied one. If that fails, pick a channel that + * an unoccupied one. If that fails, pick a channel that * looks to be quietest. */ memset(maxrssi, 0, sizeof(maxrssi)); From owner-p4-projects@FreeBSD.ORG Mon Jan 10 04:46:06 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7917F16A4D1; Mon, 10 Jan 2005 04:46: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 507CB16A4CF for ; Mon, 10 Jan 2005 04:46:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0BFF643D39 for ; Mon, 10 Jan 2005 04:46: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 j0A4k6Pl033674 for ; Mon, 10 Jan 2005 04:46:06 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0A4k5jq033671 for perforce@freebsd.org; Mon, 10 Jan 2005 04:46:05 GMT (envelope-from sam@freebsd.org) Date: Mon, 10 Jan 2005 04:46:05 GMT Message-Id: <200501100446.j0A4k5jq033671@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 68617 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2005 04:46:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=68617 Change 68617 by sam@sam_ebb on 2005/01/10 04:45:17 working fast frames; still needs work Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#64 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#26 edit .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#37 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#22 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#32 edit .. //depot/projects/wifi/tools/tools/ath/80211stats.c#8 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#64 (text+ko) ==== @@ -2184,10 +2184,10 @@ } /* * Check if the previous beacon has gone out. If - * not don't don't try to post another, skip this - * period and wait for the next. Missed beacons - * indicate a problem and should not occur. If we - * miss too many consecutive beacons reset the device. + * not don't try to post another, skip this period + * and wait for the next. Missed beacons indicate + * a problem and should not occur. If we miss too + * many consecutive beacons reset the device. */ if (ath_hal_numtxpending(ah, sc->sc_bhalq) != 0) { sc->sc_bmisscount++; @@ -2890,19 +2890,7 @@ if (status == HAL_EINPROGRESS) break; STAILQ_REMOVE_HEAD(&sc->sc_rxbuf, bf_list); - if (ds->ds_rxstat.rs_more) { - /* - * Frame spans multiple descriptors; this - * cannot happen yet as we don't support - * jumbograms. If not in monitor mode, - * discard the frame. - */ - if (ic->ic_opmode != IEEE80211_M_MONITOR) { - sc->sc_stats.ast_rx_toobig++; - goto rx_next; - } - /* fall thru for monitor mode handling... */ - } else if (ds->ds_rxstat.rs_status != 0) { + if (ds->ds_rxstat.rs_status != 0) { if (ds->ds_rxstat.rs_status & HAL_RXERR_CRC) sc->sc_stats.ast_rx_crcerr++; if (ds->ds_rxstat.rs_status & HAL_RXERR_FIFO) @@ -2911,7 +2899,7 @@ sc->sc_stats.ast_rx_phyerr++; phyerr = ds->ds_rxstat.rs_phyerr & 0x1f; sc->sc_stats.ast_rx_phy[phyerr]++; - goto rx_next; + goto rx_error; /* NB: don't count in ierrors */ } if (ds->ds_rxstat.rs_status & HAL_RXERR_DECRYPT) { /* @@ -2949,7 +2937,15 @@ } } ifp->if_ierrors++; +rx_error: /* + * Cleanup any pending partial frame. + */ + if (sc->sc_rxpending != NULL) { + m_freem(sc->sc_rxpending); + sc->sc_rxpending = NULL; + } + /* * Reject error frames, we normally don't want * to see them in monitor mode (in monitor mode * allow through packets that have crypto problems). @@ -2972,9 +2968,42 @@ bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); bf->bf_m = NULL; - m->m_pkthdr.rcvif = ifp; len = ds->ds_rxstat.rs_datalen; - m->m_pkthdr.len = m->m_len = len; + m->m_len = len; + + if (ds->ds_rxstat.rs_more) { + /* + * Frame spans multiple descriptors; save + * it for the next completed descriptor, it + * will be used to construct a jumbogram. + */ + if (sc->sc_rxpending != NULL) { + /* NB: max frame size is currently 2 clusters */ + sc->sc_stats.ast_rx_toobig++; + m_freem(sc->sc_rxpending); + } + m->m_pkthdr.rcvif = ifp; + m->m_pkthdr.len = len; + sc->sc_rxpending = m; + goto rx_next; + } else if (sc->sc_rxpending != NULL) { + /* + * This is the second part of a jumbogram, + * chain it to the first mbuf, adjust the + * frame length, and clear the rxpending state. + */ + sc->sc_rxpending->m_next = m; + sc->sc_rxpending->m_pkthdr.len += len; + m = sc->sc_rxpending; + sc->sc_rxpending = NULL; + } else { + /* + * Normal single-descriptor receive; setup + * the rcvif and packet length. + */ + m->m_pkthdr.rcvif = ifp; + m->m_pkthdr.len = len; + } sc->sc_stats.ast_ant_rx[ds->ds_rxstat.rs_antenna]++; @@ -3783,8 +3812,6 @@ 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++; @@ -4037,6 +4064,10 @@ } } #endif + if (sc->sc_rxpending != NULL) { + m_freem(sc->sc_rxpending); + sc->sc_rxpending = NULL; + } sc->sc_rxlink = NULL; /* just in case */ #undef PA2DESC } @@ -4051,6 +4082,7 @@ struct ath_buf *bf; sc->sc_rxlink = NULL; + sc->sc_rxpending = NULL; STAILQ_FOREACH(bf, &sc->sc_rxbuf, bf_list) { int error = ath_rxbuf_init(sc, bf); if (error != 0) { ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#26 (text+ko) ==== @@ -258,6 +258,7 @@ struct ath_descdma sc_rxdma; /* RX descriptos */ ath_bufhead sc_rxbuf; /* receive buffer */ + struct mbuf *sc_rxpending; /* pending receive data */ u_int32_t *sc_rxlink; /* link ptr in last RX desc */ struct task sc_rxtask; /* rx int processing */ struct task sc_rxorntask; /* rxorn int processing */ ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#37 (text+ko) ==== @@ -108,7 +108,11 @@ static struct mbuf *ieee80211_defrag(struct ieee80211com *, struct ieee80211_node *, struct mbuf *); +static void ieee80211_deliver_data(struct ieee80211com *, + struct ieee80211_node *, struct mbuf *); static struct mbuf *ieee80211_decap(struct ieee80211com *, struct mbuf *); +static struct mbuf *ieee80211_decap_fastframe(struct ieee80211com *, + struct ieee80211_node *, struct mbuf *); static void ieee80211_node_pwrsave(struct ieee80211_node *, int enable); static void ieee80211_recv_pspoll(struct ieee80211com *, struct ieee80211_node *, struct mbuf *); @@ -133,7 +137,7 @@ struct ieee80211_frame *wh; struct ieee80211_key *key; struct ether_header *eh; - int len, hdrsize, off; + int hdrsize, off; u_int8_t dir, type, subtype; u_int8_t *bssid; u_int16_t rxseq; @@ -289,8 +293,8 @@ if (m->m_len < hdrsize && (m = m_pullup(m, hdrsize)) == NULL) { IEEE80211_DISCARD(ic, IEEE80211_MSG_ANY, - wh, "data", "too short: len %u, expecting %u", - m->m_pkthdr.len, hdrsize); + wh, "data", "too short: m_pullup(%u) failed", + hdrsize); ic->ic_stats.is_rx_tooshort++; goto out; /* XXX */ } @@ -492,49 +496,32 @@ IEEE80211_NODE_STAT(ni, rx_data); IEEE80211_NODE_STAT_ADD(ni, rx_bytes, m->m_pkthdr.len); - /* perform as a bridge within the AP */ - if (ic->ic_opmode == IEEE80211_M_HOSTAP && - (ic->ic_flags & IEEE80211_F_NOBRIDGE) == 0) { - struct mbuf *m1 = NULL; +#define FF_LLC_SIZE (sizeof(struct ether_header) + sizeof(struct llc)) + if ((ni->ni_flags & IEEE80211_NODE_FF) && + m->m_pkthdr.len >= 3*FF_LLC_SIZE) { + struct llc *llc; - if (ETHER_IS_MULTICAST(eh->ether_dhost)) { - m1 = m_copypacket(m, M_DONTWAIT); - if (m1 == NULL) - ifp->if_oerrors++; - else - m1->m_flags |= M_MCAST; - } else { - /* XXX this dups work done in ieee80211_encap */ - /* check if destination is associated */ - struct ieee80211_node *ni1 = - ieee80211_find_node(ic->ic_sta, - eh->ether_dhost); - if (ni1 != NULL) { - /* XXX check if authorized */ - if (ni1->ni_associd != 0) { - m1 = m; - m = NULL; - } - /* XXX statistic? */ - ieee80211_free_node(ni1); - } + /* + * Check for fast-frame tunnel encapsulation. + */ + if (m->m_len < FF_LLC_SIZE && + (m = m_pullup(m, FF_LLC_SIZE)) == NULL) { + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_ANY, + ni->ni_macaddr, "fast-frame", + "%s", "m_pullup(llc) failed"); + ic->ic_stats.is_rx_tooshort++; } - if (m1 != NULL) { - len = m1->m_pkthdr.len; - IF_ENQUEUE(&ifp->if_snd, m1); - if (m != NULL) - ifp->if_omcasts++; - ifp->if_obytes += len; + llc = (struct llc *)(mtod(m, u_int8_t *) + + sizeof(struct ether_header)); + if (llc->llc_snap.ether_type == htons(ATH_FF_ETH_TYPE)) { + m_adj(m, FF_LLC_SIZE); + m = ieee80211_decap_fastframe(ic, ni, m); + if (m == NULL) + return; } } - if (m != NULL) { - if (ni->ni_vlan != 0) { - /* attach vlan tag */ - /* XXX goto err? */ - VLAN_INPUT_TAG(ifp, m, ni->ni_vlan, goto out); - } - (*ifp->if_input)(ifp, m); - } +#undef FF_LLC_SIZE + ieee80211_deliver_data(ic, ni, m); return; case IEEE80211_FC0_TYPE_MGT: @@ -711,6 +698,66 @@ return mfrag; } +static void +ieee80211_deliver_data(struct ieee80211com *ic, + struct ieee80211_node *ni, struct mbuf *m) +{ + struct ether_header *eh = mtod(m, struct ether_header *); + struct ifnet *ifp = ic->ic_ifp; + int len; + + /* perform as a bridge within the AP */ + if (ic->ic_opmode == IEEE80211_M_HOSTAP && + (ic->ic_flags & IEEE80211_F_NOBRIDGE) == 0) { + struct mbuf *m1 = NULL; + + if (ETHER_IS_MULTICAST(eh->ether_dhost)) { + m1 = m_copypacket(m, M_DONTWAIT); + if (m1 == NULL) + ifp->if_oerrors++; + else + m1->m_flags |= M_MCAST; + } else { + /* XXX this dups work done in ieee80211_encap */ + /* check if destination is associated */ + struct ieee80211_node *ni1 = + ieee80211_find_node(ic->ic_sta, + eh->ether_dhost); + if (ni1 != NULL) { + /* XXX check if authorized */ + if (ni1->ni_associd != 0) { + m1 = m; + m = NULL; + } + /* XXX statistic? */ + ieee80211_free_node(ni1); + } + } + if (m1 != NULL) { + len = m1->m_pkthdr.len; + IF_ENQUEUE(&ifp->if_snd, m1); + if (m != NULL) + ifp->if_omcasts++; + ifp->if_obytes += len; + } + } + if (m != NULL) { + if (ni->ni_vlan != 0) { + /* attach vlan tag */ + /* XXX goto err? */ + VLAN_INPUT_TAG(ifp, m, ni->ni_vlan, goto out); + } + (*ifp->if_input)(ifp, m); + } + return; + out: + if (m != NULL) { + if (ic->ic_rawbpf) + bpf_mtap(ic->ic_rawbpf, m); + m_freem(m); + } +} + static struct mbuf * ieee80211_decap(struct ieee80211com *ic, struct mbuf *m) { @@ -813,6 +860,104 @@ } /* + * Decap a frame encapsulated in a fast-frame. + */ +static struct mbuf * +ieee80211_decap1(struct mbuf *m, int *framelen) +{ +#define FF_LLC_SIZE (sizeof(struct ether_header) + sizeof(struct llc)) + struct ether_header *eh; + struct llc *llc; + + /* + * The frame has an 802.3 header followed by an 802.2 + * LLC header. The encapsulated frame length is in the + * first header type field; save that and overwrite it + * with the true type field found in the second. Then + * copy the 802.3 header up to where it belongs and + * adjust the mbuf contents to remove the void. + */ + if (m->m_len < FF_LLC_SIZE && (m = m_pullup(m, FF_LLC_SIZE)) == NULL) + return NULL; + eh = mtod(m, struct ether_header *); /* 802.3 header is first */ + llc = (struct llc *)&eh[1]; /* 802.2 header follows */ + *framelen = ntohs(eh->ether_type) /* encap'd frame size */ + + sizeof(struct ether_header) - sizeof(struct llc); + eh->ether_type = llc->llc_un.type_snap.ether_type; + ovbcopy(eh, mtod(m, u_int8_t *) + sizeof(struct llc), + sizeof(struct ether_header)); + m_adj(m, sizeof(struct llc)); + return m; +#undef FF_LLC_SIZE +} + +/* + * Decap the encapsulated frame pair and dispatch the first + * for delivery. The second frame is returned for delivery + * via the normal path. + */ +static struct mbuf * +ieee80211_decap_fastframe(struct ieee80211com *ic, + struct ieee80211_node *ni, struct mbuf *m) +{ +#define MS(x,f) (((x) & f) >> f##_S) + u_int32_t ath; + struct mbuf *n; + int framelen; + + m_copydata(m, 0, sizeof(u_int32_t), (caddr_t) &ath); + if (MS(ath, ATH_FF_PROTO) != ATH_FF_PROTO_L2TUNNEL) { + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_ANY, + ni->ni_macaddr, "fast-frame", + "unsupport tunnel protocol, header 0x%x", ath); + ic->ic_stats.is_ff_badhdr++; + m_freem(m); + return NULL; + } + /* NB: skip header and alignment padding */ + m_adj(m, roundup(sizeof(u_int32_t) - 2, 4) + 2); + + ic->ic_stats.is_ff_decap++; + + /* + * Decap the first frame, bust it apart from the + * second and deliver; then decap the second frame + * and return it to the caller for normal delivery. + */ + m = ieee80211_decap1(m, &framelen); + if (m == NULL) { + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_ANY, + ni->ni_macaddr, "fast-frame", "%s", "first decap failed"); + ic->ic_stats.is_ff_tooshort++; + return NULL; + } + n = m_split(m, framelen, M_NOWAIT); + if (n == NULL) { + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_ANY, + ni->ni_macaddr, "fast-frame", + "%s", "unable to split encapsulated frames"); + ic->ic_stats.is_ff_split++; + m_freem(m); /* NB: must reclaim */ + return NULL; + } + ieee80211_deliver_data(ic, ni, m); /* 1st of pair */ + + /* + * Decap second frame. + */ + m_adj(n, roundup2(framelen, 4) - framelen); /* padding */ + n = ieee80211_decap1(n, &framelen); + if (n == NULL) { + IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_ANY, + ni->ni_macaddr, "fast-frame", "%s", "second decap failed"); + ic->ic_stats.is_ff_tooshort++; + } + /* XXX verify framelen against mbuf contents */ + return n; /* 2nd delivered by caller */ +#undef MS +} + +/* * Install received rate set information in the node's state block. */ static int ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#22 (text+ko) ==== @@ -173,6 +173,11 @@ u_int32_t is_ps_unassoc; /* ps-poll for unassoc. sta */ u_int32_t is_ps_badaid; /* ps-poll w/ incorrect aid */ u_int32_t is_ps_qempty; /* ps-poll w/ nothing to send */ + u_int32_t is_ff_badhdr; /* fast frame rx'd w/ bad hdr */ + u_int32_t is_ff_tooshort; /* fast frame rx decap error */ + u_int32_t is_ff_split; /* fast frame rx split error */ + u_int32_t is_ff_decap; /* fast frames decap'd */ + u_int32_t is_ff_encap; /* fast frames encap'd for tx */ }; /* ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#32 (text+ko) ==== @@ -537,9 +537,8 @@ goto bad; } m = ieee80211_encap_fastframe(ic, m, &eh, m2, &eh2); - if (m == NULL) { + if (m == NULL) goto bad; - } } else { /* * Normal frame. @@ -768,6 +767,8 @@ llc->llc_snap.org_code[2] = ATH_FF_SNAP_ORGCODE_2; llc->llc_snap.ether_type = htons(ATH_FF_ETH_TYPE); + ic->ic_stats.is_ff_encap++; + return m1; } ==== //depot/projects/wifi/tools/tools/ath/80211stats.c#8 (text+ko) ==== @@ -144,6 +144,11 @@ STAT(ps_unassoc, "ps-poll received for unassociated station"); STAT(ps_badaid, "ps-poll received with invalid association id"); STAT(ps_qempty, "ps-poll received with nothing to send"); + STAT(ff_badhdr, "fast frame rx'd w/ bad hdr"); + STAT(ff_tooshort, "fast frame rx decap error"); + STAT(ff_split, "fast frame rx split error"); + STAT(ff_decap, "fast frames decap'd"); + STAT(ff_encap, "fast frames encap'd for tx"); #undef STAT #undef N } From owner-p4-projects@FreeBSD.ORG Mon Jan 10 05:01:25 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82B1916A4D0; Mon, 10 Jan 2005 05:01: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 469A416A4CE for ; Mon, 10 Jan 2005 05:01:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D087C43D1D for ; Mon, 10 Jan 2005 05:01:24 +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 j0A51Ogl040664 for ; Mon, 10 Jan 2005 05:01:24 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0A51ONg040661 for perforce@freebsd.org; Mon, 10 Jan 2005 05:01:24 GMT (envelope-from marcel@freebsd.org) Date: Mon, 10 Jan 2005 05:01:24 GMT Message-Id: <200501100501.j0A51ONg040661@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 68618 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2005 05:01:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=68618 Change 68618 by marcel@marcel_nfs on 2005/01/10 05:00:48 IFC @68616 Affected files ... .. //depot/projects/uart/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/uart/conf/files.i386#15 integrate .. //depot/projects/uart/conf/files.pc98#12 integrate .. //depot/projects/uart/dev/amr/amr_cam.c#4 integrate .. //depot/projects/uart/dev/amr/amrvar.h#5 integrate .. //depot/projects/uart/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/uart/dev/bktr/bktr_audio.c#6 integrate .. //depot/projects/uart/dev/bktr/bktr_card.c#6 integrate .. //depot/projects/uart/dev/bktr/bktr_core.c#8 integrate .. //depot/projects/uart/dev/bktr/bktr_i2c.c#5 integrate .. //depot/projects/uart/dev/bktr/bktr_os.c#7 integrate .. //depot/projects/uart/dev/bktr/bktr_reg.h#5 integrate .. //depot/projects/uart/dev/bktr/bktr_tuner.c#6 integrate .. //depot/projects/uart/dev/fe/if_fe_pccard.c#5 integrate .. //depot/projects/uart/dev/pccard/pccarddevs#12 integrate .. //depot/projects/uart/dev/usb/ehci.c#10 integrate .. //depot/projects/uart/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/uart/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/uart/netipx/ipx.c#4 integrate .. //depot/projects/uart/netipx/ipx_input.c#5 integrate .. //depot/projects/uart/netipx/ipx_pcb.c#4 integrate .. //depot/projects/uart/netipx/ipx_pcb.h#3 integrate .. //depot/projects/uart/netipx/ipx_usrreq.c#5 integrate .. //depot/projects/uart/netipx/spx_usrreq.c#6 integrate .. //depot/projects/uart/pc98/pc98/30line.h#3 integrate .. //depot/projects/uart/pc98/pc98/module.h#2 delete .. //depot/projects/uart/pc98/pc98/pc98gdc.c#6 integrate .. //depot/projects/uart/pci/if_sis.c#11 integrate .. //depot/projects/uart/sparc64/ebus/ebus.c#6 integrate .. //depot/projects/uart/vm/vm_object.c#12 integrate Differences ... ==== //depot/projects/uart/boot/i386/boot0/boot0.S#4 (text+ko) ==== @@ -13,7 +13,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.12 2004/11/24 15:39:04 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.13 2005/01/09 23:30:35 peadar Exp $ */ /* A 512-byte boot manager. */ @@ -104,10 +104,15 @@ * number should be used. If what the bios gives us is bad, use the '0' in * the block instead. */ - testb $0x20,_FLAGS(%bp) # Set number drive? + testb $0x20,_FLAGS(%bp) # Set drive number? jnz main.1 # Yes testb %dl,%dl # Drive number valid? js main.2 # Possibly (0x80 set) +/* + * Only update the boot-sector when there is a valid drive number or + * the drive number is set manually. + */ + orb $0x40,_FLAGS(%bp) # Disable updates main.1: movb _SETDRV(%bp),%dl # Drive number to use /* * Whatever we decided to use, now store it into the fake @@ -145,16 +150,14 @@ /* * Now scan the table of known types */ - movb $TBL1SZ,%cl # Number of entries - repne # Known - scasb # type? - jne main.4 # No + movb $TBL1SZ+1,%cl # Number of entries + repne # Locate + scasb # type /* - * If it matches get the matching element in the next array. If it doesn't, - * we are already pointing at its first element which points to a "?". + * Get the matching element in the next array. */ - addw $TBL1SZ,%di # Adjust -main.4: movb (%di),%cl # Partition + addw $TBL1SZ-1, %di # Adjust + movb (%di),%cl # Partition addw %cx,%di # description callw putx # Display it main.5: incw %dx # Next item @@ -305,7 +308,6 @@ /* * Load selected bootsector to the LOAD location in RAM. * If it fails to read or isn't marked bootable, treat it as a bad selection. - * XXX: What does %si carry? */ main.15: movw $LOAD,%bx # Address for read movb $0x2,%ah # Read sector @@ -313,10 +315,8 @@ jc main.10 # If error cmpw $MAGIC,0x1fe(%bx) # Bootable? jne main.10 # No - pushw %si # Save movw $crlf,%si # Leave some callw puts # space - popw %si # Restore jmp *%bx # Invoke bootstrap /* @@ -413,9 +413,9 @@ .byte 0x9f, 0xa5, 0xa6, 0xa9 /* * These are offsets that match the known names above and point to the strings - * that will be printed. + * that will be printed. os_misc will be used if the search of the above table + * runs over. */ - .byte os_misc-. # Unknown .byte os_dos-. # DOS .byte os_dos-. # DOS .byte os_dos-. # DOS @@ -427,6 +427,7 @@ .byte os_freebsd-. # FreeBSD .byte os_bsd-. # OpenBSD .byte os_bsd-. # NetBSD + .byte os_misc-. # Unknown /* * And here are the strings themselves. 0x80 or'd into a byte indicates * the end of the string. (not so great for Russians but...) ==== //depot/projects/uart/conf/files.i386#15 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.512 2005/01/04 06:07:25 imp Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.513 2005/01/10 04:40:23 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -102,15 +102,13 @@ compat/svr4/svr4_sysvec.c optional compat_svr4 compat/svr4/svr4_termios.c optional compat_svr4 compat/svr4/svr4_ttold.c optional compat_svr4 +contrib/dev/hptmv/gui_lib.c optional hptmv +contrib/dev/hptmv/hptproc.c optional hptmv +contrib/dev/hptmv/ioctl.c optional hptmv contrib/dev/oltr/if_oltr.c optional oltr contrib/dev/oltr/trlldbm.c optional oltr contrib/dev/oltr/trlldhm.c optional oltr contrib/dev/oltr/trlldmac.c optional oltr -contrib/dev/hptmv/gui_lib.c optional hptmv -contrib/dev/hptmv/hptproc.c optional hptmv -contrib/dev/hptmv/ioctl.c optional hptmv -dev/hptmv/entry.c optional hptmv -dev/hptmv/mv.c optional hptmv bf_enc.o optional ipsec ipsec_esp \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ @@ -150,15 +148,16 @@ dev/fdc/fdc.c optional fdc dev/fdc/fdc_acpi.c optional fdc dev/fdc/fdc_isa.c optional fdc isa -dev/fdc/fdc_pccard.c optional fdc card dev/fdc/fdc_pccard.c optional fdc pccard dev/fe/if_fe_isa.c optional fe isa +dev/hptmv/entry.c optional hptmv +dev/hptmv/mv.c optional hptmv dev/ichwd/ichwd.c optional ichwd dev/if_ndis/if_ndis.c optional ndis -dev/if_ndis/if_ndis_pccard.c optional ndis card dev/if_ndis/if_ndis_pccard.c optional ndis pccard dev/if_ndis/if_ndis_pci.c optional ndis cardbus dev/if_ndis/if_ndis_pci.c optional ndis pci +dev/io/iodev.c optional io dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd @@ -166,7 +165,6 @@ dev/kbd/kbd.c optional ukbd dev/kbd/kbd.c optional vt dev/lnc/if_lnc_isa.c optional lnc isa -dev/io/iodev.c optional io dev/mem/memutil.c optional mem dev/mse/mse.c optional mse dev/mse/mse_isa.c optional mse isa @@ -236,8 +234,8 @@ i386/i386/in_cksum.c optional inet i386/i386/initcpu.c standard i386/i386/intr_machdep.c standard +i386/i386/io.c optional io i386/i386/io_apic.c optional apic -i386/i386/io.c optional io i386/i386/k6_mem.c optional mem i386/i386/legacy.c standard i386/i386/local_apic.c optional apic ==== //depot/projects/uart/conf/files.pc98#12 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.311 2005/01/04 06:24:33 imp Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.312 2005/01/10 04:38:58 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -115,11 +115,11 @@ dev/fb/splash.c optional splash dev/fe/if_fe_cbus.c optional fe isa dev/fe/if_fe_pccard.c optional fe card +dev/io/iodev.c optional io +dev/kbd/kbd.c optional pckbd dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd -dev/kbd/kbd.c optional pckbd dev/lnc/if_lnc_cbus.c optional lnc isa -dev/io/iodev.c optional io dev/mem/memutil.c optional mem dev/mse/mse.c optional mse dev/mse/mse_cbus.c optional mse isa @@ -173,8 +173,8 @@ i386/i386/in_cksum.c optional inet i386/i386/initcpu.c standard i386/i386/intr_machdep.c standard +i386/i386/io.c optional io i386/i386/io_apic.c optional apic -i386/i386/io.c optional io i386/i386/k6_mem.c optional mem i386/i386/legacy.c standard i386/i386/local_apic.c optional apic @@ -353,9 +353,9 @@ pc98/pc98/isa_dma.c optional isa pc98/pc98/nmi.c standard pc98/pc98/olpt.c optional olpt +pc98/pc98/pc98_machdep.c standard pc98/pc98/pc98gdc.c optional gdc pc98/pc98/pc98kbd.c optional pckbd -pc98/pc98/pc98_machdep.c standard pc98/pc98/pmc.c optional pmc pc98/pc98/ppc.c optional ppc pc98/pc98/scgdcrndr.c optional sc gdc ==== //depot/projects/uart/dev/amr/amr_cam.c#4 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr_cam.c,v 1.11 2005/01/06 01:42:28 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr_cam.c,v 1.12 2005/01/10 02:34:26 dwhite Exp $"); #include #include @@ -139,10 +139,12 @@ /* * Allocate a devq for all our channels combined. This should * allow for the maximum number of SCSI commands we will accept - * at one time. + * at one time. Save the pointer in the softc so we can find it later + * during detach. */ if ((devq = cam_simq_alloc(AMR_MAX_SCSI_CMDS)) == NULL) return(ENOMEM); + sc->amr_cam_devq = devq; /* * Iterate over our channels, registering them with CAM @@ -182,19 +184,22 @@ void amr_cam_detach(struct amr_softc *sc) { - int chn, first; + int chn; - for (chn = 0, first = 1; chn < sc->amr_maxchan; chn++) { + for (chn = 0; chn < sc->amr_maxchan; chn++) { /* * If a sim was allocated for this channel, free it */ if (sc->amr_cam_sim[chn] != NULL) { xpt_bus_deregister(cam_sim_path(sc->amr_cam_sim[chn])); - cam_sim_free(sc->amr_cam_sim[chn], first ? TRUE : FALSE); - first = 0; + cam_sim_free(sc->amr_cam_sim[chn], FALSE); } } + + /* Now free the devq */ + if (sc->amr_cam_devq != NULL) + cam_simq_free(sc->amr_cam_devq); } /******************************************************************************** ==== //depot/projects/uart/dev/amr/amrvar.h#5 (text+ko) ==== @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.23 2004/12/05 23:48:17 scottl Exp $ + * $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.24 2005/01/10 02:34:26 dwhite Exp $ */ #if __FreeBSD_version >= 500005 @@ -202,6 +202,7 @@ /* CAM attachments for passthrough */ struct cam_sim *amr_cam_sim[AMR_MAX_CHANNELS]; TAILQ_HEAD(, ccb_hdr) amr_cam_ccbq; + struct cam_devq *amr_cam_devq; /* control device */ struct cdev *amr_dev_t; ==== //depot/projects/uart/dev/bfe/if_bfe.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.19 2005/01/06 01:42:30 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.20 2005/01/09 19:57:55 sam Exp $"); #include #include @@ -617,7 +617,7 @@ r = &sc->bfe_rx_ring[c]; bus_dmamap_load(sc->bfe_tag, r->bfe_map, mtod(m, void *), MCLBYTES, bfe_dma_map_desc, d, 0); - bus_dmamap_sync(sc->bfe_tag, r->bfe_map, BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(sc->bfe_tag, r->bfe_map, BUS_DMASYNC_PREREAD); ctrl = ETHER_MAX_LEN + 32; ==== //depot/projects/uart/dev/bktr/bktr_audio.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.13 2003/12/08 07:59:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.15 2005/01/08 22:52:00 imp Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -53,7 +53,6 @@ #include #include #include -#include #ifdef __FreeBSD__ @@ -61,15 +60,16 @@ #include /* for DELAY */ #include #else +#include +#include +#include #include #endif -#if (__FreeBSD_version >=300000) #include /* for bus space */ #include #include #endif -#endif #ifdef __NetBSD__ #include ==== //depot/projects/uart/dev/bktr/bktr_card.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.27 2005/01/02 04:47:36 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.29 2005/01/08 22:52:00 imp Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -51,7 +51,6 @@ #include #include -#include #ifdef __FreeBSD__ @@ -59,15 +58,16 @@ #include /* for DELAY */ #include #else +#include +#include +#include #include #endif -#if (__FreeBSD_version >=300000) #include /* for bus space */ #include #include #endif -#endif #ifdef __NetBSD__ #include /* NetBSD location for .h files */ ==== //depot/projects/uart/dev/bktr/bktr_core.c#8 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.135 2004/06/16 09:46:38 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.138 2005/01/09 17:42:03 cognet Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -107,20 +107,20 @@ #include #include #include +#include #include #include #include #include -#include +#include +#include #include #include #include #include -#if (__FreeBSD_version >=400000) || (NSMBUS > 0) #include /* used by smbus and newbus */ -#endif #if (__FreeBSD_version < 500000) #include /* for DELAY */ @@ -131,12 +131,9 @@ #include #endif - -#if (__FreeBSD_version >=300000) #include /* for bus space */ #include #include -#endif #include #include /* extensions to ioctl_meteor.h */ @@ -427,7 +424,7 @@ static bool_t getline(bktr_reg_t *, int); static bool_t notclipped(bktr_reg_t * , int , int); -static bool_t split(bktr_reg_t *, volatile u_long **, int, u_long, int, +static bool_t split(bktr_reg_t *, volatile uint32_t **, int, u_long, int, volatile u_char ** , int ); static void start_capture( bktr_ptr_t bktr, unsigned type ); @@ -1258,7 +1255,7 @@ LOCK_VBI(bktr); while(bktr->vbisize == 0) { - if (ioflag & IO_NDELAY) { + if (ioflag & FNDELAY) { status = EWOULDBLOCK; goto out; } @@ -2674,7 +2671,7 @@ return FALSE; } -static bool_t split(bktr_reg_t * bktr, volatile u_long **dma_prog, int width , +static bool_t split(bktr_reg_t * bktr, volatile uint32_t **dma_prog, int width , u_long operation, int pixel_width, volatile u_char ** target_buffer, int cols ) { @@ -2764,11 +2761,11 @@ rgb_vbi_prog( bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace ) { int i; - volatile u_long target_buffer, buffer, target,width; - volatile u_long pitch; - volatile u_long *dma_prog; /* DMA prog is an array of + volatile uint32_t target_buffer, buffer, target,width; + volatile uint32_t pitch; + volatile uint32_t *dma_prog; /* DMA prog is an array of 32 bit RISC instructions */ - volatile u_long *loop_point; + volatile uint32_t *loop_point; struct meteor_pixfmt_internal *pf_int = &pixfmt_table[ bktr->pixfmt ]; u_int Bpp = pf_int->public.Bpp; unsigned int vbisamples; /* VBI samples per line */ @@ -2804,7 +2801,7 @@ } bktr->capcontrol = 3 << 2 | 3; - dma_prog = (u_long *) bktr->dma_prog; + dma_prog = (uint32_t *) bktr->dma_prog; /* Construct Write */ @@ -2846,19 +2843,19 @@ for (i = 0; i < (rows/interlace); i++) { target = target_buffer; if ( notclipped(bktr, i, width)) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile uint32_t **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } else { while(getline(bktr, i)) { if (bktr->y != bktr->y2 ) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile uint32_t **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } if (bktr->yclip != bktr->yclip2 ) { - split(bktr,(volatile u_long **) &dma_prog, + split(bktr,(volatile uint32_t **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, Bpp, (volatile u_char **)(uintptr_t)&target, cols); @@ -2903,19 +2900,19 @@ for (i = 0; i < (rows/interlace); i++) { target = target_buffer; if ( notclipped(bktr, i, width)) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile uint32_t **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } else { while(getline(bktr, i)) { if (bktr->y != bktr->y2 ) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile uint32_t **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } if (bktr->yclip != bktr->yclip2 ) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile uint32_t **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, Bpp, (volatile u_char **)(uintptr_t) &target, cols); } @@ -2946,9 +2943,9 @@ rgb_prog( bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace ) { int i; - volatile u_long target_buffer, buffer, target,width; - volatile u_long pitch; - volatile u_long *dma_prog; + volatile uint32_t target_buffer, buffer, target,width; + volatile uint32_t pitch; + volatile uint32_t *dma_prog; struct meteor_pixfmt_internal *pf_int = &pixfmt_table[ bktr->pixfmt ]; u_int Bpp = pf_int->public.Bpp; @@ -2976,16 +2973,16 @@ } bktr->capcontrol = 3 << 2 | 3; - dma_prog = (u_long *) bktr->dma_prog; + dma_prog = (uint32_t *) bktr->dma_prog; /* Construct Write */ if (bktr->video.addr) { - target_buffer = (u_long) bktr->video.addr; + target_buffer = (uint32_t) bktr->video.addr; pitch = bktr->video.width; } else { - target_buffer = (u_long) vtophys(bktr->bigbuf); + target_buffer = (uint32_t) vtophys(bktr->bigbuf); pitch = cols*Bpp; } @@ -3000,19 +2997,19 @@ for (i = 0; i < (rows/interlace); i++) { target = target_buffer; if ( notclipped(bktr, i, width)) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile uint32_t **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } else { while(getline(bktr, i)) { if (bktr->y != bktr->y2 ) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile uint32_t **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } if (bktr->yclip != bktr->yclip2 ) { - split(bktr,(volatile u_long **) &dma_prog, + split(bktr,(volatile uint32_t **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, Bpp, (volatile u_char **)(uintptr_t)&target, cols); @@ -3032,7 +3029,7 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t ) vtophys(bktr->dma_prog); return; case 2: @@ -3041,7 +3038,7 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t ) vtophys(bktr->dma_prog); return; case 3: @@ -3049,7 +3046,7 @@ *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRO; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; ; - *dma_prog = (u_long ) vtophys(bktr->odd_dma_prog); + *dma_prog = (uint32_t ) vtophys(bktr->odd_dma_prog); break; } @@ -3057,7 +3054,7 @@ target_buffer = buffer + pitch; - dma_prog = (u_long *) bktr->odd_dma_prog; + dma_prog = (uint32_t *) bktr->odd_dma_prog; /* sync vre IRQ bit */ *dma_prog++ = OP_SYNC | BKTR_RESYNC | BKTR_FM1; @@ -3066,19 +3063,19 @@ for (i = 0; i < (rows/interlace); i++) { target = target_buffer; if ( notclipped(bktr, i, width)) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile uint32_t **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } else { while(getline(bktr, i)) { if (bktr->y != bktr->y2 ) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile uint32_t **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } if (bktr->yclip != bktr->yclip2 ) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile uint32_t **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } @@ -3096,7 +3093,7 @@ *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRE; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog) ; + *dma_prog++ = (uint32_t ) vtophys(bktr->dma_prog) ; *dma_prog++ = 0; /* NULL WORD */ } @@ -3111,8 +3108,8 @@ int i; volatile unsigned int inst; volatile unsigned int inst3; - volatile u_long target_buffer, buffer; - volatile u_long *dma_prog; + volatile uint32_t target_buffer, buffer; + volatile uint32_t *dma_prog; struct meteor_pixfmt_internal *pf_int = &pixfmt_table[ bktr->pixfmt ]; int b; @@ -3127,7 +3124,7 @@ bktr->capcontrol = 1 << 6 | 1 << 4 | 1 << 2 | 3; bktr->capcontrol = 3 << 2 | 3; - dma_prog = (u_long *) bktr->dma_prog; + dma_prog = (uint32_t *) bktr->dma_prog; /* Construct Write */ @@ -3137,9 +3134,9 @@ inst3 = OP_WRITE | OP_EOL | (cols); if (bktr->video.addr) - target_buffer = (u_long) bktr->video.addr; + target_buffer = (uint32_t) bktr->video.addr; else - target_buffer = (u_long) vtophys(bktr->bigbuf); + target_buffer = (uint32_t) vtophys(bktr->bigbuf); buffer = target_buffer; @@ -3165,7 +3162,7 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); return; case 2: @@ -3173,7 +3170,7 @@ *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_VRO; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); return; case 3: @@ -3181,15 +3178,15 @@ *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRO; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; - *dma_prog = (u_long ) vtophys(bktr->odd_dma_prog); + *dma_prog = (uint32_t) vtophys(bktr->odd_dma_prog); break; } if (interlace == 2) { - target_buffer = (u_long) buffer + cols*2; + target_buffer = (uint32_t) buffer + cols*2; - dma_prog = (u_long * ) bktr->odd_dma_prog; + dma_prog = (uint32_t *) bktr->odd_dma_prog; /* sync vre */ *dma_prog++ = OP_SYNC | BKTR_RESYNC | BKTR_FM1; @@ -3208,10 +3205,10 @@ *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRE; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); *dma_prog++ = 0; /* NULL WORD */ } @@ -3225,13 +3222,13 @@ int i; volatile unsigned int inst; - volatile u_long target_buffer, t1, buffer; - volatile u_long *dma_prog; + volatile uint32_t target_buffer, t1, buffer; + volatile uint32_t *dma_prog; struct meteor_pixfmt_internal *pf_int = &pixfmt_table[ bktr->pixfmt ]; OUTB(bktr, BKTR_COLOR_FMT, pf_int->color_fmt); - dma_prog = (u_long *) bktr->dma_prog; + dma_prog = (uint32_t*) bktr->dma_prog; bktr->capcontrol = 1 << 6 | 1 << 4 | 3; @@ -3255,9 +3252,9 @@ /* Construct Write */ inst = OP_WRITE123 | OP_SOL | OP_EOL | (cols); if (bktr->video.addr) - target_buffer = (u_long) bktr->video.addr; + target_buffer = (uint32_t) bktr->video.addr; else - target_buffer = (u_long) vtophys(bktr->bigbuf); + target_buffer = (uint32_t) vtophys(bktr->bigbuf); buffer = target_buffer; @@ -3282,7 +3279,7 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); return; case 2: @@ -3290,7 +3287,7 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); return; case 3: @@ -3298,15 +3295,15 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; - *dma_prog = (u_long ) vtophys(bktr->odd_dma_prog); + *dma_prog = (uint32_t) vtophys(bktr->odd_dma_prog); break; } if (interlace == 2) { - dma_prog = (u_long * ) bktr->odd_dma_prog; + dma_prog = (uint32_t *) bktr->odd_dma_prog; - target_buffer = (u_long) buffer + cols; + target_buffer = (uint32_t) buffer + cols; t1 = buffer + cols/2; *dma_prog++ = OP_SYNC | 1 << 15 | BKTR_FM3; *dma_prog++ = 0; /* NULL WORD */ @@ -3324,7 +3321,7 @@ *dma_prog++ = OP_SYNC | 1 << 24 | 1 << 15 | BKTR_VRE; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog) ; + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog) ; *dma_prog++ = 0; /* NULL WORD */ } @@ -3339,13 +3336,13 @@ int i; volatile unsigned int inst; volatile unsigned int inst1; - volatile u_long target_buffer, t1, buffer; - volatile u_long *dma_prog; + volatile uint32_t target_buffer, t1, buffer; + volatile uint32_t *dma_prog; struct meteor_pixfmt_internal *pf_int = &pixfmt_table[ bktr->pixfmt ]; OUTB(bktr, BKTR_COLOR_FMT, pf_int->color_fmt); - dma_prog = (u_long *) bktr->dma_prog; + dma_prog = (uint32_t *) bktr->dma_prog; bktr->capcontrol = 1 << 6 | 1 << 4 | 3; @@ -3356,9 +3353,9 @@ inst = OP_WRITE123 | OP_SOL | OP_EOL | (cols); inst1 = OP_WRITES123 | OP_SOL | OP_EOL | (cols); if (bktr->video.addr) - target_buffer = (u_long) bktr->video.addr; + target_buffer = (uint32_t) bktr->video.addr; else - target_buffer = (u_long) vtophys(bktr->bigbuf); + target_buffer = (uint32_t) vtophys(bktr->bigbuf); buffer = target_buffer; t1 = buffer; @@ -3386,7 +3383,7 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); return; case 2: @@ -3394,22 +3391,22 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); return; case 3: *dma_prog++ = OP_SYNC | 1 << 24 | 1 << 15 | BKTR_VRO; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; - *dma_prog = (u_long ) vtophys(bktr->odd_dma_prog); + *dma_prog = (uint32_t) vtophys(bktr->odd_dma_prog); break; } if (interlace == 2) { - dma_prog = (u_long * ) bktr->odd_dma_prog; + dma_prog = (uint32_t *) bktr->odd_dma_prog; - target_buffer = (u_long) buffer + cols; + target_buffer = (uint32_t) buffer + cols; t1 = buffer + cols/2; *dma_prog++ = OP_SYNC | 1 << 15 | BKTR_FM3; *dma_prog++ = 0; /* NULL WORD */ @@ -3434,7 +3431,7 @@ *dma_prog++ = OP_SYNC | 1 << 24 | 1 << 15 | BKTR_VRE; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); *dma_prog++ = 0; /* NULL WORD */ } ==== //depot/projects/uart/dev/bktr/bktr_i2c.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.25 2003/12/08 07:59:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.26 2005/01/08 22:52:00 imp Exp $"); /* * I2C support for the bti2c chipset. @@ -58,11 +58,9 @@ #include #endif -#if (__FreeBSD_version >= 300000) #include /* for bus space */ #include #include -#endif #include #include /* extensions to ioctl_meteor.h */ ==== //depot/projects/uart/dev/bktr/bktr_os.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.47 2004/06/16 09:46:38 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.49 2005/01/08 22:52:00 imp Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -72,27 +72,20 @@ #else #include #endif -#include #include #include #include #include -#if (__FreeBSD_version >=400000) #include /* used by smbus and newbus */ -#endif -#if (__FreeBSD_version >=300000) #include /* used by bus space */ #include /* used by bus space and newbus */ #include -#endif -#if (__FreeBSD_version >=400000) #include /* used by newbus */ #include /* used by newbus */ -#endif #if (__FreeBSD_version < 500000) #include /* for DELAY */ @@ -208,7 +201,6 @@ /****************************/ /* *** FreeBSD 4.x code *** */ /****************************/ -#if (__FreeBSD_version >= 400000) static int bktr_probe( device_t dev ); static int bktr_attach( device_t dev ); @@ -272,10 +264,8 @@ }; DRIVER_MODULE(bktr, pci, bktr_driver, bktr_devclass, 0, 0); -#if (__FreeBSD_version > 410000) MODULE_DEPEND(bktr, bktr_mem, 1,1,1); MODULE_VERSION(bktr, 1); -#endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 10 17:47:52 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8323616A4D0; Mon, 10 Jan 2005 17:47: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 5E85516A4CE for ; Mon, 10 Jan 2005 17:47:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D5EC43D54 for ; Mon, 10 Jan 2005 17:47:52 +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 j0AHlqHI095695 for ; Mon, 10 Jan 2005 17:47:52 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0AHlqHr095692 for perforce@freebsd.org; Mon, 10 Jan 2005 17:47:52 GMT (envelope-from sam@freebsd.org) Date: Mon, 10 Jan 2005 17:47:52 GMT Message-Id: <200501101747.j0AHlqHr095692@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 68656 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 10 Jan 2005 17:47:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=68656 Change 68656 by sam@sam_ebb on 2005/01/10 17:46:53 o bump tx descriptor count to avoid defrag'ing fast frames o correct max s/g count; it can never be more than the max(rx,tx,beacon) descriptor counts Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#27 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#27 (text+ko) ==== @@ -53,7 +53,7 @@ #define ATH_RXBUF 40 /* number of RX buffers */ #define ATH_TXBUF 100 /* number of TX buffers */ -#define ATH_TXDESC 8 /* number of descriptors per buffer */ +#define ATH_TXDESC 10 /* 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 */ @@ -98,7 +98,7 @@ struct mbuf *bf_m; /* mbuf for buf */ struct ieee80211_node *bf_node; /* pointer to the node */ bus_size_t bf_mapsize; -#define ATH_MAX_SCATTER 64 +#define ATH_MAX_SCATTER ATH_TXDESC /* max(tx,rx,beacon) desc's */ bus_dma_segment_t bf_segs[ATH_MAX_SCATTER]; }; typedef STAILQ_HEAD(, ath_buf) ath_bufhead; From owner-p4-projects@FreeBSD.ORG Tue Jan 11 03:15:15 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C58816A4D0; Tue, 11 Jan 2005 03:15:15 +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 18D9716A4CE for ; Tue, 11 Jan 2005 03:15:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7925E43D31 for ; Tue, 11 Jan 2005 03:15:14 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0B3FEPv030558 for ; Tue, 11 Jan 2005 03:15:14 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0B3EvkT030546 for perforce@freebsd.org; Tue, 11 Jan 2005 03:14:57 GMT (envelope-from peter@freebsd.org) Date: Tue, 11 Jan 2005 03:14:57 GMT Message-Id: <200501110314.j0B3EvkT030546@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 68686 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2005 03:15:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=68686 Change 68686 by peter@peter_overcee on 2005/01/11 03:14:05 IFC @68684 Affected files ... .. //depot/projects/hammer/COPYRIGHT#3 integrate .. //depot/projects/hammer/MAINTAINERS#30 integrate .. //depot/projects/hammer/Makefile.inc1#83 integrate .. //depot/projects/hammer/bin/cat/cat.1#4 integrate .. //depot/projects/hammer/bin/cat/cat.c#6 integrate .. //depot/projects/hammer/bin/chflags/chflags.1#6 integrate .. //depot/projects/hammer/bin/chflags/chflags.c#6 integrate .. //depot/projects/hammer/bin/chio/chio.1#5 integrate .. //depot/projects/hammer/bin/chio/chio.c#3 integrate .. //depot/projects/hammer/bin/chio/defs.h#2 integrate .. //depot/projects/hammer/bin/chio/pathnames.h#2 integrate .. //depot/projects/hammer/bin/chmod/chmod.1#6 integrate .. //depot/projects/hammer/bin/chmod/chmod.c#7 integrate .. //depot/projects/hammer/bin/cp/cp.1#7 integrate .. //depot/projects/hammer/bin/cp/cp.c#10 integrate .. //depot/projects/hammer/bin/csh/USD.doc/csh.1#4 integrate .. //depot/projects/hammer/bin/csh/USD.doc/csh.2#3 integrate .. //depot/projects/hammer/bin/csh/USD.doc/csh.3#3 integrate .. //depot/projects/hammer/bin/csh/USD.doc/csh.4#3 integrate .. //depot/projects/hammer/bin/csh/USD.doc/csh.a#3 integrate .. //depot/projects/hammer/bin/csh/USD.doc/csh.g#5 integrate .. //depot/projects/hammer/bin/csh/USD.doc/tabs#3 integrate .. //depot/projects/hammer/bin/date/date.1#10 integrate .. //depot/projects/hammer/bin/date/date.c#7 integrate .. //depot/projects/hammer/bin/dd/dd.1#7 integrate .. //depot/projects/hammer/bin/dd/gen.c#2 integrate .. //depot/projects/hammer/bin/df/df.1#10 integrate .. //depot/projects/hammer/bin/df/df.c#19 integrate .. //depot/projects/hammer/bin/domainname/domainname.1#4 integrate .. //depot/projects/hammer/bin/domainname/domainname.c#4 integrate .. //depot/projects/hammer/bin/echo/echo.1#6 integrate .. //depot/projects/hammer/bin/echo/echo.c#6 integrate .. //depot/projects/hammer/bin/ed/ed.h#3 integrate .. //depot/projects/hammer/bin/expr/expr.1#6 integrate .. //depot/projects/hammer/bin/expr/expr.y#3 integrate .. //depot/projects/hammer/bin/hostname/hostname.1#4 integrate .. //depot/projects/hammer/bin/hostname/hostname.c#4 integrate .. //depot/projects/hammer/bin/kenv/kenv.1#3 integrate .. //depot/projects/hammer/bin/kenv/kenv.c#4 integrate .. //depot/projects/hammer/bin/kill/kill.1#4 integrate .. //depot/projects/hammer/bin/kill/kill.c#6 integrate .. //depot/projects/hammer/bin/ln/ln.1#5 integrate .. //depot/projects/hammer/bin/ln/ln.c#4 integrate .. //depot/projects/hammer/bin/ln/symlink.7#5 integrate .. //depot/projects/hammer/bin/ls/cmp.c#5 integrate .. //depot/projects/hammer/bin/ls/ls.1#15 integrate .. //depot/projects/hammer/bin/ls/ls.c#13 integrate .. //depot/projects/hammer/bin/ls/ls.h#5 integrate .. //depot/projects/hammer/bin/ls/print.c#15 integrate .. //depot/projects/hammer/bin/ls/util.c#7 integrate .. //depot/projects/hammer/bin/mkdir/mkdir.1#4 integrate .. //depot/projects/hammer/bin/mkdir/mkdir.c#5 integrate .. //depot/projects/hammer/bin/mv/mv.1#4 integrate .. //depot/projects/hammer/bin/mv/mv.c#6 integrate .. //depot/projects/hammer/bin/pax/cpio.1#2 integrate .. //depot/projects/hammer/bin/pax/getoldopt.c#3 integrate .. //depot/projects/hammer/bin/pax/pax.1#7 integrate .. //depot/projects/hammer/bin/pax/tar.1#5 integrate .. //depot/projects/hammer/bin/ps/ps.1#20 integrate .. //depot/projects/hammer/bin/pwd/pwd.1#6 integrate .. //depot/projects/hammer/bin/pwd/pwd.c#5 integrate .. //depot/projects/hammer/bin/rcp/rcp.1#4 integrate .. //depot/projects/hammer/bin/rcp/rcp.c#7 integrate .. //depot/projects/hammer/bin/realpath/realpath.1#3 integrate .. //depot/projects/hammer/bin/rm/rm.1#9 integrate .. //depot/projects/hammer/bin/rmdir/rmdir.1#4 integrate .. //depot/projects/hammer/bin/setfacl/file.c#2 integrate .. //depot/projects/hammer/bin/setfacl/mask.c#2 integrate .. //depot/projects/hammer/bin/setfacl/merge.c#2 integrate .. //depot/projects/hammer/bin/setfacl/remove.c#2 integrate .. //depot/projects/hammer/bin/setfacl/setfacl.1#5 integrate .. //depot/projects/hammer/bin/setfacl/setfacl.c#5 integrate .. //depot/projects/hammer/bin/setfacl/setfacl.h#3 integrate .. //depot/projects/hammer/bin/setfacl/util.c#2 integrate .. //depot/projects/hammer/bin/sh/bltin/echo.1#5 integrate .. //depot/projects/hammer/bin/sh/builtins.def#4 integrate .. //depot/projects/hammer/bin/sh/funcs/cmv#3 integrate .. //depot/projects/hammer/bin/sh/funcs/dirs#3 integrate .. //depot/projects/hammer/bin/sh/funcs/kill#3 integrate .. //depot/projects/hammer/bin/sh/funcs/login#3 integrate .. //depot/projects/hammer/bin/sh/funcs/newgrp#3 integrate .. //depot/projects/hammer/bin/sh/funcs/popd#3 integrate .. //depot/projects/hammer/bin/sh/funcs/pushd#3 integrate .. //depot/projects/hammer/bin/sh/funcs/suspend#3 integrate .. //depot/projects/hammer/bin/sh/mkbuiltins#5 integrate .. //depot/projects/hammer/bin/sh/mktokens#3 integrate .. //depot/projects/hammer/bin/sh/nodetypes#3 integrate .. //depot/projects/hammer/bin/sh/sh.1#13 integrate .. //depot/projects/hammer/bin/sleep/sleep.1#3 integrate .. //depot/projects/hammer/bin/sleep/sleep.c#6 integrate .. //depot/projects/hammer/bin/stty/stty.1#4 integrate .. //depot/projects/hammer/bin/sync/sync.8#3 integrate .. //depot/projects/hammer/bin/sync/sync.c#4 integrate .. //depot/projects/hammer/bin/test/TEST.sh#2 integrate .. //depot/projects/hammer/bin/test/test.1#5 integrate .. //depot/projects/hammer/bin/test/test.c#3 integrate .. //depot/projects/hammer/contrib/telnet/telnet/commands.c#3 integrate .. //depot/projects/hammer/contrib/telnet/telnet/main.c#2 integrate .. //depot/projects/hammer/contrib/telnet/telnetd/telnetd.8#2 integrate .. //depot/projects/hammer/contrib/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/hammer/etc/defaults/pccard.conf#17 integrate .. //depot/projects/hammer/etc/defaults/periodic.conf#12 integrate .. //depot/projects/hammer/etc/devd.conf#18 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#32 integrate .. //depot/projects/hammer/etc/pccard_ether#11 integrate .. //depot/projects/hammer/etc/periodic/daily/460.status-mail-rejects#4 integrate .. //depot/projects/hammer/etc/rc.subr#21 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2#18 integrate .. //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#10 integrate .. //depot/projects/hammer/gnu/lib/libdialog/checklist.c#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gasp/gasp.1#2 integrate .. //depot/projects/hammer/gnu/usr.bin/send-pr/categories#4 integrate .. //depot/projects/hammer/gnu/usr.bin/send-pr/send-pr.1#5 integrate .. //depot/projects/hammer/include/fts.h#4 integrate .. //depot/projects/hammer/include/pthread.h#6 integrate .. //depot/projects/hammer/include/stdlib.h#11 integrate .. //depot/projects/hammer/include/uuid.h#2 integrate .. //depot/projects/hammer/lib/libalias/alias_old.c#4 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#15 integrate .. //depot/projects/hammer/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.3#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_all.c#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_util.3#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.3#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#17 integrate .. //depot/projects/hammer/lib/libarchive/libarchive.3#5 integrate .. //depot/projects/hammer/lib/libbluetooth/bluetooth.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/fts.3#8 integrate .. //depot/projects/hammer/lib/libc/gen/signal.3#9 integrate .. //depot/projects/hammer/lib/libc/gen/syslog.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/syslog.c#8 integrate .. //depot/projects/hammer/lib/libc/gen/utime.3#3 integrate .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#23 integrate .. //depot/projects/hammer/lib/libc/locale/rpmatch.3#1 branch .. //depot/projects/hammer/lib/libc/locale/rpmatch.c#1 branch .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#15 integrate .. //depot/projects/hammer/lib/libc/net/gethostbyht.c#2 integrate .. //depot/projects/hammer/lib/libc/net/getnetbyht.c#2 integrate .. //depot/projects/hammer/lib/libc/net/getprotoent.c#2 integrate .. //depot/projects/hammer/lib/libc/net/getservent.c#3 integrate .. //depot/projects/hammer/lib/libc/net/inet6_option_space.3#4 integrate .. //depot/projects/hammer/lib/libc/regex/engine.c#5 integrate .. //depot/projects/hammer/lib/libc/sys/chmod.2#5 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid_compare.c#3 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid_equal.c#3 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid_hash.c#3 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid_is_nil.c#3 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid_to_string.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_mattr_init.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_mattr_kind_np.c#2 integrate .. //depot/projects/hammer/lib/libdisk/create_chunk.c#16 integrate .. //depot/projects/hammer/lib/libdisk/libdisk.3#8 integrate .. //depot/projects/hammer/lib/libipx/ipx.3#4 integrate .. //depot/projects/hammer/lib/libstand/libstand.3#7 integrate .. //depot/projects/hammer/lib/libutil/login_cap.3#6 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#25 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#16 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#69 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/early-adopter/article.sgml#8 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#15 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/intro.sgml#4 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#7 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml#5 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml#2 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/share/sgml/release.dsl#6 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#19 integrate .. //depot/projects/hammer/sbin/badsect/badsect.c#6 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.8#9 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#18 integrate .. //depot/projects/hammer/sbin/devd/devd.8#11 integrate .. //depot/projects/hammer/sbin/dump/optr.c#9 integrate .. //depot/projects/hammer/sbin/ffsinfo/ffsinfo.c#5 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#10 integrate .. //depot/projects/hammer/sbin/gpt/gpt.8#7 integrate .. //depot/projects/hammer/sbin/ifconfig/af_link.c#2 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#20 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#23 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.h#8 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#9 integrate .. //depot/projects/hammer/sbin/ifconfig/ifmac.c#3 integrate .. //depot/projects/hammer/sbin/ifconfig/ifmedia.c#7 integrate .. //depot/projects/hammer/sbin/ifconfig/ifvlan.c#3 integrate .. //depot/projects/hammer/sbin/ipf/Makefile#4 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#34 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#35 integrate .. //depot/projects/hammer/sbin/kldunload/kldunload.8#3 integrate .. //depot/projects/hammer/sbin/mount_unionfs/mount_unionfs.8#7 integrate .. //depot/projects/hammer/sbin/natd/natd.c#9 integrate .. //depot/projects/hammer/sbin/newfs/newfs.c#12 integrate .. //depot/projects/hammer/sbin/ping6/Makefile#4 integrate .. //depot/projects/hammer/sbin/ping6/ping6.c#7 integrate .. //depot/projects/hammer/sbin/reboot/boot_i386.8#9 integrate .. //depot/projects/hammer/sbin/route/route.8#8 integrate .. //depot/projects/hammer/sbin/savecore/Makefile#3 integrate .. //depot/projects/hammer/sbin/savecore/savecore.c#7 integrate .. //depot/projects/hammer/sbin/sconfig/sconfig.8#7 integrate .. //depot/projects/hammer/sbin/slattach/slattach.8#6 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.8#8 integrate .. //depot/projects/hammer/share/examples/Makefile#9 integrate .. //depot/projects/hammer/share/examples/mdoc/POSIX-copyright#1 branch .. //depot/projects/hammer/share/examples/mdoc/deshallify.sh#1 branch .. //depot/projects/hammer/share/examples/meteor/README#2 delete .. //depot/projects/hammer/share/examples/meteor/rgb16.c#3 delete .. //depot/projects/hammer/share/examples/meteor/rgb24.c#3 delete .. //depot/projects/hammer/share/examples/meteor/test-n.c#3 delete .. //depot/projects/hammer/share/examples/meteor/yuvpk.c#3 delete .. //depot/projects/hammer/share/examples/meteor/yuvpl.c#3 delete .. //depot/projects/hammer/share/man/man3/pthread_once.3#3 integrate .. //depot/projects/hammer/share/man/man3/pthread_setspecific.3#2 integrate .. //depot/projects/hammer/share/man/man3/queue.3#5 integrate .. //depot/projects/hammer/share/man/man4/Makefile#61 integrate .. //depot/projects/hammer/share/man/man4/aac.4#10 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#30 integrate .. //depot/projects/hammer/share/man/man4/amr.4#9 integrate .. //depot/projects/hammer/share/man/man4/ath.4#21 integrate .. //depot/projects/hammer/share/man/man4/bktr.4#6 integrate .. //depot/projects/hammer/share/man/man4/em.4#7 integrate .. //depot/projects/hammer/share/man/man4/ixgb.4#8 integrate .. //depot/projects/hammer/share/man/man4/lomac.4#4 delete .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#26 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_panasonic.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/fe.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/wd.4#3 delete .. //depot/projects/hammer/share/man/man4/matcd.4#6 delete .. //depot/projects/hammer/share/man/man4/ngatmbase.4#2 integrate .. //depot/projects/hammer/share/man/man4/wlan.4#6 integrate .. //depot/projects/hammer/share/man/man4/xl.4#9 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#46 integrate .. //depot/projects/hammer/share/man/man5/style.Makefile.5#7 integrate .. //depot/projects/hammer/share/man/man7/hier.7#24 integrate .. //depot/projects/hammer/share/man/man7/tuning.7#13 integrate .. //depot/projects/hammer/share/man/man9/BUF_LOCKINIT.9#2 integrate .. //depot/projects/hammer/share/man/man9/BUS_CONFIG_INTR.9#5 integrate .. //depot/projects/hammer/share/man/man9/BUS_PRINT_CHILD.9#3 integrate .. //depot/projects/hammer/share/man/man9/BUS_SETUP_INTR.9#8 integrate .. //depot/projects/hammer/share/man/man9/DECLARE_GEOM_CLASS.9#3 integrate .. //depot/projects/hammer/share/man/man9/DECLARE_MODULE.9#3 integrate .. //depot/projects/hammer/share/man/man9/DEVICE_ATTACH.9#3 integrate .. //depot/projects/hammer/share/man/man9/DEVICE_DETACH.9#4 integrate .. //depot/projects/hammer/share/man/man9/DEVICE_PROBE.9#7 integrate .. //depot/projects/hammer/share/man/man9/DEVICE_SHUTDOWN.9#2 integrate .. //depot/projects/hammer/share/man/man9/EVENTHANDLER.9#2 integrate .. //depot/projects/hammer/share/man/man9/MODULE_DEPEND.9#2 integrate .. //depot/projects/hammer/share/man/man9/MUTEX_PROFILING.9#4 integrate .. //depot/projects/hammer/share/man/man9/Makefile#47 integrate .. //depot/projects/hammer/share/man/man9/SYSCALL_MODULE.9#3 integrate .. //depot/projects/hammer/share/man/man9/VFS_CHECKEXP.9#5 integrate .. //depot/projects/hammer/share/man/man9/VFS_FHTOVP.9#5 integrate .. //depot/projects/hammer/share/man/man9/VFS_INIT.9#4 delete .. //depot/projects/hammer/share/man/man9/VFS_MOUNT.9#5 integrate .. //depot/projects/hammer/share/man/man9/VFS_SET.9#6 integrate .. //depot/projects/hammer/share/man/man9/VFS_START.9#5 integrate .. //depot/projects/hammer/share/man/man9/VFS_STATFS.9#5 integrate .. //depot/projects/hammer/share/man/man9/VFS_SYNC.9#5 integrate .. //depot/projects/hammer/share/man/man9/VFS_UNMOUNT.9#5 integrate .. //depot/projects/hammer/share/man/man9/VFS_VGET.9#6 integrate .. //depot/projects/hammer/share/man/man9/bpf.9#2 integrate .. //depot/projects/hammer/share/man/man9/bus_dma.9#13 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#16 integrate .. //depot/projects/hammer/share/man/man9/mutex.9#12 integrate .. //depot/projects/hammer/share/man/man9/physio.9#4 integrate .. //depot/projects/hammer/share/man/man9/rtentry.9#7 integrate .. //depot/projects/hammer/share/man/man9/sleep.9#7 integrate .. //depot/projects/hammer/share/man/man9/style.9#18 integrate .. //depot/projects/hammer/share/man/man9/suser.9#7 integrate .. //depot/projects/hammer/share/man/man9/swi.9#6 integrate .. //depot/projects/hammer/share/man/man9/sx.9#8 integrate .. //depot/projects/hammer/share/man/man9/timeout.9#6 integrate .. //depot/projects/hammer/share/man/man9/vm_map_entry_resize_free.9#2 integrate .. //depot/projects/hammer/share/mk/bsd.dep.mk#11 integrate .. //depot/projects/hammer/share/mk/bsd.info.mk#5 integrate .. //depot/projects/hammer/share/mk/bsd.init.mk#3 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#26 integrate .. //depot/projects/hammer/share/mk/bsd.man.mk#7 integrate .. //depot/projects/hammer/share/mk/bsd.obj.mk#7 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#6 integrate .. //depot/projects/hammer/share/mk/bsd.subdir.mk#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#15 integrate .. //depot/projects/hammer/sys/alpha/alpha/clock.c#8 integrate .. //depot/projects/hammer/sys/alpha/alpha/clock_if.m#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/cpuconf.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_disasm.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_instruction.h#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_interface.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_1000a.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_2100_a50.c#7 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_2100_a500.c#7 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_3000_300.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_3000_500.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_axppci_33.c#7 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_eb164.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_eb64plus.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_kn20aa.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_kn300.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_kn8ae.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/dec_st550.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/divrem.m4#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/exception.s#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/gdb_machdep.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/in_cksum.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#18 integrate .. //depot/projects/hammer/sys/alpha/alpha/locore.s#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#30 integrate .. //depot/projects/hammer/sys/alpha/alpha/pal.s#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#41 integrate .. //depot/projects/hammer/sys/alpha/alpha/prom.c#7 integrate .. //depot/projects/hammer/sys/alpha/alpha/prom_disp.s#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/promcons.c#14 integrate .. //depot/projects/hammer/sys/alpha/alpha/support.s#7 integrate .. //depot/projects/hammer/sys/alpha/alpha/trap.c#15 integrate .. //depot/projects/hammer/sys/alpha/alpha/uio_machdep.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#19 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#26 integrate .. //depot/projects/hammer/sys/alpha/conf/gethints.awk#2 delete .. //depot/projects/hammer/sys/alpha/include/_limits.h#7 integrate .. //depot/projects/hammer/sys/alpha/include/alpha_cpu.h#4 integrate .. //depot/projects/hammer/sys/alpha/include/asm.h#4 integrate .. //depot/projects/hammer/sys/alpha/include/bootinfo.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/bus.h#13 integrate .. //depot/projects/hammer/sys/alpha/include/bus_memio.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/bus_pio.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/clock.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/clockvar.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/cpu.h#10 integrate .. //depot/projects/hammer/sys/alpha/include/cpuconf.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/db_machdep.h#5 integrate .. //depot/projects/hammer/sys/alpha/include/exec.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/float.h#5 integrate .. //depot/projects/hammer/sys/alpha/include/floatingpoint.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/frame.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/gdb_machdep.h#3 integrate .. //depot/projects/hammer/sys/alpha/include/ieee.h#3 integrate .. //depot/projects/hammer/sys/alpha/include/ieeefp.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/intrcnt.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/kdb.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/limits.h#6 integrate .. //depot/projects/hammer/sys/alpha/include/pal.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/param.h#11 integrate .. //depot/projects/hammer/sys/alpha/include/pc/msdos.h#2 delete .. //depot/projects/hammer/sys/alpha/include/pcb.h#5 integrate .. //depot/projects/hammer/sys/alpha/include/pmap.h#12 integrate .. //depot/projects/hammer/sys/alpha/include/proc.h#3 integrate .. //depot/projects/hammer/sys/alpha/include/profile.h#4 integrate .. //depot/projects/hammer/sys/alpha/include/prom.h#3 integrate .. //depot/projects/hammer/sys/alpha/include/pte.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/ptrace.h#4 integrate .. //depot/projects/hammer/sys/alpha/include/reg.h#3 integrate .. //depot/projects/hammer/sys/alpha/include/reloc.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/resource.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/rpb.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/runq.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/signal.h#5 integrate .. //depot/projects/hammer/sys/alpha/include/smp.h#3 integrate .. //depot/projects/hammer/sys/alpha/include/vmparam.h#4 integrate .. //depot/projects/hammer/sys/alpha/isa/mcclock_isa.c#4 integrate .. //depot/projects/hammer/sys/alpha/mcbus/mcbus.c#4 integrate .. //depot/projects/hammer/sys/alpha/mcbus/mcbusreg.h#2 integrate .. //depot/projects/hammer/sys/alpha/mcbus/mcbusvar.h#2 integrate .. //depot/projects/hammer/sys/alpha/mcbus/mcmem.c#4 integrate .. //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#11 integrate .. //depot/projects/hammer/sys/alpha/mcbus/mcpciareg.h#2 integrate .. //depot/projects/hammer/sys/alpha/mcbus/mcpciavar.h#2 integrate .. //depot/projects/hammer/sys/alpha/osf1/exec_ecoff.h#2 integrate .. //depot/projects/hammer/sys/alpha/osf1/imgact_osf1.c#8 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1.h#2 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_ioctl.c#5 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#14 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_mount.c#8 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_signal.c#14 integrate .. //depot/projects/hammer/sys/alpha/pci/alphapci_if.m#2 integrate .. //depot/projects/hammer/sys/alpha/pci/apecs.c#9 integrate .. //depot/projects/hammer/sys/alpha/pci/apecsreg.h#2 integrate .. //depot/projects/hammer/sys/alpha/pci/cia.c#8 integrate .. //depot/projects/hammer/sys/alpha/pci/cia_pci.c#4 integrate .. //depot/projects/hammer/sys/alpha/pci/ciareg.h#2 integrate .. //depot/projects/hammer/sys/alpha/pci/lcareg.h#2 integrate .. //depot/projects/hammer/sys/alpha/pci/pci_eb164_intr.s#2 integrate .. //depot/projects/hammer/sys/alpha/pci/pci_eb64plus_intr.s#2 integrate .. //depot/projects/hammer/sys/alpha/pci/pcibus.c#6 integrate .. //depot/projects/hammer/sys/alpha/pci/t2.c#9 integrate .. //depot/projects/hammer/sys/alpha/pci/t2reg.h#2 integrate .. //depot/projects/hammer/sys/alpha/tlsb/dwlpx.c#9 integrate .. //depot/projects/hammer/sys/alpha/tlsb/dwlpxreg.h#2 integrate .. //depot/projects/hammer/sys/alpha/tlsb/dwlpxvar.h#2 integrate .. //depot/projects/hammer/sys/alpha/tlsb/gbus.c#4 integrate .. //depot/projects/hammer/sys/alpha/tlsb/kftxx.c#4 integrate .. //depot/projects/hammer/sys/alpha/tlsb/kftxxreg.h#2 integrate .. //depot/projects/hammer/sys/alpha/tlsb/mcclock_tlsb.c#4 integrate .. //depot/projects/hammer/sys/alpha/tlsb/tlsb.c#5 integrate .. //depot/projects/hammer/sys/alpha/tlsb/tlsbcpu.c#4 integrate .. //depot/projects/hammer/sys/alpha/tlsb/tlsbmem.c#4 integrate .. //depot/projects/hammer/sys/alpha/tlsb/tlsbreg.h#2 integrate .. //depot/projects/hammer/sys/alpha/tlsb/tlsbvar.h#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#29 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_disasm.c#4 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#23 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#25 integrate .. //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#32 integrate .. //depot/projects/hammer/sys/amd64/amd64/uio_machdep.c#4 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#62 integrate .. //depot/projects/hammer/sys/amd64/conf/gethints.awk#6 delete .. //depot/projects/hammer/sys/amd64/include/_limits.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/apicreg.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/bus_dma.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/bus_memio.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/bus_pio.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/clock.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/cputypes.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/db_machdep.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/float.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/gdb_machdep.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/limits.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/metadata.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/mptable.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#29 integrate .. //depot/projects/hammer/sys/amd64/include/pc/display.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#51 integrate .. //depot/projects/hammer/sys/amd64/include/proc.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#23 integrate .. //depot/projects/hammer/sys/amd64/include/ptrace.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/resource.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/runq.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/signal.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#19 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#27 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#18 integrate .. //depot/projects/hammer/sys/arm/arm/bcopy_page.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/bcopyinout.S#5 integrate .. //depot/projects/hammer/sys/arm/arm/bcopyinout_xscale.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/blockio.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/bootconfig.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/bus_space_asm_generic.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#8 integrate .. //depot/projects/hammer/sys/arm/arm/copystr.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc.c#6 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm10.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm3.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm67.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm7tdmi.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm8.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm9.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_armv4.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_ixp12x0.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_sa1.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_sa11x0.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_xscale.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/db_disasm.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/db_interface.c#4 integrate .. //depot/projects/hammer/sys/arm/arm/db_trace.c#9 integrate .. //depot/projects/hammer/sys/arm/arm/disassem.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/exception.S#5 integrate .. //depot/projects/hammer/sys/arm/arm/fiq.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/fiq_subr.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/fusu.S#5 integrate .. //depot/projects/hammer/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/hammer/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/in_cksum_arm.S#4 integrate .. //depot/projects/hammer/sys/arm/arm/intr.c#7 integrate .. //depot/projects/hammer/sys/arm/arm/irq_dispatch.S#4 integrate .. //depot/projects/hammer/sys/arm/arm/locore.S#7 integrate .. //depot/projects/hammer/sys/arm/arm/machdep.c#7 integrate .. //depot/projects/hammer/sys/arm/arm/nexus.c#4 integrate .. //depot/projects/hammer/sys/arm/arm/nexus_io.c#5 integrate .. //depot/projects/hammer/sys/arm/arm/nexus_io_asm.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#15 integrate .. //depot/projects/hammer/sys/arm/arm/setcpsr.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/setstack.s#2 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#11 integrate .. //depot/projects/hammer/sys/arm/arm/trap.c#8 integrate .. //depot/projects/hammer/sys/arm/arm/uio_machdep.c#4 integrate .. //depot/projects/hammer/sys/arm/arm/undefined.c#5 integrate .. //depot/projects/hammer/sys/arm/arm/vectors.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#9 integrate .. //depot/projects/hammer/sys/arm/include/_limits.h#6 integrate .. //depot/projects/hammer/sys/arm/include/armreg.h#2 integrate .. //depot/projects/hammer/sys/arm/include/asm.h#4 integrate .. //depot/projects/hammer/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/hammer/sys/arm/include/atomic.h#5 integrate .. //depot/projects/hammer/sys/arm/include/bootconfig.h#2 integrate .. //depot/projects/hammer/sys/arm/include/bus.h#5 integrate .. //depot/projects/hammer/sys/arm/include/bus_memio.h#2 integrate .. //depot/projects/hammer/sys/arm/include/bus_pio.h#2 integrate .. //depot/projects/hammer/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/hammer/sys/arm/include/cpufunc.h#6 integrate .. //depot/projects/hammer/sys/arm/include/db_machdep.h#5 integrate .. //depot/projects/hammer/sys/arm/include/disassem.h#2 integrate .. //depot/projects/hammer/sys/arm/include/endian.h#7 integrate .. //depot/projects/hammer/sys/arm/include/exec.h#2 integrate .. //depot/projects/hammer/sys/arm/include/fiq.h#2 integrate .. //depot/projects/hammer/sys/arm/include/float.h#3 integrate .. //depot/projects/hammer/sys/arm/include/fp.h#2 integrate .. //depot/projects/hammer/sys/arm/include/frame.h#3 integrate .. //depot/projects/hammer/sys/arm/include/ieee.h#2 integrate .. //depot/projects/hammer/sys/arm/include/ieeefp.h#2 integrate .. //depot/projects/hammer/sys/arm/include/intr.h#3 integrate .. //depot/projects/hammer/sys/arm/include/katelib.h#2 integrate .. //depot/projects/hammer/sys/arm/include/kdb.h#3 integrate .. //depot/projects/hammer/sys/arm/include/limits.h#6 integrate .. //depot/projects/hammer/sys/arm/include/metadata.h#2 integrate .. //depot/projects/hammer/sys/arm/include/pcb.h#5 integrate .. //depot/projects/hammer/sys/arm/include/pmap.h#7 integrate .. //depot/projects/hammer/sys/arm/include/proc.h#2 integrate .. //depot/projects/hammer/sys/arm/include/profile.h#6 integrate .. //depot/projects/hammer/sys/arm/include/psl.h#2 integrate .. //depot/projects/hammer/sys/arm/include/pte.h#3 integrate .. //depot/projects/hammer/sys/arm/include/resource.h#2 integrate .. //depot/projects/hammer/sys/arm/include/runq.h#2 integrate .. //depot/projects/hammer/sys/arm/include/signal.h#6 integrate .. //depot/projects/hammer/sys/arm/include/stdarg.h#2 integrate .. //depot/projects/hammer/sys/arm/include/swi.h#2 integrate .. //depot/projects/hammer/sys/arm/include/sysarch.h#2 integrate .. //depot/projects/hammer/sys/arm/include/trap.h#2 integrate .. //depot/projects/hammer/sys/arm/include/undefined.h#2 integrate .. //depot/projects/hammer/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/hammer/sys/arm/sa11x0/assabet_machdep.c#8 integrate .. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_io.c#5 integrate .. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_io_asm.S#2 integrate .. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_irq.S#3 integrate .. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_ost.c#3 integrate .. //depot/projects/hammer/sys/arm/sa11x0/uart_bus_sa1110.c#2 integrate .. //depot/projects/hammer/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/hammer/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/hammer/sys/arm/sa11x0/uart_dev_sa1110.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_intr.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_mcu.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_pci.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321reg.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq80321reg.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq80321var.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/obiovar.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/uart_bus_i80321.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/uart_cpu_i80321.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/xscalereg.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/xscalevar.h#2 integrate .. //depot/projects/hammer/sys/boot/README#2 integrate .. //depot/projects/hammer/sys/boot/efi/include/README#2 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/efiboot.h#4 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/time.c#3 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/boot0.S#7 integrate .. //depot/projects/hammer/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/hammer/sys/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/hammer/sys/boot/ia64/ski/acpi_stub.c#3 integrate .. //depot/projects/hammer/sys/boot/ia64/ski/conf.c#3 integrate .. //depot/projects/hammer/sys/boot/ia64/ski/efi_stub.c#3 integrate .. //depot/projects/hammer/sys/boot/ia64/ski/elf_freebsd.c#3 integrate .. //depot/projects/hammer/sys/boot/ia64/ski/pal_stub.S#3 integrate .. //depot/projects/hammer/sys/boot/ia64/ski/sal_stub.c#3 integrate .. //depot/projects/hammer/sys/boot/ia64/ski/start.S#3 integrate .. //depot/projects/hammer/sys/boot/ia64/ski/time.c#3 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/libofw.h#5 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_console.c#4 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_disk.c#6 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_memory.c#4 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_net.c#4 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_reboot.c#3 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_time.c#3 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/openfirm.c#5 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/openfirm.h#3 integrate .. //depot/projects/hammer/sys/boot/powerpc/loader/start.c#5 integrate .. //depot/projects/hammer/sys/boot/sparc64/boot1/boot1.c#6 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/locore.S#2 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#13 integrate .. //depot/projects/hammer/sys/cam/cam.c#4 integrate .. //depot/projects/hammer/sys/cam/cam.h#2 integrate .. //depot/projects/hammer/sys/cam/cam_ccb.h#6 integrate .. //depot/projects/hammer/sys/cam/cam_debug.h#2 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#15 integrate .. //depot/projects/hammer/sys/cam/cam_periph.h#5 integrate .. //depot/projects/hammer/sys/cam/cam_queue.c#4 integrate .. //depot/projects/hammer/sys/cam/cam_queue.h#2 integrate .. //depot/projects/hammer/sys/cam/cam_sim.c#4 integrate .. //depot/projects/hammer/sys/cam/cam_sim.h#2 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#14 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/hammer/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/hammer/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_all.c#11 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_all.h#6 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#18 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_ch.c#9 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_ch.h#3 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#25 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.h#3 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_dvcfg.h#2 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_iu.h#3 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_low.c#6 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_low.h#4 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_low_pisa.c#3 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_low_pisa.h#2 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_message.h#2 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_pass.c#7 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_pass.h#2 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_pt.c#9 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_pt.h#2 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#13 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sa.h#2 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_ses.c#9 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_targ_bh.c#8 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_target.c#12 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_targetio.h#3 integrate .. //depot/projects/hammer/sys/coda/cnode.h#6 integrate .. //depot/projects/hammer/sys/coda/coda.h#5 integrate .. //depot/projects/hammer/sys/coda/coda_fbsd.c#14 integrate .. //depot/projects/hammer/sys/coda/coda_io.h#2 integrate .. //depot/projects/hammer/sys/coda/coda_kernel.h#2 integrate .. //depot/projects/hammer/sys/coda/coda_namecache.c#5 integrate .. //depot/projects/hammer/sys/coda/coda_namecache.h#4 integrate .. //depot/projects/hammer/sys/coda/coda_opstats.h#2 integrate .. //depot/projects/hammer/sys/coda/coda_pioctl.h#2 integrate .. //depot/projects/hammer/sys/coda/coda_psdev.c#11 integrate .. //depot/projects/hammer/sys/coda/coda_psdev.h#3 integrate .. //depot/projects/hammer/sys/coda/coda_subr.c#8 integrate .. //depot/projects/hammer/sys/coda/coda_subr.h#3 integrate .. //depot/projects/hammer/sys/coda/coda_venus.c#8 integrate .. //depot/projects/hammer/sys/coda/coda_venus.h#4 integrate .. //depot/projects/hammer/sys/coda/coda_vfsops.c#14 integrate .. //depot/projects/hammer/sys/coda/coda_vfsops.h#4 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.c#11 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.h#5 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#24 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#22 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#22 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#22 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#26 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#25 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#19 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#9 integrate .. //depot/projects/hammer/sys/compat/linux/linux_util.c#7 integrate .. //depot/projects/hammer/sys/compat/linux/linux_util.h#6 integrate .. //depot/projects/hammer/sys/compat/ndis/cfg_var.h#2 integrate .. //depot/projects/hammer/sys/compat/ndis/hal_var.h#5 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#21 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#15 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#11 integrate .. //depot/projects/hammer/sys/compat/ndis/pe_var.h#6 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#7 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#20 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#20 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_pe.c#5 integrate .. //depot/projects/hammer/sys/compat/netbsd/dvcfg.h#4 integrate .. //depot/projects/hammer/sys/compat/netbsd/physio_proc.h#4 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#11 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4.h#3 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_acl.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_dirent.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_errno.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_exec.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_fcntl.c#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_fcntl.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_filio.c#12 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_filio.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_fuser.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_hrt.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_ioctl.c#5 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_ioctl.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_ipc.c#4 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_ipc.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#18 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_mman.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_resource.c#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_resource.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_siginfo.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_signal.c#8 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_signal.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_socket.c#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_socket.h#4 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sockio.c#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sockio.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sockmod.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_stat.c#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_stat.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_statvfs.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_stream.c#13 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_stropts.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_systeminfo.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#12 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_termios.c#4 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_termios.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_time.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_timod.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_ttold.c#5 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_ttold.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_types.h#4 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_ucontext.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_ulimit.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_ustat.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_util.h#3 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_utsname.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_wait.h#2 integrate .. //depot/projects/hammer/sys/conf/NOTES#76 integrate .. //depot/projects/hammer/sys/conf/files#99 integrate .. //depot/projects/hammer/sys/conf/files.i386#48 integrate .. //depot/projects/hammer/sys/conf/files.pc98#38 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#41 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/fil.c#8 integrate .. //depot/projects/hammer/sys/ddb/db_access.c#5 integrate .. //depot/projects/hammer/sys/ddb/db_access.h#2 integrate .. //depot/projects/hammer/sys/ddb/db_break.c#6 integrate .. //depot/projects/hammer/sys/ddb/db_break.h#3 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#12 integrate .. //depot/projects/hammer/sys/ddb/db_command.h#2 integrate .. //depot/projects/hammer/sys/ddb/db_examine.c#4 integrate .. //depot/projects/hammer/sys/ddb/db_expr.c#3 integrate .. //depot/projects/hammer/sys/ddb/db_input.c#6 integrate .. //depot/projects/hammer/sys/ddb/db_lex.c#3 integrate .. //depot/projects/hammer/sys/ddb/db_lex.h#2 integrate .. //depot/projects/hammer/sys/ddb/db_main.c#3 integrate .. //depot/projects/hammer/sys/ddb/db_output.c#7 integrate .. //depot/projects/hammer/sys/ddb/db_output.h#2 integrate .. //depot/projects/hammer/sys/ddb/db_print.c#4 integrate .. //depot/projects/hammer/sys/ddb/db_run.c#5 integrate .. //depot/projects/hammer/sys/ddb/db_sym.c#4 integrate .. //depot/projects/hammer/sys/ddb/db_sym.h#3 integrate .. //depot/projects/hammer/sys/ddb/db_thread.c#4 integrate .. //depot/projects/hammer/sys/ddb/db_variables.c#5 integrate .. //depot/projects/hammer/sys/ddb/db_variables.h#3 integrate .. //depot/projects/hammer/sys/ddb/db_watch.c#4 integrate .. //depot/projects/hammer/sys/ddb/db_watch.h#2 integrate .. //depot/projects/hammer/sys/ddb/db_write_cmd.c#3 integrate .. //depot/projects/hammer/sys/dev/aac/aac_cam.c#11 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#19 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#52 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#28 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_if.m#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#19 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_eisa.c#7 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_isa.c#8 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/advansys/advansys.c#9 integrate .. //depot/projects/hammer/sys/dev/advansys/advansys.h#2 integrate .. //depot/projects/hammer/sys/dev/advansys/advlib.c#4 integrate .. //depot/projects/hammer/sys/dev/advansys/advlib.h#2 integrate .. //depot/projects/hammer/sys/dev/advansys/advmcode.c#3 integrate .. //depot/projects/hammer/sys/dev/advansys/advmcode.h#3 integrate .. //depot/projects/hammer/sys/dev/advansys/adw_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/advansys/adwcam.c#10 integrate .. //depot/projects/hammer/sys/dev/advansys/adwlib.c#3 integrate .. //depot/projects/hammer/sys/dev/advansys/adwlib.h#2 integrate .. //depot/projects/hammer/sys/dev/advansys/adwmcode.c#3 integrate .. //depot/projects/hammer/sys/dev/advansys/adwmcode.h#2 integrate .. //depot/projects/hammer/sys/dev/advansys/adwvar.h#2 integrate .. //depot/projects/hammer/sys/dev/aha/aha.c#11 integrate .. //depot/projects/hammer/sys/dev/aha/aha_isa.c#10 integrate .. //depot/projects/hammer/sys/dev/aha/ahareg.h#5 integrate .. //depot/projects/hammer/sys/dev/ahb/ahb.c#10 integrate .. //depot/projects/hammer/sys/dev/ahb/ahbreg.h#2 integrate .. //depot/projects/hammer/sys/dev/aic/aic6360reg.h#2 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_eisa.c#12 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_isa.c#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#15 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7770.c#10 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#19 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.h#18 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.reg#13 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.seq#12 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_inline.h#12 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.c#13 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.h#10 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_pci.c#16 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#17 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.h#11 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.reg#7 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.seq#7 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_93cx6.c#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_93cx6.h#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_inline.h#7 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.c#15 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.h#13 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic_osm_lib.c#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic_osm_lib.h#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm.c#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm.h#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_gram.y#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_scan.l#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#3 integrate .. //depot/projects/hammer/sys/dev/amd/amd.c#11 integrate .. //depot/projects/hammer/sys/dev/amd/amd.h#2 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#15 integrate .. //depot/projects/hammer/sys/dev/amr/amr_cam.c#9 integrate .. //depot/projects/hammer/sys/dev/amr/amr_disk.c#11 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/amr/amrvar.h#12 integrate .. //depot/projects/hammer/sys/dev/an/if_aironet_ieee.h#6 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#20 integrate .. //depot/projects/hammer/sys/dev/an/if_an_isa.c#8 integrate .. //depot/projects/hammer/sys/dev/an/if_an_pccard.c#11 integrate .. //depot/projects/hammer/sys/dev/an/if_anreg.h#7 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar.c#13 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar.h#2 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/ar/if_arregs.h#4 integrate .. //depot/projects/hammer/sys/dev/asr/dptalign.h#2 integrate .. //depot/projects/hammer/sys/dev/asr/dptsig.h#2 integrate .. //depot/projects/hammer/sys/dev/asr/i2oadptr.h#2 integrate .. //depot/projects/hammer/sys/dev/asr/i2obscsi.h#2 integrate .. //depot/projects/hammer/sys/dev/asr/i2odep.h#2 integrate .. //depot/projects/hammer/sys/dev/asr/i2odpt.h#2 integrate .. //depot/projects/hammer/sys/dev/asr/i2oexec.h#2 integrate .. //depot/projects/hammer/sys/dev/asr/i2omsg.h#2 integrate .. //depot/projects/hammer/sys/dev/asr/i2otypes.h#2 integrate .. //depot/projects/hammer/sys/dev/asr/i2outil.h#2 integrate .. //depot/projects/hammer/sys/dev/asr/osd_defs.h#2 integrate .. //depot/projects/hammer/sys/dev/asr/osd_unix.h#2 integrate .. //depot/projects/hammer/sys/dev/asr/osd_util.h#3 integrate .. //depot/projects/hammer/sys/dev/asr/sys_info.h#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#51 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#25 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/ath/if_athioctl.h#7 integrate .. //depot/projects/hammer/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#11 integrate .. //depot/projects/hammer/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/hammer/sys/dev/auxio/auxioreg.h#2 integrate .. //depot/projects/hammer/sys/dev/awi/if_awi_pccard.c#12 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#13 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfereg.h#6 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#41 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#21 integrate .. //depot/projects/hammer/sys/dev/bktr/CHANGELOG.TXT#2 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_audio.c#5 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_audio.h#3 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_card.c#8 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_card.h#5 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_core.c#12 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_core.h#3 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_i2c.c#4 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_mem.c#6 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_mem.h#2 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#14 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_os.h#3 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_reg.h#5 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_tuner.c#6 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_tuner.h#3 integrate .. //depot/projects/hammer/sys/dev/bktr/ioctl_meteor.h#3 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt.c#10 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_eisa.c#8 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_isa.c#7 integrate .. //depot/projects/hammer/sys/dev/buslogic/btreg.h#2 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#14 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#13 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.h#4 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbusreg.h#3 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbusvar.h#4 integrate .. //depot/projects/hammer/sys/dev/cnw/if_cnwioctl.h#2 integrate .. //depot/projects/hammer/sys/dev/cp/cpddk.c#4 integrate .. //depot/projects/hammer/sys/dev/cp/cpddk.h#4 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#14 integrate .. //depot/projects/hammer/sys/dev/cp/ng_cp.h#2 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs.c#14 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs_isa.c#5 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs_pccard.c#7 integrate .. //depot/projects/hammer/sys/dev/cs/if_csreg.h#3 integrate .. //depot/projects/hammer/sys/dev/cs/if_csvar.h#3 integrate .. //depot/projects/hammer/sys/dev/ct/bshw_machdep.c#5 integrate .. //depot/projects/hammer/sys/dev/ct/bshwvar.h#2 integrate .. //depot/projects/hammer/sys/dev/ct/ct.c#6 integrate .. //depot/projects/hammer/sys/dev/ct/ct_isa.c#9 integrate .. //depot/projects/hammer/sys/dev/ct/ct_machdep.h#2 integrate .. //depot/projects/hammer/sys/dev/ct/ctvar.h#2 integrate .. //depot/projects/hammer/sys/dev/ctau/am8530.h#2 integrate .. //depot/projects/hammer/sys/dev/ctau/ctau.c#3 integrate .. //depot/projects/hammer/sys/dev/ctau/ctaureg.h#2 integrate .. //depot/projects/hammer/sys/dev/ctau/ctddk.c#2 integrate .. //depot/projects/hammer/sys/dev/ctau/ctddk.h#2 integrate .. //depot/projects/hammer/sys/dev/ctau/ds2153.h#2 integrate .. //depot/projects/hammer/sys/dev/ctau/hdc64570.h#2 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#16 integrate .. //depot/projects/hammer/sys/dev/ctau/lxt318.h#2 integrate .. //depot/projects/hammer/sys/dev/ctau/ng_ct.h#2 integrate .. //depot/projects/hammer/sys/dev/cx/cronyxfw.h#2 integrate .. //depot/projects/hammer/sys/dev/cx/csigma.c#2 integrate .. //depot/projects/hammer/sys/dev/cx/cxddk.c#2 integrate .. //depot/projects/hammer/sys/dev/cx/cxddk.h#2 integrate .. //depot/projects/hammer/sys/dev/cx/cxreg.h#2 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#23 integrate .. //depot/projects/hammer/sys/dev/cx/machdep.h#4 integrate .. //depot/projects/hammer/sys/dev/cx/ng_cx.h#3 integrate .. //depot/projects/hammer/sys/dev/cy/cy_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons.c#11 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons.h#5 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_crom.c#6 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.c#5 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.h#2 integrate .. //depot/projects/hammer/sys/dev/dec/mc146818reg.h#2 integrate .. //depot/projects/hammer/sys/dev/dec/mcclock.c#3 integrate .. //depot/projects/hammer/sys/dev/dec/mcclock_if.m#2 integrate .. //depot/projects/hammer/sys/dev/dec/mcclockvar.h#2 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt.h#4 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_scsi.c#12 integrate .. //depot/projects/hammer/sys/dev/drm/ati_pcigart.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#10 integrate .. //depot/projects/hammer/sys/dev/drm/drm_agpsupport.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_auth.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.h#9 integrate .. //depot/projects/hammer/sys/dev/drm/drm_context.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm_dma.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drawable.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drv.h#17 integrate .. //depot/projects/hammer/sys/dev/drm/drm_fops.h#9 integrate .. //depot/projects/hammer/sys/dev/drm/drm_ioctl.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_irq.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_lock.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_memory.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm_memory_debug.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_os_freebsd.h#15 integrate .. //depot/projects/hammer/sys/dev/drm/drm_pci.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_sarea.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_scatter.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_sysctl.h#8 integrate .. //depot/projects/hammer/sys/dev/drm/drm_vm.h#10 integrate .. //depot/projects/hammer/sys/dev/drm/mga.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/mga_dma.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drm.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/mga_irq.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/mga_state.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/mga_ucode.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/mga_warp.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/r128.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/r128_cce.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drm.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/r128_irq.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/r128_state.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/radeon.h#9 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_cp.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drm.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.h#8 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_irq.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_mem.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_state.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/sis.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/sis_drv.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/sis_ds.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/sis_ds.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/sis_mm.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/tdfx.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/tdfx_drv.c#6 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#23 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed98.h#2 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_cbus.c#9 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#16 integrate .. //depot/projects/hammer/sys/dev/ed/if_edreg.h#3 integrate .. //depot/projects/hammer/sys/dev/ed/if_edvar.h#5 integrate .. //depot/projects/hammer/sys/dev/eisa/eisa_if.m#2 integrate .. //depot/projects/hammer/sys/dev/eisa/eisaconf.c#9 integrate .. //depot/projects/hammer/sys/dev/eisa/eisaconf.h#4 integrate .. //depot/projects/hammer/sys/dev/em/LICENSE#3 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#35 integrate .. //depot/projects/hammer/sys/dev/en/if_en_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#21 integrate .. //depot/projects/hammer/sys/dev/en/midwayvar.h#7 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#14 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_eisa.c#8 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_isa.c#8 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_pccard.c#10 integrate .. //depot/projects/hammer/sys/dev/ep/if_epreg.h#5 integrate .. //depot/projects/hammer/sys/dev/ep/if_epvar.h#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 11 03:26:29 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF0EF16A4D0; Tue, 11 Jan 2005 03:26: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 CB4E016A4CE for ; Tue, 11 Jan 2005 03:26:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7439B43D31 for ; Tue, 11 Jan 2005 03:26:28 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0B3QSKx030942 for ; Tue, 11 Jan 2005 03:26:28 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0B3QSjg030939 for perforce@freebsd.org; Tue, 11 Jan 2005 03:26:28 GMT (envelope-from peter@freebsd.org) Date: Tue, 11 Jan 2005 03:26:28 GMT Message-Id: <200501110326.j0B3QSjg030939@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 68687 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2005 03:26:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=68687 Change 68687 by peter@peter_overcee on 2005/01/11 03:26:01 integ -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#30 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_disasm.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#26 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#32 integrate .. //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/mpboot.S#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#33 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#16 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#62 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#63 integrate .. //depot/projects/hammer/sys/amd64/include/_limits.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/apicreg.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/bus_dma.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/bus_memio.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/bus_pio.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/clock.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/cputypes.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/db_machdep.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/float.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/limits.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/metadata.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/mptable.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#52 integrate .. //depot/projects/hammer/sys/amd64/include/proc.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#24 integrate .. //depot/projects/hammer/sys/amd64/include/ptrace.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/resource.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/runq.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/signal.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#20 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.c#14 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#28 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#19 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#30 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/db_disasm.c#5 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/db_interface.c#24 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#26 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#32 (text+ko) ==== @@ -130,7 +130,7 @@ TRAP_ERR(T_PROTFLT) IDTVEC(align) TRAP_ERR(T_ALIGNFLT) - + /* * alltraps entry point. Use swapgs if this is the first time in the * kernel from userland. Reenable interrupts if they were enabled ==== //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mpboot.S#13 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#33 (text+ko) ==== @@ -157,6 +157,7 @@ static void mptable_parse_apics_and_busses(void); static void mptable_parse_apics_and_busses_handler(u_char *entry, void *arg); +static void mptable_parse_default_config_ints(void); static void mptable_parse_ints(void); static void mptable_parse_ints_handler(u_char *entry, void *arg); static void mptable_parse_io_int(int_entry_ptr intr); @@ -246,9 +247,19 @@ mpfps = (mpfps_t)(KERNBASE + x); /* Map in the configuration table if it exists. */ - if (mpfps->config_type != 0) + if (mpfps->config_type != 0) { + if (bootverbose) + printf( + "MP Table version 1.%d found using Default Configuration %d\n", + mpfps->spec_rev, mpfps->config_type); + if (mpfps->config_type != 5 && mpfps->config_type != 6) { + printf( + "MP Table Default Configuration %d is unsupported\n", + mpfps->config_type); + return (ENXIO); + } mpct = NULL; - else { + } else { if ((uintptr_t)mpfps->pap >= 1024 * 1024) { printf("%s: Unable to map MP Configuration Table\n", __func__); @@ -310,7 +321,7 @@ printf("MPTable: <"); if (mpfps->config_type != 0) { lapic_init(DEFAULT_APIC_BASE); - printf("Preset Config %d", mpfps->config_type); + printf("Default Configuration %d", mpfps->config_type); } else { lapic_init((uintptr_t)mpct->apic_address); printf("%.*s %.*s", (int)sizeof(mpct->oem_id), mpct->oem_id, @@ -521,13 +532,13 @@ /* Is this a pre-defined config? */ if (mpfps->config_type != 0) { - ioapics[0] = ioapic_create(DEFAULT_IO_APIC_BASE, 2, 0); + ioapics[2] = ioapic_create(DEFAULT_IO_APIC_BASE, 2, 0); busses[0].bus_id = 0; - busses[0].bus_type = default_data[mpfps->config_type][2]; + busses[0].bus_type = default_data[mpfps->config_type - 1][2]; if (mptable_nbusses > 1) { busses[1].bus_id = 1; busses[1].bus_type = - default_data[mpfps->config_type][4]; + default_data[mpfps->config_type - 1][4]; } } else mptable_walk_table(mptable_parse_apics_and_busses_handler, @@ -753,7 +764,58 @@ break; } } - + +/* + * Configure interrupt pins for a default configuration. For details see + * Table 5-2 in Section 5 of the MP Table specification. + */ +static void +mptable_parse_default_config_ints(void) +{ + struct INTENTRY entry; + int pin; + + /* + * All default configs route IRQs from bus 0 to the first 16 pins + * of the first I/O APIC with an APIC ID of 2. + */ + entry.type = MPCT_ENTRY_INT; + entry.int_flags = INTENTRY_FLAGS_POLARITY_CONFORM | + INTENTRY_FLAGS_TRIGGER_CONFORM; + entry.src_bus_id = 0; + entry.dst_apic_id = 2; + + /* Run through all 16 pins. */ + for (pin = 0; pin < 16; pin++) { + entry.dst_apic_int = pin; + switch (pin) { + case 0: + /* Pin 0 is an ExtINT pin. */ + entry.int_type = INTENTRY_TYPE_EXTINT; + break; + case 2: + /* IRQ 0 is routed to pin 2. */ + entry.int_type = INTENTRY_TYPE_INT; + entry.src_bus_irq = 0; + break; + default: + /* All other pins are identity mapped. */ + entry.int_type = INTENTRY_TYPE_INT; + entry.src_bus_irq = pin; + break; + } + mptable_parse_io_int(&entry); + } + + /* Certain configs disable certain pins. */ + if (mpfps->config_type == 7) + ioapic_disable_pin(ioapics[2], 0); + if (mpfps->config_type == 2) { + ioapic_disable_pin(ioapics[2], 2); + ioapic_disable_pin(ioapics[2], 13); + } +} + /* * Configure the interrupt pins */ @@ -768,16 +830,7 @@ lapic_set_lvt_mode(APIC_ID_ALL, LVT_LINT1, APIC_LVT_DM_NMI); /* Configure I/O APIC pins. */ - if (mpfps->config_type != 7) - ioapic_set_extint(ioapics[0], 0); - else - ioapic_disable_pin(ioapics[0], 0); - if (mpfps->config_type != 2) - ioapic_remap_vector(ioapics[0], 2, 0); - else - ioapic_disable_pin(ioapics[0], 2); - if (mpfps->config_type == 2) - ioapic_disable_pin(ioapics[0], 13); + mptable_parse_default_config_ints(); } else mptable_walk_table(mptable_parse_ints_handler, NULL); } @@ -887,7 +940,7 @@ if (bus < 0) return (EINVAL); - if (pci0 == -1 || pci0 + bus > mptable_maxbusid) + if (mpct == NULL || pci0 == -1 || pci0 + bus > mptable_maxbusid) return (ENXIO); if (busses[pci0 + bus].bus_type != PCI) return (ENXIO); ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#16 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#62 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#63 (text+ko) ==== @@ -71,11 +71,11 @@ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed # Make an SMP-capable kernel by default -options SMP # Symmetric MultiProcessor Kernel +options SMP # Symmetric MultiProcessor Kernel # Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150) -device atpic # 8259A compatability -options NO_MIXED_MODE # Don't penalize working chipsets +device atpic # 8259A compatability +options NO_MIXED_MODE # Don't penalize working chipsets # Bus support. Do not remove isa, even if you have no isa slots device acpi @@ -254,7 +254,7 @@ device ums # Mouse device urio # Diamond Rio 500 MP3 player device uscanner # Scanners -# USB Ethernet, requires mii +# USB Ethernet, requires miibus device aue # ADMtek USB Ethernet device axe # ASIX Electronics USB Ethernet device cue # CATC USB Ethernet ==== //depot/projects/hammer/sys/amd64/include/_limits.h#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/apicreg.h#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus_amd64.h#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus_dma.h#14 (text+ko) ==== @@ -37,7 +37,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* +/*- * Copyright (c) 1996 Charles M. Hannum. All rights reserved. * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. * ==== //depot/projects/hammer/sys/amd64/include/bus_memio.h#7 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus_pio.h#7 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/clock.h#14 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cputypes.h#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/db_machdep.h#13 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/float.h#14 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/limits.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/metadata.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/mptable.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pmap.h#52 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/proc.h#14 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/profile.h#24 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/ptrace.h#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/resource.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/runq.h#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/signal.h#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/smp.h#20 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.147 2004/12/24 23:03:17 imp Exp $"); -/* +/*- * Modifications for Intel architecture by Garrett A. Wollman. * Copyright 1998 Massachusetts Institute of Technology * ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#28 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#19 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Jan 11 19:51:15 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84B1516A4D0; Tue, 11 Jan 2005 19:51: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 5851216A4CE for ; Tue, 11 Jan 2005 19:51:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C604C43D41 for ; Tue, 11 Jan 2005 19:51:13 +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 j0BJpDXb099442 for ; Tue, 11 Jan 2005 19:51:13 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0BJopUQ099407 for perforce@freebsd.org; Tue, 11 Jan 2005 19:50:51 GMT (envelope-from sam@freebsd.org) Date: Tue, 11 Jan 2005 19:50:51 GMT Message-Id: <200501111950.j0BJopUQ099407@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 68757 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2005 19:51:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=68757 Change 68757 by sam@sam_ebb on 2005/01/11 19:50:19 IFC @ 68756 Affected files ... .. //depot/projects/wifi/bin/cat/cat.1#2 integrate .. //depot/projects/wifi/bin/cat/cat.c#2 integrate .. //depot/projects/wifi/bin/chflags/chflags.1#2 integrate .. //depot/projects/wifi/bin/chflags/chflags.c#2 integrate .. //depot/projects/wifi/bin/chio/chio.1#2 integrate .. //depot/projects/wifi/bin/chio/chio.c#2 integrate .. //depot/projects/wifi/bin/chio/defs.h#2 integrate .. //depot/projects/wifi/bin/chio/pathnames.h#2 integrate .. //depot/projects/wifi/bin/chmod/chmod.1#2 integrate .. //depot/projects/wifi/bin/chmod/chmod.c#2 integrate .. //depot/projects/wifi/bin/cp/cp.1#2 integrate .. //depot/projects/wifi/bin/cp/cp.c#2 integrate .. //depot/projects/wifi/bin/csh/USD.doc/csh.1#2 integrate .. //depot/projects/wifi/bin/csh/USD.doc/csh.2#2 integrate .. //depot/projects/wifi/bin/csh/USD.doc/csh.3#2 integrate .. //depot/projects/wifi/bin/csh/USD.doc/csh.4#2 integrate .. //depot/projects/wifi/bin/csh/USD.doc/csh.a#2 integrate .. //depot/projects/wifi/bin/csh/USD.doc/csh.g#2 integrate .. //depot/projects/wifi/bin/csh/USD.doc/tabs#2 integrate .. //depot/projects/wifi/bin/date/date.1#2 integrate .. //depot/projects/wifi/bin/date/date.c#2 integrate .. //depot/projects/wifi/bin/dd/dd.1#2 integrate .. //depot/projects/wifi/bin/dd/gen.c#2 integrate .. //depot/projects/wifi/bin/df/df.1#2 integrate .. //depot/projects/wifi/bin/df/df.c#2 integrate .. //depot/projects/wifi/bin/domainname/domainname.1#2 integrate .. //depot/projects/wifi/bin/domainname/domainname.c#2 integrate .. //depot/projects/wifi/bin/echo/echo.1#2 integrate .. //depot/projects/wifi/bin/echo/echo.c#2 integrate .. //depot/projects/wifi/bin/ed/ed.h#2 integrate .. //depot/projects/wifi/bin/expr/expr.1#2 integrate .. //depot/projects/wifi/bin/expr/expr.y#2 integrate .. //depot/projects/wifi/bin/hostname/hostname.1#2 integrate .. //depot/projects/wifi/bin/hostname/hostname.c#2 integrate .. //depot/projects/wifi/bin/kenv/kenv.1#2 integrate .. //depot/projects/wifi/bin/kenv/kenv.c#2 integrate .. //depot/projects/wifi/bin/kill/kill.1#2 integrate .. //depot/projects/wifi/bin/kill/kill.c#2 integrate .. //depot/projects/wifi/bin/ln/ln.1#2 integrate .. //depot/projects/wifi/bin/ln/ln.c#2 integrate .. //depot/projects/wifi/bin/ln/symlink.7#2 integrate .. //depot/projects/wifi/bin/ls/cmp.c#2 integrate .. //depot/projects/wifi/bin/ls/ls.1#2 integrate .. //depot/projects/wifi/bin/ls/ls.c#2 integrate .. //depot/projects/wifi/bin/ls/ls.h#2 integrate .. //depot/projects/wifi/bin/ls/print.c#2 integrate .. //depot/projects/wifi/bin/ls/util.c#2 integrate .. //depot/projects/wifi/bin/mkdir/mkdir.1#2 integrate .. //depot/projects/wifi/bin/mkdir/mkdir.c#2 integrate .. //depot/projects/wifi/bin/mv/mv.1#2 integrate .. //depot/projects/wifi/bin/mv/mv.c#2 integrate .. //depot/projects/wifi/bin/pax/cpio.1#2 integrate .. //depot/projects/wifi/bin/pax/getoldopt.c#2 integrate .. //depot/projects/wifi/bin/pax/pax.1#2 integrate .. //depot/projects/wifi/bin/pax/tar.1#2 integrate .. //depot/projects/wifi/bin/ps/ps.1#4 integrate .. //depot/projects/wifi/bin/pwd/pwd.1#2 integrate .. //depot/projects/wifi/bin/pwd/pwd.c#2 integrate .. //depot/projects/wifi/bin/rcp/rcp.1#2 integrate .. //depot/projects/wifi/bin/rcp/rcp.c#2 integrate .. //depot/projects/wifi/bin/realpath/realpath.1#2 integrate .. //depot/projects/wifi/bin/rm/rm.1#3 integrate .. //depot/projects/wifi/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/wifi/bin/setfacl/file.c#2 integrate .. //depot/projects/wifi/bin/setfacl/mask.c#2 integrate .. //depot/projects/wifi/bin/setfacl/merge.c#2 integrate .. //depot/projects/wifi/bin/setfacl/remove.c#2 integrate .. //depot/projects/wifi/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/wifi/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/wifi/bin/setfacl/setfacl.h#2 integrate .. //depot/projects/wifi/bin/setfacl/util.c#2 integrate .. //depot/projects/wifi/bin/sh/bltin/echo.1#2 integrate .. //depot/projects/wifi/bin/sh/builtins.def#2 integrate .. //depot/projects/wifi/bin/sh/funcs/cmv#2 integrate .. //depot/projects/wifi/bin/sh/funcs/dirs#2 integrate .. //depot/projects/wifi/bin/sh/funcs/kill#2 integrate .. //depot/projects/wifi/bin/sh/funcs/login#2 integrate .. //depot/projects/wifi/bin/sh/funcs/newgrp#2 integrate .. //depot/projects/wifi/bin/sh/funcs/popd#2 integrate .. //depot/projects/wifi/bin/sh/funcs/pushd#2 integrate .. //depot/projects/wifi/bin/sh/funcs/suspend#2 integrate .. //depot/projects/wifi/bin/sh/mkbuiltins#2 integrate .. //depot/projects/wifi/bin/sh/mktokens#2 integrate .. //depot/projects/wifi/bin/sh/nodetypes#2 integrate .. //depot/projects/wifi/bin/sh/sh.1#4 integrate .. //depot/projects/wifi/bin/sleep/sleep.1#2 integrate .. //depot/projects/wifi/bin/sleep/sleep.c#2 integrate .. //depot/projects/wifi/bin/stty/stty.1#2 integrate .. //depot/projects/wifi/bin/sync/sync.8#2 integrate .. //depot/projects/wifi/bin/sync/sync.c#2 integrate .. //depot/projects/wifi/bin/test/TEST.sh#2 integrate .. //depot/projects/wifi/bin/test/test.1#2 integrate .. //depot/projects/wifi/bin/test/test.c#2 integrate .. //depot/projects/wifi/contrib/telnet/telnet/commands.c#2 integrate .. //depot/projects/wifi/contrib/telnet/telnet/main.c#2 integrate .. //depot/projects/wifi/contrib/telnet/telnetd/telnetd.8#2 integrate .. //depot/projects/wifi/contrib/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/wifi/etc/defaults/pccard.conf#4 integrate .. //depot/projects/wifi/etc/defaults/periodic.conf#3 integrate .. //depot/projects/wifi/etc/devd.conf#6 integrate .. //depot/projects/wifi/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/wifi/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/wifi/etc/pccard_ether#4 integrate .. //depot/projects/wifi/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/wifi/etc/rc.subr#3 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes2#4 integrate .. //depot/projects/wifi/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/wifi/gnu/lib/libdialog/checklist.c#2 integrate .. //depot/projects/wifi/gnu/usr.bin/binutils/gasp/gasp.1#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#3 integrate .. //depot/projects/wifi/gnu/usr.bin/send-pr/categories#2 integrate .. //depot/projects/wifi/include/fts.h#2 integrate .. //depot/projects/wifi/include/pthread.h#2 integrate .. //depot/projects/wifi/include/stdlib.h#2 integrate .. //depot/projects/wifi/include/uuid.h#2 integrate .. //depot/projects/wifi/lib/csu/i386/Makefile#2 delete .. //depot/projects/wifi/lib/csu/i386/c++rt0.c#2 delete .. //depot/projects/wifi/lib/csu/i386/crt0.c#2 delete .. //depot/projects/wifi/lib/libalias/alias_old.c#2 integrate .. //depot/projects/wifi/lib/libarchive/Makefile#3 integrate .. //depot/projects/wifi/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_iso9660.c#1 branch .. //depot/projects/wifi/lib/libarchive/archive_util.3#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write.3#3 integrate .. //depot/projects/wifi/lib/libarchive/libarchive.3#2 integrate .. //depot/projects/wifi/lib/libbluetooth/bluetooth.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/fts.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/utime.3#2 integrate .. //depot/projects/wifi/lib/libc/locale/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libc/locale/rpmatch.3#1 branch .. //depot/projects/wifi/lib/libc/locale/rpmatch.c#1 branch .. //depot/projects/wifi/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/wifi/lib/libc/net/gethostbyht.c#2 integrate .. //depot/projects/wifi/lib/libc/net/getnetbyht.c#2 integrate .. //depot/projects/wifi/lib/libc/net/getprotoent.c#2 integrate .. //depot/projects/wifi/lib/libc/net/getservent.c#2 integrate .. //depot/projects/wifi/lib/libc/uuid/uuid_compare.c#2 integrate .. //depot/projects/wifi/lib/libc/uuid/uuid_equal.c#2 integrate .. //depot/projects/wifi/lib/libc/uuid/uuid_hash.c#2 integrate .. //depot/projects/wifi/lib/libc/uuid/uuid_is_nil.c#2 integrate .. //depot/projects/wifi/lib/libc/uuid/uuid_to_string.c#2 integrate .. //depot/projects/wifi/lib/libc_r/uthread/uthread_mattr_init.c#2 integrate .. //depot/projects/wifi/lib/libc_r/uthread/uthread_mattr_kind_np.c#2 integrate .. //depot/projects/wifi/lib/libdisk/create_chunk.c#2 integrate .. //depot/projects/wifi/libexec/ftpd/ftpd.c#9 integrate .. //depot/projects/wifi/libexec/rtld-aout/Makefile#3 delete .. //depot/projects/wifi/libexec/rtld-aout/dynamic.h#2 delete .. //depot/projects/wifi/libexec/rtld-aout/i386/md-static-funcs.c#2 delete .. //depot/projects/wifi/libexec/rtld-aout/i386/md.c#2 delete .. //depot/projects/wifi/libexec/rtld-aout/i386/md.h#2 delete .. //depot/projects/wifi/libexec/rtld-aout/i386/mdprologue.S#2 delete .. //depot/projects/wifi/libexec/rtld-aout/md-prologue.c#2 delete .. //depot/projects/wifi/libexec/rtld-aout/rtld.1aout#2 delete .. //depot/projects/wifi/libexec/rtld-aout/rtld.c#2 delete .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#4 integrate .. //depot/projects/wifi/sbin/badsect/badsect.c#2 integrate .. //depot/projects/wifi/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/wifi/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/wifi/sbin/devd/devd.8#3 integrate .. //depot/projects/wifi/sbin/ffsinfo/ffsinfo.c#2 integrate .. //depot/projects/wifi/sbin/geom/class/Makefile#2 integrate .. //depot/projects/wifi/sbin/geom/class/shsec/Makefile#1 branch .. //depot/projects/wifi/sbin/geom/class/shsec/geom_shsec.c#1 branch .. //depot/projects/wifi/sbin/geom/class/shsec/gshsec.8#1 branch .. //depot/projects/wifi/sbin/geom/class/stripe/gstripe.8#4 integrate .. //depot/projects/wifi/sbin/geom/core/geom.8#3 integrate .. //depot/projects/wifi/sbin/gpt/gpt.8#4 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/wifi/sbin/init/Makefile#4 integrate .. //depot/projects/wifi/sbin/init/init.c#2 integrate .. //depot/projects/wifi/sbin/ipf/Makefile#2 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw.8#4 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/wifi/sbin/kldunload/kldunload.8#2 integrate .. //depot/projects/wifi/sbin/mount_unionfs/mount_unionfs.8#2 integrate .. //depot/projects/wifi/sbin/natd/natd.c#2 integrate .. //depot/projects/wifi/sbin/newfs/newfs.c#2 integrate .. //depot/projects/wifi/sbin/ping6/Makefile#2 integrate .. //depot/projects/wifi/sbin/ping6/ping6.c#2 integrate .. //depot/projects/wifi/sbin/reboot/boot_i386.8#2 integrate .. //depot/projects/wifi/sbin/route/route.8#3 integrate .. //depot/projects/wifi/sbin/savecore/Makefile#2 integrate .. //depot/projects/wifi/sbin/savecore/savecore.c#2 integrate .. //depot/projects/wifi/sbin/slattach/slattach.8#3 integrate .. //depot/projects/wifi/sbin/sysctl/sysctl.8#3 integrate .. //depot/projects/wifi/share/examples/Makefile#4 integrate .. //depot/projects/wifi/share/examples/mdoc/POSIX-copyright#1 branch .. //depot/projects/wifi/share/examples/mdoc/deshallify.sh#1 branch .. //depot/projects/wifi/share/examples/meteor/README#2 delete .. //depot/projects/wifi/share/examples/meteor/rgb16.c#2 delete .. //depot/projects/wifi/share/examples/meteor/rgb24.c#2 delete .. //depot/projects/wifi/share/examples/meteor/test-n.c#2 delete .. //depot/projects/wifi/share/examples/meteor/yuvpk.c#2 delete .. //depot/projects/wifi/share/examples/meteor/yuvpl.c#2 delete .. //depot/projects/wifi/share/man/man4/Makefile#11 integrate .. //depot/projects/wifi/share/man/man4/aac.4#4 integrate .. //depot/projects/wifi/share/man/man4/acpi.4#4 integrate .. //depot/projects/wifi/share/man/man4/amr.4#4 integrate .. //depot/projects/wifi/share/man/man4/ath.4#6 integrate .. //depot/projects/wifi/share/man/man4/bktr.4#3 integrate .. //depot/projects/wifi/share/man/man4/em.4#4 integrate .. //depot/projects/wifi/share/man/man4/ixgb.4#5 integrate .. //depot/projects/wifi/share/man/man4/lomac.4#2 delete .. //depot/projects/wifi/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/acpi_panasonic.4#3 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/fe.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/wd.4#2 delete .. //depot/projects/wifi/share/man/man4/matcd.4#2 delete .. //depot/projects/wifi/share/man/man4/ngatmbase.4#2 integrate .. //depot/projects/wifi/share/man/man4/wlan.4#3 integrate .. //depot/projects/wifi/share/man/man4/xl.4#3 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/wifi/share/man/man5/style.Makefile.5#2 integrate .. //depot/projects/wifi/share/man/man7/hier.7#3 integrate .. //depot/projects/wifi/share/man/man7/tuning.7#5 integrate .. //depot/projects/wifi/share/man/man9/BUF_LOCKINIT.9#2 integrate .. //depot/projects/wifi/share/man/man9/BUS_CONFIG_INTR.9#2 integrate .. //depot/projects/wifi/share/man/man9/BUS_PRINT_CHILD.9#2 integrate .. //depot/projects/wifi/share/man/man9/BUS_SETUP_INTR.9#2 integrate .. //depot/projects/wifi/share/man/man9/DECLARE_GEOM_CLASS.9#2 integrate .. //depot/projects/wifi/share/man/man9/DECLARE_MODULE.9#2 integrate .. //depot/projects/wifi/share/man/man9/DEVICE_ATTACH.9#2 integrate .. //depot/projects/wifi/share/man/man9/DEVICE_DETACH.9#2 integrate .. //depot/projects/wifi/share/man/man9/DEVICE_PROBE.9#2 integrate .. //depot/projects/wifi/share/man/man9/DEVICE_SHUTDOWN.9#2 integrate .. //depot/projects/wifi/share/man/man9/EVENTHANDLER.9#3 integrate .. //depot/projects/wifi/share/man/man9/MODULE_DEPEND.9#2 integrate .. //depot/projects/wifi/share/man/man9/MUTEX_PROFILING.9#2 integrate .. //depot/projects/wifi/share/man/man9/Makefile#6 integrate .. //depot/projects/wifi/share/man/man9/SYSCALL_MODULE.9#2 integrate .. //depot/projects/wifi/share/man/man9/VFS_CHECKEXP.9#2 integrate .. //depot/projects/wifi/share/man/man9/VFS_FHTOVP.9#2 integrate .. //depot/projects/wifi/share/man/man9/VFS_INIT.9#2 delete .. //depot/projects/wifi/share/man/man9/VFS_MOUNT.9#2 integrate .. //depot/projects/wifi/share/man/man9/VFS_SET.9#2 integrate .. //depot/projects/wifi/share/man/man9/VFS_START.9#2 integrate .. //depot/projects/wifi/share/man/man9/VFS_STATFS.9#2 integrate .. //depot/projects/wifi/share/man/man9/VFS_SYNC.9#2 integrate .. //depot/projects/wifi/share/man/man9/VFS_UNMOUNT.9#2 integrate .. //depot/projects/wifi/share/man/man9/VFS_VGET.9#2 integrate .. //depot/projects/wifi/share/man/man9/bpf.9#2 integrate .. //depot/projects/wifi/share/man/man9/bus_dma.9#2 integrate .. //depot/projects/wifi/share/man/man9/ifnet.9#2 integrate .. //depot/projects/wifi/share/man/man9/mutex.9#2 integrate .. //depot/projects/wifi/share/man/man9/physio.9#2 integrate .. //depot/projects/wifi/share/man/man9/rtentry.9#2 integrate .. //depot/projects/wifi/share/man/man9/sleep.9#2 integrate .. //depot/projects/wifi/share/man/man9/style.9#3 integrate .. //depot/projects/wifi/share/man/man9/suser.9#2 integrate .. //depot/projects/wifi/share/man/man9/sx.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_entry_resize_free.9#2 integrate .. //depot/projects/wifi/share/mk/bsd.dep.mk#3 integrate .. //depot/projects/wifi/share/mk/bsd.info.mk#3 integrate .. //depot/projects/wifi/share/mk/bsd.init.mk#4 integrate .. //depot/projects/wifi/share/mk/bsd.libnames.mk#4 integrate .. //depot/projects/wifi/share/mk/bsd.man.mk#3 integrate .. //depot/projects/wifi/share/mk/bsd.obj.mk#3 integrate .. //depot/projects/wifi/share/mk/bsd.own.mk#2 integrate .. //depot/projects/wifi/share/mk/bsd.subdir.mk#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/busdma_machdep.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/clock_if.m#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/cpuconf.c#3 integrate .. //depot/projects/wifi/sys/alpha/alpha/db_disasm.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/db_instruction.h#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/db_interface.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/dec_1000a.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/dec_2100_a50.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/dec_2100_a500.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/dec_3000_300.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/dec_3000_500.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/dec_axppci_33.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/dec_eb164.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/dec_eb64plus.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/dec_kn20aa.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/dec_kn300.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/dec_kn8ae.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/dec_st550.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/divrem.m4#3 integrate .. //depot/projects/wifi/sys/alpha/alpha/exception.s#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/gdb_machdep.c#3 integrate .. //depot/projects/wifi/sys/alpha/alpha/in_cksum.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/interrupt.c#3 integrate .. //depot/projects/wifi/sys/alpha/alpha/locore.s#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/machdep.c#6 integrate .. //depot/projects/wifi/sys/alpha/alpha/pal.s#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/pmap.c#5 integrate .. //depot/projects/wifi/sys/alpha/alpha/prom.c#3 integrate .. //depot/projects/wifi/sys/alpha/alpha/prom_disp.s#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/support.s#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/trap.c#3 integrate .. //depot/projects/wifi/sys/alpha/alpha/uio_machdep.c#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/vm_machdep.c#3 integrate .. //depot/projects/wifi/sys/alpha/conf/GENERIC#5 integrate .. //depot/projects/wifi/sys/alpha/conf/gethints.awk#2 delete .. //depot/projects/wifi/sys/alpha/include/_limits.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/alpha_cpu.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/asm.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/bootinfo.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/bus.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/bus_memio.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/bus_pio.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/clock.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/clockvar.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/cpu.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/cpuconf.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/db_machdep.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/exec.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/float.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/floatingpoint.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/frame.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/gdb_machdep.h#3 integrate .. //depot/projects/wifi/sys/alpha/include/ieee.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/ieeefp.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/intrcnt.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/kdb.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/limits.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/pal.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/param.h#3 integrate .. //depot/projects/wifi/sys/alpha/include/pc/msdos.h#2 delete .. //depot/projects/wifi/sys/alpha/include/pcb.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/pmap.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/proc.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/profile.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/prom.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/pte.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/ptrace.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/reg.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/reloc.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/resource.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/rpb.h#3 integrate .. //depot/projects/wifi/sys/alpha/include/runq.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/signal.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/smp.h#3 integrate .. //depot/projects/wifi/sys/alpha/include/vmparam.h#2 integrate .. //depot/projects/wifi/sys/alpha/isa/mcclock_isa.c#2 integrate .. //depot/projects/wifi/sys/alpha/mcbus/mcbus.c#2 integrate .. //depot/projects/wifi/sys/alpha/mcbus/mcbusreg.h#2 integrate .. //depot/projects/wifi/sys/alpha/mcbus/mcbusvar.h#2 integrate .. //depot/projects/wifi/sys/alpha/mcbus/mcmem.c#2 integrate .. //depot/projects/wifi/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/wifi/sys/alpha/mcbus/mcpciareg.h#2 integrate .. //depot/projects/wifi/sys/alpha/mcbus/mcpciavar.h#2 integrate .. //depot/projects/wifi/sys/alpha/osf1/exec_ecoff.h#2 integrate .. //depot/projects/wifi/sys/alpha/osf1/imgact_osf1.c#2 integrate .. //depot/projects/wifi/sys/alpha/osf1/osf1.h#2 integrate .. //depot/projects/wifi/sys/alpha/osf1/osf1_ioctl.c#2 integrate .. //depot/projects/wifi/sys/alpha/osf1/osf1_misc.c#3 integrate .. //depot/projects/wifi/sys/alpha/osf1/osf1_mount.c#2 integrate .. //depot/projects/wifi/sys/alpha/osf1/osf1_signal.c#3 integrate .. //depot/projects/wifi/sys/alpha/pci/alphapci_if.m#2 integrate .. //depot/projects/wifi/sys/alpha/pci/apecs.c#2 integrate .. //depot/projects/wifi/sys/alpha/pci/apecsreg.h#2 integrate .. //depot/projects/wifi/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/wifi/sys/alpha/pci/cia_pci.c#2 integrate .. //depot/projects/wifi/sys/alpha/pci/ciareg.h#2 integrate .. //depot/projects/wifi/sys/alpha/pci/lcareg.h#2 integrate .. //depot/projects/wifi/sys/alpha/pci/pci_eb164_intr.s#2 integrate .. //depot/projects/wifi/sys/alpha/pci/pci_eb64plus_intr.s#2 integrate .. //depot/projects/wifi/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/wifi/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/wifi/sys/alpha/pci/t2reg.h#2 integrate .. //depot/projects/wifi/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/wifi/sys/alpha/tlsb/dwlpxreg.h#2 integrate .. //depot/projects/wifi/sys/alpha/tlsb/dwlpxvar.h#2 integrate .. //depot/projects/wifi/sys/alpha/tlsb/gbus.c#2 integrate .. //depot/projects/wifi/sys/alpha/tlsb/kftxx.c#2 integrate .. //depot/projects/wifi/sys/alpha/tlsb/kftxxreg.h#2 integrate .. //depot/projects/wifi/sys/alpha/tlsb/mcclock_tlsb.c#2 integrate .. //depot/projects/wifi/sys/alpha/tlsb/tlsb.c#2 integrate .. //depot/projects/wifi/sys/alpha/tlsb/tlsbcpu.c#2 integrate .. //depot/projects/wifi/sys/alpha/tlsb/tlsbmem.c#2 integrate .. //depot/projects/wifi/sys/alpha/tlsb/tlsbreg.h#2 integrate .. //depot/projects/wifi/sys/alpha/tlsb/tlsbvar.h#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/wifi/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/gdb_machdep.c#4 integrate .. //depot/projects/wifi/sys/amd64/amd64/in_cksum.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/uio_machdep.c#2 integrate .. //depot/projects/wifi/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/wifi/sys/amd64/conf/gethints.awk#2 delete .. //depot/projects/wifi/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/bus_amd64.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/bus_dma.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/bus_memio.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/bus_pio.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/clock.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/db_machdep.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/float.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/gdb_machdep.h#3 integrate .. //depot/projects/wifi/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/limits.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/metadata.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/mptable.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/param.h#3 integrate .. //depot/projects/wifi/sys/amd64/include/pc/display.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/proc.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/profile.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/ptrace.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/resource.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/runq.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/signal.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/smp.h#2 integrate .. //depot/projects/wifi/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/wifi/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/wifi/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/bcopy_page.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/bcopyinout.S#4 integrate .. //depot/projects/wifi/sys/arm/arm/bcopyinout_xscale.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/blockio.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/bootconfig.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/bus_space_asm_generic.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/wifi/sys/arm/arm/copystr.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm10.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm3.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm67.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm7tdmi.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm8.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_arm9.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_armv4.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_ixp12x0.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_sa1.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_sa11x0.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm_xscale.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/db_disasm.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/db_interface.c#3 integrate .. //depot/projects/wifi/sys/arm/arm/db_trace.c#5 integrate .. //depot/projects/wifi/sys/arm/arm/disassem.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/exception.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/fiq.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/fiq_subr.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/fusu.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/wifi/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/in_cksum_arm.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/intr.c#5 integrate .. //depot/projects/wifi/sys/arm/arm/irq_dispatch.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/locore.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/wifi/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/nexus_io.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/nexus_io_asm.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/wifi/sys/arm/arm/setcpsr.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/setstack.s#2 integrate .. //depot/projects/wifi/sys/arm/arm/swtch.S#7 integrate .. //depot/projects/wifi/sys/arm/arm/trap.c#8 integrate .. //depot/projects/wifi/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/undefined.c#5 integrate .. //depot/projects/wifi/sys/arm/arm/vectors.S#2 integrate .. //depot/projects/wifi/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/wifi/sys/arm/include/_limits.h#2 integrate .. //depot/projects/wifi/sys/arm/include/armreg.h#2 integrate .. //depot/projects/wifi/sys/arm/include/asm.h#3 integrate .. //depot/projects/wifi/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/wifi/sys/arm/include/atomic.h#4 integrate .. //depot/projects/wifi/sys/arm/include/bootconfig.h#2 integrate .. //depot/projects/wifi/sys/arm/include/bus.h#2 integrate .. //depot/projects/wifi/sys/arm/include/bus_memio.h#2 integrate .. //depot/projects/wifi/sys/arm/include/bus_pio.h#2 integrate .. //depot/projects/wifi/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/wifi/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/wifi/sys/arm/include/db_machdep.h#3 integrate .. //depot/projects/wifi/sys/arm/include/disassem.h#2 integrate .. //depot/projects/wifi/sys/arm/include/endian.h#3 integrate .. //depot/projects/wifi/sys/arm/include/exec.h#2 integrate .. //depot/projects/wifi/sys/arm/include/fiq.h#2 integrate .. //depot/projects/wifi/sys/arm/include/float.h#2 integrate .. //depot/projects/wifi/sys/arm/include/fp.h#2 integrate .. //depot/projects/wifi/sys/arm/include/frame.h#2 integrate .. //depot/projects/wifi/sys/arm/include/ieee.h#2 integrate .. //depot/projects/wifi/sys/arm/include/ieeefp.h#2 integrate .. //depot/projects/wifi/sys/arm/include/intr.h#2 integrate .. //depot/projects/wifi/sys/arm/include/katelib.h#2 integrate .. //depot/projects/wifi/sys/arm/include/kdb.h#3 integrate .. //depot/projects/wifi/sys/arm/include/limits.h#2 integrate .. //depot/projects/wifi/sys/arm/include/metadata.h#2 integrate .. //depot/projects/wifi/sys/arm/include/pcb.h#2 integrate .. //depot/projects/wifi/sys/arm/include/pmap.h#4 integrate .. //depot/projects/wifi/sys/arm/include/proc.h#2 integrate .. //depot/projects/wifi/sys/arm/include/profile.h#2 integrate .. //depot/projects/wifi/sys/arm/include/psl.h#2 integrate .. //depot/projects/wifi/sys/arm/include/pte.h#2 integrate .. //depot/projects/wifi/sys/arm/include/resource.h#2 integrate .. //depot/projects/wifi/sys/arm/include/runq.h#2 integrate .. //depot/projects/wifi/sys/arm/include/signal.h#2 integrate .. //depot/projects/wifi/sys/arm/include/stdarg.h#2 integrate .. //depot/projects/wifi/sys/arm/include/swi.h#2 integrate .. //depot/projects/wifi/sys/arm/include/sysarch.h#2 integrate .. //depot/projects/wifi/sys/arm/include/trap.h#2 integrate .. //depot/projects/wifi/sys/arm/include/undefined.h#2 integrate .. //depot/projects/wifi/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/wifi/sys/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/wifi/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/wifi/sys/arm/sa11x0/sa11x0_io_asm.S#2 integrate .. //depot/projects/wifi/sys/arm/sa11x0/sa11x0_irq.S#2 integrate .. //depot/projects/wifi/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/wifi/sys/arm/sa11x0/uart_bus_sa1110.c#2 integrate .. //depot/projects/wifi/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/wifi/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/wifi/sys/arm/sa11x0/uart_dev_sa1110.h#2 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321.c#3 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321_intr.h#2 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321_mcu.c#2 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321_pci.c#3 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321reg.h#2 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/iq80321reg.h#2 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/iq80321var.h#2 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/obiovar.h#2 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/uart_bus_i80321.c#3 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/uart_cpu_i80321.c#3 integrate .. //depot/projects/wifi/sys/arm/xscale/xscalereg.h#2 integrate .. //depot/projects/wifi/sys/arm/xscale/xscalevar.h#2 integrate .. //depot/projects/wifi/sys/boot/README#2 integrate .. //depot/projects/wifi/sys/boot/efi/include/README#2 integrate .. //depot/projects/wifi/sys/boot/efi/libefi/efiboot.h#2 integrate .. //depot/projects/wifi/sys/boot/efi/libefi/time.c#2 integrate .. //depot/projects/wifi/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/wifi/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/wifi/sys/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/wifi/sys/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/wifi/sys/boot/ia64/ski/conf.c#2 integrate .. //depot/projects/wifi/sys/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/wifi/sys/boot/ia64/ski/elf_freebsd.c#2 integrate .. //depot/projects/wifi/sys/boot/ia64/ski/pal_stub.S#2 integrate .. //depot/projects/wifi/sys/boot/ia64/ski/sal_stub.c#2 integrate .. //depot/projects/wifi/sys/boot/ia64/ski/start.S#2 integrate .. //depot/projects/wifi/sys/boot/ia64/ski/time.c#2 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/libofw.h#2 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/ofw_reboot.c#2 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/ofw_time.c#2 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/openfirm.h#2 integrate .. //depot/projects/wifi/sys/boot/powerpc/loader/start.c#2 integrate .. //depot/projects/wifi/sys/boot/sparc64/boot1/boot1.c#2 integrate .. //depot/projects/wifi/sys/boot/sparc64/loader/locore.S#2 integrate .. //depot/projects/wifi/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/wifi/sys/cam/cam.c#2 integrate .. //depot/projects/wifi/sys/cam/cam.h#2 integrate .. //depot/projects/wifi/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/wifi/sys/cam/cam_debug.h#2 integrate .. //depot/projects/wifi/sys/cam/cam_periph.c#2 integrate .. //depot/projects/wifi/sys/cam/cam_periph.h#2 integrate .. //depot/projects/wifi/sys/cam/cam_queue.c#2 integrate .. //depot/projects/wifi/sys/cam/cam_queue.h#2 integrate .. //depot/projects/wifi/sys/cam/cam_sim.c#2 integrate .. //depot/projects/wifi/sys/cam/cam_sim.h#2 integrate .. //depot/projects/wifi/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/wifi/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/wifi/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/wifi/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_ch.h#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_da.h#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_dvcfg.h#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_iu.h#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_low_pisa.c#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_low_pisa.h#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_message.h#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_pass.h#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_pt.h#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_sa.h#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_targetio.h#2 integrate .. //depot/projects/wifi/sys/coda/cnode.h#2 integrate .. //depot/projects/wifi/sys/coda/coda.h#2 integrate .. //depot/projects/wifi/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/wifi/sys/coda/coda_io.h#2 integrate .. //depot/projects/wifi/sys/coda/coda_kernel.h#2 integrate .. //depot/projects/wifi/sys/coda/coda_namecache.c#2 integrate .. //depot/projects/wifi/sys/coda/coda_namecache.h#2 integrate .. //depot/projects/wifi/sys/coda/coda_opstats.h#2 integrate .. //depot/projects/wifi/sys/coda/coda_pioctl.h#2 integrate .. //depot/projects/wifi/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/wifi/sys/coda/coda_psdev.h#2 integrate .. //depot/projects/wifi/sys/coda/coda_subr.c#2 integrate .. //depot/projects/wifi/sys/coda/coda_subr.h#2 integrate .. //depot/projects/wifi/sys/coda/coda_venus.c#2 integrate .. //depot/projects/wifi/sys/coda/coda_venus.h#2 integrate .. //depot/projects/wifi/sys/coda/coda_vfsops.c#3 integrate .. //depot/projects/wifi/sys/coda/coda_vfsops.h#2 integrate .. //depot/projects/wifi/sys/coda/coda_vnops.c#4 integrate .. //depot/projects/wifi/sys/coda/coda_vnops.h#3 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/wifi/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/wifi/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/wifi/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/wifi/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/wifi/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/wifi/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/wifi/sys/compat/ndis/cfg_var.h#2 integrate .. //depot/projects/wifi/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/wifi/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/wifi/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/wifi/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/wifi/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_hal.c#3 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/wifi/sys/compat/netbsd/dvcfg.h#2 integrate .. //depot/projects/wifi/sys/compat/netbsd/physio_proc.h#2 integrate .. //depot/projects/wifi/sys/compat/pecoff/imgact_pecoff.c#4 integrate .. //depot/projects/wifi/sys/compat/pecoff/imgact_pecoff.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_acl.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_dirent.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_errno.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_exec.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_fcntl.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_filio.c#4 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_filio.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_fuser.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_hrt.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_ioctl.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_ipc.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_mman.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_resource.c#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_resource.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_siginfo.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_signal.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_sockio.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_sockmod.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_stat.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_statvfs.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_stropts.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_systeminfo.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_termios.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_time.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_timod.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_ttold.c#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_ttold.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_types.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_ucontext.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_ulimit.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_ustat.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_utsname.h#2 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_wait.h#2 integrate .. //depot/projects/wifi/sys/conf/NOTES#9 integrate .. //depot/projects/wifi/sys/conf/files#13 integrate .. //depot/projects/wifi/sys/conf/files.i386#8 integrate .. //depot/projects/wifi/sys/conf/files.pc98#4 integrate .. //depot/projects/wifi/sys/conf/kmod.mk#7 integrate .. //depot/projects/wifi/sys/conf/options#7 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/fil.c#4 integrate .. //depot/projects/wifi/sys/ddb/db_access.c#2 integrate .. //depot/projects/wifi/sys/ddb/db_access.h#2 integrate .. //depot/projects/wifi/sys/ddb/db_break.c#2 integrate .. //depot/projects/wifi/sys/ddb/db_break.h#2 integrate .. //depot/projects/wifi/sys/ddb/db_command.c#3 integrate .. //depot/projects/wifi/sys/ddb/db_command.h#2 integrate .. //depot/projects/wifi/sys/ddb/db_examine.c#2 integrate .. //depot/projects/wifi/sys/ddb/db_expr.c#2 integrate .. //depot/projects/wifi/sys/ddb/db_input.c#2 integrate .. //depot/projects/wifi/sys/ddb/db_lex.c#2 integrate .. //depot/projects/wifi/sys/ddb/db_lex.h#2 integrate .. //depot/projects/wifi/sys/ddb/db_main.c#2 integrate .. //depot/projects/wifi/sys/ddb/db_output.c#3 integrate .. //depot/projects/wifi/sys/ddb/db_output.h#2 integrate .. //depot/projects/wifi/sys/ddb/db_print.c#2 integrate .. //depot/projects/wifi/sys/ddb/db_run.c#3 integrate .. //depot/projects/wifi/sys/ddb/db_sym.c#2 integrate .. //depot/projects/wifi/sys/ddb/db_sym.h#2 integrate .. //depot/projects/wifi/sys/ddb/db_thread.c#4 integrate .. //depot/projects/wifi/sys/ddb/db_variables.c#3 integrate .. //depot/projects/wifi/sys/ddb/db_variables.h#2 integrate .. //depot/projects/wifi/sys/ddb/db_watch.c#2 integrate .. //depot/projects/wifi/sys/ddb/db_watch.h#2 integrate .. //depot/projects/wifi/sys/ddb/db_write_cmd.c#2 integrate .. //depot/projects/wifi/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/wifi/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_if.m#3 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/wifi/sys/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/wifi/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/wifi/sys/dev/advansys/advansys.h#2 integrate .. //depot/projects/wifi/sys/dev/advansys/advlib.c#2 integrate .. //depot/projects/wifi/sys/dev/advansys/advlib.h#2 integrate .. //depot/projects/wifi/sys/dev/advansys/advmcode.c#2 integrate .. //depot/projects/wifi/sys/dev/advansys/advmcode.h#2 integrate .. //depot/projects/wifi/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/wifi/sys/dev/advansys/adwlib.c#2 integrate .. //depot/projects/wifi/sys/dev/advansys/adwlib.h#2 integrate .. //depot/projects/wifi/sys/dev/advansys/adwmcode.c#2 integrate .. //depot/projects/wifi/sys/dev/advansys/adwmcode.h#2 integrate .. //depot/projects/wifi/sys/dev/advansys/adwvar.h#2 integrate .. //depot/projects/wifi/sys/dev/aha/aha.c#2 integrate .. //depot/projects/wifi/sys/dev/aha/aha_isa.c#3 integrate .. //depot/projects/wifi/sys/dev/aha/ahareg.h#2 integrate .. //depot/projects/wifi/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/wifi/sys/dev/ahb/ahbreg.h#2 integrate .. //depot/projects/wifi/sys/dev/aic/aic6360reg.h#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic79xx.h#3 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic79xx.reg#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic79xx_inline.h#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic7xxx.c#3 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic7xxx.reg#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic7xxx.seq#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic7xxx_93cx6.c#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic7xxx_93cx6.h#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aic_osm_lib.h#3 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aicasm/aicasm.h#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate .. //depot/projects/wifi/sys/dev/amd/amd.c#2 integrate .. //depot/projects/wifi/sys/dev/amd/amd.h#2 integrate .. //depot/projects/wifi/sys/dev/amr/amr.c#3 integrate .. //depot/projects/wifi/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/wifi/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/wifi/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/amr/amrvar.h#3 integrate .. //depot/projects/wifi/sys/dev/an/if_aironet_ieee.h#2 integrate .. //depot/projects/wifi/sys/dev/an/if_an.c#2 integrate .. //depot/projects/wifi/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/wifi/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/wifi/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/wifi/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/wifi/sys/dev/ar/if_ar.h#2 integrate .. //depot/projects/wifi/sys/dev/ar/if_ar_isa.c#2 integrate .. //depot/projects/wifi/sys/dev/ar/if_arregs.h#2 integrate .. //depot/projects/wifi/sys/dev/asr/dptalign.h#2 integrate .. //depot/projects/wifi/sys/dev/asr/dptsig.h#2 integrate .. //depot/projects/wifi/sys/dev/asr/i2oadptr.h#2 integrate .. //depot/projects/wifi/sys/dev/asr/i2obscsi.h#2 integrate .. //depot/projects/wifi/sys/dev/asr/i2odep.h#2 integrate .. //depot/projects/wifi/sys/dev/asr/i2odpt.h#2 integrate .. //depot/projects/wifi/sys/dev/asr/i2oexec.h#2 integrate .. //depot/projects/wifi/sys/dev/asr/i2omsg.h#2 integrate .. //depot/projects/wifi/sys/dev/asr/i2otypes.h#2 integrate .. //depot/projects/wifi/sys/dev/asr/i2outil.h#2 integrate .. //depot/projects/wifi/sys/dev/asr/osd_defs.h#2 integrate .. //depot/projects/wifi/sys/dev/asr/osd_unix.h#2 integrate .. //depot/projects/wifi/sys/dev/asr/osd_util.h#2 integrate .. //depot/projects/wifi/sys/dev/asr/sys_info.h#2 integrate .. //depot/projects/wifi/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/wifi/sys/dev/auxio/auxioreg.h#2 integrate .. //depot/projects/wifi/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/wifi/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/wifi/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/wifi/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/wifi/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_audio.c#2 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_audio.h#2 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_card.c#3 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_card.h#3 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_core.h#2 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_mem.c#2 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_mem.h#2 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_os.h#2 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_reg.h#2 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_tuner.c#3 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_tuner.h#3 integrate .. //depot/projects/wifi/sys/dev/bktr/ioctl_meteor.h#2 integrate .. //depot/projects/wifi/sys/dev/buslogic/bt.c#2 integrate .. //depot/projects/wifi/sys/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/wifi/sys/dev/buslogic/bt_isa.c#2 integrate .. //depot/projects/wifi/sys/dev/buslogic/btreg.h#2 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus_cis.h#2 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbusreg.h#2 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbusvar.h#2 integrate .. //depot/projects/wifi/sys/dev/cnw/if_cnwioctl.h#2 integrate .. //depot/projects/wifi/sys/dev/cp/cpddk.c#3 integrate .. //depot/projects/wifi/sys/dev/cp/cpddk.h#3 integrate .. //depot/projects/wifi/sys/dev/cp/if_cp.c#5 integrate .. //depot/projects/wifi/sys/dev/cp/ng_cp.h#2 integrate .. //depot/projects/wifi/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/wifi/sys/dev/cs/if_cs_isa.c#2 integrate .. //depot/projects/wifi/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/wifi/sys/dev/cs/if_csreg.h#2 integrate .. //depot/projects/wifi/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/wifi/sys/dev/ct/bshw_machdep.c#2 integrate .. //depot/projects/wifi/sys/dev/ct/bshwvar.h#2 integrate .. //depot/projects/wifi/sys/dev/ct/ct.c#2 integrate .. //depot/projects/wifi/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/wifi/sys/dev/ct/ct_machdep.h#2 integrate .. //depot/projects/wifi/sys/dev/ct/ctvar.h#2 integrate .. //depot/projects/wifi/sys/dev/ctau/am8530.h#2 integrate .. //depot/projects/wifi/sys/dev/ctau/ctau.c#2 integrate .. //depot/projects/wifi/sys/dev/ctau/ctaureg.h#2 integrate .. //depot/projects/wifi/sys/dev/ctau/ctddk.c#2 integrate .. //depot/projects/wifi/sys/dev/ctau/ctddk.h#2 integrate .. //depot/projects/wifi/sys/dev/ctau/ds2153.h#2 integrate .. //depot/projects/wifi/sys/dev/ctau/hdc64570.h#2 integrate .. //depot/projects/wifi/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/wifi/sys/dev/ctau/lxt318.h#2 integrate .. //depot/projects/wifi/sys/dev/ctau/ng_ct.h#2 integrate .. //depot/projects/wifi/sys/dev/cx/cronyxfw.h#2 integrate .. //depot/projects/wifi/sys/dev/cx/csigma.c#2 integrate .. //depot/projects/wifi/sys/dev/cx/cxddk.c#2 integrate .. //depot/projects/wifi/sys/dev/cx/cxddk.h#2 integrate .. //depot/projects/wifi/sys/dev/cx/cxreg.h#2 integrate .. //depot/projects/wifi/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/wifi/sys/dev/cx/machdep.h#2 integrate .. //depot/projects/wifi/sys/dev/cx/ng_cx.h#2 integrate .. //depot/projects/wifi/sys/dev/cy/cy_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/wifi/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/wifi/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/wifi/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/wifi/sys/dev/dcons/dcons_os.h#2 integrate .. //depot/projects/wifi/sys/dev/dec/mc146818reg.h#2 integrate .. //depot/projects/wifi/sys/dev/dec/mcclock.c#2 integrate .. //depot/projects/wifi/sys/dev/dec/mcclock_if.m#2 integrate .. //depot/projects/wifi/sys/dev/dec/mcclockvar.h#2 integrate .. //depot/projects/wifi/sys/dev/dpt/dpt.h#2 integrate .. //depot/projects/wifi/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/ati_pcigart.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_agpsupport.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_auth.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_bufs.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_context.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_dma.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_drawable.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_drv.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_fops.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_ioctl.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_irq.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_lock.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_memory.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_memory_debug.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_os_freebsd.h#3 integrate .. //depot/projects/wifi/sys/dev/drm/drm_pci.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_scatter.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/drm_sysctl.h#3 integrate .. //depot/projects/wifi/sys/dev/drm/drm_vm.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/mga.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/mga_ucode.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/r128.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/radeon.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/sis.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/sis_ds.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/sis_ds.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/tdfx.h#2 integrate .. //depot/projects/wifi/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed98.h#2 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_cbus.c#3 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/wifi/sys/dev/ed/if_edreg.h#2 integrate .. //depot/projects/wifi/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/wifi/sys/dev/eisa/eisa_if.m#2 integrate .. //depot/projects/wifi/sys/dev/eisa/eisaconf.c#2 integrate .. //depot/projects/wifi/sys/dev/eisa/eisaconf.h#2 integrate .. //depot/projects/wifi/sys/dev/em/LICENSE#2 integrate .. //depot/projects/wifi/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/en/midway.c#2 integrate .. //depot/projects/wifi/sys/dev/en/midwayvar.h#2 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep_eisa.c#2 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep_isa.c#2 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/wifi/sys/dev/ep/if_epreg.h#2 integrate .. //depot/projects/wifi/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/wifi/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/wifi/sys/dev/esp/ncr53c9xreg.h#2 integrate .. //depot/projects/wifi/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/wifi/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/wifi/sys/dev/ex/if_exreg.h#2 integrate .. //depot/projects/wifi/sys/dev/exca/exca.c#2 integrate .. //depot/projects/wifi/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/wifi/sys/dev/exca/excavar.h#2 integrate .. //depot/projects/wifi/sys/dev/fatm/firmware.h#2 integrate .. //depot/projects/wifi/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/wifi/sys/dev/fatm/if_fatm_rate.h#2 integrate .. //depot/projects/wifi/sys/dev/fatm/if_fatmreg.h#2 integrate .. //depot/projects/wifi/sys/dev/fatm/if_fatmvar.h#2 integrate .. //depot/projects/wifi/sys/dev/fb/gallant12x22.h#2 integrate .. //depot/projects/wifi/sys/dev/fb/gfb.h#2 integrate .. //depot/projects/wifi/sys/dev/fb/tga.h#2 integrate .. //depot/projects/wifi/sys/dev/fdc/fdc_isa.c#2 integrate .. //depot/projects/wifi/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/wifi/sys/dev/fdc/fdcvar.h#2 integrate .. //depot/projects/wifi/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/wifi/sys/dev/fe/if_fe_cbus.c#2 integrate .. //depot/projects/wifi/sys/dev/fe/if_fe_isa.c#2 integrate .. //depot/projects/wifi/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/wifi/sys/dev/fe/if_fereg.h#2 integrate .. //depot/projects/wifi/sys/dev/fe/if_fevar.h#2 integrate .. //depot/projects/wifi/sys/dev/firewire/firewire.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 11 20:42:17 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0A7116A4D0; Tue, 11 Jan 2005 20:42:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A6D116A4CE for ; Tue, 11 Jan 2005 20:42:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7838943D41 for ; Tue, 11 Jan 2005 20:42:16 +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 j0BKgGhw001278 for ; Tue, 11 Jan 2005 20:42:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0BKgGai001275 for perforce@freebsd.org; Tue, 11 Jan 2005 20:42:16 GMT (envelope-from sam@freebsd.org) Date: Tue, 11 Jan 2005 20:42:16 GMT Message-Id: <200501112042.j0BKgGai001275@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 68760 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2005 20:42:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=68760 Change 68760 by sam@sam_ebb on 2005/01/11 20:41:55 remove node debug msg from ieee80211_iterate_nodes; with the onoe+amrr rate control modules calling this once a second we get too much noise in debug logs Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#36 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#36 (text+ko) ==== @@ -1471,9 +1471,6 @@ IEEE80211_SCAN_LOCK(nt); gen = nt->nt_scangen++; - - IEEE80211_DPRINTF(nt->nt_ic, IEEE80211_MSG_NODE, - "%s: %s scangen %u\n", __func__, nt->nt_name, gen); restart: IEEE80211_NODE_LOCK(nt); TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { From owner-p4-projects@FreeBSD.ORG Tue Jan 11 20:45:21 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD4C916A4D2; Tue, 11 Jan 2005 20:45: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 B8FB316A4D0 for ; Tue, 11 Jan 2005 20:45:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3DEC43D46 for ; Tue, 11 Jan 2005 20:45:20 +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 j0BKjKI2001378 for ; Tue, 11 Jan 2005 20:45:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0BKjKRm001375 for perforce@freebsd.org; Tue, 11 Jan 2005 20:45:20 GMT (envelope-from sam@freebsd.org) Date: Tue, 11 Jan 2005 20:45:20 GMT Message-Id: <200501112045.j0BKjKRm001375@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 68761 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2005 20:45:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=68761 Change 68761 by sam@sam_ebb on 2005/01/11 20:45:04 move fixed rate check to ieee80211_match_bss so we that we know the rate is ok by the time we go to do a join; this eliminates the need to possibility of an error when joining an ibss network Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#37 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#37 (text+ko) ==== @@ -479,7 +479,8 @@ if (ni->ni_capinfo & IEEE80211_CAPINFO_PRIVACY) fail |= 0x04; } - rate = ieee80211_fix_rate(ic, ni, IEEE80211_F_DONEGO); + rate = ieee80211_fix_rate(ic, ni, + IEEE80211_F_DONEGO | IEEE80211_F_DOFRATE); if (rate & IEEE80211_RATE_BASIC) fail |= 0x08; if (ic->ic_des_esslen != 0 && @@ -749,15 +750,10 @@ if (ic->ic_opmode == IEEE80211_M_IBSS) { /* - * Check rate set before committing to this node. + * Delete unusable rates; we've already checked + * that the negotiated rate set is acceptable. */ - ieee80211_fix_rate(ic, selbs, IEEE80211_F_DOFRATE | - IEEE80211_F_DONEGO | IEEE80211_F_DODEL); - if (selbs->ni_rates.rs_nrates == 0) { - selbs->ni_fails++; - ic->ic_stats.is_ibss_norate++; - return 0; - } + ieee80211_fix_rate(ic, selbs, IEEE80211_F_DODEL); /* * Create the neighbor table; it will already * exist if we are simply switching mastership. From owner-p4-projects@FreeBSD.ORG Tue Jan 11 20:48:25 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3248316A4D0; Tue, 11 Jan 2005 20:48: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 0E8D216A4CE for ; Tue, 11 Jan 2005 20:48:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D227043D54 for ; Tue, 11 Jan 2005 20:48:24 +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 j0BKmOnq008133 for ; Tue, 11 Jan 2005 20:48:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0BKmOdW008130 for perforce@freebsd.org; Tue, 11 Jan 2005 20:48:24 GMT (envelope-from sam@freebsd.org) Date: Tue, 11 Jan 2005 20:48:24 GMT Message-Id: <200501112048.j0BKmOdW008130@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 68762 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2005 20:48:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=68762 Change 68762 by sam@sam_ebb on 2005/01/11 20:48:00 handle scan interruption; explicitly cancel a scan when transitioning from RUN->INIT as can (easily) happen when an interface is marked up then altered again (e.g by setting the channel or altering the operating mode) Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#38 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#19 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#21 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#38 (text+ko) ==== @@ -570,6 +570,19 @@ } /* + * Mark an ongoing scan stopped. + */ +void +ieee80211_cancel_scan(struct ieee80211com *ic) +{ + + IEEE80211_DPRINTF(ic, IEEE80211_MSG_SCAN, "end %s scan\n", + (ic->ic_flags & IEEE80211_F_ASCAN) ? "active" : "passive"); + + ic->ic_flags &= ~(IEEE80211_F_SCAN | IEEE80211_F_ASCAN); +} + +/* * Complete a scan of potential channels. */ void @@ -578,10 +591,8 @@ struct ieee80211_node *ni, *nextbs, *selbs; struct ieee80211_node_table *nt; - IEEE80211_DPRINTF(ic, IEEE80211_MSG_SCAN, "end %s scan\n", - (ic->ic_flags & IEEE80211_F_ASCAN) ? "active" : "passive"); + ieee80211_cancel_scan(ic); - ic->ic_flags &= ~(IEEE80211_F_SCAN | IEEE80211_F_ASCAN); nt = &ic->ic_scan; ni = TAILQ_FIRST(&nt->nt_node); @@ -736,6 +747,7 @@ ic->ic_flags&IEEE80211_F_SHSLOT ? "short" : "long", ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "" ); + /* XXX check ni is in sta table and not scan table */ return ieee80211_sta_join(ic, ni); } ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#19 (text+ko) ==== @@ -194,6 +194,7 @@ extern void ieee80211_create_ibss(struct ieee80211com*, struct ieee80211_channel *); extern void ieee80211_reset_bss(struct ieee80211com *); +extern void ieee80211_cancel_scan(struct ieee80211com *); extern void ieee80211_end_scan(struct ieee80211com *); extern int ieee80211_ibss_merge(struct ieee80211com *, struct ieee80211_node *); ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#21 (text+ko) ==== @@ -900,8 +900,10 @@ break; } goto reset; + case IEEE80211_S_SCAN: + ieee80211_cancel_scan(ic); + goto reset; case IEEE80211_S_AUTH: - case IEEE80211_S_SCAN: reset: ic->ic_mgt_timer = 0; IF_DRAIN(&ic->ic_mgtq); From owner-p4-projects@FreeBSD.ORG Tue Jan 11 20:50:28 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E26A16A4D0; Tue, 11 Jan 2005 20:50: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 DC68C16A4CE for ; Tue, 11 Jan 2005 20:50:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C992043D58 for ; Tue, 11 Jan 2005 20:50: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 j0BKoRmZ008174 for ; Tue, 11 Jan 2005 20:50:27 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0BKoR1w008170 for perforce@freebsd.org; Tue, 11 Jan 2005 20:50:27 GMT (envelope-from sam@freebsd.org) Date: Tue, 11 Jan 2005 20:50:27 GMT Message-Id: <200501112050.j0BKoR1w008170@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 68763 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2005 20:50:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=68763 Change 68763 by sam@sam_ebb on 2005/01/11 20:49:32 when transitioning to INIT state disable interrupts so we don't receive frames; any pending xmits should go out and the descriptors will be reaped anyway when we drain the queues Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#65 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#65 (text+ko) ==== @@ -4281,7 +4281,10 @@ if (nstate == IEEE80211_S_INIT) { sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); - ath_hal_intrset(ah, sc->sc_imask); + /* + * NB: disable interrupts so we don't rx frames. + */ + ath_hal_intrset(ah, sc->sc_imask &~ ~HAL_INT_GLOBAL); /* * Notify the rate control algorithm. */ From owner-p4-projects@FreeBSD.ORG Tue Jan 11 21:16:01 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86DEC16A4D0; Tue, 11 Jan 2005 21:16: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 61A7716A4CE for ; Tue, 11 Jan 2005 21:16:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39EBE43D41 for ; Tue, 11 Jan 2005 21:16: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 j0BLG16V009412 for ; Tue, 11 Jan 2005 21:16:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0BLG0xC009409 for perforce@freebsd.org; Tue, 11 Jan 2005 21:16:00 GMT (envelope-from sam@freebsd.org) Date: Tue, 11 Jan 2005 21:16:00 GMT Message-Id: <200501112116.j0BLG0xC009409@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 68768 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2005 21:16:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=68768 Change 68768 by sam@sam_ebb on 2005/01/11 21:15:29 oops, process beacon frames in ibss mode Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#38 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#38 (text+ko) ==== @@ -1872,7 +1872,7 @@ */ if (!((ic->ic_flags & IEEE80211_F_SCAN) || (ic->ic_opmode == IEEE80211_M_STA && ni->ni_associd) || - ic->ic_opmode != IEEE80211_M_IBSS)) { + ic->ic_opmode == IEEE80211_M_IBSS)) { ic->ic_stats.is_rx_mgtdiscard++; return; } From owner-p4-projects@FreeBSD.ORG Tue Jan 11 21:30:19 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13ED816A4D0; Tue, 11 Jan 2005 21:30:19 +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 E40BF16A4CE for ; Tue, 11 Jan 2005 21:30:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1F4143D1D for ; Tue, 11 Jan 2005 21:30:18 +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 j0BLUIa8009786 for ; Tue, 11 Jan 2005 21:30:18 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0BLUIcT009783 for perforce@freebsd.org; Tue, 11 Jan 2005 21:30:18 GMT (envelope-from jhb@freebsd.org) Date: Tue, 11 Jan 2005 21:30:18 GMT Message-Id: <200501112130.j0BLUIcT009783@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 68769 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2005 21:30:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=68769 Change 68769 by jhb@jhb_twclab on 2005/01/11 21:29:32 Submit this hack that I have to carry around as a workaround for the broken BIOS on my quad xeon (it sets the IRQ for the mouse to 0 rather than 12). Affected files ... .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#23 edit Differences ... ==== //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#23 (text+ko) ==== @@ -77,6 +77,12 @@ req->counter++; break; } + if (irq != rman_get_start(req->res && irq == 0)) { + if (bootverbose) + printf("IRQ is %u, resource is %lu\n", irq, + rman_get_start(req->res)); + return (AE_CTRL_TERMINATE); + } req->found = 1; KASSERT(irq == rman_get_start(req->res), ("IRQ resources do not match")); From owner-p4-projects@FreeBSD.ORG Tue Jan 11 22:02:03 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01C3116A4D0; Tue, 11 Jan 2005 22:02: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 D0B9316A4CE for ; Tue, 11 Jan 2005 22:02:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A7CF243D2F for ; Tue, 11 Jan 2005 22:02:02 +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 j0BM22Kk011171 for ; Tue, 11 Jan 2005 22:02:02 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0BM221Q011168 for perforce@freebsd.org; Tue, 11 Jan 2005 22:02:02 GMT (envelope-from jhb@freebsd.org) Date: Tue, 11 Jan 2005 22:02:02 GMT Message-Id: <200501112202.j0BM221Q011168@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 68775 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Jan 2005 22:02:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=68775 Change 68775 by jhb@jhb_twclab on 2005/01/11 22:01:01 Wouldn't you know it, I fat fingered the hack when I tried to clean it up some. Affected files ... .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#24 edit Differences ... ==== //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#24 (text+ko) ==== @@ -77,7 +77,7 @@ req->counter++; break; } - if (irq != rman_get_start(req->res && irq == 0)) { + if (irq != rman_get_start(req->res) && irq == 0) { if (bootverbose) printf("IRQ is %u, resource is %lu\n", irq, rman_get_start(req->res)); From owner-p4-projects@FreeBSD.ORG Wed Jan 12 03:53:29 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99B4C16A4D0; Wed, 12 Jan 2005 03:53: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 6E74D16A4CE for ; Wed, 12 Jan 2005 03:53:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55CB143D45 for ; Wed, 12 Jan 2005 03:53:29 +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 j0C3rT2T031160 for ; Wed, 12 Jan 2005 03:53:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0C3rT8V031157 for perforce@freebsd.org; Wed, 12 Jan 2005 03:53:29 GMT (envelope-from sam@freebsd.org) Date: Wed, 12 Jan 2005 03:53:29 GMT Message-Id: <200501120353.j0C3rT8V031157@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 68799 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2005 03:53:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=68799 Change 68799 by sam@sam_ebb on 2005/01/12 03:53:12 cleanup ibss merge handling: we don't need to do anything specifically to reprogram the beacon timers, it all happens automatically when the state machine is clocked; just move the call to stop tx dma on the beacon queue to the right place Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#66 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#66 (text+ko) ==== @@ -2795,21 +2795,13 @@ * frame before attempting the merge. The 802.11 spec * says the station should change it's bssid to match * the oldest station with the same ssid, where oldest - * is determined by the tsf. + * is determined by the tsf. Note that hardware + * reconfiguration happens through callback to + * ath_newstate as the state machine will be go + * from RUN -> RUN when this happens. */ - if (le64toh(ni->ni_tstamp.tsf) >= tsf && - 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); - } + if (le64toh(ni->ni_tstamp.tsf) >= tsf) + (void) ieee80211_ibss_merge(ic, ni); } break; } @@ -4338,6 +4330,14 @@ */ if (ic->ic_opmode == IEEE80211_M_HOSTAP || ic->ic_opmode == IEEE80211_M_IBSS) { + /* + * Stop any previous beacon DMA. This may be + * necessary, for example, when an ibss merge + * causes reconfiguration; there will be a state + * transition from RUN->RUN that means we may + * be called with beacon transmission active. + */ + ath_hal_stoptxdma(ah, sc->sc_bhalq); error = ath_beacon_alloc(sc, ni); if (error != 0) goto bad; From owner-p4-projects@FreeBSD.ORG Wed Jan 12 07:06:25 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92F6216A4D0; Wed, 12 Jan 2005 07:06: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 6474D16A4CE for ; Wed, 12 Jan 2005 07:06:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E87A43D1D for ; Wed, 12 Jan 2005 07:06:25 +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 j0C76PFU046904 for ; Wed, 12 Jan 2005 07:06:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0C76PfW046901 for perforce@freebsd.org; Wed, 12 Jan 2005 07:06:25 GMT (envelope-from sam@freebsd.org) Date: Wed, 12 Jan 2005 07:06:25 GMT Message-Id: <200501120706.j0C76PfW046901@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 68809 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2005 07:06:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=68809 Change 68809 by sam@sam_ebb on 2005/01/12 07:05:44 Setup the beacon queue so it doesn't generate any interrupts; we don't use them and for ibss mode the overhead can be noticeable. This also eliminates softled flash when operating in adhoc/ap mode. Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#67 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#67 (text+ko) ==== @@ -122,6 +122,7 @@ static void ath_mode_init(struct ath_softc *); static void ath_setslottime(struct ath_softc *); static void ath_updateslot(struct ifnet *); +static int ath_beaconq_setup(struct ath_hal *); static int ath_beacon_alloc(struct ath_softc *, struct ieee80211_node *); static void ath_beacon_setup(struct ath_softc *, struct ath_buf *); static void ath_beacon_proc(void *, int); @@ -380,7 +381,7 @@ * * XXX PS-Poll */ - sc->sc_bhalq = ath_hal_setuptxqueue(ah, HAL_TX_QUEUE_BEACON, NULL); + sc->sc_bhalq = ath_beaconq_setup(ah); if (sc->sc_bhalq == (u_int) -1) { if_printf(ifp, "unable to setup a beacon xmit queue!\n"); error = EIO; @@ -2036,6 +2037,22 @@ } /* + * Setup a h/w transmit queue for beacons. + */ +static int +ath_beaconq_setup(struct ath_hal *ah) +{ + HAL_TXQ_INFO qi; + + memset(&qi, 0, sizeof(qi)); + qi.tqi_aifs = HAL_TXQ_USEDEFAULT; + qi.tqi_cwmin = HAL_TXQ_USEDEFAULT; + qi.tqi_cwmax = HAL_TXQ_USEDEFAULT; + /* NB: don't enable any interrupts */ + return ath_hal_setuptxqueue(ah, HAL_TX_QUEUE_BEACON, &qi); +} + +/* * Allocate and setup an initial beacon frame. */ static int From owner-p4-projects@FreeBSD.ORG Wed Jan 12 22:00:10 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C45116A4D0; Wed, 12 Jan 2005 22:00: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 F3A0B16A4CE for ; Wed, 12 Jan 2005 22:00:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDF1C43D2F for ; Wed, 12 Jan 2005 22:00: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 j0CM09iB012256 for ; Wed, 12 Jan 2005 22:00:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0CM09C9012253 for perforce@freebsd.org; Wed, 12 Jan 2005 22:00:09 GMT (envelope-from sam@freebsd.org) Date: Wed, 12 Jan 2005 22:00:09 GMT Message-Id: <200501122200.j0CM09C9012253@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 68856 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2005 22:00:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=68856 Change 68856 by sam@sam_ebb on 2005/01/12 21:59:40 o hold a node reference in each beacon tx buf for consistency o reclaim existing beacon resources explicitly before allocating new ones (eliminates code duplication) Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#68 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#68 (text+ko) ==== @@ -2069,12 +2069,6 @@ sc->sc_stats.ast_be_nombuf++; /* XXX */ return ENOMEM; /* XXX */ } - if (bf->bf_m != NULL) { - bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); - m_freem(bf->bf_m); - bf->bf_m = NULL; - bf->bf_node = NULL; - } /* * NB: the beacon data buffer must be 32-bit aligned; * we assume the mbuf routines will return us something @@ -2092,7 +2086,7 @@ BUS_DMA_NOWAIT); if (error == 0) { bf->bf_m = m; - bf->bf_node = ni; /* NB: no held reference */ + bf->bf_node = ieee80211_ref_node(ni); } else { m_freem(m); } @@ -2322,13 +2316,17 @@ { struct ath_buf *bf; - STAILQ_FOREACH(bf, &sc->sc_bbuf, bf_list) + STAILQ_FOREACH(bf, &sc->sc_bbuf, bf_list) { if (bf->bf_m != NULL) { bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); m_freem(bf->bf_m); bf->bf_m = NULL; + } + if (bf->bf_node != NULL) { + ieee80211_free_node(bf->bf_node); bf->bf_node = NULL; } + } } /* @@ -4355,6 +4353,7 @@ * be called with beacon transmission active. */ ath_hal_stoptxdma(ah, sc->sc_bhalq); + ath_beacon_free(sc); error = ath_beacon_alloc(sc, ni); if (error != 0) goto bad; From owner-p4-projects@FreeBSD.ORG Wed Jan 12 22:02:14 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FBC516A4D0; Wed, 12 Jan 2005 22:02: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 DE90516A4CE for ; Wed, 12 Jan 2005 22:02:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6D2F43D1F for ; Wed, 12 Jan 2005 22:02:13 +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 j0CM2DG5012363 for ; Wed, 12 Jan 2005 22:02:13 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0CM2DTH012360 for perforce@freebsd.org; Wed, 12 Jan 2005 22:02:13 GMT (envelope-from sam@freebsd.org) Date: Wed, 12 Jan 2005 22:02:13 GMT Message-Id: <200501122202.j0CM2DTH012360@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 68857 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2005 22:02:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=68857 Change 68857 by sam@sam_ebb on 2005/01/12 22:01:12 clear wme update flag when constructing the ie in a beacon; for consistency Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#33 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#33 (text+ko) ==== @@ -1619,6 +1619,7 @@ if (ic->ic_flags & IEEE80211_F_WME) { bo->bo_wme = frm; frm = ieee80211_add_wme_param(frm, &ic->ic_wme); + ic->ic_flags &= ~IEEE80211_F_WMEUPDATE; } if (ic->ic_flags & IEEE80211_F_WPA) frm = ieee80211_add_wpa(frm, ic); From owner-p4-projects@FreeBSD.ORG Wed Jan 12 23:11:41 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4029716A4D0; Wed, 12 Jan 2005 23:11: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 025CB16A4CE for ; Wed, 12 Jan 2005 23:11:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE8F543D1F for ; Wed, 12 Jan 2005 23:11:40 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0CNBe6I016145 for ; Wed, 12 Jan 2005 23:11:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0CNBe5L016142 for perforce@freebsd.org; Wed, 12 Jan 2005 23:11:40 GMT (envelope-from sam@freebsd.org) Date: Wed, 12 Jan 2005 23:11:40 GMT Message-Id: <200501122311.j0CNBe5L016142@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 68864 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Jan 2005 23:11:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=68864 Change 68864 by sam@sam_ebb on 2005/01/12 23:11:01 Embed the station table in the ieee80211com structure instead of dynamically allocating it. We can't do the latter safely without locking the enclosing structure or revamping locking strategy. Since a node table is <250 bytes just eat the space for now. The positive in this is that we can eliminate all the checks for whether the table is allocated. Affected files ... .. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#7 edit .. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#7 edit .. //depot/projects/wifi/sys/net80211/ieee80211.c#19 edit .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#39 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#34 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#39 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#20 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#22 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#23 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#7 (text+ko) ==== @@ -361,8 +361,7 @@ * For any other operating mode we want to reset the * tx rate state of each node. */ - if (ic->ic_sta != NULL) - ieee80211_iterate_nodes(ic->ic_sta, ath_rate_cb, 0); + ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, 0); ath_rate_update(sc, ic->ic_bss, 0); } if (ic->ic_fixed_rate == -1 && state == IEEE80211_S_RUN) { @@ -467,8 +466,8 @@ if (ic->ic_opmode == IEEE80211_M_STA) ath_rate_ctl(sc, ic->ic_bss); /* NB: no reference */ - else if (ic->ic_sta != NULL) - ieee80211_iterate_nodes(ic->ic_sta, ath_rate_ctl, sc); + else + ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_ctl, sc); } interval = ath_rateinterval; if (ic->ic_opmode == IEEE80211_M_STA) ==== //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#7 (text+ko) ==== @@ -345,8 +345,7 @@ * For any other operating mode we want to reset the * tx rate state of each node. */ - if (ic->ic_sta != NULL) - ieee80211_iterate_nodes(ic->ic_sta, ath_rate_cb, 0); + ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, 0); ath_rate_update(sc, ic->ic_bss, 0); } if (ic->ic_fixed_rate == -1 && state == IEEE80211_S_RUN) { @@ -448,8 +447,8 @@ if (ic->ic_opmode == IEEE80211_M_STA) ath_rate_ctl(sc, ic->ic_bss); /* NB: no reference */ - else if (ic->ic_sta != NULL) - ieee80211_iterate_nodes(ic->ic_sta, ath_rate_ctl, sc); + else + ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_ctl, sc); } interval = ath_rateinterval; if (ic->ic_opmode == IEEE80211_M_STA) ==== //depot/projects/wifi/sys/net80211/ieee80211.c#19 (text+ko) ==== @@ -714,8 +714,8 @@ nt->nt_timeout(nt); need_inact_timer += nt->nt_inact_timer; } - nt = ic->ic_sta; - if (nt != NULL && nt->nt_inact_timer) { + nt = &ic->ic_sta; + if (nt->nt_inact_timer) { if (--nt->nt_inact_timer == 0) nt->nt_timeout(nt); need_inact_timer += nt->nt_inact_timer; ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#39 (text+ko) ==== @@ -239,7 +239,7 @@ * Fake up a node for this newly * discovered member of the IBSS. */ - ni = ieee80211_fakeup_adhoc_node(ic->ic_sta, + ni = ieee80211_fakeup_adhoc_node(&ic->ic_sta, type == IEEE80211_FC0_TYPE_CTL ? wh->i_addr1 : wh->i_addr2); if (ni == NULL) { @@ -353,7 +353,7 @@ IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, wh, "data", "%s", "unknown src"); /* NB: caller deals with reference */ - ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); + ni = ieee80211_dup_bss(&ic->ic_sta, wh->i_addr2); if (ni != NULL) { IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_DEAUTH, @@ -721,7 +721,7 @@ /* XXX this dups work done in ieee80211_encap */ /* check if destination is associated */ struct ieee80211_node *ni1 = - ieee80211_find_node(ic->ic_sta, + ieee80211_find_node(&ic->ic_sta, eh->ether_dhost); if (ni1 != NULL) { /* XXX check if authorized */ @@ -1018,7 +1018,7 @@ } /* always accept open authentication requests */ if (ni == ic->ic_bss) { - ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); + ni = ieee80211_dup_bss(&ic->ic_sta, wh->i_addr2); if (ni == NULL) return; } else @@ -1165,7 +1165,7 @@ switch (seq) { case IEEE80211_AUTH_SHARED_REQUEST: if (ni == ic->ic_bss) { - ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); + ni = ieee80211_dup_bss(&ic->ic_sta, wh->i_addr2); if (ni == NULL) { /* NB: no way to return an error */ return; @@ -2072,7 +2072,7 @@ if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) { if ((capinfo & IEEE80211_CAPINFO_IBSS) == 0) return; - ni = ieee80211_fakeup_adhoc_node(ic->ic_sta, + ni = ieee80211_fakeup_adhoc_node(&ic->ic_sta, wh->i_addr2); } else ni = ieee80211_dup_bss(&ic->ic_scan, wh->i_addr2); @@ -2186,10 +2186,10 @@ * send the response so blindly add them to the * neighbor table. */ - ni = ieee80211_fakeup_adhoc_node(ic->ic_sta, + ni = ieee80211_fakeup_adhoc_node(&ic->ic_sta, wh->i_addr2); } else - ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); + ni = ieee80211_dup_bss(&ic->ic_sta, wh->i_addr2); if (ni == NULL) return; allocbs = 1; @@ -2361,7 +2361,7 @@ "[%s] deny %s request, sta not authenticated\n", ether_sprintf(wh->i_addr2), reassoc ? "reassoc" : "assoc"); - ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); + ni = ieee80211_dup_bss(&ic->ic_sta, wh->i_addr2); if (ni != NULL) { IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_DEAUTH, ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#34 (text+ko) ==== @@ -868,9 +868,7 @@ return error; kid = ik.ik_keyix; if (kid == IEEE80211_KEYIX_NONE) { - if (ic->ic_sta == NULL) - return EINVAL; - ni = ieee80211_find_node(ic->ic_sta, ik.ik_macaddr); + ni = ieee80211_find_node(&ic->ic_sta, ik.ik_macaddr); if (ni == NULL) return EINVAL; /* XXX */ wk = &ni->ni_ucastkey; @@ -958,9 +956,7 @@ error = copyin(ireq->i_data, wpaie.wpa_macaddr, IEEE80211_ADDR_LEN); if (error != 0) return error; - if (ic->ic_sta == NULL) - return EINVAL; - ni = ieee80211_find_node(ic->ic_sta, wpaie.wpa_macaddr); + ni = ieee80211_find_node(&ic->ic_sta, wpaie.wpa_macaddr); if (ni == NULL) return EINVAL; /* XXX */ memset(wpaie.wpa_ie, 0, sizeof(wpaie.wpa_ie)); @@ -989,9 +985,7 @@ error = copyin(ireq->i_data, macaddr, IEEE80211_ADDR_LEN); if (error != 0) return error; - if (ic->ic_sta == NULL) - return EINVAL; - ni = ieee80211_find_node(ic->ic_sta, macaddr); + ni = ieee80211_find_node(&ic->ic_sta, macaddr); if (ni == NULL) return EINVAL; /* XXX */ if (ireq->i_len > sizeof(struct ieee80211req_sta_stats)) @@ -1145,9 +1139,7 @@ int error, space; u_int8_t *p, *cp; - nt = ic->ic_sta; - if (nt == NULL) - return EINVAL; + nt = &ic->ic_sta; p = ireq->i_data; space = ireq->i_len; error = 0; @@ -1193,9 +1185,7 @@ error = copyin(ireq->i_data, &txpow, sizeof(txpow)); if (error != 0) return error; - if (ic->ic_sta == NULL) - return EINVAL; - ni = ieee80211_find_node(ic->ic_sta, txpow.it_macaddr); + ni = ieee80211_find_node(&ic->ic_sta, txpow.it_macaddr); if (ni == NULL) return EINVAL; /* XXX */ txpow.it_txpow = ni->ni_txpower; @@ -1524,9 +1514,7 @@ if (!IEEE80211_ADDR_EQ(ik.ik_macaddr, ni->ni_bssid)) return EADDRNOTAVAIL; } else { - if (ic->ic_sta == NULL) - return EINVAL; - ni = ieee80211_find_node(ic->ic_sta, ik.ik_macaddr); + ni = ieee80211_find_node(&ic->ic_sta, ik.ik_macaddr); if (ni == NULL) return ENOENT; } @@ -1579,9 +1567,7 @@ if (dk.idk_keyix == (u_int8_t) IEEE80211_KEYIX_NONE) { struct ieee80211_node *ni; - if (ic->ic_sta == NULL) - return EINVAL; - ni = ieee80211_find_node(ic->ic_sta, dk.idk_macaddr); + ni = ieee80211_find_node(&ic->ic_sta, dk.idk_macaddr); if (ni == NULL) return EINVAL; /* XXX */ /* XXX error return */ @@ -1662,15 +1648,13 @@ case IEEE80211_M_HOSTAP: /* NB: the broadcast address means do 'em all */ if (!IEEE80211_ADDR_EQ(mlme.im_macaddr, ic->ic_ifp->if_broadcastaddr)) { - if (ic->ic_sta == NULL || - (ni = ieee80211_find_node(ic->ic_sta, + if ((ni = ieee80211_find_node(&ic->ic_sta, mlme.im_macaddr)) == NULL) return EINVAL; domlme(&mlme, ni); ieee80211_free_node(ni); } else { - if (ic->ic_sta != NULL) - ieee80211_iterate_nodes(ic->ic_sta, + ieee80211_iterate_nodes(&ic->ic_sta, domlme, &mlme); } break; @@ -1682,9 +1666,7 @@ case IEEE80211_MLME_UNAUTHORIZE: if (ic->ic_opmode != IEEE80211_M_HOSTAP) return EINVAL; - if (ic->ic_sta == NULL) - return EINVAL; - ni = ieee80211_find_node(ic->ic_sta, mlme.im_macaddr); + ni = ieee80211_find_node(&ic->ic_sta, mlme.im_macaddr); if (ni == NULL) return EINVAL; if (mlme.im_op == IEEE80211_MLME_AUTHORIZE) @@ -1817,9 +1799,7 @@ error = copyin(ireq->i_data, &txpow, sizeof(txpow)); if (error != 0) return error; - if (ic->ic_sta == NULL) - return EINVAL; - ni = ieee80211_find_node(ic->ic_sta, txpow.it_macaddr); + ni = ieee80211_find_node(&ic->ic_sta, txpow.it_macaddr); if (ni == NULL) return EINVAL; /* XXX */ ni->ni_txpower = txpow.it_txpow; ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#39 (text+ko) ==== @@ -68,9 +68,6 @@ static void ieee80211_node_table_init(struct ieee80211com *ic, struct ieee80211_node_table *nt, const char *name, int inact, void (*timeout)(struct ieee80211_node_table *)); -static struct ieee80211_node_table *ieee80211_node_table_alloc( - struct ieee80211com *ic, const char *name, int inact, - void (*timeout)(struct ieee80211_node_table *)); static void ieee80211_node_table_cleanup(struct ieee80211_node_table *nt); MALLOC_DEFINE(M_80211_NODE, "80211node", "802.11 node state"); @@ -79,7 +76,8 @@ ieee80211_node_attach(struct ieee80211com *ic) { - ic->ic_sta = NULL; /* defer to when we need it */ + ieee80211_node_table_init(ic, &ic->ic_sta, "station", + IEEE80211_INACT_INIT, ieee80211_timeout_stations); ieee80211_node_table_init(ic, &ic->ic_scan, "scan", IEEE80211_INACT_SCAN, ieee80211_timeout_scan_candidates); @@ -176,10 +174,7 @@ ic->ic_bss = NULL; } ieee80211_node_table_cleanup(&ic->ic_scan); - if (ic->ic_sta != NULL) { - ieee80211_node_table_free(ic->ic_sta); - ic->ic_sta = NULL; - } + ieee80211_node_table_cleanup(&ic->ic_sta); if (ic->ic_aid_bitmap != NULL) { FREE(ic->ic_aid_bitmap, M_DEVBUF); ic->ic_aid_bitmap = NULL; @@ -355,6 +350,7 @@ void ieee80211_create_ibss(struct ieee80211com* ic, struct ieee80211_channel *chan) { + struct ieee80211_node_table *nt; struct ieee80211_node *ni; IEEE80211_DPRINTF(ic, IEEE80211_MSG_SCAN, @@ -366,33 +362,27 @@ * we create nodes only through discovery and they typically * are long-lived associations. */ - if (ic->ic_opmode == IEEE80211_M_HOSTAP) - ic->ic_sta = ieee80211_node_table_alloc(ic, - "station", ic->ic_inact_init, - ieee80211_timeout_stations); - else - ic->ic_sta = ieee80211_node_table_alloc(ic, - "neighbor", ic->ic_inact_run, - ieee80211_timeout_stations); - if (ic->ic_sta == NULL) { - /* - * Should remain in SCAN state and retry. - */ - /* XXX stat+msg */ + nt = &ic->ic_sta; + IEEE80211_NODE_LOCK(nt); + if (ic->ic_opmode == IEEE80211_M_HOSTAP) { + nt->nt_name = "station"; + nt->nt_inact_init = ic->ic_inact_init; + } else { + nt->nt_name = "neighbor"; + nt->nt_inact_init = ic->ic_inact_run; + } + IEEE80211_NODE_UNLOCK(nt); + + ni = ieee80211_alloc_node(nt, ic->ic_myaddr); + if (ni == NULL) { + /* XXX recovery? */ + IEEE80211_NODE_UNLOCK(nt); return; } - - ni = ic->ic_bss; - IEEE80211_ADDR_COPY(ni->ni_macaddr, ic->ic_myaddr); IEEE80211_ADDR_COPY(ni->ni_bssid, ic->ic_myaddr); ni->ni_esslen = ic->ic_des_esslen; memcpy(ni->ni_essid, ic->ic_des_essid, ni->ni_esslen); - ni->ni_rssi = 0; - ni->ni_rstamp = 0; - ni->ni_tstamp.tsf = 0; ni->ni_intval = ic->ic_lintval; - ni->ni_capinfo = 0; - ni->ni_erp = 0; if (ic->ic_flags & IEEE80211_F_PRIVACY) ni->ni_capinfo |= IEEE80211_CAPINFO_PRIVACY; if (ic->ic_phytype == IEEE80211_T_FH) { @@ -423,15 +413,8 @@ */ ieee80211_set11gbasicrates(&ni->ni_rates, IEEE80211_MODE_11B); } - /* - * Set the erp state (mostly the slot time) to deal with - * the auto-select case; this should be redundant if the - * mode is locked. - */ - ieee80211_reset_erp(ic); - ieee80211_wme_initparams(ic); - ieee80211_new_state(ic, IEEE80211_S_RUN, -1); + (void) ieee80211_sta_join(ic, ieee80211_ref_node(ni)); } void @@ -440,16 +423,14 @@ struct ieee80211_node *ni, *obss; ieee80211_node_table_reset(&ic->ic_scan); + ieee80211_node_table_reset(&ic->ic_sta); + ni = ieee80211_alloc_node(&ic->ic_scan, ic->ic_myaddr); KASSERT(ni != NULL, ("unable to setup inital BSS node")); obss = ic->ic_bss; ic->ic_bss = ieee80211_ref_node(ni); if (obss != NULL) ieee80211_free_node(obss); - if (ic->ic_sta != NULL) { - ieee80211_node_table_free(ic->ic_sta); - ic->ic_sta = NULL; - } } static int @@ -576,7 +557,8 @@ ieee80211_cancel_scan(struct ieee80211com *ic) { - IEEE80211_DPRINTF(ic, IEEE80211_MSG_SCAN, "end %s scan\n", + IEEE80211_DPRINTF(ic, IEEE80211_MSG_SCAN, "%s: end %s scan\n", + __func__, (ic->ic_flags & IEEE80211_F_ASCAN) ? "active" : "passive"); ic->ic_flags &= ~(IEEE80211_F_SCAN | IEEE80211_F_ASCAN); @@ -588,14 +570,10 @@ void ieee80211_end_scan(struct ieee80211com *ic) { - struct ieee80211_node *ni, *nextbs, *selbs; - struct ieee80211_node_table *nt; + struct ieee80211_node_table *nt = &ic->ic_scan; + struct ieee80211_node *ni, *selbs; ieee80211_cancel_scan(ic); - - nt = &ic->ic_scan; - ni = TAILQ_FIRST(&nt->nt_node); - ieee80211_notify_scan_done(ic); if (ic->ic_opmode == IEEE80211_M_HOSTAP) { @@ -611,15 +589,14 @@ * looks to be quietest. */ memset(maxrssi, 0, sizeof(maxrssi)); - for (; ni != NULL; ni = nextbs) { - ieee80211_ref_node(ni); - nextbs = TAILQ_NEXT(ni, ni_list); + IEEE80211_NODE_LOCK(nt); + TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { rssi = ic->ic_node_getrssi(ni); i = ieee80211_chan2ieee(ic, ni->ni_chan); if (rssi > maxrssi[i]) maxrssi[i] = rssi; - ieee80211_unref_node(&ni); } + IEEE80211_NODE_UNLOCK(nt); /* XXX select channel more intelligently */ bestchan = -1; for (i = 0; i < IEEE80211_CHAN_MAX; i++) @@ -656,7 +633,8 @@ * Automatic sequencing; look for a candidate and * if found join the network. */ - if (ni == NULL) { + /* NB: unlocked read should be ok */ + if (TAILQ_FIRST(&nt->nt_node) == NULL) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_SCAN, "%s: no scan candidate\n", __func__); notfound: @@ -677,9 +655,8 @@ selbs = NULL; IEEE80211_DPRINTF(ic, IEEE80211_MSG_SCAN, "\t%s\n", "macaddr bssid chan rssi rate flag wep essid"); - for (; ni != NULL; ni = nextbs) { - ieee80211_ref_node(ni); - nextbs = TAILQ_NEXT(ni, ni_list); + IEEE80211_NODE_LOCK(nt); + TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { if (ni->ni_fails) { /* * The configuration of the access points may change @@ -690,26 +667,27 @@ "%s: skip scan candidate %s, fails %u\n", __func__, ether_sprintf(ni->ni_macaddr), ni->ni_fails); + ni->ni_fails++; +#if 0 if (ni->ni_fails++ > 2) ieee80211_free_node(ni); +#endif continue; } if (ieee80211_match_bss(ic, ni) == 0) { if (selbs == NULL) selbs = ni; - else if (ieee80211_node_compare(ic, ni, selbs) > 0) { - ieee80211_unref_node(&selbs); + else if (ieee80211_node_compare(ic, ni, selbs) > 0) selbs = ni; - } else - ieee80211_unref_node(&ni); - } else { - ieee80211_unref_node(&ni); } } + if (selbs != NULL) /* NB: grab ref while dropping lock */ + (void) ieee80211_ref_node(selbs); + IEEE80211_NODE_UNLOCK(nt); if (selbs == NULL) goto notfound; if (!ieee80211_sta_join(ic, selbs)) { - ieee80211_unref_node(&selbs); + ieee80211_free_node(selbs); goto notfound; } } @@ -730,7 +708,8 @@ ieee80211_ibss_merge(struct ieee80211com *ic, struct ieee80211_node *ni) { - if (IEEE80211_ADDR_EQ(ni->ni_bssid, ic->ic_bss->ni_bssid)) { + if (ni == ic->ic_bss || + IEEE80211_ADDR_EQ(ni->ni_bssid, ic->ic_bss->ni_bssid)) { /* unchanged, nothing to do */ return 0; } @@ -747,8 +726,7 @@ ic->ic_flags&IEEE80211_F_SHSLOT ? "short" : "long", ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "" ); - /* XXX check ni is in sta table and not scan table */ - return ieee80211_sta_join(ic, ni); + return ieee80211_sta_join(ic, ieee80211_ref_node(ni)); } /* @@ -761,34 +739,28 @@ struct ieee80211_node *obss; if (ic->ic_opmode == IEEE80211_M_IBSS) { + struct ieee80211_node_table *nt; /* * Delete unusable rates; we've already checked * that the negotiated rate set is acceptable. */ ieee80211_fix_rate(ic, selbs, IEEE80211_F_DODEL); /* - * Create the neighbor table; it will already + * Fillin the neighbor table; it will already * exist if we are simply switching mastership. */ - if (ic->ic_sta == NULL) { - ic->ic_sta = ieee80211_node_table_alloc(ic, - "neighbor", ic->ic_inact_run, - ieee80211_timeout_stations); - if (ic->ic_sta == NULL) { - /* - * Should remain in SCAN state and retry. - */ - /* XXX stat+msg */ - return 0; - } - } + nt = &ic->ic_sta; + IEEE80211_NODE_LOCK(nt); + nt->nt_name = "neighbor"; + nt->nt_inact_init = ic->ic_inact_run; + IEEE80211_NODE_UNLOCK(nt); } /* * Committed to selbs, setup state. */ obss = ic->ic_bss; - ic->ic_bss = selbs; + ic->ic_bss = selbs; /* NB: caller assumed to bump refcnt */ if (obss != NULL) ieee80211_free_node(obss); /* @@ -799,10 +771,10 @@ ic->ic_curmode = ieee80211_chan2mode(ic, selbs->ni_chan); ieee80211_reset_erp(ic); ieee80211_wme_initparams(ic); - if (ic->ic_opmode == IEEE80211_M_IBSS) + if (ic->ic_opmode == IEEE80211_M_STA) + ieee80211_new_state(ic, IEEE80211_S_AUTH, -1); + else ieee80211_new_state(ic, IEEE80211_S_RUN, -1); - else - ieee80211_new_state(ic, IEEE80211_S_AUTH, -1); return 1; } @@ -1077,7 +1049,7 @@ (ic->ic_flags & IEEE80211_F_SCAN)) nt = &ic->ic_scan; else - nt = ic->ic_sta; + nt = &ic->ic_sta; /* XXX check ic_bss first in station mode */ /* XXX 4-address frames? */ IEEE80211_NODE_LOCK(nt); @@ -1104,7 +1076,7 @@ ieee80211_find_txnode(struct ieee80211com *ic, const u_int8_t *macaddr) #endif { - struct ieee80211_node_table *nt = ic->ic_sta; + struct ieee80211_node_table *nt = &ic->ic_sta; struct ieee80211_node *ni; /* @@ -1112,7 +1084,7 @@ * unless we are operating in station mode or this is a * multicast/broadcast frame. */ - if (nt == NULL || IEEE80211_IS_MULTICAST(macaddr)) + if (ic->ic_opmode == IEEE80211_M_STA || IEEE80211_IS_MULTICAST(macaddr)) return ieee80211_ref_node(ic->ic_bss); /* XXX can't hold lock across dup_bss 'cuz of recursive locking */ @@ -1272,7 +1244,7 @@ * Other references are present, just remove the * node from the table so it cannot be found. When * the references are dropped storage will be - * reclaimed. This normally only happens for ic_bss. + * reclaimed. */ TAILQ_REMOVE(&nt->nt_node, ni, ni_list); LIST_REMOVE(ni, ni_hash); @@ -1754,7 +1726,7 @@ ieee80211_getrssi(struct ieee80211com *ic) { #define NZ(x) ((x) == 0 ? 1 : (x)) - struct ieee80211_node_table *nt = ic->ic_sta; + struct ieee80211_node_table *nt = &ic->ic_sta; u_int32_t rssi_samples, rssi_total; struct ieee80211_node *ni; @@ -1762,32 +1734,23 @@ rssi_samples = 0; switch (ic->ic_opmode) { case IEEE80211_M_IBSS: /* average of all ibss neighbors */ - nt = ic->ic_sta; - if (nt == NULL) - break; /* XXX locking */ - TAILQ_FOREACH(ni, &ic->ic_sta->nt_node, ni_list) + TAILQ_FOREACH(ni, &nt->nt_node, ni_list) if (ni->ni_capinfo & IEEE80211_CAPINFO_IBSS) { rssi_samples++; rssi_total += ic->ic_node_getrssi(ni); } break; case IEEE80211_M_AHDEMO: /* average of all neighbors */ - nt = ic->ic_sta; - if (nt == NULL) - break; /* XXX locking */ - TAILQ_FOREACH(ni, &ic->ic_sta->nt_node, ni_list) { + TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { rssi_samples++; rssi_total += ic->ic_node_getrssi(ni); } break; case IEEE80211_M_HOSTAP: /* average of all associated stations */ - nt = ic->ic_sta; - if (nt == NULL) - break; /* XXX locking */ - TAILQ_FOREACH(ni, &ic->ic_sta->nt_node, ni_list) + TAILQ_FOREACH(ni, &nt->nt_node, ni_list) if (IEEE80211_AID(ni->ni_associd) != 0) { rssi_samples++; rssi_total += ic->ic_node_getrssi(ni); @@ -1860,24 +1823,6 @@ nt->nt_timeout = timeout; } -static struct ieee80211_node_table * -ieee80211_node_table_alloc(struct ieee80211com *ic, - const char *name, int inact, - void (*timeout)(struct ieee80211_node_table *)) -{ - struct ieee80211_node_table *nt; - - MALLOC(nt, struct ieee80211_node_table *, - sizeof(struct ieee80211_node_table), - M_DEVBUF, M_NOWAIT | M_ZERO); - if (nt == NULL) { - printf("%s: no memory node table!\n", __func__); - return NULL; - } - ieee80211_node_table_init(ic, nt, name, inact, timeout); - return nt; -} - void ieee80211_node_table_reset(struct ieee80211_node_table *nt) { @@ -1902,19 +1847,3 @@ IEEE80211_SCAN_LOCK_DESTROY(nt); IEEE80211_NODE_LOCK_DESTROY(nt); } - -/* - * NB: public for use in ieee80211_proto.c - */ -void -ieee80211_node_table_free(struct ieee80211_node_table *nt) -{ - - IEEE80211_DPRINTF(nt->nt_ic, IEEE80211_MSG_NODE, - "%s %s table\n", __func__, nt->nt_name); - - IEEE80211_NODE_LOCK(nt); - nt->nt_inact_timer = 0; - ieee80211_node_table_cleanup(nt); - FREE(nt, M_DEVBUF); -} ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#20 (text+ko) ==== @@ -223,7 +223,6 @@ void (*nt_timeout)(struct ieee80211_node_table *); }; extern void ieee80211_node_table_reset(struct ieee80211_node_table *); -extern void ieee80211_node_table_free(struct ieee80211_node_table *); extern struct ieee80211_node *ieee80211_alloc_node( struct ieee80211_node_table *, const u_int8_t *); ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#22 (text+ko) ==== @@ -856,11 +856,7 @@ ieee80211_sta_leave(ic, ni); break; case IEEE80211_M_HOSTAP: - nt = ic->ic_sta; - if (nt == NULL) { /* XXX cannot happen */ - if_printf(ifp, "no sta table (run)\n"); - break; - } + nt = &ic->ic_sta; IEEE80211_NODE_LOCK(nt); TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { if (ni->ni_associd == 0) @@ -883,11 +879,7 @@ IEEE80211_REASON_AUTH_LEAVE); break; case IEEE80211_M_HOSTAP: - nt = ic->ic_sta; - if (nt == NULL) { /* XXX cannot happen */ - if_printf(ifp, "no sta table (assoc)\n"); - break; - } + nt = &ic->ic_sta; IEEE80211_NODE_LOCK(nt); TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { IEEE80211_SEND_MGMT(ic, ni, @@ -1029,9 +1021,10 @@ break; /* fall thru... */ case IEEE80211_S_AUTH: - case IEEE80211_S_RUN: IEEE80211_DPRINTF(ic, IEEE80211_MSG_ANY, "%s: invalid transition\n", __func__); + /* fall thru... */ + case IEEE80211_S_RUN: break; case IEEE80211_S_SCAN: /* adhoc/hostap mode */ case IEEE80211_S_ASSOC: /* infra mode */ @@ -1083,8 +1076,7 @@ * XXX */ ic->ic_scan.nt_inact_timer = IEEE80211_INACT_WAIT; - if (ic->ic_sta != NULL) - ic->ic_sta->nt_inact_timer = IEEE80211_INACT_WAIT; + ic->ic_sta.nt_inact_timer = IEEE80211_INACT_WAIT; break; } return 0; ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#23 (text+ko) ==== @@ -114,7 +114,7 @@ enum ieee80211_state ic_state; /* 802.11 state */ enum ieee80211_protmode ic_protmode; /* 802.11g protection mode */ enum ieee80211_roamingmode ic_roaming; /* roaming mode */ - struct ieee80211_node_table *ic_sta; /* stations/neighbors */ + struct ieee80211_node_table ic_sta; /* stations/neighbors */ u_int32_t *ic_aid_bitmap; /* association id map */ u_int16_t ic_max_aid; u_int16_t ic_sta_assoc; /* stations associated */ From owner-p4-projects@FreeBSD.ORG Thu Jan 13 15:38:10 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8671216A4D0; Thu, 13 Jan 2005 15:38: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 47B3816A4CE for ; Thu, 13 Jan 2005 15:38:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F9B443D2D for ; Thu, 13 Jan 2005 15:38:10 +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 j0DFcA0n082602 for ; Thu, 13 Jan 2005 15:38:10 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0DFc9JX082599 for perforce@freebsd.org; Thu, 13 Jan 2005 15:38:09 GMT (envelope-from jhb@freebsd.org) Date: Thu, 13 Jan 2005 15:38:09 GMT Message-Id: <200501131538.j0DFc9JX082599@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 68903 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2005 15:38:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=68903 Change 68903 by jhb@jhb_slimer on 2005/01/13 15:37:27 Idea for KTR improvement / tweak. Affected files ... .. //depot/projects/smpng/sys/notes#29 edit Differences ... ==== //depot/projects/smpng/sys/notes#29 (text+ko) ==== @@ -52,5 +52,7 @@ do this. That really needs to only be done in spinlock_*() (and maybe some frobbing in intr_execute_handlers()) and needs to happen after the spinlock_*() changes happen. +- KTR change: include __func__ along with __FILE__ and __LINE__ and display + it after cpu number by default Space reserved for child branches: From owner-p4-projects@FreeBSD.ORG Thu Jan 13 21:07:05 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BAC816A4D0; Thu, 13 Jan 2005 21:07:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C18C416A4CE for ; Thu, 13 Jan 2005 21:07:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89A0443D2D for ; Thu, 13 Jan 2005 21:07:04 +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 j0DL744R010616 for ; Thu, 13 Jan 2005 21:07:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0DL74Ov010613 for perforce@freebsd.org; Thu, 13 Jan 2005 21:07:04 GMT (envelope-from jhb@freebsd.org) Date: Thu, 13 Jan 2005 21:07:04 GMT Message-Id: <200501132107.j0DL74Ov010613@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 68938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2005 21:07:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=68938 Change 68938 by jhb@jhb_slimer on 2005/01/13 21:06:03 cpu_exit() cleaning inspired by sparc64 use-after-free bug: - Remove stale comment (alpha, powerpc) - Drop redundant dbregs drop (i386, amd64) - Note that fp state should probably be per thread (alpha, ia64) Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#37 edit .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#22 edit .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#59 edit .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#44 edit .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#40 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#37 (text+ko) ==== @@ -224,17 +224,15 @@ td->td_pcb->pcb_context[2] = (u_long) arg; } -/* - * cpu_exit is called as the last action during exit. - * We release the address space of the process, block interrupts, - * and call switch_exit. switch_exit switches to proc0's PCB and stack, - * then jumps into the middle of cpu_switch, as if it were switching - * from proc0. - */ void cpu_exit(struct thread *td) { + /* + * XXX: Should this be in thread_exit instead? If so, + * alpha_fpstate_save() should be in cpu_set_upcall() + * as well. + */ alpha_fpstate_drop(td); } ==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#22 (text+ko) ==== @@ -185,13 +185,6 @@ void cpu_exit(struct thread *td) { - struct pcb *pcb = td->td_pcb; - - if (pcb->pcb_flags & PCB_DBREGS) { - /* disable all hardware breakpoints */ - reset_dbregs(); - pcb->pcb_flags &= ~PCB_DBREGS; - } } void ==== //depot/projects/smpng/sys/i386/i386/vm_machdep.c#59 (text+ko) ==== @@ -295,8 +295,6 @@ cpu_exit(struct thread *td) { struct mdproc *mdp; - struct pcb *pcb = td->td_pcb; - /* Reset pc->pcb_gs and %gs before possibly invalidating it. */ mdp = &td->td_proc->p_md; @@ -307,18 +305,13 @@ user_ldt_free(td); } else mtx_unlock_spin(&sched_lock); - - if (pcb->pcb_flags & PCB_DBREGS) { - /* disable all hardware breakpoints */ - reset_dbregs(); - pcb->pcb_flags &= ~PCB_DBREGS; - } } void cpu_thread_exit(struct thread *td) { struct pcb *pcb = td->td_pcb; + #ifdef DEV_NPX if (td == PCPU_GET(fpcurthread)) npxdrop(); ==== //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#44 (text+ko) ==== @@ -297,6 +297,7 @@ cpu_exit(struct thread *td) { + /* XXX: Should this be in cpu_thread_exit() instead? */ /* Throw away the high FP registers. */ ia64_highfp_drop(td); } ==== //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#40 (text+ko) ==== @@ -182,13 +182,6 @@ cf->cf_arg0 = (register_t)arg; } -/* - * cpu_exit is called as the last action during exit. - * We release the address space of the process, block interrupts, - * and call switch_exit. switch_exit switches to proc0's PCB and stack, - * then jumps into the middle of cpu_switch, as if it were switching - * from proc0. - */ void cpu_exit(td) register struct thread *td; From owner-p4-projects@FreeBSD.ORG Thu Jan 13 21:22:24 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 769DF16A4D0; Thu, 13 Jan 2005 21:22: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 3863416A4CE for ; Thu, 13 Jan 2005 21:22:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13DB943D48 for ; Thu, 13 Jan 2005 21:22:24 +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 j0DLMNIl011328 for ; Thu, 13 Jan 2005 21:22:23 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0DLMNc8011325 for perforce@freebsd.org; Thu, 13 Jan 2005 21:22:23 GMT (envelope-from jhb@freebsd.org) Date: Thu, 13 Jan 2005 21:22:23 GMT Message-Id: <200501132122.j0DLMNc8011325@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 68940 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2005 21:22:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=68940 Change 68940 by jhb@jhb_slimer on 2005/01/13 21:22:16 Use a simple API to manage md_utrap structures and protect their reference count with the mutex pool. Hopefull this will fix the modified after free panics kris is seeing on sparc64. Affected files ... .. //depot/projects/smpng/sys/sparc64/include/md_var.h#13 edit .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#70 edit .. //depot/projects/smpng/sys/sparc64/sparc64/sys_machdep.c#11 edit .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#45 edit Differences ... ==== //depot/projects/smpng/sys/sparc64/include/md_var.h#13 (text+ko) ==== @@ -45,10 +45,14 @@ extern vm_paddr_t kstack0_phys; struct pcpu; +struct md_utrap; void cpu_identify(u_long vers, u_int clock, u_int id); void cpu_setregs(struct pcpu *pc); int is_physical_memory(vm_paddr_t addr); +struct md_utrap *utrap_alloc(void); +void utrap_free(struct md_utrap *ut); +struct md_utrap *utrap_hold(struct md_utrap *ut); cpu_block_copy_t spitfire_block_copy; cpu_block_zero_t spitfire_block_zero; ==== //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#70 (text+ko) ==== @@ -744,7 +744,6 @@ exec_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) { struct trapframe *tf; - struct md_utrap *ut; struct pcb *pcb; struct proc *p; u_long sp; @@ -752,10 +751,8 @@ /* XXX no cpu_exec */ p = td->td_proc; p->p_md.md_sigtramp = NULL; - if ((ut = p->p_md.md_utrap) != NULL) { - ut->ut_refcnt--; - if (ut->ut_refcnt == 0) - free(ut, M_SUBPROC); + if (p->p_md.md_utrap != NULL) { + utrap_free(p->p_md.md_utrap); p->p_md.md_utrap = NULL; } @@ -838,3 +835,40 @@ tf->tf_gsr = fpregs->fr_gsr; return (0); } + +struct md_utrap * +utrap_alloc(void) +{ + struct md_utrap *ut; + + ut = malloc(sizeof(struct md_utrap), M_SUBPROC, M_WAITOK | M_ZERO); + ut->ut_refcnt = 1; + return (ut); +} + +void +utrap_free(struct md_utrap *ut) +{ + int refcnt; + + if (ut == NULL) + return; + mtx_pool_lock(mtxpool_sleep, ut); + ut->ut_refcnt--; + refcnt = ut->ut_refcnt; + mtx_pool_unlock(mtxpool_sleep, ut); + if (refcnt == 0) + free(ut, M_SUBPROC); +} + +struct md_utrap * +utrap_hold(struct md_utrap *ut) +{ + + if (ut == NULL) + return (NULL); + mtx_pool_lock(mtxpool_sleep, ut); + ut->ut_refcnt++; + mtx_pool_unlock(mtxpool_sleep, ut); + return (ut); +} ==== //depot/projects/smpng/sys/sparc64/sparc64/sys_machdep.c#11 (text+ko) ==== @@ -119,9 +119,7 @@ } if (ua.type != UTH_NOCHANGE) { if (ut == NULL) { - ut = malloc(sizeof *ut, M_SUBPROC, - M_WAITOK | M_ZERO); - ut->ut_refcnt = 1; + ut = utrap_alloc(); td->td_proc->p_md.md_utrap = ut; } ut->ut_precise[ua.type] = ua.new_precise; ==== //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#45 (text+ko) ==== @@ -116,10 +116,8 @@ p = td->td_proc; p->p_md.md_sigtramp = NULL; - if ((ut = p->p_md.md_utrap) != NULL) { - ut->ut_refcnt--; - if (ut->ut_refcnt == 0) - free(ut, M_SUBPROC); + if (p->p_md.md_utrap != NULL) { + utrap_free(p->p_md.md_utrap); p->p_md.md_utrap = NULL; } } @@ -200,7 +198,6 @@ void cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) { - struct md_utrap *ut; struct trapframe *tf; struct frame *fp; struct pcb *pcb1; @@ -216,9 +213,7 @@ return; p2->p_md.md_sigtramp = td1->td_proc->p_md.md_sigtramp; - if ((ut = td1->td_proc->p_md.md_utrap) != NULL) - ut->ut_refcnt++; - p2->p_md.md_utrap = ut; + p2->p_md.md_utrap = utrap_hold(td1->td_proc->p_md.md_utrap); /* The pcb must be aligned on a 64-byte boundary. */ pcb1 = td1->td_pcb; From owner-p4-projects@FreeBSD.ORG Thu Jan 13 21:28:33 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E52F116A4D0; Thu, 13 Jan 2005 21:28: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 BAB3116A4CE for ; Thu, 13 Jan 2005 21:28:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 326FE43D31 for ; Thu, 13 Jan 2005 21:28: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 j0DLSWrk011680 for ; Thu, 13 Jan 2005 21:28:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0DLSVHH011677 for perforce@freebsd.org; Thu, 13 Jan 2005 21:28:31 GMT (envelope-from sam@freebsd.org) Date: Thu, 13 Jan 2005 21:28:31 GMT Message-Id: <200501132128.j0DLSVHH011677@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 68941 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2005 21:28:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=68941 Change 68941 by sam@sam_ebb on 2005/01/13 21:28:00 IFC @ 68940 Affected files ... .. //depot/projects/wifi/bin/chio/chio.1#3 integrate .. //depot/projects/wifi/bin/expr/expr.1#3 integrate .. //depot/projects/wifi/bin/pax/ar_subs.c#2 integrate .. //depot/projects/wifi/bin/pax/extern.h#2 integrate .. //depot/projects/wifi/bin/pax/ftree.c#2 integrate .. //depot/projects/wifi/etc/periodic/daily/460.status-mail-rejects#3 integrate .. //depot/projects/wifi/etc/periodic/security/100.chksetuid#2 integrate .. //depot/projects/wifi/etc/rc.d/cleartmp#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/kgdb.1#3 integrate .. //depot/projects/wifi/include/Makefile#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.3#3 integrate .. //depot/projects/wifi/lib/libbluetooth/bluetooth.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/getnetgrent.c#3 integrate .. //depot/projects/wifi/lib/libc/locale/mbsrtowcs.3#2 integrate .. //depot/projects/wifi/lib/libc/net/addr2ascii.3#2 integrate .. //depot/projects/wifi/lib/libc/posix1e/mac.conf.5#3 integrate .. //depot/projects/wifi/lib/libc/stdio/setbuf.3#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/merge.c#2 integrate .. //depot/projects/wifi/lib/libc/stdtime/strftime.3#3 integrate .. //depot/projects/wifi/lib/libc/sys/intro.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/kse.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mlock.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/pathconf.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/recv.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/stat.2#3 integrate .. //depot/projects/wifi/lib/libutil/fparseln.3#2 integrate .. //depot/projects/wifi/lib/msun/Makefile#2 integrate .. //depot/projects/wifi/lib/msun/amd64/fenv.h#2 integrate .. //depot/projects/wifi/lib/msun/i387/e_atan2f.S#1 branch .. //depot/projects/wifi/lib/msun/i387/e_log10f.S#1 branch .. //depot/projects/wifi/lib/msun/i387/e_logf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/e_remainderf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/e_scalbf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/e_sqrtf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_ceilf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_copysignf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_cosf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_floorf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_llrint.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_log1p.S#2 delete .. //depot/projects/wifi/lib/msun/i387/s_logbf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_lrint.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_rintf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_scalbnf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_significandf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_sinf.S#1 branch .. //depot/projects/wifi/lib/msun/i387/s_tanf.S#1 branch .. //depot/projects/wifi/lib/msun/man/ceil.3#2 integrate .. //depot/projects/wifi/lib/msun/man/cimag.3#2 integrate .. //depot/projects/wifi/lib/msun/man/feclearexcept.3#2 integrate .. //depot/projects/wifi/lib/msun/man/fenv.3#2 integrate .. //depot/projects/wifi/lib/msun/man/floor.3#2 integrate .. //depot/projects/wifi/lib/msun/man/lrint.3#1 branch .. //depot/projects/wifi/lib/msun/man/lround.3#1 branch .. //depot/projects/wifi/lib/msun/man/math.3#2 integrate .. //depot/projects/wifi/lib/msun/man/rint.3#2 integrate .. //depot/projects/wifi/lib/msun/man/round.3#2 integrate .. //depot/projects/wifi/lib/msun/src/math.h#2 integrate .. //depot/projects/wifi/lib/msun/src/s_ceill.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_floorl.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_llrint.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_llrintf.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_llround.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_llroundf.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_lrint.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_lrintf.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_lround.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_lroundf.c#1 branch .. //depot/projects/wifi/lib/msun/src/s_round.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_roundf.c#2 integrate .. //depot/projects/wifi/release/Makefile#4 integrate .. //depot/projects/wifi/share/examples/Makefile#5 integrate .. //depot/projects/wifi/share/examples/mdoc/example.1#2 integrate .. //depot/projects/wifi/share/examples/mdoc/example.3#2 integrate .. //depot/projects/wifi/share/examples/mdoc/example.4#2 integrate .. //depot/projects/wifi/share/examples/mdoc/example.9#1 branch .. //depot/projects/wifi/share/man/man3/tgmath.3#2 integrate .. //depot/projects/wifi/share/man/man4/axe.4#2 integrate .. //depot/projects/wifi/share/man/man4/ciss.4#2 integrate .. //depot/projects/wifi/share/man/man4/cm.4#2 integrate .. //depot/projects/wifi/share/man/man4/cnw.4#2 integrate .. //depot/projects/wifi/share/man/man4/dc.4#3 integrate .. //depot/projects/wifi/share/man/man4/divert.4#3 integrate .. //depot/projects/wifi/share/man/man4/hptmv.4#2 integrate .. //depot/projects/wifi/share/man/man4/ida.4#2 integrate .. //depot/projects/wifi/share/man/man4/inet.4#2 integrate .. //depot/projects/wifi/share/man/man4/ipsec.4#2 integrate .. //depot/projects/wifi/share/man/man4/mac_biba.4#2 integrate .. //depot/projects/wifi/share/man/man4/mac_mls.4#2 integrate .. //depot/projects/wifi/share/man/man4/mac_portacl.4#4 integrate .. //depot/projects/wifi/share/man/man4/man4.sparc64/auxio.4#2 integrate .. //depot/projects/wifi/share/man/man4/mem.4#3 integrate .. //depot/projects/wifi/share/man/man4/mpt.4#3 integrate .. //depot/projects/wifi/share/man/man4/netgraph.4#3 integrate .. //depot/projects/wifi/share/man/man4/ng_device.4#2 integrate .. //depot/projects/wifi/share/man/man4/ngatmbase.4#3 integrate .. //depot/projects/wifi/share/man/man4/psm.4#2 integrate .. //depot/projects/wifi/share/man/man4/uplcom.4#2 integrate .. //depot/projects/wifi/share/man/man4/wlan.4#4 integrate .. //depot/projects/wifi/share/man/man4/wlan_acl.4#3 integrate .. //depot/projects/wifi/share/man/man4/wlan_ccmp.4#3 integrate .. //depot/projects/wifi/share/man/man4/wlan_tkip.4#3 integrate .. //depot/projects/wifi/share/man/man4/wlan_wep.4#2 integrate .. //depot/projects/wifi/share/man/man4/wlan_xauth.4#3 integrate .. //depot/projects/wifi/share/man/man4/xl.4#4 integrate .. //depot/projects/wifi/share/man/man5/periodic.conf.5#3 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#7 integrate .. //depot/projects/wifi/share/man/man7/firewall.7#2 integrate .. //depot/projects/wifi/share/man/man9/DECLARE_GEOM_CLASS.9#3 integrate .. //depot/projects/wifi/share/man/man9/DECLARE_MODULE.9#3 integrate .. //depot/projects/wifi/share/man/man9/MODULE_DEPEND.9#3 integrate .. //depot/projects/wifi/share/man/man9/VFS_START.9#3 integrate .. //depot/projects/wifi/share/man/man9/VFS_STATFS.9#3 integrate .. //depot/projects/wifi/share/man/man9/VFS_SYNC.9#3 integrate .. //depot/projects/wifi/share/man/man9/VFS_VGET.9#3 integrate .. //depot/projects/wifi/share/man/man9/bpf.9#3 integrate .. //depot/projects/wifi/share/man/man9/ifnet.9#3 integrate .. //depot/projects/wifi/share/man/man9/mbuf_tags.9#3 integrate .. //depot/projects/wifi/share/man/man9/microtime.9#2 integrate .. //depot/projects/wifi/share/man/man9/microuptime.9#2 integrate .. //depot/projects/wifi/share/man/man9/module.9#2 integrate .. //depot/projects/wifi/share/man/man9/pfil.9#2 integrate .. //depot/projects/wifi/share/man/man9/physio.9#3 integrate .. //depot/projects/wifi/share/man/man9/printf.9#2 integrate .. //depot/projects/wifi/share/man/man9/sleepqueue.9#2 integrate .. //depot/projects/wifi/share/man/man9/style.9#4 integrate .. //depot/projects/wifi/share/man/man9/suser.9#3 integrate .. //depot/projects/wifi/share/man/man9/sx.9#3 integrate .. //depot/projects/wifi/share/man/man9/taskqueue.9#3 integrate .. //depot/projects/wifi/share/man/man9/time.9#2 integrate .. //depot/projects/wifi/share/man/man9/vflush.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map.9#2 integrate .. //depot/projects/wifi/sys/coda/coda_fbsd.c#3 integrate .. //depot/projects/wifi/sys/coda/coda_vnops.c#5 integrate .. //depot/projects/wifi/sys/compat/pecoff/imgact_pecoff.c#5 integrate .. //depot/projects/wifi/sys/conf/NOTES#10 integrate .. //depot/projects/wifi/sys/conf/files#14 integrate .. //depot/projects/wifi/sys/conf/newvers.sh#2 integrate .. //depot/projects/wifi/sys/contrib/dev/acpica/dsutils.c#3 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus_cis.h#3 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbusreg.h#3 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbbreg.h#3 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/wifi/sys/fs/deadfs/dead_vnops.c#5 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#14 integrate .. //depot/projects/wifi/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/wifi/sys/fs/fifofs/fifo_vnops.c#8 integrate .. //depot/projects/wifi/sys/fs/hpfs/hpfs_vnops.c#6 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vnops.c#7 integrate .. //depot/projects/wifi/sys/fs/nullfs/null_vnops.c#5 integrate .. //depot/projects/wifi/sys/fs/nwfs/nwfs_vnops.c#5 integrate .. //depot/projects/wifi/sys/fs/portalfs/portal_vnops.c#4 integrate .. //depot/projects/wifi/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_vnops.c#5 integrate .. //depot/projects/wifi/sys/fs/udf/udf_vnops.c#6 integrate .. //depot/projects/wifi/sys/fs/umapfs/umap_vnops.c#4 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_subr.c#5 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/wifi/sys/i386/i386/mptable.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/wifi/sys/kern/vfs_default.c#9 integrate .. //depot/projects/wifi/sys/kern/vfs_init.c#5 integrate .. //depot/projects/wifi/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/wifi/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/wifi/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/wifi/sys/netgraph/ng_tty.c#4 integrate .. //depot/projects/wifi/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/wifi/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/wifi/sys/sys/umtx.h#6 integrate .. //depot/projects/wifi/sys/sys/vnode.h#11 integrate .. //depot/projects/wifi/sys/tools/vnode_if.awk#5 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#11 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/wifi/tools/regression/lib/msun/Makefile#2 integrate .. //depot/projects/wifi/tools/regression/lib/msun/test-lrint.c#1 branch .. //depot/projects/wifi/tools/regression/lib/msun/test-lrint.t#1 branch .. //depot/projects/wifi/tools/regression/lib/msun/test-lround.c#1 branch .. //depot/projects/wifi/tools/regression/lib/msun/test-lround.t#1 branch .. //depot/projects/wifi/tools/regression/sockets/reconnect/Makefile#1 branch .. //depot/projects/wifi/tools/regression/sockets/reconnect/reconnect.c#1 branch .. //depot/projects/wifi/usr.bin/fstat/fstat.c#3 integrate .. //depot/projects/wifi/usr.bin/tail/forward.c#4 integrate .. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/parser.y#3 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/install.c#2 integrate .. //depot/projects/wifi/usr.sbin/vidcontrol/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/vidcontrol/decode.c#2 integrate .. //depot/projects/wifi/usr.sbin/vidcontrol/vidcontrol.c#2 integrate Differences ... ==== //depot/projects/wifi/bin/chio/chio.1#3 (text+ko) ==== @@ -1,5 +1,4 @@ .\" $NetBSD: chio.1,v 1.4 1997/10/02 00:41:25 hubertf Exp $ - .\"- .\" Copyright (c) 1996 Jason R. Thorpe .\" All rights reserved. @@ -31,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/chio/chio.1,v 1.25 2005/01/10 08:39:20 imp Exp $ +.\" $FreeBSD: src/bin/chio/chio.1,v 1.26 2005/01/13 08:46:19 ru Exp $ .\" .Dd May 14, 1998 .Dt CHIO 1 ==== //depot/projects/wifi/bin/expr/expr.1#3 (text+ko) ==== @@ -1,5 +1,4 @@ .\" -*- nroff -*- - .\"- .\" Copyright (c) 1993 Winning Strategies, Inc. .\" All rights reserved. @@ -29,7 +28,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/bin/expr/expr.1,v 1.26 2005/01/10 08:39:22 imp Exp $ +.\" $FreeBSD: src/bin/expr/expr.1,v 1.27 2005/01/13 08:46:19 ru Exp $ .\" .Dd July 12, 2004 .Dt EXPR 1 ==== //depot/projects/wifi/bin/pax/ar_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ar_subs.c,v 1.23 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_subs.c,v 1.24 2005/01/12 03:25:55 brian Exp $"); #include #include @@ -400,8 +400,10 @@ /* * check if this file meets user specified options match. */ - if (sel_chk(arcn) != 0) + if (sel_chk(arcn) != 0) { + ftree_notsel(); continue; + } fd = -1; if (uflag) { /* @@ -785,8 +787,10 @@ /* * check if this file meets user specified options */ - if (sel_chk(arcn) != 0) + if (sel_chk(arcn) != 0) { + ftree_notsel(); continue; + } /* * if there is already a file in the destination directory with ==== //depot/projects/wifi/bin/pax/extern.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/18/94 - * $FreeBSD: src/bin/pax/extern.h,v 1.15 2004/04/06 20:06:48 markm Exp $ + * $FreeBSD: src/bin/pax/extern.h,v 1.16 2005/01/12 03:25:55 brian Exp $ */ /* @@ -155,6 +155,7 @@ int ftree_start(void); int ftree_add(char *, int); void ftree_sel(ARCHD *); +void ftree_notsel(void); void ftree_chk(void); int next_file(ARCHD *); ==== //depot/projects/wifi/bin/pax/ftree.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ftree.c,v 1.23 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ftree.c,v 1.24 2005/01/12 03:25:55 brian Exp $"); #include #include @@ -214,6 +214,18 @@ } /* + * ftree_notsel() + * this entry has not been selected by pax. + */ + +void +ftree_notsel() +{ + if (ftent != NULL) + (void)fts_set(ftsp, ftent, FTS_SKIP); +} + +/* * ftree_chk() * called at end on pax execution. Prints all those file args that did not * have a selected member (reference count still 0) ==== //depot/projects/wifi/etc/periodic/daily/460.status-mail-rejects#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.19 2005/01/11 10:54:38 brian Exp $ +# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.20 2005/01/12 01:31:21 brian Exp $ # # If there is a global system configuration file, suck it in. @@ -51,7 +51,7 @@ done cat /var/log/maillog } | - sed -n -E "s/^$start"'.*ruleset=check_[^ \t]+,[ \t]+arg1=,]+).*reject=([^ \t]*)[ \t].*[ \t]([a-zA-Z0-9_.]+)$/\2 (\3... \4)/p' | + sed -n -E "s/^$start"'.*ruleset=check_[^ ]+, +arg1=,]+).*reject=([^ ]+) .* ([^ ]+)$/\2 (\3... \4)/p' | sort -f | uniq -ic | sort -fnr | tee /dev/stderr | wc -l) [ $rc -gt 0 ] && rc=1 fi;; ==== //depot/projects/wifi/etc/periodic/security/100.chksetuid#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.7 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.8 2005/01/13 15:07:35 glebius Exp $ # # If there is a global system configuration file, suck it in. @@ -44,7 +44,7 @@ echo "" echo 'Checking setuid files and devices:' # XXX Note that there is the possibility of overrunning the args to ls - MP=`mount -t ufs | grep -v " nosuid" | awk '{ print $3 }' | sort` + MP=`mount -t ufs | egrep -v " no(suid|exec)" | awk '{ print $3 }' | sort` if [ -n "${MP}" ] then set ${MP} ==== //depot/projects/wifi/etc/rc.d/cleartmp#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: cleartmp,v 1.4 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/cleartmp,v 1.11 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.12 2005/01/12 07:18:25 anholt Exp $ # # PROVIDE: cleartmp @@ -14,6 +14,7 @@ rcvar=`set_rcvar clear_tmp` start_cmd="cleartmp_start" stop_cmd=":" +x11_socket_dirs="/tmp/.X11-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/.XIM-unix" cleartmp_start() { @@ -31,9 +32,9 @@ load_rc_config $name run_rc_command "$1" -# Remove X lock files, since they will prevent you from -# restarting X -# +# Remove X lock files, since they will prevent you from restarting X. rm -f /tmp/.X[0-9]-lock -rm -fr /tmp/.X11-unix -mkdir -m 1777 /tmp/.X11-unix + +# Create socket directories with correct permissions to avoid security problem. +rm -fr ${x11_socket_dirs} +mkdir -m 1777 ${x11_socket_dirs} ==== //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/kgdb.1#3 (text+ko) ==== @@ -22,13 +22,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.4 2004/11/22 16:07:28 joerg Exp $ +.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.5 2005/01/13 10:07:51 ru Exp $ .Dd August 1, 2004 .Os .Dt KGDB 1 .Sh NAME .Nm kgdb -.Nd The kernel debugger +.Nd "kernel debugger" .Sh SYNOPSIS .Nm .Op Fl a @@ -83,8 +83,7 @@ .El .Pp The -.Fl c , -.Fl n , +.Fl c , n , and .Fl r options are mutually exclusive. @@ -101,7 +100,7 @@ will be opened to allow debugging the currenlty running kernel. .Sh FILES -.Bl -tag -width "Pa /var/crash" +.Bl -tag -width ".Pa /var/crash" .It Pa /dev/mem Default memory image to open if no core dump file has been specified. ==== //depot/projects/wifi/include/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.229 2004/11/17 23:48:17 ru Exp $ +# $FreeBSD: src/include/Makefile,v 1.230 2005/01/11 21:15:18 pjd Exp $ # # Doing a "make install" builds /usr/include. @@ -39,7 +39,7 @@ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/udf fs/umapfs fs/unionfs \ geom/concat geom/gate geom/label geom/mirror geom/nop geom/raid3 \ - geom/stripe \ + geom/shsec geom/stripe \ isofs/cd9660 netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ security/mac_biba security/mac_bsdextended security/mac_lomac \ ==== //depot/projects/wifi/lib/libarchive/archive_read.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.14 2005/01/10 05:11:15 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.16 2005/01/12 05:56:49 kientzle Exp $ .\" .Dd January 8, 2005 .Dt archive_read 3 @@ -50,7 +50,7 @@ .Nm archive_read_data_into_fd , .Nm archive_read_extract , .Nm archive_read_extract_set_progress_callback , -.Nm archive_read_close +.Nm archive_read_close , .Nm archive_read_finish .Nd functions for reading streaming archives .Sh SYNOPSIS @@ -80,9 +80,9 @@ .Ft int .Fn archive_read_open "struct archive *" "void *client_data" "archive_open_archive_callback *" "archive_read_archive_callback *" "archive_close_archive_callback *" .Ft int -.Fn archive_read_open_fd "struct archive *" "int fd" +.Fn archive_read_open_fd "struct archive *" "int fd" "size_t block_size" .Ft int -.Fn archive_read_open_file "struct archive *" "const char *filename" +.Fn archive_read_open_file "struct archive *" "const char *filename" "size_t block_size" .Ft int .Fn archive_read_next_header "struct archive *" "struct archive_entry **" .Ft ssize_t @@ -96,7 +96,7 @@ .Ft int .Fn archive_read_data_into_fd "struct archive *" "int fd" .Ft int -.Fn archive_read_extract "struct archive *" "int flags" +.Fn archive_read_extract "struct archive *" "struct archive_entry *" "int flags" .Ft void .Fn archive_read_extract_set_progress_callback "struct archive *" "void (*func)(void *)" "void *user_data" .Ft int @@ -146,7 +146,12 @@ Freeze the settings, open the archive, and prepare for reading entries. This is the most generic version of this call, which accepts three callback functions. -The library invokes these client-provided functions to obtain +Most clients will want to use +.Fn archive_read_open_file +or +.Fn archive_read_open_fd +instead. +The library invokes the client-provided functions to obtain raw bytes from the archive. Note: The API permits a decompression method to fork and invoke the callbacks from another process. @@ -159,14 +164,14 @@ .It Fn archive_read_open_fd Like .Fn archive_read_open , -except that it accepts a file descriptor rather than +except that it accepts a file descriptor and block size rather than a trio of function pointers. Note that the file descriptor will not be automatically closed at end-of-archive. .It Fn archive_read_open_file Like .Fn archive_read_open , -except that it accepts a simple filename. +except that it accepts a simple filename and a block size. A NULL filename represents standard input. .It Fn archive_read_next_header Read the header for the next entry and return a pointer to @@ -188,6 +193,9 @@ sparse files, as supported by some archive formats. The library gaurantees that offsets will increase and that blocks will not overlap. +Note that the blocks returned from this function can be much larger +than the block size read from disk, due to compression +and internal buffer optimizations. .It Fn archive_read_data_skip A convenience function that repeatedly calls .Fn archive_read_data_block @@ -204,6 +212,10 @@ .It Fn archive_read_extract A convenience function that recreates the specified object on disk and reads the entry data into that object. +The filename, permissions, and other critical information +are taken from the provided +.Va archive_entry +object. The .Va flags argument modifies how the object is recreated. @@ -227,7 +239,20 @@ By default, existing files are truncated and rewritten, but the file is not recreated. In particular, the default behavior does not break existing hard links. +.It Cm ARCHIVE_EXTRACT_ACL +Attempt to restore ACLs. +By default, extended ACLs are ignored. +.It Cm ARCHIVE_EXTRACT_FFLAGS +Attempt to restore extended file flags. +By default, file flags are ignored. .El +Note that not all attributes are set immediately; +some attributes are cached in memory and written to disk only +when the archive is closed. +(For example, read-only directories are initially created +writable so that files within those directories can be +restored. +The final permissions are set when the archive is closed.) .It Fn archive_read_extract_set_progress_callback Sets a pointer to a user-defined callback that can be used for updating progress displays during extraction. ==== //depot/projects/wifi/lib/libbluetooth/bluetooth.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $Id: bluetooth.3,v 1.5 2003/05/20 23:04:30 max Exp $ -.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.4 2005/01/04 20:00:27 emax Exp $ +.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.5 2005/01/13 08:49:45 ru Exp $ .\" .Dd May 7, 2003 .Dt BLUETOOTH 3 @@ -87,7 +87,7 @@ argument passed to .Fn bt_gethostbyname should point to a -.Dv NULL Ns -terminated +.Dv NUL Ns -terminated hostname. The .Fa addr @@ -142,7 +142,7 @@ argument passed to .Fn bt_getprotobyname should point to a -.Dv NULL Ns -terminated +.Dv NUL Ns -terminated Bluetooth Protocol Service Multiplexor name. The .Fa proto ==== //depot/projects/wifi/lib/libc/gen/getnetgrent.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)getnetgrent.c 8.2 (Berkeley) 4/27/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.32 2004/11/13 20:40:28 bz Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.33 2005/01/13 18:33:01 jon Exp $"); #include #include @@ -273,6 +273,7 @@ free((char *)ogp); } grouphead.gr = (struct netgrp *)0; + nextgrp = (struct netgrp *)0; #ifdef YP _netgr_yp_enabled = 0; #endif ==== //depot/projects/wifi/lib/libc/locale/mbsrtowcs.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/mbsrtowcs.3,v 1.5 2004/07/21 10:54:57 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbsrtowcs.3,v 1.6 2005/01/11 20:50:49 ru Exp $ .Dd July 21, 2004 .Dt MBSRTOWCS 3 .Os @@ -95,7 +95,7 @@ .Fn mbsrtowcs , except that conversion stops after reading at most .Fa nms -bytes from the buffer pointed to by +bytes from the buffer pointed to by .Fa src . .Sh RETURN VALUES The ==== //depot/projects/wifi/lib/libc/net/addr2ascii.3#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" $ANA: addr2ascii.3,v 1.1 1996/06/13 18:41:46 wollman Exp $ -.\" $FreeBSD: src/lib/libc/net/addr2ascii.3,v 1.17 2004/10/09 17:13:58 maxim Exp $ +.\" $FreeBSD: src/lib/libc/net/addr2ascii.3,v 1.18 2005/01/11 20:50:49 ru Exp $ .\" .Dd June 13, 1996 .Dt ADDR2ASCII 3 @@ -107,21 +107,24 @@ .Pp .Bl -tag -width AF_INETxxxx -compact .It Dv AF_INET -.Li struct in_addr +.Vt "struct in_addr" (in .In arpa/inet.h ) .It Dv AF_LINK -.Li struct sockaddr_dl +.Vt "struct sockaddr_dl" (in .In net/if_dl.h ) .\" .It Dv AF_INET6 -.\" .Li struct in6_addr +.\" .Vt "struct in6_addr" .\" (in .\" .In netinet6/in6.h ) .El .Pp -.Dv AF_INET and AF_LINK constants are defined in -.In sys/socket.h +.Dv AF_INET +and +.Dv AF_LINK +constants are defined in +.In sys/socket.h . .Sh RETURN VALUES The .Fn addr2ascii @@ -167,7 +170,7 @@ functions, rather than the other way around. .Sh ERRORS When a failure is returned, -.Li errno +.Va errno is set to one of the following values: .Bl -tag -width Er .It Bq Er ENAMETOOLONG @@ -222,7 +225,7 @@ generic interface would provide a means for determining the length of the buffer to be used so that it could be dynamically allocated, and would always require a -.Dq Li "struct sockaddr" +.Vt "struct sockaddr" to hold the binary address. Unfortunately, this is incompatible with existing practice. ==== //depot/projects/wifi/lib/libc/posix1e/mac.conf.5#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac.conf.5,v 1.5 2004/11/18 15:24:47 csjp Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac.conf.5,v 1.6 2005/01/11 20:50:50 ru Exp $ .\" .Dd April 19, 2003 .Dt MAC.CONF 5 @@ -46,7 +46,8 @@ symbol. .Pp Currently, the implementation supports two syntax styles for label -element declaration. The old (deprecated) syntax consists of a +element declaration. +The old (deprecated) syntax consists of a single line with two fields separated by white space: the object class name, and a list of label elements as used by the .Xr mac_prepare 3 ==== //depot/projects/wifi/lib/libc/stdio/setbuf.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)setbuf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/setbuf.3,v 1.15 2004/08/24 21:48:21 alfred Exp $ +.\" $FreeBSD: src/lib/libc/stdio/setbuf.3,v 1.16 2005/01/11 20:50:50 ru Exp $ .\" .Dd June 4, 1993 .Dt SETBUF 3 @@ -117,7 +117,9 @@ this buffer will be used instead of the current buffer. If .Fa buf -is not NULL, it is the caller's responsibility to +is not +.Dv NULL , +it is the caller's responsibility to .Xr free 3 this buffer after closing the stream. (If the ==== //depot/projects/wifi/lib/libc/stdlib/merge.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)merge.c 8.2 (Berkeley) 2/14/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/merge.c,v 1.6 2002/03/21 22:48:42 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/merge.c,v 1.7 2005/01/12 03:39:34 brian Exp $"); /* * Hybrid exponential search/linear search merge sort with hybrid @@ -60,8 +60,10 @@ #include #include -static void setup(u_char *, u_char *, size_t, size_t, int (*)()); -static void insertionsort(u_char *, size_t, size_t, int (*)()); +static void setup(u_char *, u_char *, size_t, size_t, + int (*)(const void *, const void *)); +static void insertionsort(u_char *, size_t, size_t, + int (*)(const void *, const void *)); #define ISIZE sizeof(int) #define PSIZE sizeof(u_char *) @@ -103,7 +105,8 @@ size_t size; int (*cmp)(const void *, const void *); { - int i, sense; + size_t i; + int sense; int big, iflag; u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2; u_char *list2, *list1, *p2, *p, *last, **p1; ==== //depot/projects/wifi/lib/libc/stdtime/strftime.3#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strftime.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.35 2004/11/04 08:34:57 delphij Exp $ +.\" $FreeBSD: src/lib/libc/stdtime/strftime.3,v 1.36 2005/01/11 20:50:50 ru Exp $ .\" .Dd November 4, 2004 .Dt STRFTIME 3 @@ -106,7 +106,7 @@ .Dq Li %m/%d/%y . .It Cm %d is replaced by the day of the month as a decimal number (01-31). -.It Cm \&%E* Cm \&%O* +.It Cm %E* %O* POSIX locale extensions. The sequences %Ec %EC %Ex %EX %Ey %EY @@ -135,7 +135,8 @@ .It Cm \&%H is replaced by the hour (24-hour clock) as a decimal number (00-23). .It Cm %h -the same as %b. +the same as +.Cm %b . .It Cm \&%I is replaced by the hour (12-hour clock) as a decimal number (01-12). .It Cm %j @@ -152,8 +153,9 @@ is replaced by the month as a decimal number (01-12). .It Cm %n is replaced by a newline. -.It Cm \&%O* -the same as %E*. +.It Cm %O* +the same as +.Cm %E* . .It Cm %p is replaced by national representation of either "ante meridiem" @@ -207,7 +209,7 @@ is replaced by the year without century as a decimal number (00-99). .It Cm \&%Z is replaced by the time zone name. -.It Cm \&%z +.It Cm %z is replaced by the time zone offset from UTC; a leading plus sign stands for east of UTC, a minus sign for west of UTC, hours and minutes follow with two digits each and no delimiter between them (common form for @@ -216,13 +218,13 @@ is replaced by national representation of the date and time (the format is similar to that produced by .Xr date 1 ) . -.It Cm \&%-* +.It Cm %-* GNU libc extension. Do not do any padding when performing numerical outputs. -.It Cm \&%_* +.It Cm %_* GNU libc extension. Explicitly specify space for padding. -.It Cm \&%0* +.It Cm %0* GNU libc extension. Explicitly specify zero for padding. .It Cm %% ==== //depot/projects/wifi/lib/libc/sys/intro.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)intro.2 8.5 (Berkeley) 2/27/95 -.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.42 2004/07/08 20:27:38 wollman Exp $ +.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.43 2005/01/11 20:50:50 ru Exp $ .\" .Dd February 27, 1995 .Dt INTRO 2 @@ -605,12 +605,12 @@ an ordinary file, special file, or directory. .Pp These characters may be arbitrary eight-bit values, -excluding NUL -.Po Tn ASCII -.No 0 Pc -and the +excluding +.Dv NUL +.Tn ( ASCII +0) and the .Ql \&/ -character (slash, +character (slash, .Tn ASCII 47). .Pp @@ -625,7 +625,7 @@ by the shell. .It Path Name A path name is a -.Tn NUL Ns -terminated +.Dv NUL Ns -terminated character string starting with an optional slash .Ql \&/ , ==== //depot/projects/wifi/lib/libc/sys/kse.2#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.14 2004/10/08 20:40:30 julian Exp $ +.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.15 2005/01/11 20:50:50 ru Exp $ .\" .Dd September 10, 2002 .Dt KSE 2 @@ -332,43 +332,62 @@ .\" .Ss Signals .\" -.Pp -The current implementation creates a special a signal thread. +The current implementation creates a special signal thread. Kernel threads (KSEs) in a process mask all signals, and only the signal thread waits for signals to be delivered to the process, the signal thread is responsible for dispatching signals to user threads. .Pp A downside of this is that if a multiplexed thread -calls the execve() syscall, its signal mask and pending signals may not be -available in the kernel. They are stored -in userland and the kernel does not know where to get them, however POSIX +calls the +.Fn execve +syscall, its signal mask and pending signals may not be +available in the kernel. +They are stored +in userland and the kernel does not know where to get them, however +.Tn POSIX requires them to be restored and passed them to new process. -Just setting the mask for the thread before calling execve is only a +Just setting the mask for the thread before calling +.Fn execve +is only a close approximation to the problem as it does not re-deliver back to the kernel -any pending signals that the old process may have blocked, and it allows a -window in which new signals may be delivered to the process between the setting of the mask and the execve(). +any pending signals that the old process may have blocked, and it allows a +window in which new signals may be delivered to the process between the setting +of the mask and the +.Fn execve . .Pp For now this problem has been solved by adding a special combined -kse_thr_interrupt()/execve() mode to the +.Fn kse_thr_interrupt Ns / Ns Fn execve +mode to the .Fn kse_thr_interrupt syscall. -The +The .Fn kse_thr_interrupt -syscall has a sub command KSE_INTR_EXECVE, that allows it to accept a -.Va kse_execv_args +syscall has a sub command +.Dv KSE_INTR_EXECVE , +that allows it to accept a +.Vt kse_execv_args structure, and allowing it to adjust the signals and then atomically -convert into an execve() call. +convert into an +.Fn execve +call. Additional pending signals and the correct signal mask can be passed -to the kernel in this way. The thread library overrides the execve syscall -and translates it into kse_intr_interrupt call, allowing a multiplexed thread -to restore pending signals and the correct signal mask before doing the exec. +to the kernel in this way. +The thread library overrides the +.Fn execve +syscall +and translates it into +.Fn kse_intr_interrupt +call, allowing a multiplexed thread +to restore pending signals and the correct signal mask before doing the +.Fn exec . This solution to the problem may change. .\" .Ss KSE Mailboxes .\" -Each KSE has a unique mailbox for user-kernel communication defined in -sys/kse.h. Some of the fields there are: +Each KSE has a unique mailbox for user-kernel communication defined in +.In sys/kse.h . +Some of the fields there are: .Pp .Va km_version describes the version of this structure and must be equal to @@ -466,20 +485,18 @@ .Va km_flags may contain any of the following bits OR'ed together: .Bl -tag -width indent -.It \& -KMF_NOUPCALL -block upcalls from happening. The thread is in some critical section. -.It \& -KMF_NOCOMPLETED -.It \& -KMF_DONE -.It \& >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 13 21:39:46 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6670916A4D0; Thu, 13 Jan 2005 21:39: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 3E44316A4CE for ; Thu, 13 Jan 2005 21:39:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A29643D1F for ; Thu, 13 Jan 2005 21:39:46 +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 j0DLdkUK012080 for ; Thu, 13 Jan 2005 21:39:46 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0DLdjgM012077 for perforce@freebsd.org; Thu, 13 Jan 2005 21:39:45 GMT (envelope-from jhb@freebsd.org) Date: Thu, 13 Jan 2005 21:39:45 GMT Message-Id: <200501132139.j0DLdjgM012077@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 68942 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Jan 2005 21:39:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=68942 Change 68942 by jhb@jhb_slimer on 2005/01/13 21:39:00 Compile. Submitted by: kris Affected files ... .. //depot/projects/smpng/sys/sparc64/sparc64/sys_machdep.c#12 edit .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#46 edit Differences ... ==== //depot/projects/smpng/sys/sparc64/sparc64/sys_machdep.c#12 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include +#include #include #include ==== //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#46 (text+ko) ==== @@ -111,7 +111,6 @@ void cpu_exit(struct thread *td) { - struct md_utrap *ut; struct proc *p; p = td->td_proc; From owner-p4-projects@FreeBSD.ORG Fri Jan 14 15:30:49 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FE5E16A4DB; Fri, 14 Jan 2005 15:30:49 +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 1FE0C16A4D9 for ; Fri, 14 Jan 2005 15:30:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F339943D1F for ; Fri, 14 Jan 2005 15:30:47 +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 j0EFUlen084616 for ; Fri, 14 Jan 2005 15:30:47 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0EFUk7L084613 for perforce@freebsd.org; Fri, 14 Jan 2005 15:30:46 GMT (envelope-from jhb@freebsd.org) Date: Fri, 14 Jan 2005 15:30:46 GMT Message-Id: <200501141530.j0EFUk7L084613@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 69006 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Jan 2005 15:30:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=69006 Change 69006 by jhb@jhb_slimer on 2005/01/14 15:30:06 IFC @69003 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic.c#8 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_xscale.S#4 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#8 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/undefined.c#5 integrate .. //depot/projects/smpng/sys/arm/include/proc.h#3 integrate .. //depot/projects/smpng/sys/arm/include/trap.h#2 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0.S#5 integrate .. //depot/projects/smpng/sys/coda/coda_fbsd.c#12 integrate .. //depot/projects/smpng/sys/coda/coda_venus.c#11 integrate .. //depot/projects/smpng/sys/coda/coda_venus.h#5 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.c#21 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.c#19 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#43 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#25 integrate .. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#15 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#36 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#17 integrate .. //depot/projects/smpng/sys/compat/linux/linux_mib.c#11 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#51 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#16 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#21 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#21 integrate .. //depot/projects/smpng/sys/compat/linux/linux_sysctl.c#11 integrate .. //depot/projects/smpng/sys/compat/linux/linux_uid16.c#20 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#24 integrate .. //depot/projects/smpng/sys/conf/NOTES#90 integrate .. //depot/projects/smpng/sys/conf/files#133 integrate .. //depot/projects/smpng/sys/conf/files.i386#74 integrate .. //depot/projects/smpng/sys/conf/files.pc98#68 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#15 integrate .. //depot/projects/smpng/sys/conf/options#91 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#16 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#77 integrate .. //depot/projects/smpng/sys/dev/aha/aha.c#15 integrate .. //depot/projects/smpng/sys/dev/aha/aha_isa.c#12 integrate .. //depot/projects/smpng/sys/dev/amr/amr_cam.c#11 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#16 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#14 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_audio.c#6 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_card.c#9 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_core.c#16 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_i2c.c#7 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#23 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_reg.h#8 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_tuner.c#6 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#22 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#22 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.h#7 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbusreg.h#5 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbusvar.h#8 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#14 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc_pccard.c#5 integrate .. //depot/projects/smpng/sys/dev/fdc/fdcvar.h#6 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#17 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_cbus.c#6 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_pccard.c#10 integrate .. //depot/projects/smpng/sys/dev/fe/if_fevar.h#4 integrate .. //depot/projects/smpng/sys/dev/matcd/creativeif.h#3 delete .. //depot/projects/smpng/sys/dev/matcd/matcd.c#7 delete .. //depot/projects/smpng/sys/dev/matcd/matcd_data.h#4 delete .. //depot/projects/smpng/sys/dev/matcd/matcd_isa.c#5 delete .. //depot/projects/smpng/sys/dev/matcd/matcddrv.h#3 delete .. //depot/projects/smpng/sys/dev/matcd/options.h#3 delete .. //depot/projects/smpng/sys/dev/mse/mse.c#3 integrate .. //depot/projects/smpng/sys/dev/mse/mse_cbus.c#3 integrate .. //depot/projects/smpng/sys/dev/mse/mse_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/mse/msevar.h#3 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#40 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#48 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbdevid.h#15 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbreg.h#10 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#15 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#20 integrate .. //depot/projects/smpng/sys/dev/puc/puc_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/puc/pucvar.h#13 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/ehcivar.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/ohcivar.h#12 integrate .. //depot/projects/smpng/sys/dev/usb/uhcivar.h#12 integrate .. //depot/projects/smpng/sys/fs/deadfs/dead_vnops.c#12 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#20 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#39 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#20 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#33 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#26 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#25 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#38 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#30 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#26 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#20 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#17 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#18 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs.h#6 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_io.c#16 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_node.c#13 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vnops.c#12 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#21 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#20 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#34 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs.h#10 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#20 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#18 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#29 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#23 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vnops.c#10 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#22 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#17 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#14 integrate .. //depot/projects/smpng/sys/geom/shsec/g_shsec.c#1 branch .. //depot/projects/smpng/sys/geom/shsec/g_shsec.h#1 branch .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#41 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#29 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC.hints#7 integrate .. //depot/projects/smpng/sys/i386/i386/mptable.c#13 integrate .. //depot/projects/smpng/sys/isa/psm.c#32 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vnops.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#91 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#18 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#65 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#72 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#34 integrate .. //depot/projects/smpng/sys/kern/vfs_init.c#20 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#22 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#43 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#93 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#80 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#56 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#21 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile#11 integrate .. //depot/projects/smpng/sys/modules/geom/geom_shsec/Makefile#1 branch .. //depot/projects/smpng/sys/net/bridge.c#33 integrate .. //depot/projects/smpng/sys/net/if.c#60 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#55 integrate .. //depot/projects/smpng/sys/net/if_stf.c#29 integrate .. //depot/projects/smpng/sys/net/net_osdep.h#12 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#10 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#15 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#21 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#18 integrate .. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_lmi.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#18 integrate .. //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#16 integrate .. //depot/projects/smpng/sys/netgraph/ng_tty.c#16 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#26 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#47 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#9 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#35 integrate .. //depot/projects/smpng/sys/netipx/ipx.c#11 integrate .. //depot/projects/smpng/sys/netipx/ipx_input.c#14 integrate .. //depot/projects/smpng/sys/netipx/ipx_pcb.c#17 integrate .. //depot/projects/smpng/sys/netipx/ipx_pcb.h#8 integrate .. //depot/projects/smpng/sys/netipx/ipx_usrreq.c#21 integrate .. //depot/projects/smpng/sys/netipx/spx_usrreq.c#20 integrate .. //depot/projects/smpng/sys/netkey/key.c#29 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#12 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#12 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#38 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#9 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#46 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#48 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#39 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#24 integrate .. //depot/projects/smpng/sys/pc98/pc98/30line.h#3 integrate .. //depot/projects/smpng/sys/pc98/pc98/module.h#2 delete .. //depot/projects/smpng/sys/pc98/pc98/pc98gdc.c#13 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#47 integrate .. //depot/projects/smpng/sys/pci/if_sisreg.h#14 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#9 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#13 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#18 integrate .. //depot/projects/smpng/sys/sys/buf.h#35 integrate .. //depot/projects/smpng/sys/sys/bufobj.h#3 integrate .. //depot/projects/smpng/sys/sys/joystick.h#3 integrate .. //depot/projects/smpng/sys/sys/linker_set.h#7 integrate .. //depot/projects/smpng/sys/sys/mount.h#36 integrate .. //depot/projects/smpng/sys/sys/umtx.h#9 integrate .. //depot/projects/smpng/sys/sys/vnode.h#55 integrate .. //depot/projects/smpng/sys/tools/vnode_if.awk#10 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#15 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#20 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#11 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#44 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#38 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#65 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#31 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#20 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#45 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#53 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#65 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/prof_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.21 2004/05/26 09:43:37 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.22 2005/01/11 03:44:17 imp Exp $"); #ifdef GUPROF #if 0 @@ -49,11 +49,7 @@ #include -#ifdef PC98 -#include -#else #include -#endif #include #ifdef GUPROF ==== //depot/projects/smpng/sys/amd64/isa/atpic.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.13 2004/08/16 23:12:30 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.14 2005/01/11 03:44:16 imp Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -64,14 +64,9 @@ #define SLAVE 1 /* - * PC-98 machines wire the slave 8259A to pin 7 on the master PIC, and * PC-AT machines wire the slave PIC to pin 2 on the master PIC. */ -#ifdef PC98 -#define ICU_SLAVEID 7 -#else #define ICU_SLAVEID 2 -#endif /* * Determine the base master and slave modes not including auto EOI support. ==== //depot/projects/smpng/sys/arm/arm/cpufunc_asm_xscale.S#4 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_xscale.S,v 1.3 2005/01/05 21:58:47 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_xscale.S,v 1.4 2005/01/10 22:41:08 cognet Exp $"); /* * Size of the XScale core D-cache. @@ -171,13 +171,11 @@ /* * TLB functions * - * Note: We don't need to worry about issuing a CPWAIT after - * TLB operations, because we expect a pmap_update() to follow. */ ENTRY(xscale_tlb_flushID_SE) mcr p15, 0, r0, c8, c6, 1 /* flush D tlb single entry */ mcr p15, 0, r0, c8, c5, 1 /* flush I tlb single entry */ - RET + CPWAIT_AND_RETURN(r0) /* * Cache functions ==== //depot/projects/smpng/sys/arm/arm/machdep.c#8 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.8 2005/01/05 21:58:47 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.9 2005/01/10 22:43:16 cognet Exp $"); #include #include @@ -64,8 +64,10 @@ #include #include #include +#include #include #include +#include #include #include @@ -289,17 +291,68 @@ return (0); } + +static int +ptrace_read_int(struct thread *td, vm_offset_t addr, u_int32_t *v) +{ + struct iovec iov; + struct uio uio; + iov.iov_base = (caddr_t) v; + iov.iov_len = sizeof(u_int32_t); + uio.uio_iov = &iov; + uio.uio_iovcnt = 1; + uio.uio_offset = (off_t)addr; + uio.uio_resid = sizeof(u_int32_t); + uio.uio_segflg = UIO_SYSSPACE; + uio.uio_rw = UIO_READ; + uio.uio_td = td; + return proc_rwmem(td->td_proc, &uio); +} + +static int +ptrace_write_int(struct thread *td, vm_offset_t addr, u_int32_t v) +{ + struct iovec iov; + struct uio uio; + iov.iov_base = (caddr_t) &v; + iov.iov_len = sizeof(u_int32_t); + uio.uio_iov = &iov; + uio.uio_iovcnt = 1; + uio.uio_offset = (off_t)addr; + uio.uio_resid = sizeof(u_int32_t); + uio.uio_segflg = UIO_SYSSPACE; + uio.uio_rw = UIO_WRITE; + uio.uio_td = td; + return proc_rwmem(td->td_proc, &uio); +} + int ptrace_single_step(struct thread *td) { - /* XXX */ - return (0); + int error; + + KASSERT(td->td_md.md_ptrace_instr == 0, + ("Didn't clear single step")); + error = ptrace_read_int(td, td->td_frame->tf_pc + 4, + &td->td_md.md_ptrace_instr); + if (error) + return (error); + error = ptrace_write_int(td, td->td_frame->tf_pc + 4, + PTRACE_BREAKPOINT); + if (error) + td->td_md.md_ptrace_instr = 0; + td->td_md.md_ptrace_addr = td->td_frame->tf_pc + 4; + return (error); } int ptrace_clear_single_step(struct thread *td) { - /* XXX */ + if (td->td_md.md_ptrace_instr) { + ptrace_write_int(td, td->td_md.md_ptrace_addr, + td->td_md.md_ptrace_instr); + td->td_md.md_ptrace_instr = 0; + } return (0); } ==== //depot/projects/smpng/sys/arm/arm/trap.c#7 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.9 2005/01/05 21:58:47 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.10 2005/01/10 22:43:16 cognet Exp $"); #include @@ -100,6 +100,8 @@ #include #include #endif +#include +#include #include #include @@ -919,6 +921,8 @@ if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = 0; + STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK)); + PTRACESTOP_SC(p, td, S_PT_SCE); error = (*callp->sy_call)(td, args); } switch (error) { @@ -952,6 +956,8 @@ CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); + STOPEVENT(p, S_SCX, code); + PTRACESTOP_SC(p, td, S_PT_SCX); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); ==== //depot/projects/smpng/sys/arm/arm/undefined.c#5 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.6 2005/01/05 21:58:47 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.7 2005/01/10 22:43:16 cognet Exp $"); #include #include @@ -62,6 +62,7 @@ #include #include #include +#include #ifdef KDB #include #endif @@ -135,26 +136,17 @@ struct thread *td; td = (curthread == NULL) ? &thread0 : curthread; -#if 0 if (insn == GDB_BREAKPOINT || insn == GDB5_BREAKPOINT) { if (code == FAULT_USER) { - ksiginfo_t ksi; - - KSI_INIT_TRAP(&ksi); - ksi.ksi_signo = SIGTRAP; - ksi.ksi_code = TRAP_BRKPT; - ksi.ksi_addr = (u_int32_t *)addr; - ksi.ksi_trap = 0; - PROC_LOCK(td->td_proc); - trapsignal(td, &ksi); - PROC_UNLOCK(td->td_proc); + trapsignal(td, SIGTRAP, 0); return 0; } +#if 0 #ifdef KGDB return !kgdb_trap(T_BREAKPOINT, frame); #endif +#endif } -#endif return 1; } @@ -257,6 +249,11 @@ fault_code) == 0) break; + if (fault_code & FAULT_USER && fault_instruction == PTRACE_BREAKPOINT) { + ptrace_clear_single_step(td); + return; + } + if (uh == NULL && (fault_code & FAULT_USER)) { /* Fault has not been handled */ trapsignal(td, SIGILL, 0); @@ -272,7 +269,7 @@ return; } else panic("Undefined instruction in kernel.\n"); - } + } #ifdef FAST_FPE /* Optimised exit code */ ==== //depot/projects/smpng/sys/arm/include/proc.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 * from: FreeBSD: src/sys/i386/include/proc.h,v 1.11 2001/06/29 - * $FreeBSD: src/sys/arm/include/proc.h,v 1.2 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/proc.h,v 1.3 2005/01/10 22:43:16 cognet Exp $ */ #ifndef _MACHINE_PROC_H_ @@ -47,6 +47,8 @@ struct mdthread { register_t md_savecrit; + int md_ptrace_instr; + int md_ptrace_addr; }; struct mdproc { ==== //depot/projects/smpng/sys/arm/include/trap.h#2 (text+ko) ==== @@ -1,4 +1,10 @@ /* $NetBSD: trap.h,v 1.1 2001/02/23 03:48:19 ichiro Exp $ */ -/* $FreeBSD: src/sys/arm/include/trap.h,v 1.1 2004/05/14 11:46:44 cognet Exp $ */ +/* $FreeBSD: src/sys/arm/include/trap.h,v 1.2 2005/01/10 22:43:16 cognet Exp $ */ +#ifndef _MACHINE_TRAP_H_ +#define _MACHINE_TRAP_H_ +#define GDB_BREAKPOINT 0xe6000011 +#define GDB5_BREAKPOINT 0xe7ffdefe +#define PTRACE_BREAKPOINT 0xe7fffff0 #define KERNEL_BREAKPOINT 0xe7ffffff +#endif /* _MACHINE_TRAP_H_ */ ==== //depot/projects/smpng/sys/boot/i386/boot0/boot0.S#5 (text+ko) ==== @@ -13,7 +13,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.12 2004/11/24 15:39:04 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.13 2005/01/09 23:30:35 peadar Exp $ */ /* A 512-byte boot manager. */ @@ -104,10 +104,15 @@ * number should be used. If what the bios gives us is bad, use the '0' in * the block instead. */ - testb $0x20,_FLAGS(%bp) # Set number drive? + testb $0x20,_FLAGS(%bp) # Set drive number? jnz main.1 # Yes testb %dl,%dl # Drive number valid? js main.2 # Possibly (0x80 set) +/* + * Only update the boot-sector when there is a valid drive number or + * the drive number is set manually. + */ + orb $0x40,_FLAGS(%bp) # Disable updates main.1: movb _SETDRV(%bp),%dl # Drive number to use /* * Whatever we decided to use, now store it into the fake @@ -145,16 +150,14 @@ /* * Now scan the table of known types */ - movb $TBL1SZ,%cl # Number of entries - repne # Known - scasb # type? - jne main.4 # No + movb $TBL1SZ+1,%cl # Number of entries + repne # Locate + scasb # type /* - * If it matches get the matching element in the next array. If it doesn't, - * we are already pointing at its first element which points to a "?". + * Get the matching element in the next array. */ - addw $TBL1SZ,%di # Adjust -main.4: movb (%di),%cl # Partition + addw $TBL1SZ-1, %di # Adjust + movb (%di),%cl # Partition addw %cx,%di # description callw putx # Display it main.5: incw %dx # Next item @@ -305,7 +308,6 @@ /* * Load selected bootsector to the LOAD location in RAM. * If it fails to read or isn't marked bootable, treat it as a bad selection. - * XXX: What does %si carry? */ main.15: movw $LOAD,%bx # Address for read movb $0x2,%ah # Read sector @@ -313,10 +315,8 @@ jc main.10 # If error cmpw $MAGIC,0x1fe(%bx) # Bootable? jne main.10 # No - pushw %si # Save movw $crlf,%si # Leave some callw puts # space - popw %si # Restore jmp *%bx # Invoke bootstrap /* @@ -413,9 +413,9 @@ .byte 0x9f, 0xa5, 0xa6, 0xa9 /* * These are offsets that match the known names above and point to the strings - * that will be printed. + * that will be printed. os_misc will be used if the search of the above table + * runs over. */ - .byte os_misc-. # Unknown .byte os_dos-. # DOS .byte os_dos-. # DOS .byte os_dos-. # DOS @@ -427,6 +427,7 @@ .byte os_freebsd-. # FreeBSD .byte os_bsd-. # OpenBSD .byte os_bsd-. # NetBSD + .byte os_misc-. # Unknown /* * And here are the strings themselves. 0x80 or'd into a byte indicates * the end of the string. (not so great for Russians but...) ==== //depot/projects/smpng/sys/coda/coda_fbsd.c#12 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.39 2005/01/05 23:35:00 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.40 2005/01/13 12:25:18 phk Exp $"); #include #include @@ -140,9 +140,9 @@ return (error); } if (vp->v_type == VREG) { - error = vfs_object_create(vp, p, cred); + error = VOP_CREATEVOBJECT(vp, cred, p); if (error != 0) { - printf("coda_getpage: vfs_object_create() returns %d\n", error); + printf("coda_getpage: VOP_CREATEVOBJECT() returns %d\n", error); vput(vp); return(error); } ==== //depot/projects/smpng/sys/coda/coda_venus.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_venus.c,v 1.22 2005/01/05 23:35:00 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_venus.c,v 1.23 2005/01/11 07:36:18 phk Exp $"); #include #include @@ -395,14 +395,13 @@ } int -venus_fsync(void *mdp, CodaFid *fid, - struct ucred *cred, struct proc *p) +venus_fsync(void *mdp, CodaFid *fid, struct proc *p) { DECL_NO_OUT(coda_fsync); /* sets Isize & Osize */ ALLOC_NO_OUT(coda_fsync); /* sets inp & outp */ /* send the open to venus. */ - INIT_IN(&inp->ih, CODA_FSYNC, cred, p); + INIT_IN(&inp->ih, CODA_FSYNC, NOCRED, p); /* XXX: should be cached mount cred */ inp->Fid = *fid; error = coda_call(mdp, Isize, &Osize, (char *)inp); ==== //depot/projects/smpng/sys/coda/coda_venus.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_venus.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_venus.h,v 1.7 2005/01/05 23:35:00 imp Exp $ + * $FreeBSD: src/sys/coda/coda_venus.h,v 1.8 2005/01/11 07:36:18 phk Exp $ * */ @@ -75,8 +75,7 @@ /*out*/ char **str, int *len); int -venus_fsync(void *mdp, CodaFid *fid, - struct ucred *cred, struct proc *p); +venus_fsync(void *mdp, CodaFid *fid, struct proc *p); int venus_lookup(void *mdp, CodaFid *fid, ==== //depot/projects/smpng/sys/coda/coda_vfsops.c#21 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.56 2005/01/05 23:35:00 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vfsops.c,v 1.57 2005/01/11 07:36:18 phk Exp $"); #include #include @@ -419,10 +419,9 @@ * Flush any pending I/O. */ int -coda_sync(vfsp, waitfor, cred, td) +coda_sync(vfsp, waitfor, td) struct mount *vfsp; int waitfor; - struct ucred *cred; struct thread *td; { ENTRY; ==== //depot/projects/smpng/sys/coda/coda_vnops.c#19 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.56 2005/01/05 23:35:00 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.58 2005/01/13 12:25:18 phk Exp $"); #include #include @@ -267,9 +267,9 @@ } /* grab (above) does this when it calls newvnode unless it's in the cache*/ if (vp->v_type == VREG) { - error = vfs_object_create(vp, td, cred); + error = VOP_CREATEVOBJECT(vp, cred, td); if (error != 0) { - printf("coda_open: vfs_object_create() returns %d\n", error); + printf("coda_open: VOP_CREATEVOBJECT() returns %d\n", error); vput(vp); } } @@ -432,9 +432,9 @@ return (error); } if (vp->v_type == VREG) { - error = vfs_object_create(vp, td, cred); + error = VOP_CREATEVOBJECT(vp, cred, td); if (error != 0) { - printf("coda_rdwr: vfs_object_create() returns %d\n", error); + printf("coda_rdwr: VOP_CREATEVOBJECT() returns %d\n", error); vput(vp); } } @@ -763,7 +763,6 @@ /* true args */ struct vnode *vp = ap->a_vp; struct cnode *cp = VTOC(vp); - struct ucred *cred = ap->a_cred; struct thread *td = ap->a_td; /* locals */ struct vnode *convp = cp->c_ovp; @@ -787,7 +786,7 @@ } if (convp) - VOP_FSYNC(convp, cred, MNT_WAIT, td); + VOP_FSYNC(convp, MNT_WAIT, td); /* * We see fsyncs with usecount == 1 then usecount == 0. @@ -815,7 +814,7 @@ /* needs research */ return 0; - error = venus_fsync(vtomi(vp), &cp->c_fid, cred, td->td_proc); + error = venus_fsync(vtomi(vp), &cp->c_fid, td->td_proc); CODADEBUG(CODA_FSYNC, myprintf(("in fsync result %d\n",error)); ); return(error); @@ -1564,9 +1563,9 @@ return (error); } if (vp->v_type == VREG) { - error = vfs_object_create(vp, td, cred); + error = VOP_CREATEVOBJECT(vp, cred, td); if (error != 0) { - printf("coda_readdir: vfs_object_create() returns %d\n", error); + printf("coda_readdir: VOP_CREATEVOBJECT() returns %d\n", error); vput(vp); } } ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#43 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.87 2005/01/05 22:34:35 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.88 2005/01/14 04:44:56 obrien Exp $"); #include #include @@ -92,10 +92,10 @@ #endif /* __i386__ || __amd64__ */ #include "opt_compat.h" -#if !COMPAT_LINUX32 /* XXX */ +#ifdef COMPAT_LINUX32 /* XXX */ +#include +#else #include -#else -#include #endif #include #include ==== //depot/projects/smpng/sys/compat/linux/linux_file.c#25 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.89 2004/12/03 18:14:22 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.90 2005/01/14 04:44:56 obrien Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -56,12 +56,12 @@ #include "opt_compat.h" -#if !COMPAT_LINUX32 +#ifdef COMPAT_LINUX32 +#include +#include +#else #include #include -#else -#include -#include #endif #include @@ -833,7 +833,7 @@ l_off_t l_len; l_pid_t l_pid; } -#if __amd64__ && COMPAT_LINUX32 +#if defined(__amd64__) && defined(COMPAT_LINUX32) __packed #endif ; @@ -881,7 +881,7 @@ linux_flock->l_pid = (l_pid_t)bsd_flock->l_pid; } -#if defined(__i386__) || (defined(__amd64__) && COMPAT_LINUX32) +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) struct l_flock64 { l_short l_type; l_short l_whence; @@ -889,7 +889,7 @@ l_loff_t l_len; l_pid_t l_pid; } -#if __amd64__ && COMPAT_LINUX32 +#if defined(__amd64__) && defined(COMPAT_LINUX32) __packed #endif ; @@ -1064,7 +1064,7 @@ return (fcntl_common(td, &args64)); } -#if defined(__i386__) || (defined(__amd64__) && COMPAT_LINUX32) +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) int linux_fcntl64(struct thread *td, struct linux_fcntl64_args *args) { ==== //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#15 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.15 2004/08/16 07:28:16 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.16 2005/01/14 04:44:56 obrien Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -61,12 +61,12 @@ #include "opt_compat.h" -#if !COMPAT_LINUX32 +#ifdef COMPAT_LINUX32 +#include +#include +#else #include #include -#else -#include -#include #endif #include ==== //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#36 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.122 2005/01/05 22:34:35 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.123 2005/01/14 04:44:56 obrien Exp $"); #include #include @@ -58,12 +58,12 @@ #include "opt_compat.h" -#if !COMPAT_LINUX32 +#ifdef COMPAT_LINUX32 +#include +#include +#else #include #include -#else -#include -#include #endif #include @@ -2088,7 +2088,7 @@ static int linux_ifconf(struct thread *td, struct ifconf *uifc) { -#if COMPAT_LINUX32 +#ifdef COMPAT_LINUX32 struct l_ifconf ifc; #else struct ifconf ifc; ==== //depot/projects/smpng/sys/compat/linux/linux_ipc.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.39 2004/08/16 07:28:16 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.40 2005/01/14 04:44:56 obrien Exp $"); #include #include @@ -41,14 +41,14 @@ #include "opt_compat.h" -#if !COMPAT_LINUX32 +#ifdef COMPAT_LINUX32 +#include +#include +#include +#else #include #include #include -#else -#include -#include -#include #endif #include #include @@ -154,7 +154,7 @@ l_pid_t msg_lspid; /* pid of last msgsnd */ l_pid_t msg_lrpid; /* last receive pid */ } -#if __amd64__ && COMPAT_LINUX32 +#if defined(__amd64__) && defined(COMPAT_LINUX32) __packed #endif ; @@ -169,7 +169,7 @@ l_uintptr_t undo; l_ushort sem_nsems; } -#if __amd64__ && COMPAT_LINUX32 +#if defined(__amd64__) && defined(COMPAT_LINUX32) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 15 20:35:30 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEB7A16A4D0; Sat, 15 Jan 2005 20:35: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 8366316A4CE for ; Sat, 15 Jan 2005 20:35:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F181F43D46 for ; Sat, 15 Jan 2005 20:35:28 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0FKZSvk091760 for ; Sat, 15 Jan 2005 20:35:29 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0FKZRVb091757 for perforce@freebsd.org; Sat, 15 Jan 2005 20:35:27 GMT (envelope-from peter@freebsd.org) Date: Sat, 15 Jan 2005 20:35:27 GMT Message-Id: <200501152035.j0FKZRVb091757@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 69080 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Jan 2005 20:35:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=69080 Change 69080 by peter@peter_overcee on 2005/01/15 20:34:26 IFC @69079 Affected files ... .. //depot/projects/hammer/UPDATING#71 integrate .. //depot/projects/hammer/bin/cat/cat.1#5 integrate .. //depot/projects/hammer/bin/chio/chio.1#6 integrate .. //depot/projects/hammer/bin/expr/expr.1#7 integrate .. //depot/projects/hammer/bin/ls/ls.1#16 integrate .. //depot/projects/hammer/bin/pax/ar_subs.c#5 integrate .. //depot/projects/hammer/bin/pax/extern.h#4 integrate .. //depot/projects/hammer/bin/pax/ftree.c#5 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc.tmac#9 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#29 integrate .. //depot/projects/hammer/etc/periodic/daily/460.status-mail-rejects#5 integrate .. //depot/projects/hammer/etc/periodic/security/100.chksetuid#5 integrate .. //depot/projects/hammer/etc/rc.d/cleartmp#10 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kgdb.1#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#6 integrate .. //depot/projects/hammer/include/Makefile#36 integrate .. //depot/projects/hammer/lib/csu/i386/Makefile#2 delete .. //depot/projects/hammer/lib/csu/i386/c++rt0.c#2 delete .. //depot/projects/hammer/lib/csu/i386/crt0.c#2 delete .. //depot/projects/hammer/lib/libarchive/archive_read.3#12 integrate .. //depot/projects/hammer/lib/libarchive/libarchive.3#6 integrate .. //depot/projects/hammer/lib/libbluetooth/bluetooth.3#4 integrate .. //depot/projects/hammer/lib/libc/Makefile#20 integrate .. //depot/projects/hammer/lib/libc/alpha/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/alpha/stdlib/gdtoa.mk#2 delete .. //depot/projects/hammer/lib/libc/amd64/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libc/arm/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/arm/stdlib/gdtoa.mk#2 delete .. //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libc/gen/getnetgrent.c#5 integrate .. //depot/projects/hammer/lib/libc/gen/vis.3#7 integrate .. //depot/projects/hammer/lib/libc/i386/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libc/i386/stdlib/gdtoa.mk#2 delete .. //depot/projects/hammer/lib/libc/ia64/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/ia64/stdlib/gdtoa.mk#2 delete .. //depot/projects/hammer/lib/libc/locale/mbsrtowcs.3#5 integrate .. //depot/projects/hammer/lib/libc/locale/nextwctype.3#2 integrate .. //depot/projects/hammer/lib/libc/locale/rpmatch.3#2 integrate .. //depot/projects/hammer/lib/libc/net/addr2ascii.3#7 integrate .. //depot/projects/hammer/lib/libc/net/getprotoent.3#3 integrate .. //depot/projects/hammer/lib/libc/posix1e/acl_valid.3#4 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac.conf.5#5 integrate .. //depot/projects/hammer/lib/libc/powerpc/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libc/powerpc/stdlib/gdtoa.mk#3 delete .. //depot/projects/hammer/lib/libc/sparc64/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/stdlib/gdtoa.mk#2 delete .. //depot/projects/hammer/lib/libc/stdio/setbuf.3#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/getopt_long.3#6 integrate .. //depot/projects/hammer/lib/libc/stdlib/merge.c#2 integrate .. //depot/projects/hammer/lib/libc/stdtime/strftime.3#7 integrate .. //depot/projects/hammer/lib/libc/sys/intro.2#8 integrate .. //depot/projects/hammer/lib/libc/sys/kse.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/mlock.2#8 integrate .. //depot/projects/hammer/lib/libc/sys/pathconf.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/recv.2#8 integrate .. //depot/projects/hammer/lib/libc/sys/semctl.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/semop.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/sendfile.2#11 integrate .. //depot/projects/hammer/lib/libc/sys/stat.2#9 integrate .. //depot/projects/hammer/lib/libutil/fparseln.3#3 integrate .. //depot/projects/hammer/lib/msun/Makefile#19 integrate .. //depot/projects/hammer/lib/msun/alpha/fenv.h#2 integrate .. //depot/projects/hammer/lib/msun/amd64/e_sqrt.S#1 branch .. //depot/projects/hammer/lib/msun/amd64/fenv.h#2 integrate .. //depot/projects/hammer/lib/msun/amd64/s_llrint.S#1 branch .. //depot/projects/hammer/lib/msun/amd64/s_lrint.S#1 branch .. //depot/projects/hammer/lib/msun/arm/fenv.h#3 integrate .. //depot/projects/hammer/lib/msun/i387/e_atan2f.S#1 branch .. //depot/projects/hammer/lib/msun/i387/e_log10f.S#1 branch .. //depot/projects/hammer/lib/msun/i387/e_logf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/e_remainderf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/e_scalbf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/e_sqrtf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/fenv.h#2 integrate .. //depot/projects/hammer/lib/msun/i387/s_ceilf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_copysignf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_cosf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_floorf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_llrint.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_log1p.S#2 delete .. //depot/projects/hammer/lib/msun/i387/s_logbf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_lrint.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_rintf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_scalbnf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_significandf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_sinf.S#1 branch .. //depot/projects/hammer/lib/msun/i387/s_tanf.S#1 branch .. //depot/projects/hammer/lib/msun/ia64/fenv.h#2 integrate .. //depot/projects/hammer/lib/msun/man/acos.3#2 integrate .. //depot/projects/hammer/lib/msun/man/acosh.3#2 integrate .. //depot/projects/hammer/lib/msun/man/asin.3#3 integrate .. //depot/projects/hammer/lib/msun/man/atan2.3#3 integrate .. //depot/projects/hammer/lib/msun/man/atanh.3#3 integrate .. //depot/projects/hammer/lib/msun/man/ceil.3#3 integrate .. //depot/projects/hammer/lib/msun/man/cimag.3#2 integrate .. //depot/projects/hammer/lib/msun/man/cosh.3#2 integrate .. //depot/projects/hammer/lib/msun/man/exp.3#3 integrate .. //depot/projects/hammer/lib/msun/man/feclearexcept.3#2 integrate .. //depot/projects/hammer/lib/msun/man/fegetround.3#2 integrate .. //depot/projects/hammer/lib/msun/man/fenv.3#2 integrate .. //depot/projects/hammer/lib/msun/man/floor.3#3 integrate .. //depot/projects/hammer/lib/msun/man/fmax.3#2 integrate .. //depot/projects/hammer/lib/msun/man/hypot.3#5 integrate .. //depot/projects/hammer/lib/msun/man/j0.3#2 integrate .. //depot/projects/hammer/lib/msun/man/lgamma.3#3 integrate .. //depot/projects/hammer/lib/msun/man/lrint.3#1 branch .. //depot/projects/hammer/lib/msun/man/lround.3#1 branch .. //depot/projects/hammer/lib/msun/man/math.3#5 integrate .. //depot/projects/hammer/lib/msun/man/rint.3#3 integrate .. //depot/projects/hammer/lib/msun/man/round.3#3 integrate .. //depot/projects/hammer/lib/msun/man/sinh.3#3 integrate .. //depot/projects/hammer/lib/msun/man/sqrt.3#2 integrate .. //depot/projects/hammer/lib/msun/powerpc/fenv.h#2 integrate .. //depot/projects/hammer/lib/msun/sparc64/fenv.h#2 integrate .. //depot/projects/hammer/lib/msun/src/math.h#24 integrate .. //depot/projects/hammer/lib/msun/src/s_ceill.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_floorl.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_llrint.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_llrintf.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_llround.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_llroundf.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_lrint.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_lrintf.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_lround.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_lroundf.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_round.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_roundf.c#3 integrate .. //depot/projects/hammer/libexec/rtld-aout/Makefile#3 delete .. //depot/projects/hammer/libexec/rtld-aout/dynamic.h#3 delete .. //depot/projects/hammer/libexec/rtld-aout/i386/md-static-funcs.c#2 delete .. //depot/projects/hammer/libexec/rtld-aout/i386/md.c#2 delete .. //depot/projects/hammer/libexec/rtld-aout/i386/md.h#2 delete .. //depot/projects/hammer/libexec/rtld-aout/i386/mdprologue.S#2 delete .. //depot/projects/hammer/libexec/rtld-aout/md-prologue.c#2 delete .. //depot/projects/hammer/libexec/rtld-aout/rtld.1aout#4 delete .. //depot/projects/hammer/libexec/rtld-aout/rtld.c#3 delete .. //depot/projects/hammer/release/Makefile#67 integrate .. //depot/projects/hammer/sbin/ccdconfig/ccdconfig.8#8 integrate .. //depot/projects/hammer/sbin/geom/class/Makefile#5 integrate .. //depot/projects/hammer/sbin/geom/class/concat/gconcat.8#8 integrate .. //depot/projects/hammer/sbin/geom/class/concat/geom_concat.c#6 integrate .. //depot/projects/hammer/sbin/geom/class/label/geom_label.c#4 integrate .. //depot/projects/hammer/sbin/geom/class/label/glabel.8#7 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/geom_mirror.c#5 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/gmirror.8#5 integrate .. //depot/projects/hammer/sbin/geom/class/nop/geom_nop.c#4 integrate .. //depot/projects/hammer/sbin/geom/class/nop/gnop.8#8 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#8 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/graid3.8#6 integrate .. //depot/projects/hammer/sbin/geom/class/shsec/Makefile#1 branch .. //depot/projects/hammer/sbin/geom/class/shsec/geom_shsec.c#1 branch .. //depot/projects/hammer/sbin/geom/class/shsec/gshsec.8#1 branch .. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#9 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#11 integrate .. //depot/projects/hammer/sbin/geom/core/geom.8#8 integrate .. //depot/projects/hammer/sbin/init/Makefile#6 integrate .. //depot/projects/hammer/sbin/init/init.c#8 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#35 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#36 integrate .. //depot/projects/hammer/sbin/ldconfig/Makefile#3 integrate .. //depot/projects/hammer/sbin/ldconfig/ldconfig.c#7 integrate .. //depot/projects/hammer/sbin/natd/natd.8#7 integrate .. //depot/projects/hammer/share/examples/Makefile#10 integrate .. //depot/projects/hammer/share/examples/mdoc/example.1#2 integrate .. //depot/projects/hammer/share/examples/mdoc/example.3#6 integrate .. //depot/projects/hammer/share/examples/mdoc/example.4#3 integrate .. //depot/projects/hammer/share/examples/mdoc/example.9#1 branch .. //depot/projects/hammer/share/man/man3/tgmath.3#2 integrate .. //depot/projects/hammer/share/man/man4/altq.4#6 integrate .. //depot/projects/hammer/share/man/man4/ath.4#22 integrate .. //depot/projects/hammer/share/man/man4/ath_hal.4#10 integrate .. //depot/projects/hammer/share/man/man4/axe.4#8 integrate .. //depot/projects/hammer/share/man/man4/bktr.4#7 integrate .. //depot/projects/hammer/share/man/man4/ciss.4#8 integrate .. //depot/projects/hammer/share/man/man4/cm.4#4 integrate .. //depot/projects/hammer/share/man/man4/cnw.4#2 integrate .. //depot/projects/hammer/share/man/man4/dc.4#15 integrate .. //depot/projects/hammer/share/man/man4/divert.4#8 integrate .. //depot/projects/hammer/share/man/man4/hptmv.4#2 integrate .. //depot/projects/hammer/share/man/man4/ida.4#4 integrate .. //depot/projects/hammer/share/man/man4/inet.4#13 integrate .. //depot/projects/hammer/share/man/man4/ipsec.4#2 integrate .. //depot/projects/hammer/share/man/man4/mac_biba.4#6 integrate .. //depot/projects/hammer/share/man/man4/mac_mls.4#8 integrate .. //depot/projects/hammer/share/man/man4/mac_portacl.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_panasonic.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/pbio.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.sparc64/auxio.4#3 integrate .. //depot/projects/hammer/share/man/man4/mem.4#7 integrate .. //depot/projects/hammer/share/man/man4/mpt.4#6 integrate .. //depot/projects/hammer/share/man/man4/netgraph.4#9 integrate .. //depot/projects/hammer/share/man/man4/ng_device.4#4 integrate .. //depot/projects/hammer/share/man/man4/ng_netflow.4#3 integrate .. //depot/projects/hammer/share/man/man4/ngatmbase.4#3 integrate .. //depot/projects/hammer/share/man/man4/psm.4#7 integrate .. //depot/projects/hammer/share/man/man4/tdfx.4#3 integrate .. //depot/projects/hammer/share/man/man4/uplcom.4#8 integrate .. //depot/projects/hammer/share/man/man4/vge.4#4 integrate .. //depot/projects/hammer/share/man/man4/vkbd.4#2 integrate .. //depot/projects/hammer/share/man/man4/wlan.4#7 integrate .. //depot/projects/hammer/share/man/man4/wlan_acl.4#3 integrate .. //depot/projects/hammer/share/man/man4/wlan_ccmp.4#3 integrate .. //depot/projects/hammer/share/man/man4/wlan_tkip.4#3 integrate .. //depot/projects/hammer/share/man/man4/wlan_wep.4#2 integrate .. //depot/projects/hammer/share/man/man4/wlan_xauth.4#3 integrate .. //depot/projects/hammer/share/man/man4/xl.4#10 integrate .. //depot/projects/hammer/share/man/man5/ethers.5#2 integrate .. //depot/projects/hammer/share/man/man5/periodic.conf.5#10 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#47 integrate .. //depot/projects/hammer/share/man/man7/development.7#6 integrate .. //depot/projects/hammer/share/man/man7/firewall.7#9 integrate .. //depot/projects/hammer/share/man/man7/hier.7#25 integrate .. //depot/projects/hammer/share/man/man9/DECLARE_GEOM_CLASS.9#4 integrate .. //depot/projects/hammer/share/man/man9/DECLARE_MODULE.9#4 integrate .. //depot/projects/hammer/share/man/man9/MODULE_DEPEND.9#3 integrate .. //depot/projects/hammer/share/man/man9/VFS_START.9#6 integrate .. //depot/projects/hammer/share/man/man9/VFS_STATFS.9#6 integrate .. //depot/projects/hammer/share/man/man9/VFS_SYNC.9#6 integrate .. //depot/projects/hammer/share/man/man9/VFS_VGET.9#7 integrate .. //depot/projects/hammer/share/man/man9/bpf.9#3 integrate .. //depot/projects/hammer/share/man/man9/devclass_get_count.9#2 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#17 integrate .. //depot/projects/hammer/share/man/man9/mbuf_tags.9#5 integrate .. //depot/projects/hammer/share/man/man9/microtime.9#3 integrate .. //depot/projects/hammer/share/man/man9/microuptime.9#3 integrate .. //depot/projects/hammer/share/man/man9/module.9#3 integrate .. //depot/projects/hammer/share/man/man9/pfil.9#10 integrate .. //depot/projects/hammer/share/man/man9/physio.9#5 integrate .. //depot/projects/hammer/share/man/man9/printf.9#3 integrate .. //depot/projects/hammer/share/man/man9/sleepqueue.9#6 integrate .. //depot/projects/hammer/share/man/man9/style.9#19 integrate .. //depot/projects/hammer/share/man/man9/suser.9#8 integrate .. //depot/projects/hammer/share/man/man9/sx.9#9 integrate .. //depot/projects/hammer/share/man/man9/taskqueue.9#8 integrate .. //depot/projects/hammer/share/man/man9/time.9#6 integrate .. //depot/projects/hammer/share/man/man9/vflush.9#3 integrate .. //depot/projects/hammer/share/man/man9/vfs_suser.9#2 integrate .. //depot/projects/hammer/share/man/man9/vm_map.9#6 integrate .. //depot/projects/hammer/share/man/man9/vm_map_entry_resize_free.9#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#16 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#20 integrate .. //depot/projects/hammer/sys/alpha/include/bus.h#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#63 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#45 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#9 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#6 integrate .. //depot/projects/hammer/sys/arm/include/bus.h#6 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_timer.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/i80321/iq80321.c#3 integrate .. //depot/projects/hammer/sys/coda/coda_fbsd.c#15 integrate .. //depot/projects/hammer/sys/coda/coda_venus.c#9 integrate .. //depot/projects/hammer/sys/coda/coda_venus.h#5 integrate .. //depot/projects/hammer/sys/coda/coda_vfsops.c#15 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.c#12 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#26 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#13 integrate .. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#8 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#20 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ipc.c#9 integrate .. //depot/projects/hammer/sys/compat/linux/linux_mib.c#6 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#23 integrate .. //depot/projects/hammer/sys/compat/linux/linux_signal.c#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#15 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#15 integrate .. //depot/projects/hammer/sys/compat/linux/linux_sysctl.c#8 integrate .. //depot/projects/hammer/sys/compat/linux/linux_uid16.c#9 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#22 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#12 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#21 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#21 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#12 integrate .. //depot/projects/hammer/sys/conf/NOTES#77 integrate .. //depot/projects/hammer/sys/conf/files#100 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#14 integrate .. //depot/projects/hammer/sys/conf/options#64 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsutils.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsinit.c#9 integrate .. //depot/projects/hammer/sys/dev/aha/aha.c#12 integrate .. //depot/projects/hammer/sys/dev/aha/aha_isa.c#11 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#15 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#14 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.h#5 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbusreg.h#4 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbusvar.h#5 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#12 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_pccard.c#7 integrate .. //depot/projects/hammer/sys/dev/fdc/fdcvar.h#8 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_pccard.c#7 integrate .. //depot/projects/hammer/sys/dev/mse/mse.c#3 integrate .. //depot/projects/hammer/sys/dev/mse/mse_cbus.c#3 integrate .. //depot/projects/hammer/sys/dev/mse/mse_isa.c#3 integrate .. //depot/projects/hammer/sys/dev/mse/msevar.h#3 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#32 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbdevid.h#10 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbreg.h#5 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbvar.h#8 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#13 integrate .. //depot/projects/hammer/sys/dev/puc/puc_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/puc/pucvar.h#10 integrate .. //depot/projects/hammer/sys/dev/usb/ehcivar.h#5 integrate .. //depot/projects/hammer/sys/dev/usb/ohcivar.h#7 integrate .. //depot/projects/hammer/sys/dev/usb/uhcivar.h#7 integrate .. //depot/projects/hammer/sys/fs/deadfs/dead_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#13 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#24 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#13 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#28 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#15 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#14 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#28 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#20 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#20 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#14 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#14 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#12 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs.h#5 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_io.c#12 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_node.c#9 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vnops.c#12 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#15 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs.h#7 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_io.c#14 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#14 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#19 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#20 integrate .. //depot/projects/hammer/sys/fs/umapfs/umap_vnops.c#9 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#15 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#20 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#29 integrate .. //depot/projects/hammer/sys/geom/geom_vfs.c#3 integrate .. //depot/projects/hammer/sys/geom/shsec/g_shsec.c#1 branch .. //depot/projects/hammer/sys/geom/shsec/g_shsec.h#1 branch .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#25 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#21 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC.hints#7 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/mptable.c#16 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#39 integrate .. //depot/projects/hammer/sys/ia64/ia64/busdma_machdep.c#15 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#26 integrate .. //depot/projects/hammer/sys/ia64/include/bus.h#13 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vnops.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#17 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#49 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#46 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#31 integrate .. //depot/projects/hammer/sys/kern/vfs_init.c#15 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#10 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#47 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#68 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#38 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#27 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#13 integrate .. //depot/projects/hammer/sys/modules/geom/Makefile#10 integrate .. //depot/projects/hammer/sys/modules/geom/geom_shsec/Makefile#1 branch .. //depot/projects/hammer/sys/net/bridge.c#21 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#36 integrate .. //depot/projects/hammer/sys/net/if_stf.c#17 integrate .. //depot/projects/hammer/sys/net/net_osdep.h#8 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#11 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#13 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#15 integrate .. //depot/projects/hammer/sys/netgraph/ng_l2tp.c#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_lmi.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_ppp.c#13 integrate .. //depot/projects/hammer/sys/netgraph/ng_pptpgre.c#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_tty.c#11 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#19 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#48 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#9 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#28 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#14 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#15 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#30 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_diskless.c#9 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#35 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#34 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#20 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#15 integrate .. //depot/projects/hammer/sys/powerpc/include/bus.h#9 integrate .. //depot/projects/hammer/sys/powerpc/powermac/uninorth.c#10 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#13 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#22 integrate .. //depot/projects/hammer/sys/sparc64/conf/NOTES#12 integrate .. //depot/projects/hammer/sys/sparc64/include/bus.h#16 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/bus_machdep.c#19 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/iommu.c#19 integrate .. //depot/projects/hammer/sys/sys/buf.h#21 integrate .. //depot/projects/hammer/sys/sys/bufobj.h#3 integrate .. //depot/projects/hammer/sys/sys/linker_set.h#6 integrate .. //depot/projects/hammer/sys/sys/mount.h#29 integrate .. //depot/projects/hammer/sys/sys/umtx.h#7 integrate .. //depot/projects/hammer/sys/sys/vnode.h#42 integrate .. //depot/projects/hammer/sys/tools/vnode_if.awk#10 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_balloc.c#9 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_inode.c#11 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#12 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#30 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#20 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#41 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#14 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#10 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#28 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#36 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#48 integrate .. //depot/projects/hammer/tools/regression/geom_raid3/test-1.sh#2 integrate .. //depot/projects/hammer/tools/regression/geom_shsec/Makefile#1 branch .. //depot/projects/hammer/tools/regression/geom_shsec/runtests.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_shsec/test-1.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_shsec/test-2.sh#1 branch .. //depot/projects/hammer/tools/regression/lib/msun/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-lrint.c#1 branch .. //depot/projects/hammer/tools/regression/lib/msun/test-lrint.t#1 branch .. //depot/projects/hammer/tools/regression/lib/msun/test-lround.c#1 branch .. //depot/projects/hammer/tools/regression/lib/msun/test-lround.t#1 branch .. //depot/projects/hammer/tools/regression/sockets/reconnect/Makefile#1 branch .. //depot/projects/hammer/tools/regression/sockets/reconnect/reconnect.c#1 branch .. //depot/projects/hammer/usr.bin/c99/c99.c#2 integrate .. //depot/projects/hammer/usr.bin/column/column.1#4 integrate .. //depot/projects/hammer/usr.bin/find/find.1#14 integrate .. //depot/projects/hammer/usr.bin/fstat/fstat.c#12 integrate .. //depot/projects/hammer/usr.bin/getopt/getopt.1#5 integrate .. //depot/projects/hammer/usr.bin/hexdump/od.1#5 integrate .. //depot/projects/hammer/usr.bin/locate/locate/locate.1#5 integrate .. //depot/projects/hammer/usr.bin/make/make.1#16 integrate .. //depot/projects/hammer/usr.bin/ncal/ncal.1#5 integrate .. //depot/projects/hammer/usr.bin/nl/nl.1#4 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpcgen.1#4 integrate .. //depot/projects/hammer/usr.bin/sed/sed.1#9 integrate .. //depot/projects/hammer/usr.bin/sockstat/sockstat.1#4 integrate .. //depot/projects/hammer/usr.bin/tail/forward.c#6 integrate .. //depot/projects/hammer/usr.bin/tr/tr.1#9 integrate .. //depot/projects/hammer/usr.bin/wc/wc.1#5 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/parser.y#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/l2ping/l2ping.8#8 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#7 integrate .. //depot/projects/hammer/usr.sbin/diskinfo/diskinfo.8#6 integrate .. //depot/projects/hammer/usr.sbin/diskinfo/diskinfo.c#6 integrate .. //depot/projects/hammer/usr.sbin/eeprom/eeprom.8#3 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#11 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#15 integrate .. //depot/projects/hammer/usr.sbin/lptcontrol/lptcontrol.8#5 integrate .. //depot/projects/hammer/usr.sbin/moused/moused.8#10 integrate .. //depot/projects/hammer/usr.sbin/mrouted/mrinfo.8#3 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/ndiscvt.8#5 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/main.c#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/pkg_version.1#6 integrate .. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#15 integrate .. //depot/projects/hammer/usr.sbin/rtprio/rtprio.1#3 integrate .. //depot/projects/hammer/usr.sbin/setkey/setkey.8#8 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/install.c#23 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.8#10 integrate .. //depot/projects/hammer/usr.sbin/vidcontrol/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/vidcontrol/decode.c#2 integrate .. //depot/projects/hammer/usr.sbin/vidcontrol/vidcontrol.c#4 integrate .. //depot/projects/hammer/usr.sbin/zic/zic.8#4 integrate Differences ... ==== //depot/projects/hammer/UPDATING#71 (text+ko) ==== @@ -23,6 +23,15 @@ developers choose to disable these features on build machines to maximize performance. + +20050114: + Support for abbreviated forms of a number of ipfw options is + now deprecated. Warnings are printed to stderr indicating the + correct full form when a match occurs. Some abbreviations may + be supported at a later date based on user feedback. To be + considered for support, abbreviations must be in use prior to + this commit and unlikely to be confused with current key words. + 20041221: By a popular demand, a lot of NOFOO options were renamed to NO_FOO (see bsd.compat.mk for a full list). The old @@ -2000,4 +2009,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.385 2004/12/23 16:03:08 ru Exp $ +$FreeBSD: src/UPDATING,v 1.386 2005/01/15 01:53:49 brooks Exp $ ==== //depot/projects/hammer/bin/cat/cat.1#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cat.1 8.3 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/cat/cat.1,v 1.23 2005/01/10 08:39:20 imp Exp $ +.\" $FreeBSD: src/bin/cat/cat.1,v 1.24 2005/01/15 12:27:59 ru Exp $ .\" .Dd March 21, 2004 .Dt CAT 1 @@ -107,18 +107,16 @@ .Ex -std .Sh EXAMPLES The command: -.Bd -literal -offset indent -.Ic cat file1 -.Ed +.Pp +.Dl "cat file1" .Pp will print the contents of .Ar file1 to the standard output. .Pp The command: -.Bd -literal -offset indent -.Ic cat file1 file2 > file3 -.Ed +.Pp +.Dl "cat file1 file2 > file3" .Pp will sequentially print the contents of .Ar file1 @@ -134,9 +132,8 @@ for more information on redirection. .Pp The command: -.Bd -literal -offset indent -.Ic cat file1 - file2 - file3 -.Ed +.Pp +.Dl "cat file1 - file2 - file3" .Pp will print the contents of .Ar file1 , ==== //depot/projects/hammer/bin/chio/chio.1#6 (text+ko) ==== @@ -1,5 +1,4 @@ .\" $NetBSD: chio.1,v 1.4 1997/10/02 00:41:25 hubertf Exp $ - .\"- .\" Copyright (c) 1996 Jason R. Thorpe .\" All rights reserved. @@ -31,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/chio/chio.1,v 1.25 2005/01/10 08:39:20 imp Exp $ +.\" $FreeBSD: src/bin/chio/chio.1,v 1.26 2005/01/13 08:46:19 ru Exp $ .\" .Dd May 14, 1998 .Dt CHIO 1 ==== //depot/projects/hammer/bin/expr/expr.1#7 (text+ko) ==== @@ -1,5 +1,4 @@ .\" -*- nroff -*- - .\"- .\" Copyright (c) 1993 Winning Strategies, Inc. .\" All rights reserved. @@ -29,7 +28,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/bin/expr/expr.1,v 1.26 2005/01/10 08:39:22 imp Exp $ +.\" $FreeBSD: src/bin/expr/expr.1,v 1.27 2005/01/13 08:46:19 ru Exp $ .\" .Dd July 12, 2004 .Dt EXPR 1 ==== //depot/projects/hammer/bin/ls/ls.1#16 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.83 2005/01/10 08:39:23 imp Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.84 2005/01/11 08:51:21 joerg Exp $ .\" -.Dd May 2, 2004 +.Dd January 11, 2005 .Dt LS 1 .Os .Sh NAME @@ -196,7 +196,9 @@ .Dq ell . ) List in long format. (See below.) -If the output is to a terminal, a total sum for all the file +A total sum (in blocks, see the +.Fl s +option for the block size unit) for all the file sizes is output on a line before the long listing. .It Fl m Stream output format; list files across the page, separated by commas. @@ -224,7 +226,7 @@ .It Fl s Display the number of file system blocks actually used by each file, in units of 512 bytes, where partial units are rounded up to the next integer value. -If the output is to a terminal, a total sum for all the file +A total sum for all the file sizes is output on a line before the listing. The environment variable .Ev BLOCKSIZE ==== //depot/projects/hammer/bin/pax/ar_subs.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ar_subs.c,v 1.23 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_subs.c,v 1.24 2005/01/12 03:25:55 brian Exp $"); #include #include @@ -400,8 +400,10 @@ /* * check if this file meets user specified options match. */ - if (sel_chk(arcn) != 0) + if (sel_chk(arcn) != 0) { + ftree_notsel(); continue; + } fd = -1; if (uflag) { /* @@ -785,8 +787,10 @@ /* * check if this file meets user specified options */ - if (sel_chk(arcn) != 0) + if (sel_chk(arcn) != 0) { + ftree_notsel(); continue; + } /* * if there is already a file in the destination directory with ==== //depot/projects/hammer/bin/pax/extern.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/18/94 - * $FreeBSD: src/bin/pax/extern.h,v 1.15 2004/04/06 20:06:48 markm Exp $ + * $FreeBSD: src/bin/pax/extern.h,v 1.16 2005/01/12 03:25:55 brian Exp $ */ /* @@ -155,6 +155,7 @@ int ftree_start(void); int ftree_add(char *, int); void ftree_sel(ARCHD *); +void ftree_notsel(void); void ftree_chk(void); int next_file(ARCHD *); ==== //depot/projects/hammer/bin/pax/ftree.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ftree.c,v 1.23 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ftree.c,v 1.24 2005/01/12 03:25:55 brian Exp $"); #include #include @@ -214,6 +214,18 @@ } /* + * ftree_notsel() + * this entry has not been selected by pax. + */ + +void +ftree_notsel() +{ + if (ftent != NULL) + (void)fts_set(ftsp, ftent, FTS_SKIP); +} + +/* * ftree_chk() * called at end on pax execution. Prints all those file args that did not * have a selected member (reference count still 0) ==== //depot/projects/hammer/contrib/groff/tmac/doc.tmac#9 (text+ko) ==== @@ -2501,7 +2501,9 @@ . nop \)\s[\n[doc-fontmode-size-stack\n[doc-fontmode-depth]]u]\c . . nr doc-fontmode-font-stack\n[doc-fontmode-depth] 0 +. nr doc-curr-font \n[.f] . nr doc-fontmode-size-stack\n[doc-fontmode-depth] 0 +. nr doc-curr-size \n[.ps] . nr doc-fontmode-depth -1 . \} . el \ ==== //depot/projects/hammer/etc/mtree/BSD.include.dist#29 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.94 2004/12/15 13:58:28 pjd Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.96 2005/01/14 14:18:18 dds Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -42,6 +42,8 @@ .. ofw .. + pbio + .. ppbus .. smbus @@ -94,6 +96,8 @@ .. raid3 .. + shsec + .. stripe .. .. ==== //depot/projects/hammer/etc/periodic/daily/460.status-mail-rejects#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.18 2005/01/11 02:08:53 brian Exp $ +# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.20 2005/01/12 01:31:21 brian Exp $ # # If there is a global system configuration file, suck it in. @@ -51,7 +51,7 @@ done cat /var/log/maillog } | - sed -n -E "s/^$start"'.*ruleset=check_[^ \t]+,[ \t]+arg1=<([^@]+@)?([^>,]+).*reject=([^ \t]*)[ \t].*[ \t]([a-zA-Z0-9_.]+)$/\2 (\3... \4)/p' | + sed -n -E "s/^$start"'.*ruleset=check_[^ ]+, +arg1=,]+).*reject=([^ ]+) .* ([^ ]+)$/\2 (\3... \4)/p' | sort -f | uniq -ic | sort -fnr | tee /dev/stderr | wc -l) [ $rc -gt 0 ] && rc=1 fi;; ==== //depot/projects/hammer/etc/periodic/security/100.chksetuid#5 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.7 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.8 2005/01/13 15:07:35 glebius Exp $ # # If there is a global system configuration file, suck it in. @@ -44,7 +44,7 @@ echo "" echo 'Checking setuid files and devices:' # XXX Note that there is the possibility of overrunning the args to ls - MP=`mount -t ufs | grep -v " nosuid" | awk '{ print $3 }' | sort` + MP=`mount -t ufs | egrep -v " no(suid|exec)" | awk '{ print $3 }' | sort` if [ -n "${MP}" ] then set ${MP} ==== //depot/projects/hammer/etc/rc.d/cleartmp#10 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: cleartmp,v 1.4 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/cleartmp,v 1.11 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.12 2005/01/12 07:18:25 anholt Exp $ # # PROVIDE: cleartmp @@ -14,6 +14,7 @@ rcvar=`set_rcvar clear_tmp` start_cmd="cleartmp_start" stop_cmd=":" +x11_socket_dirs="/tmp/.X11-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/.XIM-unix" cleartmp_start() { @@ -31,9 +32,9 @@ load_rc_config $name run_rc_command "$1" -# Remove X lock files, since they will prevent you from -# restarting X -# +# Remove X lock files, since they will prevent you from restarting X. rm -f /tmp/.X[0-9]-lock -rm -fr /tmp/.X11-unix -mkdir -m 1777 /tmp/.X11-unix + +# Create socket directories with correct permissions to avoid security problem. +rm -fr ${x11_socket_dirs} +mkdir -m 1777 ${x11_socket_dirs} ==== //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kgdb.1#3 (text+ko) ==== @@ -22,13 +22,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.4 2004/11/22 16:07:28 joerg Exp $ +.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.5 2005/01/13 10:07:51 ru Exp $ .Dd August 1, 2004 .Os .Dt KGDB 1 .Sh NAME .Nm kgdb -.Nd The kernel debugger +.Nd "kernel debugger" .Sh SYNOPSIS .Nm .Op Fl a @@ -83,8 +83,7 @@ .El .Pp The -.Fl c , -.Fl n , +.Fl c , n , and .Fl r options are mutually exclusive. @@ -101,7 +100,7 @@ will be opened to allow debugging the currenlty running kernel. .Sh FILES -.Bl -tag -width "Pa /var/crash" +.Bl -tag -width ".Pa /var/crash" .It Pa /dev/mem Default memory image to open if no core dump file has been specified. ==== //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.8 2004/11/15 13:06:01 davidxu Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.9 2005/01/11 14:53:16 peadar Exp $ */ /* FreeBSD libthread_db assisted debugging support. Copyright 1999, 2000, 2001 Free Software Foundation, Inc. @@ -602,7 +602,8 @@ return; } - lwp = GET_LWP (inferior_ptid); + /* XXX: We've replaced the pid with the lwpid for GDB's benefit. */ + lwp = GET_PID (inferior_ptid); if (ptrace (PT_GETREGS, lwp, (caddr_t) &gregs, 0) == -1) error ("Cannot get lwp %d registers: %s\n", lwp, safe_strerror (errno)); @@ -1271,7 +1272,10 @@ struct cleanup *old_chain; old_chain = save_inferior_ptid (); - inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid)); + + /* XXX: Target operation isn't lwp aware: replace pid with lwp */ + inferior_ptid = BUILD_LWP (0, lwpid); + target_fetch_registers (-1); fill_gregset (gregset, -1); do_cleanups (old_chain); ==== //depot/projects/hammer/include/Makefile#36 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.229 2004/11/17 23:48:17 ru Exp $ +# $FreeBSD: src/include/Makefile,v 1.231 2005/01/14 14:18:18 dds Exp $ # # Doing a "make install" builds /usr/include. @@ -32,13 +32,16 @@ netipsec netipx netkey netnatm netncp netsmb nfs nfsclient nfsserver \ pccard posix4 sys vm -LSUBDIRS= cam/scsi dev/an dev/bktr dev/firewire dev/ic dev/iicbus \ - dev/ofw dev/ppbus dev/smbus dev/usb dev/wi dev/utopia fs/devfs \ - fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ - fs/procfs fs/smbfs fs/udf fs/umapfs fs/unionfs \ +LSUBDIRS= cam/scsi \ + dev/an dev/bktr dev/firewire dev/ic dev/iicbus dev/ofw dev/pbio \ + dev/ppbus dev/smbus dev/usb dev/wi dev/utopia \ + fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ + fs/nwfs fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ + fs/unionfs \ geom/concat geom/gate geom/label geom/mirror geom/nop geom/raid3 \ - geom/stripe \ - isofs/cd9660 netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ + geom/shsec geom/stripe \ + isofs/cd9660 \ + netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ security/mac_biba security/mac_bsdextended security/mac_lomac \ security/mac_mls security/mac_partition \ ==== //depot/projects/hammer/lib/libarchive/archive_read.3#12 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.14 2005/01/10 05:11:15 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.16 2005/01/12 05:56:49 kientzle Exp $ .\" .Dd January 8, 2005 .Dt archive_read 3 @@ -50,7 +50,7 @@ .Nm archive_read_data_into_fd , .Nm archive_read_extract , .Nm archive_read_extract_set_progress_callback , -.Nm archive_read_close +.Nm archive_read_close , .Nm archive_read_finish .Nd functions for reading streaming archives .Sh SYNOPSIS @@ -80,9 +80,9 @@ .Ft int .Fn archive_read_open "struct archive *" "void *client_data" "archive_open_archive_callback *" "archive_read_archive_callback *" "archive_close_archive_callback *" .Ft int -.Fn archive_read_open_fd "struct archive *" "int fd" +.Fn archive_read_open_fd "struct archive *" "int fd" "size_t block_size" .Ft int -.Fn archive_read_open_file "struct archive *" "const char *filename" +.Fn archive_read_open_file "struct archive *" "const char *filename" "size_t block_size" .Ft int .Fn archive_read_next_header "struct archive *" "struct archive_entry **" .Ft ssize_t @@ -96,7 +96,7 @@ .Ft int .Fn archive_read_data_into_fd "struct archive *" "int fd" .Ft int -.Fn archive_read_extract "struct archive *" "int flags" +.Fn archive_read_extract "struct archive *" "struct archive_entry *" "int flags" .Ft void .Fn archive_read_extract_set_progress_callback "struct archive *" "void (*func)(void *)" "void *user_data" .Ft int @@ -146,7 +146,12 @@ Freeze the settings, open the archive, and prepare for reading entries. This is the most generic version of this call, which accepts three callback functions. -The library invokes these client-provided functions to obtain +Most clients will want to use +.Fn archive_read_open_file +or +.Fn archive_read_open_fd +instead. +The library invokes the client-provided functions to obtain raw bytes from the archive. Note: The API permits a decompression method to fork and invoke the callbacks from another process. @@ -159,14 +164,14 @@ .It Fn archive_read_open_fd Like .Fn archive_read_open , -except that it accepts a file descriptor rather than +except that it accepts a file descriptor and block size rather than a trio of function pointers. Note that the file descriptor will not be automatically closed at end-of-archive. .It Fn archive_read_open_file Like .Fn archive_read_open , -except that it accepts a simple filename. +except that it accepts a simple filename and a block size. A NULL filename represents standard input. .It Fn archive_read_next_header Read the header for the next entry and return a pointer to @@ -188,6 +193,9 @@ sparse files, as supported by some archive formats. The library gaurantees that offsets will increase and that blocks will not overlap. +Note that the blocks returned from this function can be much larger +than the block size read from disk, due to compression >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 15 20:38:34 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E239316A4D0; Sat, 15 Jan 2005 20:38:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB13D16A4CE for ; Sat, 15 Jan 2005 20:38:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87CB143D5E for ; Sat, 15 Jan 2005 20:38:33 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0FKcX3n091861 for ; Sat, 15 Jan 2005 20:38:33 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0FKcWGS091858 for perforce@freebsd.org; Sat, 15 Jan 2005 20:38:32 GMT (envelope-from peter@freebsd.org) Date: Sat, 15 Jan 2005 20:38:32 GMT Message-Id: <200501152038.j0FKcWGS091858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 69081 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Jan 2005 20:38:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=69081 Change 69081 by peter@peter_overcee on 2005/01/15 20:38:11 integ -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#41 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#34 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#64 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#12 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#41 (text+ko) ==== @@ -449,7 +449,7 @@ printf("lapic%u:", apic_id); } if (bootverbose) - printf(" LINT%u polarity: active-%s\n", pin, + printf(" LINT%u polarity: %s\n", pin, pol == INTR_POLARITY_HIGH ? "high" : "low"); return (0); } ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#34 (text+ko) ==== @@ -628,23 +628,38 @@ mptable_parse_io_int(int_entry_ptr intr) { void *ioapic; - u_int pin; + u_int pin, apic_id; + apic_id = intr->dst_apic_id; if (intr->dst_apic_id == 0xff) { - printf("MPTable: Ignoring global interrupt entry for pin %d\n", - intr->dst_apic_int); - return; + /* + * An APIC ID of 0xff means that the interrupt is connected + * to the specified pin on all I/O APICs in the system. If + * there is only one I/O APIC, then use that APIC to route + * the interrupts. If there is more than one I/O APIC, then + * punt. + */ + if (mptable_nioapics == 1) { + apic_id = 0; + while (ioapics[apic_id] == NULL) + apic_id++; + } else { + printf( + "MPTable: Ignoring global interrupt entry for pin %d\n", + intr->dst_apic_int); + return; + } } - if (intr->dst_apic_id >= NAPICID) { + if (apic_id >= NAPICID) { printf("MPTable: Ignoring interrupt entry for ioapic%d\n", intr->dst_apic_id); return; } - ioapic = ioapics[intr->dst_apic_id]; + ioapic = ioapics[apic_id]; if (ioapic == NULL) { printf( "MPTable: Ignoring interrupt entry for missing ioapic%d\n", - intr->dst_apic_id); + apic_id); return; } pin = intr->dst_apic_int; ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#64 (text+ko) ==== @@ -239,7 +239,7 @@ /* * Initialize machine state (pcb and trap frame) for a new thread about to - * upcall. Pu t enough state in the new thread's PCB to get it to go back + * upcall. Put enough state in the new thread's PCB to get it to go back * userret(), where we can intercept it again to set the return (upcall) * Address and stack, along with those from upcals that are from other sources * such as those generated in thread_userret() itself. ==== //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#12 (text+ko) ====