From owner-p4-projects@FreeBSD.ORG Sun Nov 30 14:57:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18F8E16A4CF; Sun, 30 Nov 2003 14:57:03 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0ABB116A4D0 for ; Sun, 30 Nov 2003 14:57:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59F8843FE5 for ; Sun, 30 Nov 2003 14:56:58 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAUMuvXJ068255 for ; Sun, 30 Nov 2003 14:56:57 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAUMuvr9068252 for perforce@freebsd.org; Sun, 30 Nov 2003 14:56:57 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 30 Nov 2003 14:56:57 -0800 (PST) Message-Id: <200311302256.hAUMuvr9068252@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 43192 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Nov 2003 22:57:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=43192 Change 43192 by marcel@marcel_nfs on 2003/11/30 14:56:40 rename to to stick to tradition. Pointed out by: jmallet Affected files ... .. //depot/projects/ia64/include/dirent.h#7 edit .. //depot/projects/ia64/include/locale.h#6 edit .. //depot/projects/ia64/include/rpc/types.h#4 edit .. //depot/projects/ia64/include/stddef.h#7 edit .. //depot/projects/ia64/include/stdio.h#15 edit .. //depot/projects/ia64/include/stdlib.h#23 edit .. //depot/projects/ia64/include/string.h#12 edit .. //depot/projects/ia64/include/time.h#12 edit .. //depot/projects/ia64/include/unistd.h#22 edit .. //depot/projects/ia64/include/wchar.h#16 edit .. //depot/projects/ia64/sys/sys/_null.h#1 add .. //depot/projects/ia64/sys/sys/null.h#2 delete .. //depot/projects/ia64/sys/sys/param.h#50 edit .. //depot/projects/ia64/sys/sys/stddef.h#4 edit Differences ... ==== //depot/projects/ia64/include/dirent.h#7 (text+ko) ==== @@ -54,6 +54,8 @@ #if __BSD_VISIBLE +#include + /* definitions for library routines operating on directories. */ #define DIRBLKSIZ 1024 @@ -81,8 +83,6 @@ #define DTF_REWIND 0x0004 /* rewind after reading union stack */ #define __DTF_READALL 0x0008 /* everything has been read */ -#include - #else /* !__BSD_VISIBLE */ typedef void * DIR; ==== //depot/projects/ia64/include/locale.h#6 (text+ko) ==== @@ -37,8 +37,7 @@ #ifndef _LOCALE_H_ #define _LOCALE_H_ -#include -#include +#include struct lconv { char *decimal_point; @@ -77,6 +76,8 @@ #define _LC_LAST 7 /* marks end */ +#include + __BEGIN_DECLS struct lconv *localeconv(void); char *setlocale(int, const char *); ==== //depot/projects/ia64/include/rpc/types.h#4 (text+ko) ==== @@ -39,8 +39,8 @@ #ifndef _RPC_TYPES_H #define _RPC_TYPES_H -#include #include +#include typedef int32_t bool_t; typedef int32_t enum_t; ==== //depot/projects/ia64/include/stddef.h#7 (text+ko) ==== @@ -39,7 +39,7 @@ #define _STDDEF_H_ #include -#include +#include #include typedef __ptrdiff_t ptrdiff_t; ==== //depot/projects/ia64/include/stdio.h#15 (text+ko) ==== @@ -41,7 +41,7 @@ #define _STDIO_H_ #include -#include +#include #include typedef __off_t fpos_t; ==== //depot/projects/ia64/include/stdlib.h#23 (text+ko) ==== @@ -38,6 +38,7 @@ #define _STDLIB_H_ #include +#include #include #if __BSD_VISIBLE @@ -69,8 +70,6 @@ long rem; } ldiv_t; -#include - #define EXIT_FAILURE 1 #define EXIT_SUCCESS 0 ==== //depot/projects/ia64/include/string.h#12 (text+ko) ==== @@ -38,7 +38,7 @@ #define _STRING_H_ #include -#include +#include #include /* ==== //depot/projects/ia64/include/time.h#12 (text+ko) ==== @@ -46,7 +46,7 @@ #define _TIME_H_ #include -#include +#include #include #if __POSIX_VISIBLE > 0 && __POSIX_VISIBLE < 200112 || __BSD_VISIBLE ==== //depot/projects/ia64/include/unistd.h#22 (text+ko) ==== @@ -40,6 +40,7 @@ #include #include /* XXX adds too much pollution. */ #include +#include #include #ifndef _GID_T_DECLARED @@ -81,8 +82,6 @@ #define STDOUT_FILENO 1 /* standard output file descriptor */ #define STDERR_FILENO 2 /* standard error file descriptor */ -#include - #if __XSI_VISIBLE || __POSIX_VISIBLE >= 200112 #define F_ULOCK 0 /* unlock locked section */ #define F_LOCK 1 /* lock a section for exclusive use */ ==== //depot/projects/ia64/include/wchar.h#16 (text+ko) ==== @@ -68,7 +68,7 @@ #define _WCHAR_H_ #include -#include +#include #include #include ==== //depot/projects/ia64/sys/sys/param.h#50 (text+ko) ==== @@ -42,6 +42,8 @@ #ifndef _SYS_PARAM_H_ #define _SYS_PARAM_H_ +#include + #define BSD 199506 /* System version (year & month). */ #define BSD4_3 1 #define BSD4_4 1 @@ -59,8 +61,6 @@ #undef __FreeBSD_version #define __FreeBSD_version 501114 /* Master, propagated to newvers */ -#include - #ifndef LOCORE #include #endif ==== //depot/projects/ia64/sys/sys/stddef.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ #define _SYS_STDDEF_H_ #include -#include +#include #include typedef __ptrdiff_t ptrdiff_t; From owner-p4-projects@FreeBSD.ORG Sun Nov 30 21:37:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D334C16A4D0; Sun, 30 Nov 2003 21:37:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC3D416A4CE for ; Sun, 30 Nov 2003 21:37:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1546343FBF for ; Sun, 30 Nov 2003 21:37:16 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB15bFXJ099284 for ; Sun, 30 Nov 2003 21:37:15 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB15bFnK099281 for perforce@freebsd.org; Sun, 30 Nov 2003 21:37:15 -0800 (PST) (envelope-from sam@freebsd.org) Date: Sun, 30 Nov 2003 21:37:15 -0800 (PST) Message-Id: <200312010537.hB15bFnK099281@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 43213 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Dec 2003 05:37:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=43213 Change 43213 by sam@sam_ebb on 2003/11/30 21:36:21 o use the multi-rate retry support in the 5212 to retry data frames at the current rate, then a rate one step below the current rate, then falling back to the lowest supported rate; this appears to smooth performance in the presence of noise but there are better algorithms o precalculate the conversion from ieee rate to h/w rate cookies Affected files ... .. //depot/projects/netperf/sys/dev/ath/if_ath.c#45 edit .. //depot/projects/netperf/sys/dev/ath/if_athvar.h#10 edit Differences ... ==== //depot/projects/netperf/sys/dev/ath/if_ath.c#45 (text+ko) ==== @@ -134,6 +134,8 @@ static int ath_rate_setup(struct ath_softc *sc, u_int mode); static void ath_setcurmode(struct ath_softc *, enum ieee80211_phymode); +static void ath_rate_update(struct ath_softc *, struct ieee80211_node *, + int rate); static void ath_rate_ctl_reset(struct ath_softc *, enum ieee80211_state); static void ath_rate_ctl(void *, struct ieee80211_node *); @@ -1908,6 +1910,20 @@ KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode)); /* + * NB: the 802.11 layer marks whether or not we should + * use short preamble based on the current mode and + * negotiated parameters. + */ + if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && + (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE)) { + shortPreamble = AH_TRUE; + sc->sc_stats.ast_tx_shortpre++; + } else { + shortPreamble = AH_FALSE; + } + + an = (struct ath_node *) ni; + /* * Calculate Atheros packet type from IEEE80211 packet header * and setup for rate calculations. */ @@ -1922,16 +1938,23 @@ else if (subtype == IEEE80211_FC0_SUBTYPE_ATIM) atype = HAL_PKT_TYPE_ATIM; rix = 0; /* XXX lowest rate */ + if (shortPreamble) + txrate = an->an_tx_mgtrate; + else + txrate = an->an_tx_mgtratesp; break; case IEEE80211_FC0_TYPE_CTL: subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK; if (subtype == IEEE80211_FC0_SUBTYPE_PS_POLL) atype = HAL_PKT_TYPE_PSPOLL; rix = 0; /* XXX lowest rate */ + if (shortPreamble) + txrate = an->an_tx_mgtrate; + else + txrate = an->an_tx_mgtratesp; break; default: - rix = sc->sc_rixmap[ni->ni_rates.rs_rates[ni->ni_txrate] & - IEEE80211_RATE_VAL]; + rix = an->an_tx_rix0; if (rix == 0xff) { if_printf(ifp, "bogus xmit rate 0x%x\n", ni->ni_rates.rs_rates[ni->ni_txrate]); @@ -1939,22 +1962,12 @@ m_freem(m0); return EIO; } + if (shortPreamble) + txrate = an->an_tx_rate0; + else + txrate = an->an_tx_rate0sp; break; } - /* - * NB: the 802.11 layer marks whether or not we should - * use short preamble based on the current mode and - * negotiated parameters. - */ - if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && - (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE)) { - txrate = rt->info[rix].rateCode | rt->info[rix].shortPreamble; - shortPreamble = AH_TRUE; - sc->sc_stats.ast_tx_shortpre++; - } else { - txrate = rt->info[rix].rateCode; - shortPreamble = AH_FALSE; - } /* * Calculate miscellaneous flags. @@ -2023,7 +2036,6 @@ * initialized to 0 which gives us ``auto'' or the * ``default'' antenna. */ - an = (struct ath_node *) ni; if (an->an_tx_antenna) antenna = an->an_tx_antenna; else @@ -2054,21 +2066,31 @@ , hdrlen /* header length */ , atype /* Atheros packet type */ , 60 /* txpower XXX */ - , txrate, 1+10 /* series 0 rate/tries */ + , txrate, 1+3 /* series 0 rate/tries */ , iswep ? sc->sc_ic.ic_wep_txkey : HAL_TXKEYIX_INVALID , antenna /* antenna mode */ , flags /* flags */ , ctsrate /* rts/cts rate */ , ctsduration /* rts/cts duration */ ); -#ifdef notyet - ath_hal_setupxtxdesc(ah, ds - , AH_FALSE /* short preamble */ - , 0, 0 /* series 1 rate/tries */ - , 0, 0 /* series 2 rate/tries */ - , 0, 0 /* series 3 rate/tries */ - ); -#endif + if (rix != 0) { + if (shortPreamble) { + ath_hal_setupxtxdesc(ah, ds + , AH_TRUE /* short preamble */ + , an->an_tx_rate1sp, 2 /* series 1 */ + , an->an_tx_rate2sp, 2 /* series 2 */ + , an->an_tx_rate3sp, 2 /* series 3 */ + ); + } else { + ath_hal_setupxtxdesc(ah, ds + , AH_FALSE /* no short preamble */ + , an->an_tx_rate1, 2 /* series 1 */ + , an->an_tx_rate2, 2 /* series 2 */ + , an->an_tx_rate3, 2 /* series 3 */ + ); + } + } + /* * Fillin the remainder of the descriptor info. */ @@ -2551,10 +2573,6 @@ ath_newassoc(struct ieee80211com *ic, struct ieee80211_node *ni, int isnew) { if (isnew) { - struct ath_node *an = (struct ath_node *) ni; - - an->an_tx_ok = an->an_tx_err = - an->an_tx_retr = an->an_tx_upper = 0; /* start with highest negotiated rate */ /* * XXX should do otherwise but only when @@ -2562,7 +2580,8 @@ */ KASSERT(ni->ni_rates.rs_nrates > 0, ("new association w/ no rates!")); - ni->ni_txrate = ni->ni_rates.rs_nrates - 1; + ath_rate_update((struct ath_softc *)ic, ni, + ni->ni_rates.rs_nrates - 1); } } @@ -2671,8 +2690,60 @@ sc->sc_hwmap[i] = rt->info[rt->rateCodeToIndex[i]].dot11Rate; sc->sc_currates = rt; sc->sc_curmode = mode; + /* NB: caller is responsible for reseting rate control state */ } +static void +ath_rate_update(struct ath_softc *sc, struct ieee80211_node *ni, int rate) +{ + struct ath_node *an = (struct ath_node *) ni; + const HAL_RATE_TABLE *rt = sc->sc_currates; + u_int8_t rix; + + KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode)); + + ni->ni_txrate = rate; + an->an_tx_rix0 = sc->sc_rixmap[ + ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL]; + an->an_tx_rate0 = rt->info[an->an_tx_rix0].rateCode; + an->an_tx_rate0sp = an->an_tx_rate0 | + rt->info[an->an_tx_rix0].shortPreamble; + /* XXX management/control frames always go at the lowest speed */ + an->an_tx_mgtrate = rt->info[0].rateCode; + an->an_tx_mgtratesp = an->an_tx_mgtrate | rt->info[0].shortPreamble; + if (--rate >= 0) { + rix = sc->sc_rixmap[ + ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL]; + an->an_tx_rate1 = rt->info[rix].rateCode; + an->an_tx_rate1sp = an->an_tx_rate1 | + rt->info[rix].shortPreamble; + } else + an->an_tx_rate1 = 0; +#if 0 + if (--rate >= 0) { + rix = sc->sc_rixmap[ + ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL]; + an->an_tx_rate2 = rt->info[rix].rateCode; + an->an_tx_rate2sp = an->an_tx_rate2 | + rt->info[rix].shortPreamble; + } else + an->an_tx_rate2 = 0; + if (--rate >= 0) { + rix = sc->sc_rixmap[ + ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL]; + an->an_tx_rate3 = rt->info[rix].rateCode; + an->an_tx_rate3sp = an->an_tx_rate3 | + rt->info[rix].shortPreamble; + } else + an->an_tx_rate3 = 0; +#else + an->an_tx_rate2 = an->an_tx_mgtrate; + an->an_tx_rate2sp = an->an_tx_mgtratesp; + an->an_tx_rate3 = an->an_tx_rate3sp = 0; +#endif + an->an_tx_ok = an->an_tx_err = an->an_tx_retr = an->an_tx_upper = 0; +} + /* * Reset the rate control state for each 802.11 state transition. */ @@ -2681,7 +2752,6 @@ { struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_node *ni; - struct ath_node *an; if (ic->ic_opmode != IEEE80211_M_STA) { /* @@ -2690,28 +2760,21 @@ * For any other operating mode we want to reset the * tx rate state of each node. */ - TAILQ_FOREACH(ni, &ic->ic_node, ni_list) { - ni->ni_txrate = 0; /* use lowest rate */ - an = (struct ath_node *) ni; - an->an_tx_ok = an->an_tx_err = an->an_tx_retr = - an->an_tx_upper = 0; - } + TAILQ_FOREACH(ni, &ic->ic_node, ni_list) + ath_rate_update(sc, ni, 0); /* use lowest rate */ } /* * Reset local xmit state; this is really only meaningful * when operating in station or adhoc mode. */ ni = ic->ic_bss; - an = (struct ath_node *) ni; - an->an_tx_ok = an->an_tx_err = an->an_tx_retr = an->an_tx_upper = 0; if (state == IEEE80211_S_RUN) { /* start with highest negotiated rate */ KASSERT(ni->ni_rates.rs_nrates > 0, ("transition to RUN state w/ no rates!")); - ni->ni_txrate = ni->ni_rates.rs_nrates - 1; + ath_rate_update(sc, ni, ni->ni_rates.rs_nrates - 1); } else { - /* use lowest rate */ - ni->ni_txrate = 0; + ath_rate_update(sc, ni, 0); /* use lowest rate */ } } @@ -2724,7 +2787,7 @@ struct ath_softc *sc = arg; struct ath_node *an = (struct ath_node *) ni; struct ieee80211_rateset *rs = &ni->ni_rates; - int mod = 0, orate, enough; + int mod = 0, nrate, enough; /* * Rate control @@ -2746,15 +2809,15 @@ if (enough && an->an_tx_err == 0 && an->an_tx_ok > an->an_tx_retr * 10) mod = 1; - orate = ni->ni_txrate; + nrate = ni->ni_txrate; switch (mod) { case 0: if (enough && an->an_tx_upper > 0) an->an_tx_upper--; break; case -1: - if (ni->ni_txrate > 0) { - ni->ni_txrate--; + if (nrate > 0) { + nrate--; sc->sc_stats.ast_rate_drop++; } an->an_tx_upper = 0; @@ -2763,21 +2826,21 @@ if (++an->an_tx_upper < 2) break; an->an_tx_upper = 0; - if (ni->ni_txrate + 1 < rs->rs_nrates) { - ni->ni_txrate++; + if (nrate + 1 < rs->rs_nrates) { + nrate++; sc->sc_stats.ast_rate_raise++; } break; } - if (ni->ni_txrate != orate) { + if (nrate != ni->ni_txrate) { DPRINTF(("%s: %dM -> %dM (%d ok, %d err, %d retr)\n", __func__, - (rs->rs_rates[orate] & IEEE80211_RATE_VAL) / 2, (rs->rs_rates[ni->ni_txrate] & IEEE80211_RATE_VAL) / 2, + (rs->rs_rates[nrate] & IEEE80211_RATE_VAL) / 2, an->an_tx_ok, an->an_tx_err, an->an_tx_retr)); - } - if (ni->ni_txrate != orate || enough) + ath_rate_update(sc, ni, nrate); + } else if (enough) an->an_tx_ok = an->an_tx_err = an->an_tx_retr = 0; } ==== //depot/projects/netperf/sys/dev/ath/if_athvar.h#10 (text+ko) ==== @@ -70,6 +70,17 @@ u_int an_tx_retr; /* tx retry count */ int an_tx_upper; /* tx upper rate req cnt */ u_int an_tx_antenna; /* antenna for last good frame */ + u_int8_t an_tx_rix0; /* series 0 rate index */ + u_int8_t an_tx_mgtrate; /* h/w rate for management/ctl frames */ + u_int8_t an_tx_mgtratesp;/* short preamble h/w rate for " " */ + u_int8_t an_tx_rate0; /* series 0 h/w rate */ + u_int8_t an_tx_rate1; /* series 1 h/w rate */ + u_int8_t an_tx_rate2; /* series 2 h/w rate */ + u_int8_t an_tx_rate3; /* series 3 h/w rate */ + u_int8_t an_tx_rate0sp; /* series 0 short preamble h/w rate */ + u_int8_t an_tx_rate1sp; /* series 1 short preamble h/w rate */ + u_int8_t an_tx_rate2sp; /* series 2 short preamble h/w rate */ + u_int8_t an_tx_rate3sp; /* series 3 short preamble h/w rate */ u_int an_rx_antenna; /* antenna for last rcvd frame */ struct ath_recv_hist an_rx_hist[ATH_RHIST_SIZE]; u_int an_rx_hist_next;/* index of next ``free entry'' */ From owner-p4-projects@FreeBSD.ORG Mon Dec 1 06:59:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E25D16A4D0; Mon, 1 Dec 2003 06:59:47 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4997A16A4CE for ; Mon, 1 Dec 2003 06:59:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9194843FE0 for ; Mon, 1 Dec 2003 06:59:46 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB1ExkXJ037354 for ; Mon, 1 Dec 2003 06:59:46 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB1ExkJ3037351 for perforce@freebsd.org; Mon, 1 Dec 2003 06:59:46 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Dec 2003 06:59:46 -0800 (PST) Message-Id: <200312011459.hB1ExkJ3037351@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 43224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Dec 2003 14:59:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=43224 Change 43224 by jhb@jhb_blue on 2003/12/01 06:59:27 More notes after dinking with the current power resource code (which is nice actually) while trying to get my fans to work last week. Affected files ... .. //depot/projects/power/notes#8 edit Differences ... ==== //depot/projects/power/notes#8 (text+ko) ==== @@ -1,4 +1,4 @@ -This branch exists to provide support for manging the power state of devices. +rThis branch exists to provide support for manging the power state of devices. For example, being able to power down devices that aren't in use and power them on when they are needed. @@ -20,6 +20,9 @@ - XXX: need to handle _PRx and _SxD !! - We should be able to hook the power resource stuff up once we have our power shadow tree in the acpi_SetPowerState() function. + - Use the power resource consumer power state change stuff in + acpi_SetDevicePowerState(). We need to pre-register all the resources + and consumers in a tree sweep though to do this properly. - define a bus method for powering up/down devices - bus_set_powerstate(parent, child, state) where state is on or off # actually on/off is insufficient for a power management daemon that From owner-p4-projects@FreeBSD.ORG Mon Dec 1 11:36:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D9A016A4D0; Mon, 1 Dec 2003 11:36:19 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D6F116A4CE for ; Mon, 1 Dec 2003 11:36:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77D3B43FBF for ; Mon, 1 Dec 2003 11:36:15 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB1JaFXJ056977 for ; Mon, 1 Dec 2003 11:36:15 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB1Ja3us056973 for perforce@freebsd.org; Mon, 1 Dec 2003 11:36:03 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 1 Dec 2003 11:36:03 -0800 (PST) Message-Id: <200312011936.hB1Ja3us056973@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 43235 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Dec 2003 19:36:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=43235 Change 43235 by peter@peter_daintree on 2003/12/01 11:35:44 IFC @43231 Affected files ... .. //depot/projects/hammer/contrib/bind/CHANGES#5 integrate .. //depot/projects/hammer/contrib/bind/README#4 integrate .. //depot/projects/hammer/contrib/bind/Version#4 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_init.c#3 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_resp.c#5 integrate .. //depot/projects/hammer/contrib/bind/bin/nslookup/commands.l#2 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#17 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#14 integrate .. //depot/projects/hammer/etc/mtree/BSD.local.dist#12 integrate .. //depot/projects/hammer/etc/mtree/BSD.sendmail.dist#2 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#15 integrate .. //depot/projects/hammer/etc/mtree/BSD.var.dist#4 integrate .. //depot/projects/hammer/etc/rc.d/cleartmp#4 integrate .. //depot/projects/hammer/etc/rc.d/ike#1 branch .. //depot/projects/hammer/lib/compat/compat4x.i386/Makefile#3 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/libc.so.4.bz2.uu#3 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/libc_r.so.4.bz2.uu#3 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/libdevstat.so.2.bz2.uu#1 branch .. //depot/projects/hammer/lib/compat/compat4x.i386/libedit.so.3.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/libgmp.so.3.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/libmp.so.3.bz2.uu#1 branch .. //depot/projects/hammer/lib/compat/compat4x.i386/libpam.so.1.bz2.uu#3 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/libperl.so.3.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/libposix1e.so.2.bz2.uu#2 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/libskey.so.2.bz2.uu#1 branch .. //depot/projects/hammer/lib/compat/compat4x.i386/libstdc++.so.3.bz2.uu#3 integrate .. //depot/projects/hammer/lib/compat/compat4x.i386/libusbhid.so.0.bz2.uu#1 branch .. //depot/projects/hammer/lib/compat/compat4x.i386/libutil.so.3.bz2.uu#1 branch .. //depot/projects/hammer/lib/compat/compat4x.i386/libvgl.so.2.bz2.uu#1 branch .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#12 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/thr_enter_uts.S#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#14 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#26 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#19 integrate .. //depot/projects/hammer/release/Makefile#41 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#39 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#49 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.ent#7 integrate .. //depot/projects/hammer/release/i386/drivers.conf#15 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#12 integrate .. //depot/projects/hammer/sbin/dhclient/Makefile.inc#4 integrate .. //depot/projects/hammer/sbin/dumpfs/dumpfs.c#10 integrate .. //depot/projects/hammer/sbin/gbde/gbde.8#5 integrate .. //depot/projects/hammer/sbin/mount_udf/mount_udf.c#4 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#14 integrate .. //depot/projects/hammer/share/man/man4/Makefile#28 integrate .. //depot/projects/hammer/share/man/man4/led.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/CPU_ELAN.4#1 branch .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#10 integrate .. //depot/projects/hammer/share/man/man4/nsp.4#1 branch .. //depot/projects/hammer/share/man/man4/stg.4#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_trace.c#4 integrate .. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#44 integrate .. //depot/projects/hammer/sys/amd64/amd64/support.S#16 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_all.c#9 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#16 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/ah.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#5 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/version.h#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#18 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#12 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#20 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#13 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#14 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#14 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#13 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#7 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_core.c#8 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#7 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_os.h#2 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_reg.h#3 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#17 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#27 integrate .. //depot/projects/hammer/sys/dev/ips/ips.c#6 integrate .. //depot/projects/hammer/sys/dev/ips/ips.h#5 integrate .. //depot/projects/hammer/sys/dev/ips/ips_commands.c#7 integrate .. //depot/projects/hammer/sys/dev/led/led.c#3 integrate .. //depot/projects/hammer/sys/dev/puc/puc_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#8 integrate .. //depot/projects/hammer/sys/dev/sio/sio_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/buffer.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/buffer.h#4 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/ohci.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/ohci_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/vinum/vinuminterrupt.c#6 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumio.c#12 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrequest.c#10 integrate .. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#10 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#20 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#28 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile#9 integrate .. //depot/projects/hammer/sys/net/bpf.h#5 integrate .. //depot/projects/hammer/sys/net/route.c#10 integrate .. //depot/projects/hammer/sys/netatalk/at_control.c#3 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#17 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#13 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#12 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#21 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#25 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#14 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#19 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#14 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#12 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#9 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#10 integrate .. //depot/projects/hammer/sys/netkey/key.c#11 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#27 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#23 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#17 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#28 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#16 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#18 integrate .. //depot/projects/hammer/tools/diag/ac/cknames.pl#2 integrate .. //depot/projects/hammer/tools/diag/ac/ent.sh#2 integrate .. //depot/projects/hammer/tools/tools/release/chk_dokern.sh_and_drivers.conf#2 integrate .. //depot/projects/hammer/usr.bin/locale/locale.1#3 integrate .. //depot/projects/hammer/usr.bin/netstat/if.c#5 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.1#5 integrate .. //depot/projects/hammer/usr.bin/netstat/route.c#6 integrate .. //depot/projects/hammer/usr.sbin/mtree/specspec.c#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#9 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/help/securelevel.hlp#1 branch .. //depot/projects/hammer/usr.sbin/sysinstall/help/security.hlp#2 delete .. //depot/projects/hammer/usr.sbin/sysinstall/install.c#15 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#18 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#13 integrate .. //depot/projects/hammer/usr.sbin/tzsetup/tzsetup.c#2 integrate Differences ... ==== //depot/projects/hammer/contrib/bind/CHANGES#5 (text+ko) ==== @@ -1,4 +1,9 @@ + --- 8.3.7-REL released --- (Wed Sep 3 21:01:37 PDT 2003) + +1581. [bug] apply anti-cache poison techniques to negative + answers. + --- 8.3.6-REL released --- (Sun Jun 8 15:11:32 PDT 2003) 1547. [port] cope with spurious EINVAL from evRead. ==== //depot/projects/hammer/contrib/bind/README#4 (text+ko) ==== @@ -10,6 +10,9 @@ Note that BIND 8 is in "end-of-life", having been replaced by BIND 9. See http://www.isc.org/ for more details. +BIND 8.3.7 Highlights + Security release. + BIND 8.3.6 Highlights Maintenance release. ==== //depot/projects/hammer/contrib/bind/Version#4 (text+ko) ==== @@ -1,1 +1,1 @@ -8.3.6-REL +8.3.7-REL ==== //depot/projects/hammer/contrib/bind/bin/named/ns_init.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static const char sccsid[] = "@(#)ns_init.c 4.38 (Berkeley) 3/21/91"; -static const char rcsid[] = "$Id: ns_init.c,v 8.77 2002/08/20 04:27:23 marka Exp $"; +static const char rcsid[] = "$Id: ns_init.c,v 8.77.8.2 2003/09/04 04:09:09 marka Exp $"; #endif /* not lint */ /* ==== //depot/projects/hammer/contrib/bind/bin/named/ns_resp.c#5 (text+ko) ==== @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static const char sccsid[] = "@(#)ns_resp.c 4.65 (Berkeley) 3/3/91"; -static const char rcsid[] = "$Id: ns_resp.c,v 8.186.6.4 2003/06/02 09:56:35 marka Exp $"; +static const char rcsid[] = "$Id: ns_resp.c,v 8.186.6.5 2003/09/04 03:03:18 marka Exp $"; #endif /* not lint */ /* @@ -271,7 +271,7 @@ int soacount; u_int qtype, qclass; int validanswer, dbflags; - int cname, lastwascname, externalcname; + int cname, lastwascname, externalcname, cachenegative; int count, founddata, foundname; int buflen; int newmsglen; @@ -911,6 +911,7 @@ cname = 0; lastwascname = 0; externalcname = 0; + cachenegative = 1; strcpy(aname, qname); if (count) { @@ -980,6 +981,7 @@ name); db_detach(&dp); validanswer = 0; + cachenegative = 0; continue; } if (type == T_CNAME && @@ -1014,6 +1016,7 @@ "last was cname, ignoring auth. and add."); db_detach(&dp); validanswer = 0; + cachenegative = 0; break; } if (i < arfirst) { @@ -1029,6 +1032,7 @@ sin_ntoa(from)); db_detach(&dp); validanswer = 0; + cachenegative = 0; continue; } else if (!ns_samedomain(name, qp->q_domain)) { @@ -1042,6 +1046,7 @@ sin_ntoa(from)); db_detach(&dp); validanswer = 0; + cachenegative = 0; continue; } if (type == T_NS) { @@ -1205,8 +1210,9 @@ ) ) { - cache_n_resp(msg, msglen, from, qp->q_name, - qp->q_class, qp->q_type); + if (cachenegative) + cache_n_resp(msg, msglen, from, qp->q_name, + qp->q_class, qp->q_type); if (!qp->q_cmsglen && validanswer) { ns_debug(ns_log_default, 3, ==== //depot/projects/hammer/contrib/bind/bin/nslookup/commands.l#2 (text+ko) ==== @@ -1,5 +1,5 @@ %{ -/* $FreeBSD: src/contrib/bind/bin/nslookup/commands.l,v 1.10 2002/07/01 01:20:28 dougb Exp $ */ +/* $FreeBSD: src/contrib/bind/bin/nslookup/commands.l,v 1.11 2003/11/28 22:02:17 dougb Exp $ */ /* * Copyright (c) 1985 * The Regents of the University of California. All rights reserved. @@ -77,7 +77,6 @@ * exit - exit the program * root - set default server to the root * ls NAME - list the domain NAME - * view FILE - sorts and view the file with more * set OPTION - set an option * help - print help information * ? - print help information @@ -103,7 +102,6 @@ extern char rootServerName[]; extern void PrintHelp(); -extern void ViewList(char *); #define YY_INPUT(buf, result, max_size) \ { \ ==== //depot/projects/hammer/etc/defaults/rc.conf#17 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.190 2003/10/03 21:33:39 phk Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.191 2003/11/28 17:28:42 bms Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -71,6 +71,9 @@ firewall_flags="" # Flags passed to ipfw when type is a file ip_portrange_first="NO" # Set first dynamically allocated port ip_portrange_last="NO" # Set last dynamically allocated port +ike_enable="NO" # Enable IKE daemon (usually racoon or isakmpd) +ike_program="/usr/local/sbin/isakmpd" # Path to IKE daemon +ike_flags="" # Additional flags for IKE daemon ipsec_enable="NO" # Set to YES to run setkey on ipsec_file ipsec_file="/etc/ipsec.conf" # Name of config file for setkey natd_program="/sbin/natd" # path to natd, if you want a different one. ==== //depot/projects/hammer/etc/mtree/BSD.include.dist#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.76 2003/11/22 06:08:59 scottl Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.77 2003/11/29 18:22:01 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -9,6 +9,16 @@ .. bsnmp .. + c++ + 3.3 + backward + .. + bits + .. + ext + .. + .. + .. cam scsi .. @@ -18,12 +28,12 @@ dev an .. + firewire + .. ic .. iicbus .. - firewire - .. ofw .. ppbus @@ -58,23 +68,13 @@ .. smbfs .. - udf - .. + udf + .. umapfs .. unionfs .. .. - c++ - 3.3 - backward - .. - bits - .. - ext - .. - .. - .. geom .. isc ==== //depot/projects/hammer/etc/mtree/BSD.local.dist#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.103 2003/11/08 05:18:25 davidxu Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.104 2003/11/29 18:22:01 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -449,14 +449,14 @@ .. uk_UA.KOI8-U .. - zh_CN.eucCN - .. zh_CN.GB18030 .. zh_CN.GB2312 .. zh_CN.GBK .. + zh_CN.eucCN + .. zh_TW.Big5 .. .. ==== //depot/projects/hammer/etc/mtree/BSD.sendmail.dist#2 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/etc/mtree/BSD.sendmail.dist,v 1.1 2002/04/20 19:00:11 gshapiro Exp $ +# $FreeBSD: src/etc/mtree/BSD.sendmail.dist,v 1.2 2003/11/29 18:22:01 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # /set type=dir uname=root gname=wheel mode=0755 -. nochange - var nochange - spool nochange +. nochange + var nochange + spool nochange clientmqueue uname=smmsp gname=smmsp mode=0770 .. .. ==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.286 2003/11/10 09:06:38 harti Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.287 2003/11/29 18:22:01 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -519,14 +519,14 @@ .. uk_UA.KOI8-U .. - zh_CN.eucCN + zh_CN.GB18030 .. - zh_CN.GB18030 - .. zh_CN.GB2312 .. zh_CN.GBK .. + zh_CN.eucCN + .. zh_TW.Big5 .. .. @@ -853,14 +853,14 @@ .. uk_UA.KOI8-U .. - zh_CN.eucCN - .. zh_CN.GB18030 .. zh_CN.GB2312 .. zh_CN.GBK .. + zh_CN.eucCN + .. zh_TW.Big5 .. .. @@ -890,8 +890,8 @@ Etc .. .. - security - .. + security + .. sendmail .. skel ==== //depot/projects/hammer/etc/mtree/BSD.var.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.67 2002/11/04 07:50:48 markm Exp $ +# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.68 2003/11/29 18:22:01 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -33,12 +33,10 @@ pkg .. .. - empty mode=0555 flags=schg + empty mode=0555 flags=schg .. -/set gname=games mode=0775 - games + games gname=games mode=0775 .. -/set gname=wheel mode=0755 heimdal mode=0700 .. log ==== //depot/projects/hammer/etc/rc.d/cleartmp#4 (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.4 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.5 2003/12/01 16:35:57 mtm Exp $ # # PROVIDE: cleartmp @@ -27,20 +27,20 @@ (cd /tmp && rm -rf [a-km-pr-zA-Z]* && find -x . ! -name . ! -name lost+found ! -name quota.user \ ! -name quota.group -exec rm -rf -- {} \; -type d -prune) - - case ${OSTYPE} in - FreeBSD) - # Remove X lock files, since they will prevent you from - # restarting X - # - rm -f /tmp/.X*-lock - rm -fr /tmp/.X11-unix - mkdir -m 1777 /tmp/.X11-unix - ;; - NetBSD) - ;; - esac } load_rc_config $name run_rc_command "$1" + +case ${OSTYPE} in +FreeBSD) + # Remove X lock files, since they will prevent you from + # restarting X + # + rm -f /tmp/.X*-lock + rm -fr /tmp/.X11-unix + mkdir -m 1777 /tmp/.X11-unix + ;; +NetBSD) + ;; +esac ==== //depot/projects/hammer/lib/compat/compat4x.i386/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/compat/compat4x.i386/Makefile,v 1.21 2003/02/17 13:45:13 nectar Exp $ +# $FreeBSD: src/lib/compat/compat4x.i386/Makefile,v 1.22 2003/11/29 03:29:16 obrien Exp $ DISTRIBUTION= compat4x @@ -7,16 +7,22 @@ libc_r.so.4 \ libcrypto.so.1 \ libcrypto.so.2 \ + libdevstat.so.2 \ libgmp.so.3 \ libedit.so.3 \ libfetch.so.2 \ + libmp.so.3 \ libpam.so.1 \ libperl.so.3 \ libposix1e.so.2 \ + libskey.so.2 \ libssl.so.1 \ libssl.so.2 \ libstdc++.so.3 \ libusb.so.0 \ + libusbhid.so.0 \ + libutil.so.3 \ + libvgl.so.2 \ pam_cleartext_pass_ok.so \ pam_deny.so \ pam_opie.so \ ==== //depot/projects/hammer/lib/compat/compat4x.i386/libc.so.4.bz2.uu#3 (text+ko) ==== @@ -1,4245 +1,4276 @@ -$FreeBSD: src/lib/compat/compat4x.i386/libc.so.4.bz2.uu,v 1.2 2002/12/18 18:05:06 obrien Exp $ +$FreeBSD: src/lib/compat/compat4x.i386/libc.so.4.bz2.uu,v 1.3 2003/11/29 03:29:16 obrien Exp $ -begin-base64 444 libc.so.4.bz2 -QlpoOTFBWSZTWRIru2wCmBb/////////////////////////////////////////////45DFQAD7 -2eu4fe6PJfMjI8p6GNsAAIjb3Ad7egbp3B3ZoaoUAK0BfYABkWIMA4Ud9lOr2t9922aPXw7PAAIB -6XvdXE97dTT7dbt63oQKpE2+7va9s6N3alw9O54FyR2js76we9jc0qhZiZq97vPbXJnaQy2Q1uB1 -6e8aY+Weu7e+ghWAAAdCd3He88vebxuxrNthoRmAADtovcqqu4oANO9569vvtz20uOY6NLu6u192 -8H24vvYqn3nHvOURM6oGY7s17t569zDrPXNYD6MToFAM2AA2+1M7NvtxigABoAAAD0FBYxQSFBAU -QAAADQAMlACiqdABVAADQdAFABIct7aF3w3gdXt9fAAAAAAAAAAAHo+ntz17O29CteHPt54ECIAA -AAAB7OC9tdhs2pVTZ9d8QEAAA6ABvoBvN9m7ux0dAAC7AOIqUypKXVGVE93vPVVUKtdN7e76AAoA -B53T32e3wAAADgGun329vOfADvIMhdfYp1ezr533vRg8eAA3wAA7ucG+K3j5ziD21b2OhurMbl2T -3nPvvfOH3M6dhfO+2A085686u8fToPte3ANOV0drzj6r3prdutQrNU19xG93t4d12a4bxXNADCiq -JUBnndK7FFXqwACXWdmffWevGPSe7tvuPe2jMru8JtTNtVtd7PvOw331928eAATmhh7pinj3Z773 -Hs9txtmvui+to9u923hnYDu9mezW90vrDumPsx6E+dGte8LsPZh7pYG8292efd27Hsw0hDbD3pjv -evqHNn3mffdw+99cOrbLfRvSTz4T7ve+4PQ+2dO73uu8H0dQ9GNJZLWswR933eDmw+199u+5TXx5 -3vu77t6fB8Pdr0vrdfBvh3vfeuj0o3q2wO+fW998PHsCHi9uHIj7M5b7zeWe998Ph72cSAF97fav -r1777D7j1yrT04J1Z7YdO+e1573dPvdt94DPM2ZnZ9724+2d6NLTpKkzlUfe77w94rXsfeUhR6zP -o7TWtsKaB0BkULYNASAL1RlrSqjz4+g+PvrNoul0r7Pe+7PjdFaH21dOujt7Z95xvfWADr30e3uA -+97jJU1AdFMH3uPIns2e+90pa9yKCpVCBfW6nCuaHK4LuNNt9dHAdD1PvieAKOPnkzePIgAAAAUA -AGlN3c9sAem5X2TQoUUvqc3vIARnYU6KO8vNpRrffH0oqqfN8z7G33OwdOdbe9K+2dE7tL3zs7XT -XRXmwGV4x3vjyve77lWmz7K+ud3erz3OtZbvbBJc9fb3BpbJe3UAHPfNfGH0uHUFBPe03zK6+d87 -VUOj1Rp9PRJ1eRzttsmh9ddrO7t98+d4dy+3Pc33dz1XfOm48vWj3LcLjG21ER3XdfbVCrY577uv -opXQaPrxe+59mHu9m2a+mStNG5582TL0+zktmuX3nXp53y9Qbuiu1UWlVottNab67pKmjShRvoQj -d3DrIO5tr41dKvp9cfXHOujUo0pUnrFFaOpSOiMNA9rzvmeHE4MwiwmDnN94mffb59vnAc1Jnp7V -B3p9oHet8d8AGUQJ62+w1yUdO7S13cdp1kmILVur577ul3fDXlddOFaD6UiUTtfEPcojzOpdK1nn -SzAWsPqu6NKQduvMIAfQA6DTqQ66V0y2Z3YBQdCh0ZczKux7fXUSHi53ckT7vAfL25Zvnz6lFKAo -A7YDd3Bdobtt7N7yUO1yzLq97wY2nscdz248Pag52cVboClV0CkQAAaKABNgA6Bide53LWNfT3Nj -bbPol9tFdGywfRoAV21C1qCIFB1e+97rfSbUdHbO7nDodFwS2Is3XR0NdEqCQBXQyBVaOtFDoAdN -b3u6JHQZ2GnkAUAffDeG+i3FfXd6k56s2lOdvRoDJVGjVAXp3Kd03vr6ngvN6ZVThr4VX3d2eOtc -AAOzrX1QB06MlQNAAPLtoFu3WxYL48Wwo6+W3W4VVAK5sBbXyfce7nm8bjoA5oHvnxc9SHt025pu -3tm7muAXx7j7333m+b0+i9xuo+7fQ+95wPQm977crr733cr74dbvnd649h57r7sfd11599e3R253 -bd30N77B8nfL7O73h7eM9Sx3fX3tBtr3n11qVvke93Ub2333EDX2ONfVefAdHztz75x8PrrFZtb6 -vt7Yz1X16XsL3dxBpq0y1tvrtzx5jseed9AAAAY++zX13e3eh7sOph6+sjsd33YevPjeTPn2N09f -X3x8su2p73nrbzTdjq7HBu93g6GgN6b33H2rbT3Sl7d2Br770K3Pvb71M23WiB1IBKKKUooJHTKl -FSQkWzVSqBCBIBFJKlTR26u2SVltrJQi573nJ7bAdGvuZQUFeq9dAc+p99bYPs333V3u8r13vtvU -WIyr3zoT33J2Ofcj23TQO7l3deafee97eTvbWl3eG33PrrUw74tjtuVKADBPp83LBt3neAADyGgA -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 -v1q1YjxyB2HVQtyPAQW3S1QmnuDcvEt9/vZCHb8FPCPimCgZF2BlR2Xy5vZtHtOEhDRt9QcUpwtU -GBtU4ZQKbmxSyqdaFlOYwQkAvJ7OLTX9lPTG5iZVRxiVBGVcfP9+9pkHmTt94X7PITvO9nQY8PP3 -ulGj0uPHt8Ht8eZdJ98XlK+ixYSGOzMNUma0LjhziQETeGkRWzEDLYMspjm7PE0/6J8x+VFxMIdr -4IPLhDNcyrFu2owGQlX93AGKY1zDRJImtrBoHmzLDjRDBbgxTB/mdx0er4OHrFw7XAt6VOprdbd4 -hXzWOEm9wt6JQjLHAc1YL1/c70ipxoUJnTPsv/tBbT499kTl7gwVaDD4n40I22jq2lYbEGxp6qQw -GM7Gm/dhmLjaNk2C08f22N7wvyEklOSPIWGQyGQyGAjAwLy8vLy8vLy8Ly8vL6O8vLy8vLALy8vL -y8vLy8vLz6prAw6p4mJiYmJiYmCMC8vLy8vLy8vLrwZeXl5eXl5eXl5eXl5eXl5eXl50e5/hyCYT -CYTCYTCYTCYQEBAQEPrnERERERGtw5gJhMJjExMTExMS8vLy8vLy8vLy87IwMDAwMDAwMBERECgI -CAgICAgICBQEBAQEBAQEBAQGlEojAwMDAwMDAwLy8vLy8vLy8vLzlb2OKbMTExMTExMTEvLy8vLy -8vLy8vK3XjLy8oXl5eXkBAQEBAQEBAQEBAQEBAQEBAQEBAQGOIiIiIiIiIiIiIgICAgICAgICAgI -CAgICAgICAgIDfxERERERERERERGtERERERERERERGuIiImBgYGBgYGGbRjisTExMTExMTEwyY4m -JiYmJiYmJidjhgYGBgYGBgYGBeW2lshfsDh9kyB996OXS3nW3pkFyE18Q/0p7w22zZRcqJwCU4Uh -1ZCMmSoaEZgmLuTqMn1RcwmBbeJrSBXvxvQR5GWin00CnlScytTS1S5x8cJiY0ErGY3AvDNOeimx -Hf9383pbvOeMFZ7IPHF7I0sPMgefR31TyUvbnP7fa5+hcrqIs6/P07orlwux87Ag8tEIdwCOjfnm -qVYAmxsgrecwvD2C8pEAzLo/LapXMOLhp0rxSmIfYQ2OmWS4mLBMYViDlQRrYYMlpMatjLt5La1x -uwvIvtlW5xoUV9lKxBiZbOLbzjfqdtb/M3jgpt583GQ4HdICGoYYYGz95LP6UKLuX9xk+xgR9Wbe -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 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 1 11:58:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0082F16A4D0; Mon, 1 Dec 2003 11:58:45 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D012316A4CE for ; Mon, 1 Dec 2003 11:58:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22AB843F85 for ; Mon, 1 Dec 2003 11:58:45 -0800 (PST) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB1JwiXJ057857 for ; Mon, 1 Dec 2003 11:58:44 -0800 (PST) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB1JwiKs057854 for perforce@freebsd.org; Mon, 1 Dec 2003 11:58:44 -0800 (PST) (envelope-from areisse@nailabs.com) Date: Mon, 1 Dec 2003 11:58:44 -0800 (PST) Message-Id: <200312011958.hB1JwiKs057854@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 43239 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Dec 2003 19:58:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=43239 Change 43239 by areisse@areisse_ibook on 2003/12/01 11:58:06 make sebsd_enabled() library call actually check. Affected files ... .. //depot/projects/trustedbsd/sedarwin/libsebsd/system.c#2 edit .. //depot/projects/trustedbsd/sedarwin/sebsd_system/wslogin/wslogin.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/libsebsd/system.c#2 (text+ko) ==== @@ -42,10 +42,19 @@ int sebsd_enabled() { - int error, i; - error = sysctlbyname ("security.mac.sebsd.enforcing", - &i, sizeof(int), NULL, 0); - return (error != ENOENT); + int args[2]; + int i; + size_t mibn = sizeof(int) * 64; + int mibs[64]; + + args[0] = 0; + args[1] = 3; + + const char *name = "security.mac.sebsd.enforcing"; + i = sysctl (args, 2, mibs, &mibn, name, strlen(name)); + if (i < 0) + return 0; + return 1; } int ==== //depot/projects/trustedbsd/sedarwin/sebsd_system/wslogin/wslogin.c#5 (text+ko) ==== @@ -49,6 +49,9 @@ */ int setuid (uid_t uid) { + if (!sebsd_enabled()) + return syscall (23, uid); + mac_t execlabel = NULL; /* label to transition to in exec */ openlog ("wslogin", LOG_ODELAY, LOG_AUTH); @@ -73,7 +76,6 @@ return 0; } - if (sebsd_enabled()) { char *labeltext, *queried, **contexts; size_t ncontexts; From owner-p4-projects@FreeBSD.ORG Mon Dec 1 12:31:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D15B16A4D0; Mon, 1 Dec 2003 12:31:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3645E16A4CE for ; Mon, 1 Dec 2003 12:31:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C52543FE3 for ; Mon, 1 Dec 2003 12:31:26 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB1KVQXJ059824 for ; Mon, 1 Dec 2003 12:31:26 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB1KVPkI059821 for perforce@freebsd.org; Mon, 1 Dec 2003 12:31:25 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 1 Dec 2003 12:31:25 -0800 (PST) Message-Id: <200312012031.hB1KVPkI059821@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 43241 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Dec 2003 20:31:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=43241 Change 43241 by peter@peter_daintree on 2003/12/01 12:31:09 integrate -I -b i386_hammer .. this is somewhat of an experiment. I hope to automagically track i386 changes like this. Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#9 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#8 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/amd64-gdbstub.c#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/atomic.c#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/critical.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_disasm.c#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#25 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#28 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/locore.S#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#72 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#45 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#18 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#46 integrate .. //depot/projects/hammer/sys/amd64/amd64/support.S#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#35 integrate .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#21 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#26 integrate .. //depot/projects/hammer/sys/amd64/include/_limits.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/_stdint.h#4 integrate .. //depot/projects/hammer/sys/amd64/include/_types.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/asm.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/asmacros.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/bus_dma.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/clock.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/cpu.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/critical.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/elf.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/endian.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/fpu.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/frame.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/legacyvar.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/limits.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#19 integrate .. //depot/projects/hammer/sys/amd64/include/metadata.h#4 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/pcb.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/pcpu.h#17 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#24 integrate .. //depot/projects/hammer/sys/amd64/include/proc.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/segments.h#16 integrate .. //depot/projects/hammer/sys/amd64/include/sf_buf.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/stdarg.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/sysarch.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/varargs.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#17 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#31 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#18 integrate .. //depot/projects/hammer/sys/amd64/isa/icu.h#15 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.c#8 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.h#6 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#8 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#10 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#7 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#7 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/amd64-gdbstub.c#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#5 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/atomic.c#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/autoconf.c#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#14 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/critical.c#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/db_disasm.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/db_interface.c#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#25 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#4 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#28 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#18 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#7 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/initcpu.c#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/locore.S#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#72 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#45 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#18 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#46 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/support.S#17 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#35 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/tsc.c#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#21 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#26 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/_limits.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/_stdint.h#4 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/_types.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/asm.h#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/asmacros.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/atomic.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus_amd64.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus_dma.h#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/clock.h#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cpu.h#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/critical.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/elf.h#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/endian.h#5 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/fpu.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/frame.h#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/ieeefp.h#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/legacyvar.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/limits.h#5 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/md_var.h#19 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/metadata.h#4 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/param.h#13 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pcb.h#13 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#7 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#17 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pmap.h#24 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/proc.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/profile.h#7 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/segments.h#16 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/sf_buf.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/specialreg.h#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/stdarg.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/sysarch.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/varargs.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/vmparam.h#17 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#31 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/clock.c#18 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/icu.h#15 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa.c#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa.h#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa_dma.c#8 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#7 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Dec 1 12:40:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC8A116A4D0; Mon, 1 Dec 2003 12:40:39 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9819A16A4CE for ; Mon, 1 Dec 2003 12:40:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2110943FE1 for ; Mon, 1 Dec 2003 12:40:38 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB1KebXJ060191 for ; Mon, 1 Dec 2003 12:40:37 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB1KebY1060188 for perforce@freebsd.org; Mon, 1 Dec 2003 12:40:37 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 1 Dec 2003 12:40:37 -0800 (PST) Message-Id: <200312012040.hB1KebY1060188@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 43242 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Dec 2003 20:40:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=43242 Change 43242 by peter@peter_daintree on 2003/12/01 12:39:42 diff reduction Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/amd64-gdbstub.c#7 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/amd64-gdbstub.c#7 (text+ko) ==== @@ -12,6 +12,9 @@ ****************************************************************************/ +#include +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.25 2003/07/25 21:15:44 obrien Exp $"); + /**************************************************************************** * Header: remcom.c,v 1.34 91/03/09 12:29:49 glenne Exp $ * @@ -92,9 +95,6 @@ * ****************************************************************************/ -#include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.25 2003/07/25 21:15:44 obrien Exp $"); - #include #include #include From owner-p4-projects@FreeBSD.ORG Mon Dec 1 12:40:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61B4016A4D6; Mon, 1 Dec 2003 12:40:40 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 11F0816A4FA for ; Mon, 1 Dec 2003 12:40:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9110643FEA for ; Mon, 1 Dec 2003 12:40:38 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB1KecXJ060197 for ; Mon, 1 Dec 2003 12:40:38 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB1KecfY060194 for perforce@freebsd.org; Mon, 1 Dec 2003 12:40:38 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 1 Dec 2003 12:40:38 -0800 (PST) Message-Id: <200312012040.hB1KecfY060194@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 43243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Dec 2003 20:40:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=43243 Change 43243 by peter@peter_daintree on 2003/12/01 12:40:23 sync Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#6 (text+ko) ==== @@ -22,7 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include From owner-p4-projects@FreeBSD.ORG Mon Dec 1 12:45:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5EF716A4D3; Mon, 1 Dec 2003 12:45:46 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8FAF116A4CE for ; Mon, 1 Dec 2003 12:45:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E27F143FBF for ; Mon, 1 Dec 2003 12:45:45 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB1KjjXJ060462 for ; Mon, 1 Dec 2003 12:45:45 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB1Kjjh3060459 for perforce@freebsd.org; Mon, 1 Dec 2003 12:45:45 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 1 Dec 2003 12:45:45 -0800 (PST) Message-Id: <200312012045.hB1Kjjh3060459@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 43245 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Dec 2003 20:45:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=43245 Change 43245 by peter@peter_daintree on 2003/12/01 12:45:32 i386 sync. now that curthread isn't so damn toxic.... Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/critical.c#11 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/critical.c#11 (text+ko) ==== @@ -30,15 +30,7 @@ #include #include -#include -#include -#include -#include -#include #include -#include -#include -#include #include /* @@ -47,8 +39,6 @@ void cpu_critical_fork_exit(void) { - struct thread *td; - td = curthread; - td->td_md.md_savecrit = read_rflags() | PSL_I; + curthread->td_md.md_savecrit = read_rflags() | PSL_I; } From owner-p4-projects@FreeBSD.ORG Mon Dec 1 13:11:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DE3C16A4D1; Mon, 1 Dec 2003 13:11:20 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC39916A4CE for ; Mon, 1 Dec 2003 13:11:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E611043FDD for ; Mon, 1 Dec 2003 13:11:18 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB1LBIXJ067940 for ; Mon, 1 Dec 2003 13:11:18 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB1LBIKF067937 for perforce@freebsd.org; Mon, 1 Dec 2003 13:11:18 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 1 Dec 2003 13:11:18 -0800 (PST) Message-Id: <200312012111.hB1LBIKF067937@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 43248 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Dec 2003 21:11:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=43248 Change 43248 by peter@peter_daintree on 2003/12/01 13:10:58 MTX_LOCK_SPIN and MTX_UNLOCK_SPIN are not used.. kill the broken definitions of them. XXX also appears to be unused on i386. Affected files ... .. //depot/projects/hammer/sys/amd64/include/mutex.h#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/mutex.h#6 (text+ko) ==== @@ -33,7 +33,6 @@ #define _MACHINE_MUTEX_H_ #ifndef LOCORE - #ifdef _KERNEL /* Global locks */ @@ -41,35 +40,5 @@ #endif /* _KERNEL */ -#else /* !LOCORE */ - -/* - * Simple assembly macros to get and release mutexes. - * - * Note: All of these macros accept a "flags" argument and are analoguous - * to the mtx_lock_flags and mtx_unlock_flags general macros. If one - * desires to not pass a flag, the value 0 may be passed as second - * argument. - * - * XXX: We only have MTX_LOCK_SPIN and MTX_UNLOCK_SPIN for now, since that's - * all we use right now. We should add MTX_LOCK and MTX_UNLOCK (for sleep - * locks) in the near future, however. - */ -#define MTX_LOCK_SPIN(lck, flags) \ - pushq $0 ; \ - pushq $0 ; \ - pushq $flags ; \ - pushq $lck ; \ - call _mtx_lock_spin_flags ; \ - addq $0x20, %rsp ; \ - -#define MTX_UNLOCK_SPIN(lck) \ - pushq $0 ; \ - pushq $0 ; \ - pushq $0 ; \ - pushq $lck ; \ - call _mtx_unlock_spin_flags ; \ - addq $0x20, %rsp ; \ - #endif /* !LOCORE */ #endif /* __MACHINE_MUTEX_H */ From owner-p4-projects@FreeBSD.ORG Mon Dec 1 13:17:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C06D816A4D0; Mon, 1 Dec 2003 13:17:27 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9AC0716A4CE for ; Mon, 1 Dec 2003 13:17:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F204443FE3 for ; Mon, 1 Dec 2003 13:17:26 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB1LHQXJ068160 for ; Mon, 1 Dec 2003 13:17:26 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB1LHQ6l068157 for perforce@freebsd.org; Mon, 1 Dec 2003 13:17:26 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 1 Dec 2003 13:17:26 -0800 (PST) Message-Id: <200312012117.hB1LHQ6l068157@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 43249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Dec 2003 21:17:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=43249 Change 43249 by peter@peter_daintree on 2003/12/01 13:16:53 sync with i386 (minus bogus comments in i386 version) Affected files ... .. //depot/projects/hammer/sys/amd64/include/critical.h#10 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/critical.h#10 (text+ko) ==== @@ -57,10 +57,7 @@ static __inline void cpu_critical_enter(void) { - struct thread *td; - - td = curthread; - td->td_md.md_savecrit = intr_disable(); + curthread->td_md.md_savecrit = intr_disable(); } /* @@ -73,10 +70,7 @@ static __inline void cpu_critical_exit(void) { - struct thread *td; - - td = curthread; - intr_restore(td->td_md.md_savecrit); + intr_restore(curthread->td_md.md_savecrit); } #else /* !__GNUC__ */ From owner-p4-projects@FreeBSD.ORG Mon Dec 1 13:19:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57A7916A4D0; Mon, 1 Dec 2003 13:19:35 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 052AE16A4CE for ; Mon, 1 Dec 2003 13:19:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4143943F3F for ; Mon, 1 Dec 2003 13:19:30 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB1LJUXJ068212 for ; Mon, 1 Dec 2003 13:19:30 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB1LJT9f068209 for perforce@freebsd.org; Mon, 1 Dec 2003 13:19:29 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 1 Dec 2003 13:19:29 -0800 (PST) Message-Id: <200312012119.hB1LJT9f068209@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 43250 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Dec 2003 21:19:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=43250 Change 43250 by peter@peter_daintree on 2003/12/01 13:18:40 cosmetic sync with i386 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#5 edit .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#73 edit .. //depot/projects/hammer/sys/amd64/amd64/mem.c#13 edit .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#19 edit .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#47 edit .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#22 edit .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#11 edit .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#8 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)npx.c 7.2 (Berkeley) 5/12/91 + * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 */ #include ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#73 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)machdep.c 7.4 (Berkeley) 6/3/91 + * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 */ #include ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#13 (text+ko) ==== @@ -36,8 +36,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Utah $Hdr: mem.c 1.13 89/10/08$ - * @(#)mem.c 7.2 (Berkeley) 5/9/91 + * from: Utah $Hdr: mem.c 1.13 89/10/08$ + * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 */ #include @@ -175,6 +175,7 @@ } c = iov->iov_len; + /* * Make sure that all of the pages are currently resident so * that we don't create any zero-fill pages. ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#19 (text+ko) ==== @@ -174,7 +174,7 @@ if (last == -1) last = irq; } else if (last != -1) { - if (rman_manage_region(&irq_rman, last, irq - 1) != 0) + if (rman_manage_region(&irq_rman, last, irq - 1) != 0) panic("nexus_probe irq_rman add"); last = -1; } ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#47 (text+ko) ==== @@ -40,7 +40,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 + * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#22 (text+ko) ==== @@ -59,8 +59,8 @@ #include #include #include +#include #include -#include #include #include ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#11 (text+ko) ==== @@ -84,8 +84,8 @@ static const char * legacy_pcib_is_host_bridge(int bus, int slot, int func, - u_int32_t id, u_int8_t class, u_int8_t subclass, - u_int8_t *busnum) + u_int32_t id, u_int8_t class, u_int8_t subclass, + u_int8_t *busnum) { const char *s = NULL; static u_int8_t pxb[4]; /* hack for 450nx */ ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#8 (text+ko) ==== @@ -346,3 +346,4 @@ devmax = 0; return (cfgmech); } + From owner-p4-projects@FreeBSD.ORG Mon Dec 1 13:36:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50BCE16A4D0; Mon, 1 Dec 2003 13:36:59 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2891116A4CE for ; Mon, 1 Dec 2003 13:36:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF7B943FDF for ; Mon, 1 Dec 2003 13:36:54 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB1LasXJ068872 for ; Mon, 1 Dec 2003 13:36:54 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB1LapTd068858 for perforce@freebsd.org; Mon, 1 Dec 2003 13:36:51 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Dec 2003 13:36:51 -0800 (PST) Message-Id: <200312012136.hB1LapTd068858@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 43251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Dec 2003 21:36:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=43251 Change 43251 by jhb@jhb_blue on 2003/12/01 13:36:01 IFC @43247. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/db_trace.c#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#24 integrate .. //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/autoconf.c#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/legacy.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/support.S#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/sys_machdep.c#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#14 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#12 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#11 integrate .. //depot/projects/smpng/sys/amd64/include/_limits.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/_stdint.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/asmacros.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/atomic.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/bus_dma.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/limits.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/pcpu.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/proc.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/smpng/sys/amd64/isa/isa.c#3 integrate .. //depot/projects/smpng/sys/amd64/isa/isa_dma.c#3 integrate .. //depot/projects/smpng/sys/boot/i386/loader/loader.rc#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#19 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#27 integrate .. //depot/projects/smpng/sys/conf/majors#30 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#8 integrate .. //depot/projects/smpng/sys/conf/options.i386#35 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ah.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#5 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/version.h#4 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#18 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#43 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#20 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#15 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#23 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#33 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#15 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#25 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#43 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#12 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/ath/if_athioctl.h#4 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#7 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_core.c#13 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#17 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.h#5 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_reg.h#5 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#21 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#47 integrate .. //depot/projects/smpng/sys/dev/ips/ips.c#5 integrate .. //depot/projects/smpng/sys/dev/ips/ips.h#5 integrate .. //depot/projects/smpng/sys/dev/ips/ips_commands.c#6 integrate .. //depot/projects/smpng/sys/dev/led/led.c#2 integrate .. //depot/projects/smpng/sys/dev/puc/puc_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#5 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.h#5 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#23 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/vinum/vinuminterrupt.c#6 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumio.c#16 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#12 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#69 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#60 integrate .. //depot/projects/smpng/sys/i386/include/pcpu.h#10 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#26 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#22 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#22 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#63 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#16 integrate .. //depot/projects/smpng/sys/net/bpf.h#8 integrate .. //depot/projects/smpng/sys/net/route.c#16 integrate .. //depot/projects/smpng/sys/netatalk/at_control.c#8 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#40 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#26 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#29 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#24 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#25 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#46 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#33 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#43 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#39 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#23 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#35 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#25 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#22 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#25 integrate .. //depot/projects/smpng/sys/netkey/key.c#22 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#13 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#23 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#15 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#32 integrate .. //depot/projects/smpng/sys/nfsclient/nfsmount.h#6 integrate .. //depot/projects/smpng/sys/nfsclient/nfsnode.h#7 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#49 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#40 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#26 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#39 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mp_machdep.c#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#20 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#29 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#10 integrate .. //depot/projects/smpng/sys/sys/smp.h#8 integrate .. //depot/projects/smpng/sys/sys/soundcard.h#8 integrate .. //depot/projects/smpng/sys/sys/timepps.h#5 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#39 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/db_trace.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.15 2003/08/17 06:42:07 marcel Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.16 2003/11/29 11:57:02 jeff Exp $ */ /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */ /*- @@ -112,7 +112,7 @@ * Decode the function prologue for the function we're in, and note * which registers are stored where, and how large the stack frame is. */ -static void +static int decode_prologue(db_addr_t callpc, db_addr_t func, struct prologue_info *pi) { @@ -127,6 +127,7 @@ do { \ if (pi->pi_frame_size != 0) { \ db_printf("frame size botch: adjust register offsets?\n"); \ + return (1); \ } \ } while (0) @@ -143,9 +144,11 @@ */ signed_immediate = (long)ins.mem_format.displacement; #if 1 - if (signed_immediate > 0) + if (signed_immediate > 0) { db_printf("prologue botch: displacement %ld\n", signed_immediate); + return (1); + } #endif CHECK_FRAMESIZE; pi->pi_frame_size += -signed_immediate; @@ -169,6 +172,7 @@ pi->pi_reg_offset[ins.mem_format.rd] = signed_immediate; } } + return (0); } static int @@ -363,7 +367,8 @@ * * XXX How does this interact w/ alloca()?! */ - decode_prologue(callpc, symval, &pi); + if (decode_prologue(callpc, symval, &pi)) + return; if ((pi.pi_regmask & (1 << 26)) == 0) { /* * No saved RA found. We might have RA from ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#24 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.48 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.50 2003/11/30 22:08:24 jeff Exp $"); #include "opt_kstack_pages.h" @@ -64,6 +64,7 @@ u_int boot_cpu_id; static void release_aps(void *dummy); +static int smp_cpu_enabled(struct pcs *pcsp); extern void smp_init_secondary_glue(void); static int smp_send_secondary_command(const char *command, int cpuid); static int smp_start_secondary(int cpuid); @@ -301,10 +302,49 @@ /* Other stuff */ +static int +smp_cpu_enabled(struct pcs *pcsp) +{ + + /* Is this CPU present? */ + if ((pcsp->pcs_flags & PCS_PP) == 0) + return (0); + + /* Is this CPU available? */ + if ((pcsp->pcs_flags & PCS_PA) == 0) + /* + * The TurboLaser PCS_PA bit doesn't seem to be set + * correctly. + */ + if (hwrpb->rpb_type != ST_DEC_21000) + return (0); + + /* Is this CPU's PALcode valid? */ + if ((pcsp->pcs_flags & PCS_PV) == 0) + return (0); + + return (1); +} + +void +cpu_mp_setmaxid(void) +{ + int i; + + mp_maxid = 0; + for (i = 0; i < hwrpb->rpb_pcs_cnt && i < MAXCPU; i++) { + if (i == PCPU_GET(cpuid)) + continue; + if (!smp_cpu_enabled(LOCATE_PCS(hwrpb, i))) + continue; + mp_maxid = i; + } + mp_maxid++; +} + int cpu_mp_probe(void) { - struct pcs *pcsp; int i, cpus; /* XXX: Need to check for valid platforms here. */ @@ -315,33 +355,16 @@ all_cpus = 1 << boot_cpu_id; mp_ncpus = 1; - mp_maxid = 0; /* Make sure we have at least one secondary CPU. */ cpus = 0; for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { if (i == PCPU_GET(cpuid)) continue; - pcsp = (struct pcs *)((char *)hwrpb + hwrpb->rpb_pcs_off + - (i * hwrpb->rpb_pcs_size)); - if ((pcsp->pcs_flags & PCS_PP) == 0) { + if (!smp_cpu_enabled(LOCATE_PCS(hwrpb, i))) continue; - } - if ((pcsp->pcs_flags & PCS_PA) == 0) { - /* - * The TurboLaser PCS_PA bit doesn't seem to be set - * correctly. - */ - if (hwrpb->rpb_type != ST_DEC_21000) - continue; - } - if ((pcsp->pcs_flags & PCS_PV) == 0) { + if (i > MAXCPU) continue; - } - if (i > MAXCPU) { - continue; - } - mp_maxid = i; cpus++; } return (cpus); @@ -359,8 +382,7 @@ if (i == boot_cpu_id) continue; - pcsp = (struct pcs *)((char *)hwrpb + hwrpb->rpb_pcs_off + - (i * hwrpb->rpb_pcs_size)); + pcsp = LOCATE_PCS(hwrpb, i); if ((pcsp->pcs_flags & PCS_PP) == 0) continue; if ((pcsp->pcs_flags & PCS_PA) == 0) { ==== //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.22 2003/10/21 18:28:33 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.23 2003/11/22 01:11:07 peter Exp $"); #include #include @@ -214,13 +214,13 @@ msrv = rdmsr(msr); mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | amd64_mtrr2mrt(msrv & 0xff); - mrd->mr_base = msrv & 0x000ffffffffff000L; + mrd->mr_base = msrv & 0x000000fffffff000L; msrv = rdmsr(msr + 1); mrd->mr_flags = (msrv & 0x800) ? (mrd->mr_flags | MDF_ACTIVE) : (mrd->mr_flags & ~MDF_ACTIVE); /* Compute the range from the mask. Ick. */ - mrd->mr_len = (~(msrv & 0x000ffffffffff000L) & 0x000fffffffffffffL) + 1; + mrd->mr_len = (~(msrv & 0x000000fffffff000L) & 0x000000ffffffffffL) + 1; if (!mrvalid(mrd->mr_base, mrd->mr_len)) mrd->mr_flags |= MDF_BOGUS; /* If unclaimed and active, must be the BIOS */ @@ -348,7 +348,7 @@ /* base/type register */ omsrv = rdmsr(msr); if (mrd->mr_flags & MDF_ACTIVE) { - msrv = mrd->mr_base & 0x000ffffffffff000L; + msrv = mrd->mr_base & 0x000000fffffff000L; msrv |= amd64_mrt2mtrr(mrd->mr_flags, omsrv); } else { msrv = 0; @@ -357,7 +357,7 @@ /* mask/active register */ if (mrd->mr_flags & MDF_ACTIVE) { - msrv = 0x800 | (~(mrd->mr_len - 1) & 0x000ffffffffff000L); + msrv = 0x800 | (~(mrd->mr_len - 1) & 0x000000fffffff000L); } else { msrv = 0; } @@ -553,7 +553,6 @@ return; } nmdesc = mtrrcap & 0xff; - printf("Pentium Pro MTRR support enabled\n"); /* If fixed MTRRs supported and enabled */ if ((mtrrcap & 0x100) && (mtrrdef & 0x400)) { ==== //depot/projects/smpng/sys/amd64/amd64/autoconf.c#5 (text+ko) ==== @@ -33,11 +33,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)autoconf.c 7.1 (Berkeley) 5/9/91 + * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.176 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.177 2003/11/21 03:01:59 peter Exp $"); /* * Setup the system to run on the current machine. ==== //depot/projects/smpng/sys/amd64/amd64/genassym.c#9 (text+ko) ==== @@ -33,11 +33,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)genassym.c 5.11 (Berkeley) 5/10/91 + * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.150 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.151 2003/11/21 03:01:59 peter Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1992 Terrence R. Lambert. * Copyright (c) 1982, 1987, 1990 The Regents of the University of California. * Copyright (c) 1997 KATO Takenori. @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.127 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.128 2003/11/21 03:01:59 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/smpng/sys/amd64/amd64/initcpu.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) KATO Takenori, 1997, 1998. * * All rights reserved. Unpublished rights reserved under the copyright @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.46 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.47 2003/11/21 03:01:59 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/smpng/sys/amd64/amd64/legacy.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright 1998 Massachusetts Institute of Technology * * Permission to use, copy, modify, and distribute this software and @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.51 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.52 2003/11/21 03:01:59 peter Exp $"); /* * This code implements a system driver for legacy systems that do not ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#17 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.599 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.600 2003/11/20 22:54:44 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -121,6 +121,9 @@ #include #include +/* Sanity check for __curthread() */ +CTASSERT(offsetof(struct pcpu, pc_curthread) == 0); + extern u_int64_t hammer_time(u_int64_t, u_int64_t); extern void dblfault_handler(void); ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.226 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.229 2003/11/30 22:20:40 jeff Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -130,7 +130,7 @@ } static cpu_info[MAXCPU]; static int cpu_apic_ids[MAXCPU]; -static u_int boot_address; +static u_int boot_address; static void set_logical_apic_ids(void); static int start_all_aps(void); @@ -179,14 +179,34 @@ cpu_info[apic_id].cpu_bsp = 1; } mp_ncpus++; - if (apic_id > mp_maxid) - mp_maxid = apic_id; + if (apic_id >= mp_maxid) + mp_maxid = apic_id + 1; if (bootverbose) printf("SMP: Added CPU %d (%s)\n", apic_id, boot_cpu ? "BSP" : "AP"); } +void +cpu_mp_setmaxid(void) +{ + + /* + * mp_maxid should be already set by calls to cpu_add(). + * Just sanity check its value here. + */ + if (mp_ncpus == 0) + KASSERT(mp_maxid == 0, + ("%s: mp_ncpus is zero, but mp_maxid is not", __func__)); + else if (mp_ncpus == 1) + mp_maxid = 0; + else + KASSERT(mp_maxid >= mp_ncpus - 1, + ("%s: counters out of sync: max %d, count %d", __func__, + mp_maxid, mp_ncpus)); + +} + int cpu_mp_probe(void) { @@ -202,8 +222,6 @@ * the variables to represent a system with a single CPU * with an id of 0. */ - KASSERT(mp_maxid == 0, - ("%s: mp_ncpus is zero, but mp_maxid is not", __func__)); mp_ncpus = 1; return (0); } @@ -219,9 +237,6 @@ } /* At least two CPUs were found. */ - KASSERT(mp_maxid >= mp_ncpus - 1, - ("%s: counters out of sync: max %d, count %d", __func__, mp_maxid, - mp_ncpus)); return (1); } ==== //depot/projects/smpng/sys/amd64/amd64/nexus.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.56 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.57 2003/11/21 03:00:05 peter Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -135,6 +135,7 @@ static int nexus_probe(device_t dev) { + int irq, last; device_quiet(dev); /* suppress attach message for neatness */ @@ -160,12 +161,27 @@ irq_rman.rm_type = RMAN_ARRAY; irq_rman.rm_descr = "Interrupt request lines"; irq_rman.rm_end = NUM_IO_INTS - 1; - if (rman_init(&irq_rman) - || rman_manage_region(&irq_rman, - irq_rman.rm_start, irq_rman.rm_end)) + if (rman_init(&irq_rman)) panic("nexus_probe irq_rman"); /* + * We search for regions of existing IRQs and add those to the IRQ + * resource manager. + */ + last = -1; + for (irq = 0; irq < NUM_IO_INTS; irq++) + if (intr_lookup_source(irq) != NULL) { + if (last == -1) + last = irq; + } else if (last != -1) { + if (rman_manage_region(&irq_rman, last, irq - 1) != 0) + panic("nexus_probe irq_rman add"); + last = -1; + } + if (last != -1 && rman_manage_region(&irq_rman, last, irq - 1) != 0) + panic("nexus_probe irq_rman add"); + + /* * ISA DMA on PCI systems is implemented in the ISA part of each * PCI->ISA bridge and the channels can be duplicated if there are * multiple bridges. (eg: laptops with docking stations) ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#17 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1991 Regents of the University of California. * All rights reserved. * Copyright (c) 1994 John S. Dyson @@ -40,7 +40,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)pmap.c 7.7 (Berkeley) 5/12/91 + * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.446 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.447 2003/11/21 03:01:59 peter Exp $"); /* * Manages physical address maps. ==== //depot/projects/smpng/sys/amd64/amd64/support.S#8 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.104 2003/11/17 08:58:13 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.105 2003/11/27 17:20:44 peter Exp $ */ #include "opt_ddb.h" @@ -45,7 +45,7 @@ ALIGN_DATA .globl intrcnt, eintrcnt intrcnt: - .space INTRCNT_COUNT * 4 + .space INTRCNT_COUNT * 8 eintrcnt: .globl intrnames, eintrnames ==== //depot/projects/smpng/sys/amd64/amd64/sys_machdep.c#5 (text+ko) ==== @@ -31,11 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 + * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.86 2003/11/08 04:39:21 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.87 2003/11/21 03:01:59 peter Exp $"); #include #include ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#14 (text+ko) ==== @@ -34,11 +34,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)trap.c 7.4 (Berkeley) 5/13/91 + * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.270 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.271 2003/11/21 03:01:59 peter Exp $"); /* * AMD64 Trap and System call handling ==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#12 (text+ko) ==== @@ -36,12 +36,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 + * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.223 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.224 2003/11/21 03:02:00 peter Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#11 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.398 2003/11/19 18:11:27 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.399 2003/11/21 03:19:59 peter Exp $ machine amd64 cpu HAMMER @@ -68,6 +68,7 @@ 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 acpi device isa ==== //depot/projects/smpng/sys/amd64/include/_limits.h#3 (text+ko) ==== @@ -31,9 +31,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * From: FreeBSD: src/sys/alpha/include/limits.h,v 1.8 2001/11/02 - * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.7 2003/05/19 20:29:06 kan Exp $ + * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.8 2003/11/21 03:02:00 peter Exp $ */ #ifndef _MACHINE__LIMITS_H_ @@ -53,27 +51,26 @@ #define __CHAR_BIT 8 /* number of bits in a char */ #define __SCHAR_MAX 0x7f /* max value for a signed char */ -#define __SCHAR_MIN (-0x7f-1) /* min value for a signed char */ +#define __SCHAR_MIN (-0x7f - 1) /* min value for a signed char */ #define __UCHAR_MAX 0xffU /* max value for an unsigned char */ #define __USHRT_MAX 0xffffU /* max value for an unsigned short */ #define __SHRT_MAX 0x7fff /* max value for a short */ -#define __SHRT_MIN (-0x7fff-1) /* min value for a short */ +#define __SHRT_MIN (-0x7fff - 1) /* min value for a short */ #define __UINT_MAX 0xffffffffU /* max value for an unsigned int */ #define __INT_MAX 0x7fffffff /* max value for an int */ -#define __INT_MIN (-0x7fffffff-1) /* min value for an int */ +#define __INT_MIN (-0x7fffffff - 1) /* min value for an int */ #define __ULONG_MAX 0xffffffffffffffffUL /* max for an unsigned long */ #define __LONG_MAX 0x7fffffffffffffffL /* max for a long */ -#define __LONG_MIN (-0x7fffffffffffffffL-1) /* min for a long */ +#define __LONG_MIN (-0x7fffffffffffffffL - 1) /* min for a long */ -/* Long longs and longs are the same size on the alpha. */ - /* max for an unsigned long long */ + /* max value for an unsigned long long */ #define __ULLONG_MAX 0xffffffffffffffffULL -#define __LLONG_MAX 0x7fffffffffffffffLL /* max for a long long */ -#define __LLONG_MIN (-0x7fffffffffffffffLL-1) /* min for a long long */ +#define __LLONG_MAX 0x7fffffffffffffffLL /* max value for a long long */ +#define __LLONG_MIN (-0x7fffffffffffffffLL - 1) /* min for a long long */ #define __SSIZE_MAX __LONG_MAX /* max value for a ssize_t */ @@ -83,9 +80,9 @@ #define __OFF_MIN __LONG_MIN /* min value for an off_t */ /* Quads and longs are the same on the amd64. Ensure they stay in sync. */ -#define __UQUAD_MAX (__ULONG_MAX) /* max value for a uquad_t */ -#define __QUAD_MAX (__LONG_MAX) /* max value for a quad_t */ -#define __QUAD_MIN (__LONG_MIN) /* min value for a quad_t */ +#define __UQUAD_MAX __ULONG_MAX /* max value for a uquad_t */ +#define __QUAD_MAX __LONG_MAX /* max value for a quad_t */ +#define __QUAD_MIN __LONG_MIN /* min value for a quad_t */ #define __LONG_BIT 64 #define __WORD_BIT 32 ==== //depot/projects/smpng/sys/amd64/include/_stdint.h#2 (text+ko) ==== @@ -34,10 +34,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/_stdint.h,v 1.1 2002/07/29 17:41:23 mike Exp $ + * $FreeBSD: src/sys/amd64/include/_stdint.h,v 1.2 2003/11/21 03:02:00 peter Exp $ */ -#ifndef _MACHINE__STDINT_H_ +#ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ #if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) ==== //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.3 2003/09/22 22:12:46 peter Exp $ + * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.4 2003/11/21 03:02:00 peter Exp $ */ /****************************************************************************** @@ -103,6 +103,6 @@ #define COMPILER_DEPENDENT_INT64 long #define COMPILER_DEPENDENT_UINT64 unsigned long -void acpi_SetDefaultIntrModel(int model); +void acpi_SetDefaultIntrModel(int model); #endif /* __ACPICA_MACHDEP_H__ */ ==== //depot/projects/smpng/sys/amd64/include/asmacros.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.26 2003/11/17 08:58:14 peter Exp $ + * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.27 2003/11/21 03:02:00 peter Exp $ */ #ifndef _MACHINE_ASMACROS_H_ @@ -115,7 +115,7 @@ #define CROSSJUMPTARGET(label) \ ALIGN_TEXT; __CONCAT(to,label): ; MCOUNT; jmp label #define ENTRY(name) GEN_ENTRY(name) ; 9: ; MCOUNT -#define FAKE_MCOUNT(caller) pushq caller ; call __mcount ; popl %ecx +#define FAKE_MCOUNT(caller) pushq caller ; call __mcount ; popq %rcx #define MCOUNT call __mcount #define MCOUNT_LABEL(name) GEN_ENTRY(name) ; nop ; ALIGN_TEXT #define MEXITCOUNT call HIDENAME(mexitcount) ==== //depot/projects/smpng/sys/amd64/include/atomic.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.31 2003/11/17 08:58:14 peter Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.32 2003/11/21 03:02:00 peter Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -99,7 +99,8 @@ __asm __volatile(__XSTRING(MPLOCKED) OP \ : "+m" (*p) \ : CONS (V)); \ -} +} \ +struct __hack #else /* !__GNUC__ */ @@ -150,7 +151,7 @@ " movzbq %%al,%0 ; " "1: " "# atomic_cmpset_long" - : "+a" (res) /* 0 (result) %rax, XXX check */ + : "+a" (res) /* 0 (result) */ : "r" (src), /* 1 */ "m" (*(dst)) /* 2 */ : "memory"); @@ -185,7 +186,8 @@ : "+m" (*p), /* 0 */ \ "+r" (v) /* 1 */ \ : : "memory"); \ -} +} \ +struct __hack #else /* !defined(__GNUC__) */ @@ -330,7 +332,11 @@ static __inline void * atomic_load_acq_ptr(volatile void *p) { - return (void *)atomic_load_acq_long((volatile u_long *)p); + /* + * The apparently-bogus cast to intptr_t in the following is to + * avoid a warning from "gcc -Wbad-function-cast". + */ + return ((void *)(intptr_t)atomic_load_acq_long((volatile u_long *)p)); } static __inline void ==== //depot/projects/smpng/sys/amd64/include/bus_dma.h#8 (text+ko) ==== @@ -67,7 +67,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.25 2003/11/07 23:29:42 scottl Exp $ */ +/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.26 2003/11/21 03:02:00 peter Exp $ */ #ifndef _AMD64_BUS_DMA_H_ #define _AMD64_BUS_DMA_H_ @@ -78,7 +78,7 @@ #define BUS_DMA_WAITOK 0x00 /* safe to sleep (pseudo-flag) */ #define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */ #define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */ -#define BUS_DMA_COHERENT 0x04 /* hint map memory in a coherent way */ +#define BUS_DMA_COHERENT 0x04 /* hint: map memory in a coherent way */ #define BUS_DMA_ZERO 0x08 /* allocate zero'ed memory */ #define BUS_DMA_BUS1 0x10 /* placeholders for bus functions... */ #define BUS_DMA_BUS2 0x20 @@ -104,7 +104,7 @@ * A machine-dependent opaque type describing the characteristics * of how to perform DMA mappings. This structure encapsultes * information concerning address and alignment restrictions, number - * of S/G segments, amount of data per S/G segment, etc. + * of S/G segments, amount of data per S/G segment, etc. */ typedef struct bus_dma_tag *bus_dma_tag_t; @@ -133,7 +133,7 @@ typedef int bus_dma_filter_t(void *, bus_addr_t); /* - * A function that performs driver-specific syncronization on behalf of + * A function that performs driver-specific synchronization on behalf of * busdma. */ typedef enum { @@ -147,7 +147,7 @@ * Allocate a device specific dma_tag encapsulating the constraints of * the parent tag in addition to other restrictions specified: * - * alignment: alignment for segments. + * alignment: Alignment for segments. * boundary: Boundary that segments cannot cross. * lowaddr: Low restricted address that cannot appear in a mapping. * highaddr: High restricted address that cannot appear in a mapping. @@ -184,21 +184,21 @@ int bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp); /* - * Destroy a handle for mapping from kva/uva/physical + * Destroy a handle for mapping from kva/uva/physical * address space into bus device space. */ int bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map); /* * Allocate a piece of memory that can be efficiently mapped into - * bus device space based on the constraints lited in the dma tag. + * bus device space based on the constraints listed in the dma tag. * A dmamap to for use with dmamap_load is also allocated. */ int bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, bus_dmamap_t *mapp); /* - * Free a piece of memory and it's allociated dmamap, that was allocated + * Free a piece of memory and its allocated dmamap, that was allocated * via bus_dmamem_alloc. */ void bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map); @@ -218,7 +218,7 @@ /* * Like bus_dmamap_callback but includes map size in bytes. This is - * defined as a separate interface to maintain compatiiblity for users + * defined as a separate interface to maintain compatibility for users * of bus_dmamap_callback_t--at some point these interfaces should be merged. */ typedef void bus_dmamap_callback2_t(void *, bus_dma_segment_t *, int, bus_size_t, int); @@ -240,7 +240,7 @@ int flags); /* - * Perform a syncronization operation on the given map. + * Perform a synchronization operation on the given map. */ void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t); #define bus_dmamap_sync(dmat, dmamap, op) \ ==== //depot/projects/smpng/sys/amd64/include/limits.h#3 (text+ko) ==== @@ -31,9 +31,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * From: FreeBSD: src/sys/alpha/include/limits.h,v 1.8 2001/11/02 - * $FreeBSD: src/sys/amd64/include/limits.h,v 1.6 2003/05/19 20:29:06 kan Exp $ + * $FreeBSD: src/sys/amd64/include/limits.h,v 1.7 2003/11/21 03:02:00 peter Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 1 13:57:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8506216A4D0; Mon, 1 Dec 2003 13:57:51 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5CD8316A4CE for ; Mon, 1 Dec 2003 13:57:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4111143FE3 for ; Mon, 1 Dec 2003 13:57:44 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB1LviXJ069749 for ; Mon, 1 Dec 2003 13:57:44 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB1Lvf9A069746 for perforce@freebsd.org; Mon, 1 Dec 2003 13:57:41 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Dec 2003 13:57:41 -0800 (PST) Message-Id: <200312012157.hB1Lvf9A069746@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 43260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Dec 2003 21:57:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=43260 Change 43260 by jhb@jhb_blue on 2003/12/01 13:56:49 IFC @43247. Affected files ... .. //depot/projects/power/sys/alpha/alpha/db_trace.c#2 integrate .. //depot/projects/power/sys/alpha/alpha/mp_machdep.c#2 integrate .. //depot/projects/power/sys/amd64/amd64/amd64_mem.c#3 integrate .. //depot/projects/power/sys/amd64/amd64/autoconf.c#3 integrate .. //depot/projects/power/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/power/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/power/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/power/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/power/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/power/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/power/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/power/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/power/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/power/sys/amd64/amd64/sys_machdep.c#3 integrate .. //depot/projects/power/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/power/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/power/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/power/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/power/sys/amd64/include/_stdint.h#2 integrate .. //depot/projects/power/sys/amd64/include/acpica_machdep.h#3 integrate .. //depot/projects/power/sys/amd64/include/asmacros.h#3 integrate .. //depot/projects/power/sys/amd64/include/atomic.h#3 integrate .. //depot/projects/power/sys/amd64/include/bus_dma.h#3 integrate .. //depot/projects/power/sys/amd64/include/limits.h#2 integrate .. //depot/projects/power/sys/amd64/include/pcpu.h#3 integrate .. //depot/projects/power/sys/amd64/include/proc.h#2 integrate .. //depot/projects/power/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/power/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/power/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/power/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/power/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/power/sys/boot/i386/loader/loader.rc#2 integrate .. //depot/projects/power/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/power/sys/conf/kern.post.mk#3 integrate .. //depot/projects/power/sys/conf/majors#4 integrate .. //depot/projects/power/sys/conf/newvers.sh#2 integrate .. //depot/projects/power/sys/conf/options.i386#3 integrate .. //depot/projects/power/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/power/sys/contrib/dev/acpica/exfldio.c#3 integrate .. //depot/projects/power/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/power/sys/contrib/dev/ath/ah.h#3 integrate .. //depot/projects/power/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#3 integrate .. //depot/projects/power/sys/contrib/dev/ath/version.h#3 integrate .. //depot/projects/power/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/power/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/power/sys/dev/aic7xxx/ahc_pci.c#4 integrate .. //depot/projects/power/sys/dev/aic7xxx/ahd_pci.c#4 integrate .. //depot/projects/power/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/power/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/power/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/power/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/power/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/power/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/power/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/power/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/power/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/power/sys/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/power/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/power/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/power/sys/dev/bktr/bktr_core.c#3 integrate .. //depot/projects/power/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/power/sys/dev/bktr/bktr_os.h#2 integrate .. //depot/projects/power/sys/dev/bktr/bktr_reg.h#2 integrate .. //depot/projects/power/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/power/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/power/sys/dev/ips/ips.c#2 integrate .. //depot/projects/power/sys/dev/ips/ips.h#2 integrate .. //depot/projects/power/sys/dev/ips/ips_commands.c#3 integrate .. //depot/projects/power/sys/dev/led/led.c#2 integrate .. //depot/projects/power/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/power/sys/dev/re/if_re.c#4 integrate .. //depot/projects/power/sys/dev/sio/sio_pci.c#3 integrate .. //depot/projects/power/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/power/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/power/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/power/sys/dev/uart/uart_bus_pci.c#4 integrate .. //depot/projects/power/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/power/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/power/sys/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/power/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/power/sys/dev/vinum/vinuminterrupt.c#2 integrate .. //depot/projects/power/sys/dev/vinum/vinumio.c#2 integrate .. //depot/projects/power/sys/dev/vinum/vinumrequest.c#3 integrate .. //depot/projects/power/sys/i386/i386/elan-mmcr.c#4 integrate .. //depot/projects/power/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/power/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/power/sys/i386/include/pcpu.h#3 integrate .. //depot/projects/power/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/power/sys/kern/subr_smp.c#4 integrate .. //depot/projects/power/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/power/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/power/sys/modules/acpi/Makefile#3 integrate .. //depot/projects/power/sys/net/bpf.h#3 integrate .. //depot/projects/power/sys/net/route.c#4 integrate .. //depot/projects/power/sys/netatalk/at_control.c#2 integrate .. //depot/projects/power/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/power/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/power/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/power/sys/netinet/ip_dummynet.c#5 integrate .. //depot/projects/power/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/power/sys/netinet/ip_input.c#5 integrate .. //depot/projects/power/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/power/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/power/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/power/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/power/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/power/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/power/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/power/sys/netinet6/raw_ip6.c#6 integrate .. //depot/projects/power/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/power/sys/netkey/key.c#5 integrate .. //depot/projects/power/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/power/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/power/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/power/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/power/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/power/sys/nfsclient/nfsmount.h#3 integrate .. //depot/projects/power/sys/nfsclient/nfsnode.h#3 integrate .. //depot/projects/power/sys/pci/if_dc.c#5 integrate .. //depot/projects/power/sys/pci/if_rl.c#3 integrate .. //depot/projects/power/sys/pci/if_sk.c#4 integrate .. //depot/projects/power/sys/pci/if_xl.c#4 integrate .. //depot/projects/power/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/power/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/power/sys/sys/mbuf.h#5 integrate .. //depot/projects/power/sys/sys/pcpu.h#2 integrate .. //depot/projects/power/sys/sys/smp.h#2 integrate .. //depot/projects/power/sys/sys/soundcard.h#2 integrate .. //depot/projects/power/sys/sys/timepps.h#2 integrate .. //depot/projects/power/sys/vm/uma_core.c#4 integrate Differences ... ==== //depot/projects/power/sys/alpha/alpha/db_trace.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.15 2003/08/17 06:42:07 marcel Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.16 2003/11/29 11:57:02 jeff Exp $ */ /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */ /*- @@ -112,7 +112,7 @@ * Decode the function prologue for the function we're in, and note * which registers are stored where, and how large the stack frame is. */ -static void +static int decode_prologue(db_addr_t callpc, db_addr_t func, struct prologue_info *pi) { @@ -127,6 +127,7 @@ do { \ if (pi->pi_frame_size != 0) { \ db_printf("frame size botch: adjust register offsets?\n"); \ + return (1); \ } \ } while (0) @@ -143,9 +144,11 @@ */ signed_immediate = (long)ins.mem_format.displacement; #if 1 - if (signed_immediate > 0) + if (signed_immediate > 0) { db_printf("prologue botch: displacement %ld\n", signed_immediate); + return (1); + } #endif CHECK_FRAMESIZE; pi->pi_frame_size += -signed_immediate; @@ -169,6 +172,7 @@ pi->pi_reg_offset[ins.mem_format.rd] = signed_immediate; } } + return (0); } static int @@ -363,7 +367,8 @@ * * XXX How does this interact w/ alloca()?! */ - decode_prologue(callpc, symval, &pi); + if (decode_prologue(callpc, symval, &pi)) + return; if ((pi.pi_regmask & (1 << 26)) == 0) { /* * No saved RA found. We might have RA from ==== //depot/projects/power/sys/alpha/alpha/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.48 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.50 2003/11/30 22:08:24 jeff Exp $"); #include "opt_kstack_pages.h" @@ -64,6 +64,7 @@ u_int boot_cpu_id; static void release_aps(void *dummy); +static int smp_cpu_enabled(struct pcs *pcsp); extern void smp_init_secondary_glue(void); static int smp_send_secondary_command(const char *command, int cpuid); static int smp_start_secondary(int cpuid); @@ -301,10 +302,49 @@ /* Other stuff */ +static int +smp_cpu_enabled(struct pcs *pcsp) +{ + + /* Is this CPU present? */ + if ((pcsp->pcs_flags & PCS_PP) == 0) + return (0); + + /* Is this CPU available? */ + if ((pcsp->pcs_flags & PCS_PA) == 0) + /* + * The TurboLaser PCS_PA bit doesn't seem to be set + * correctly. + */ + if (hwrpb->rpb_type != ST_DEC_21000) + return (0); + + /* Is this CPU's PALcode valid? */ + if ((pcsp->pcs_flags & PCS_PV) == 0) + return (0); + + return (1); +} + +void +cpu_mp_setmaxid(void) +{ + int i; + + mp_maxid = 0; + for (i = 0; i < hwrpb->rpb_pcs_cnt && i < MAXCPU; i++) { + if (i == PCPU_GET(cpuid)) + continue; + if (!smp_cpu_enabled(LOCATE_PCS(hwrpb, i))) + continue; + mp_maxid = i; + } + mp_maxid++; +} + int cpu_mp_probe(void) { - struct pcs *pcsp; int i, cpus; /* XXX: Need to check for valid platforms here. */ @@ -315,33 +355,16 @@ all_cpus = 1 << boot_cpu_id; mp_ncpus = 1; - mp_maxid = 0; /* Make sure we have at least one secondary CPU. */ cpus = 0; for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { if (i == PCPU_GET(cpuid)) continue; - pcsp = (struct pcs *)((char *)hwrpb + hwrpb->rpb_pcs_off + - (i * hwrpb->rpb_pcs_size)); - if ((pcsp->pcs_flags & PCS_PP) == 0) { + if (!smp_cpu_enabled(LOCATE_PCS(hwrpb, i))) continue; - } - if ((pcsp->pcs_flags & PCS_PA) == 0) { - /* - * The TurboLaser PCS_PA bit doesn't seem to be set - * correctly. - */ - if (hwrpb->rpb_type != ST_DEC_21000) - continue; - } - if ((pcsp->pcs_flags & PCS_PV) == 0) { + if (i > MAXCPU) continue; - } - if (i > MAXCPU) { - continue; - } - mp_maxid = i; cpus++; } return (cpus); @@ -359,8 +382,7 @@ if (i == boot_cpu_id) continue; - pcsp = (struct pcs *)((char *)hwrpb + hwrpb->rpb_pcs_off + - (i * hwrpb->rpb_pcs_size)); + pcsp = LOCATE_PCS(hwrpb, i); if ((pcsp->pcs_flags & PCS_PP) == 0) continue; if ((pcsp->pcs_flags & PCS_PA) == 0) { ==== //depot/projects/power/sys/amd64/amd64/amd64_mem.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.22 2003/10/21 18:28:33 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.23 2003/11/22 01:11:07 peter Exp $"); #include #include @@ -214,13 +214,13 @@ msrv = rdmsr(msr); mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | amd64_mtrr2mrt(msrv & 0xff); - mrd->mr_base = msrv & 0x000ffffffffff000L; + mrd->mr_base = msrv & 0x000000fffffff000L; msrv = rdmsr(msr + 1); mrd->mr_flags = (msrv & 0x800) ? (mrd->mr_flags | MDF_ACTIVE) : (mrd->mr_flags & ~MDF_ACTIVE); /* Compute the range from the mask. Ick. */ - mrd->mr_len = (~(msrv & 0x000ffffffffff000L) & 0x000fffffffffffffL) + 1; + mrd->mr_len = (~(msrv & 0x000000fffffff000L) & 0x000000ffffffffffL) + 1; if (!mrvalid(mrd->mr_base, mrd->mr_len)) mrd->mr_flags |= MDF_BOGUS; /* If unclaimed and active, must be the BIOS */ @@ -348,7 +348,7 @@ /* base/type register */ omsrv = rdmsr(msr); if (mrd->mr_flags & MDF_ACTIVE) { - msrv = mrd->mr_base & 0x000ffffffffff000L; + msrv = mrd->mr_base & 0x000000fffffff000L; msrv |= amd64_mrt2mtrr(mrd->mr_flags, omsrv); } else { msrv = 0; @@ -357,7 +357,7 @@ /* mask/active register */ if (mrd->mr_flags & MDF_ACTIVE) { - msrv = 0x800 | (~(mrd->mr_len - 1) & 0x000ffffffffff000L); + msrv = 0x800 | (~(mrd->mr_len - 1) & 0x000000fffffff000L); } else { msrv = 0; } @@ -553,7 +553,6 @@ return; } nmdesc = mtrrcap & 0xff; - printf("Pentium Pro MTRR support enabled\n"); /* If fixed MTRRs supported and enabled */ if ((mtrrcap & 0x100) && (mtrrdef & 0x400)) { ==== //depot/projects/power/sys/amd64/amd64/autoconf.c#3 (text+ko) ==== @@ -33,11 +33,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)autoconf.c 7.1 (Berkeley) 5/9/91 + * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.176 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.177 2003/11/21 03:01:59 peter Exp $"); /* * Setup the system to run on the current machine. ==== //depot/projects/power/sys/amd64/amd64/genassym.c#4 (text+ko) ==== @@ -33,11 +33,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)genassym.c 5.11 (Berkeley) 5/10/91 + * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.150 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.151 2003/11/21 03:01:59 peter Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" ==== //depot/projects/power/sys/amd64/amd64/identcpu.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1992 Terrence R. Lambert. * Copyright (c) 1982, 1987, 1990 The Regents of the University of California. * Copyright (c) 1997 KATO Takenori. @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.127 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.128 2003/11/21 03:01:59 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/power/sys/amd64/amd64/initcpu.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) KATO Takenori, 1997, 1998. * * All rights reserved. Unpublished rights reserved under the copyright @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.46 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.47 2003/11/21 03:01:59 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/power/sys/amd64/amd64/legacy.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright 1998 Massachusetts Institute of Technology * * Permission to use, copy, modify, and distribute this software and @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.51 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.52 2003/11/21 03:01:59 peter Exp $"); /* * This code implements a system driver for legacy systems that do not ==== //depot/projects/power/sys/amd64/amd64/machdep.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.599 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.600 2003/11/20 22:54:44 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -121,6 +121,9 @@ #include #include +/* Sanity check for __curthread() */ +CTASSERT(offsetof(struct pcpu, pc_curthread) == 0); + extern u_int64_t hammer_time(u_int64_t, u_int64_t); extern void dblfault_handler(void); ==== //depot/projects/power/sys/amd64/amd64/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.226 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.229 2003/11/30 22:20:40 jeff Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -130,7 +130,7 @@ } static cpu_info[MAXCPU]; static int cpu_apic_ids[MAXCPU]; -static u_int boot_address; +static u_int boot_address; static void set_logical_apic_ids(void); static int start_all_aps(void); @@ -179,14 +179,34 @@ cpu_info[apic_id].cpu_bsp = 1; } mp_ncpus++; - if (apic_id > mp_maxid) - mp_maxid = apic_id; + if (apic_id >= mp_maxid) + mp_maxid = apic_id + 1; if (bootverbose) printf("SMP: Added CPU %d (%s)\n", apic_id, boot_cpu ? "BSP" : "AP"); } +void +cpu_mp_setmaxid(void) +{ + + /* + * mp_maxid should be already set by calls to cpu_add(). + * Just sanity check its value here. + */ + if (mp_ncpus == 0) + KASSERT(mp_maxid == 0, + ("%s: mp_ncpus is zero, but mp_maxid is not", __func__)); + else if (mp_ncpus == 1) + mp_maxid = 0; + else + KASSERT(mp_maxid >= mp_ncpus - 1, + ("%s: counters out of sync: max %d, count %d", __func__, + mp_maxid, mp_ncpus)); + +} + int cpu_mp_probe(void) { @@ -202,8 +222,6 @@ * the variables to represent a system with a single CPU * with an id of 0. */ - KASSERT(mp_maxid == 0, - ("%s: mp_ncpus is zero, but mp_maxid is not", __func__)); mp_ncpus = 1; return (0); } @@ -219,9 +237,6 @@ } /* At least two CPUs were found. */ - KASSERT(mp_maxid >= mp_ncpus - 1, - ("%s: counters out of sync: max %d, count %d", __func__, mp_maxid, - mp_ncpus)); return (1); } ==== //depot/projects/power/sys/amd64/amd64/nexus.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.56 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.57 2003/11/21 03:00:05 peter Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -135,6 +135,7 @@ static int nexus_probe(device_t dev) { + int irq, last; device_quiet(dev); /* suppress attach message for neatness */ @@ -160,12 +161,27 @@ irq_rman.rm_type = RMAN_ARRAY; irq_rman.rm_descr = "Interrupt request lines"; irq_rman.rm_end = NUM_IO_INTS - 1; - if (rman_init(&irq_rman) - || rman_manage_region(&irq_rman, - irq_rman.rm_start, irq_rman.rm_end)) + if (rman_init(&irq_rman)) panic("nexus_probe irq_rman"); /* + * We search for regions of existing IRQs and add those to the IRQ + * resource manager. + */ + last = -1; + for (irq = 0; irq < NUM_IO_INTS; irq++) + if (intr_lookup_source(irq) != NULL) { + if (last == -1) + last = irq; + } else if (last != -1) { + if (rman_manage_region(&irq_rman, last, irq - 1) != 0) + panic("nexus_probe irq_rman add"); + last = -1; + } + if (last != -1 && rman_manage_region(&irq_rman, last, irq - 1) != 0) + panic("nexus_probe irq_rman add"); + + /* * ISA DMA on PCI systems is implemented in the ISA part of each * PCI->ISA bridge and the channels can be duplicated if there are * multiple bridges. (eg: laptops with docking stations) ==== //depot/projects/power/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1991 Regents of the University of California. * All rights reserved. * Copyright (c) 1994 John S. Dyson @@ -40,7 +40,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)pmap.c 7.7 (Berkeley) 5/12/91 + * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.446 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.447 2003/11/21 03:01:59 peter Exp $"); /* * Manages physical address maps. ==== //depot/projects/power/sys/amd64/amd64/support.S#4 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.104 2003/11/17 08:58:13 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.105 2003/11/27 17:20:44 peter Exp $ */ #include "opt_ddb.h" @@ -45,7 +45,7 @@ ALIGN_DATA .globl intrcnt, eintrcnt intrcnt: - .space INTRCNT_COUNT * 4 + .space INTRCNT_COUNT * 8 eintrcnt: .globl intrnames, eintrnames ==== //depot/projects/power/sys/amd64/amd64/sys_machdep.c#3 (text+ko) ==== @@ -31,11 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 + * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.86 2003/11/08 04:39:21 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.87 2003/11/21 03:01:59 peter Exp $"); #include #include ==== //depot/projects/power/sys/amd64/amd64/trap.c#5 (text+ko) ==== @@ -34,11 +34,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)trap.c 7.4 (Berkeley) 5/13/91 + * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.270 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.271 2003/11/21 03:01:59 peter Exp $"); /* * AMD64 Trap and System call handling ==== //depot/projects/power/sys/amd64/amd64/vm_machdep.c#3 (text+ko) ==== @@ -36,12 +36,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 + * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.223 2003/11/17 08:58:13 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.224 2003/11/21 03:02:00 peter Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" ==== //depot/projects/power/sys/amd64/conf/GENERIC#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.398 2003/11/19 18:11:27 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.399 2003/11/21 03:19:59 peter Exp $ machine amd64 cpu HAMMER @@ -68,6 +68,7 @@ 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 acpi device isa ==== //depot/projects/power/sys/amd64/include/_limits.h#2 (text+ko) ==== @@ -31,9 +31,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * From: FreeBSD: src/sys/alpha/include/limits.h,v 1.8 2001/11/02 - * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.7 2003/05/19 20:29:06 kan Exp $ + * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.8 2003/11/21 03:02:00 peter Exp $ */ #ifndef _MACHINE__LIMITS_H_ @@ -53,27 +51,26 @@ #define __CHAR_BIT 8 /* number of bits in a char */ #define __SCHAR_MAX 0x7f /* max value for a signed char */ -#define __SCHAR_MIN (-0x7f-1) /* min value for a signed char */ +#define __SCHAR_MIN (-0x7f - 1) /* min value for a signed char */ #define __UCHAR_MAX 0xffU /* max value for an unsigned char */ #define __USHRT_MAX 0xffffU /* max value for an unsigned short */ #define __SHRT_MAX 0x7fff /* max value for a short */ -#define __SHRT_MIN (-0x7fff-1) /* min value for a short */ +#define __SHRT_MIN (-0x7fff - 1) /* min value for a short */ #define __UINT_MAX 0xffffffffU /* max value for an unsigned int */ #define __INT_MAX 0x7fffffff /* max value for an int */ -#define __INT_MIN (-0x7fffffff-1) /* min value for an int */ +#define __INT_MIN (-0x7fffffff - 1) /* min value for an int */ #define __ULONG_MAX 0xffffffffffffffffUL /* max for an unsigned long */ #define __LONG_MAX 0x7fffffffffffffffL /* max for a long */ -#define __LONG_MIN (-0x7fffffffffffffffL-1) /* min for a long */ +#define __LONG_MIN (-0x7fffffffffffffffL - 1) /* min for a long */ -/* Long longs and longs are the same size on the alpha. */ - /* max for an unsigned long long */ + /* max value for an unsigned long long */ #define __ULLONG_MAX 0xffffffffffffffffULL -#define __LLONG_MAX 0x7fffffffffffffffLL /* max for a long long */ -#define __LLONG_MIN (-0x7fffffffffffffffLL-1) /* min for a long long */ +#define __LLONG_MAX 0x7fffffffffffffffLL /* max value for a long long */ +#define __LLONG_MIN (-0x7fffffffffffffffLL - 1) /* min for a long long */ #define __SSIZE_MAX __LONG_MAX /* max value for a ssize_t */ @@ -83,9 +80,9 @@ #define __OFF_MIN __LONG_MIN /* min value for an off_t */ /* Quads and longs are the same on the amd64. Ensure they stay in sync. */ -#define __UQUAD_MAX (__ULONG_MAX) /* max value for a uquad_t */ -#define __QUAD_MAX (__LONG_MAX) /* max value for a quad_t */ -#define __QUAD_MIN (__LONG_MIN) /* min value for a quad_t */ +#define __UQUAD_MAX __ULONG_MAX /* max value for a uquad_t */ +#define __QUAD_MAX __LONG_MAX /* max value for a quad_t */ +#define __QUAD_MIN __LONG_MIN /* min value for a quad_t */ #define __LONG_BIT 64 #define __WORD_BIT 32 ==== //depot/projects/power/sys/amd64/include/_stdint.h#2 (text+ko) ==== @@ -34,10 +34,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/_stdint.h,v 1.1 2002/07/29 17:41:23 mike Exp $ + * $FreeBSD: src/sys/amd64/include/_stdint.h,v 1.2 2003/11/21 03:02:00 peter Exp $ */ -#ifndef _MACHINE__STDINT_H_ +#ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ #if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) ==== //depot/projects/power/sys/amd64/include/acpica_machdep.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.3 2003/09/22 22:12:46 peter Exp $ + * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.4 2003/11/21 03:02:00 peter Exp $ */ /****************************************************************************** @@ -103,6 +103,6 @@ #define COMPILER_DEPENDENT_INT64 long #define COMPILER_DEPENDENT_UINT64 unsigned long -void acpi_SetDefaultIntrModel(int model); +void acpi_SetDefaultIntrModel(int model); #endif /* __ACPICA_MACHDEP_H__ */ ==== //depot/projects/power/sys/amd64/include/asmacros.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.26 2003/11/17 08:58:14 peter Exp $ + * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.27 2003/11/21 03:02:00 peter Exp $ */ #ifndef _MACHINE_ASMACROS_H_ @@ -115,7 +115,7 @@ #define CROSSJUMPTARGET(label) \ ALIGN_TEXT; __CONCAT(to,label): ; MCOUNT; jmp label #define ENTRY(name) GEN_ENTRY(name) ; 9: ; MCOUNT -#define FAKE_MCOUNT(caller) pushq caller ; call __mcount ; popl %ecx +#define FAKE_MCOUNT(caller) pushq caller ; call __mcount ; popq %rcx #define MCOUNT call __mcount #define MCOUNT_LABEL(name) GEN_ENTRY(name) ; nop ; ALIGN_TEXT #define MEXITCOUNT call HIDENAME(mexitcount) ==== //depot/projects/power/sys/amd64/include/atomic.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.31 2003/11/17 08:58:14 peter Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.32 2003/11/21 03:02:00 peter Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -99,7 +99,8 @@ __asm __volatile(__XSTRING(MPLOCKED) OP \ : "+m" (*p) \ : CONS (V)); \ -} +} \ +struct __hack #else /* !__GNUC__ */ @@ -150,7 +151,7 @@ " movzbq %%al,%0 ; " "1: " "# atomic_cmpset_long" - : "+a" (res) /* 0 (result) %rax, XXX check */ + : "+a" (res) /* 0 (result) */ : "r" (src), /* 1 */ "m" (*(dst)) /* 2 */ : "memory"); @@ -185,7 +186,8 @@ : "+m" (*p), /* 0 */ \ "+r" (v) /* 1 */ \ : : "memory"); \ -} +} \ +struct __hack #else /* !defined(__GNUC__) */ @@ -330,7 +332,11 @@ static __inline void * atomic_load_acq_ptr(volatile void *p) { - return (void *)atomic_load_acq_long((volatile u_long *)p); + /* + * The apparently-bogus cast to intptr_t in the following is to + * avoid a warning from "gcc -Wbad-function-cast". + */ + return ((void *)(intptr_t)atomic_load_acq_long((volatile u_long *)p)); } static __inline void ==== //depot/projects/power/sys/amd64/include/bus_dma.h#3 (text+ko) ==== @@ -67,7 +67,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.25 2003/11/07 23:29:42 scottl Exp $ */ +/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.26 2003/11/21 03:02:00 peter Exp $ */ #ifndef _AMD64_BUS_DMA_H_ #define _AMD64_BUS_DMA_H_ @@ -78,7 +78,7 @@ #define BUS_DMA_WAITOK 0x00 /* safe to sleep (pseudo-flag) */ #define BUS_DMA_NOWAIT 0x01 /* not safe to sleep */ #define BUS_DMA_ALLOCNOW 0x02 /* perform resource allocation now */ -#define BUS_DMA_COHERENT 0x04 /* hint map memory in a coherent way */ +#define BUS_DMA_COHERENT 0x04 /* hint: map memory in a coherent way */ #define BUS_DMA_ZERO 0x08 /* allocate zero'ed memory */ #define BUS_DMA_BUS1 0x10 /* placeholders for bus functions... */ #define BUS_DMA_BUS2 0x20 @@ -104,7 +104,7 @@ * A machine-dependent opaque type describing the characteristics * of how to perform DMA mappings. This structure encapsultes * information concerning address and alignment restrictions, number - * of S/G segments, amount of data per S/G segment, etc. + * of S/G segments, amount of data per S/G segment, etc. */ typedef struct bus_dma_tag *bus_dma_tag_t; @@ -133,7 +133,7 @@ typedef int bus_dma_filter_t(void *, bus_addr_t); /* - * A function that performs driver-specific syncronization on behalf of + * A function that performs driver-specific synchronization on behalf of * busdma. */ typedef enum { @@ -147,7 +147,7 @@ * Allocate a device specific dma_tag encapsulating the constraints of * the parent tag in addition to other restrictions specified: * - * alignment: alignment for segments. + * alignment: Alignment for segments. * boundary: Boundary that segments cannot cross. * lowaddr: Low restricted address that cannot appear in a mapping. * highaddr: High restricted address that cannot appear in a mapping. @@ -184,21 +184,21 @@ int bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp); /* - * Destroy a handle for mapping from kva/uva/physical + * Destroy a handle for mapping from kva/uva/physical * address space into bus device space. */ int bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map); /* * Allocate a piece of memory that can be efficiently mapped into - * bus device space based on the constraints lited in the dma tag. + * bus device space based on the constraints listed in the dma tag. * A dmamap to for use with dmamap_load is also allocated. */ int bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, bus_dmamap_t *mapp); /* - * Free a piece of memory and it's allociated dmamap, that was allocated + * Free a piece of memory and its allocated dmamap, that was allocated * via bus_dmamem_alloc. */ void bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map); @@ -218,7 +218,7 @@ /* * Like bus_dmamap_callback but includes map size in bytes. This is - * defined as a separate interface to maintain compatiiblity for users + * defined as a separate interface to maintain compatibility for users * of bus_dmamap_callback_t--at some point these interfaces should be merged. */ typedef void bus_dmamap_callback2_t(void *, bus_dma_segment_t *, int, bus_size_t, int); @@ -240,7 +240,7 @@ int flags); /* - * Perform a syncronization operation on the given map. + * Perform a synchronization operation on the given map. */ void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t); #define bus_dmamap_sync(dmat, dmamap, op) \ ==== //depot/projects/power/sys/amd64/include/limits.h#2 (text+ko) ==== @@ -31,9 +31,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * From: FreeBSD: src/sys/alpha/include/limits.h,v 1.8 2001/11/02 - * $FreeBSD: src/sys/amd64/include/limits.h,v 1.6 2003/05/19 20:29:06 kan Exp $ + * $FreeBSD: src/sys/amd64/include/limits.h,v 1.7 2003/11/21 03:02:00 peter Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 1 14:31:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FAC816A4D2; Mon, 1 Dec 2003 14:31:45 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC41216A4CE for ; Mon, 1 Dec 2003 14:31:44 -0800 (PST) Received: from mail1.speakeasy.net (mail1.speakeasy.net [216.254.0.201]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56C7F43FDF for ; Mon, 1 Dec 2003 14:31:40 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 15212 invoked from network); 1 Dec 2003 22:31:38 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 1 Dec 2003 22:31:38 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.9/8.12.9) with ESMTP id hB1MVUFn097787; Mon, 1 Dec 2003 17:31:32 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200312012111.hB1LBIKF067937@repoman.freebsd.org> Date: Mon, 01 Dec 2003 17:31:33 -0500 (EST) From: John Baldwin To: Peter Wemm X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: Perforce Change Reviews Subject: RE: PERFORCE change 43248 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Dec 2003 22:31:45 -0000 On 01-Dec-2003 Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=43248 > > Change 43248 by peter@peter_daintree on 2003/12/01 13:10:58 > > MTX_LOCK_SPIN and MTX_UNLOCK_SPIN are not used.. kill the broken definitions of them. > XXX also appears to be unused on i386. Yeah, they were used in the old interrupt code. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Tue Dec 2 07:57:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4ADF16A4D0; Tue, 2 Dec 2003 07:57:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B320D16A4CE for ; Tue, 2 Dec 2003 07:57:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D69F43FBF for ; Tue, 2 Dec 2003 07:57:52 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB2FvpXJ045993 for ; Tue, 2 Dec 2003 07:57:52 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB2FvpUE045990 for perforce@freebsd.org; Tue, 2 Dec 2003 07:57:51 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 2 Dec 2003 07:57:51 -0800 (PST) Message-Id: <200312021557.hB2FvpUE045990@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 43298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2003 15:57:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=43298 Change 43298 by rwatson@rwatson_fledge on 2003/12/02 07:56:57 Add permission to /dev/zero. Affected files ... .. //depot/projects/trustedbsd/sedarwin/policy/rules#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/policy/rules#4 (text+ko) ==== @@ -66,7 +66,7 @@ allow domain file:{file lnk_file sock_file} {create_file_perms execute }; allow domain file:file execute_no_trans; allow domain file:dir { create_dir_perms }; -allow domain {null_device_t console_device_t memory_device_t random_device_t device_t}:{file chr_file} create_file_perms; +allow domain {null_device_t console_device_t memory_device_t random_device_t zero_device_t device_t}:{file chr_file} create_file_perms; allow domain device_t:blk_file create_file_perms; allow domain {devpts_t user_devpts_t sysadm_devpts_t}:chr_file create_file_perms; allow domain domain:process { signal sigkill setsched getsession }; From owner-p4-projects@FreeBSD.ORG Tue Dec 2 08:11:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A23B16A4D0; Tue, 2 Dec 2003 08:11:10 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E937C16A4CE for ; Tue, 2 Dec 2003 08:11:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3528C43FA3 for ; Tue, 2 Dec 2003 08:11:09 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB2GB9XJ047445 for ; Tue, 2 Dec 2003 08:11:09 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB2GB8Bg047442 for perforce@freebsd.org; Tue, 2 Dec 2003 08:11:08 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 2 Dec 2003 08:11:08 -0800 (PST) Message-Id: <200312021611.hB2GB8Bg047442@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 43300 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2003 16:11:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=43300 Change 43300 by cvance@cvance_osx_laptop on 2003/12/02 08:10:47 Add 'clean' target Affected files ... .. //depot/projects/trustedbsd/sedarwin/mac_cmds/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/mac_cmds/Makefile#2 (text+ko) ==== @@ -5,6 +5,12 @@ (cd mexec ; make) (cd setfsmac ; make) +clean: + (cd getfmac ; make clean) + (cd getpmac ; make clean) + (cd mexec ; make clean) + (cd setfsmac ; make clean) + install: (cd getfmac ; make install) (cd getpmac ; make install) From owner-p4-projects@FreeBSD.ORG Tue Dec 2 08:12:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F241216A4D0; Tue, 2 Dec 2003 08:12:11 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CDF0416A4CE for ; Tue, 2 Dec 2003 08:12:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C5F743FE5 for ; Tue, 2 Dec 2003 08:12:11 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB2GCAXJ047505 for ; Tue, 2 Dec 2003 08:12:10 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB2GCAv9047502 for perforce@freebsd.org; Tue, 2 Dec 2003 08:12:10 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 2 Dec 2003 08:12:10 -0800 (PST) Message-Id: <200312021612.hB2GCAv9047502@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 43301 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2003 16:12:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=43301 Change 43301 by rwatson@rwatson_powerbook on 2003/12/02 08:11:30 Install target for extattr_cmds. Affected files ... .. //depot/projects/trustedbsd/sedarwin/extattr_cmds/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/extattr_cmds/Makefile#3 (text+ko) ==== @@ -1,7 +1,8 @@ include ../Makeconfig -all: rmextattr getextattr lsextattr setextattr extattrctl +PROGS=rmextattr getextattr lsextattr setextattr extattrctl +all: $(PROGS) rmextattr: extattrcmds.o gcc -o rmextattr extattrcmds.o ../libextattr/libextattr.a @@ -18,5 +19,8 @@ extattrctl: extattrctl.o gcc -o extattrctl extattrctl.o ../libextattr/libextattr.a +install: all + install -m 755 -o root -g wheel $(PROGS) /usr/sbin + clean: - rm -f *.o rmextattr getextattr lsextattr setextattr extattrctl+ rm -f *.o rmextattr getextattr lsextattr setextattr extattrctl From owner-p4-projects@FreeBSD.ORG Tue Dec 2 08:15:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7916D16A4D0; Tue, 2 Dec 2003 08:15:16 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 53CE116A4CE for ; Tue, 2 Dec 2003 08:15:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97C2443FA3 for ; Tue, 2 Dec 2003 08:15:15 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB2GFFXJ047666 for ; Tue, 2 Dec 2003 08:15:15 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB2GFFVS047663 for perforce@freebsd.org; Tue, 2 Dec 2003 08:15:15 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 2 Dec 2003 08:15:15 -0800 (PST) Message-Id: <200312021615.hB2GFFVS047663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 43302 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2003 16:15:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=43302 Change 43302 by cvance@cvance_osx_laptop on 2003/12/02 08:14:19 Add 'clean' targets Affected files ... .. //depot/projects/trustedbsd/sedarwin/sebsd_cmds/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin/sebsd_cmds/loadpolicy/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin/sebsd_cmds/newrole/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/sebsd_cmds/Makefile#2 (text+ko) ==== @@ -4,6 +4,11 @@ (cd loadpolicy ; make) (cd newrole ; make) +clean: + (cd checkpolicy ; make clean) + (cd loadpolicy ; make clean) + (cd newrole ; make clean) + install: (cd checkpolicy ; make install) (cd loadpolicy ; make install) ==== //depot/projects/trustedbsd/sedarwin/sebsd_cmds/loadpolicy/Makefile#3 (text+ko) ==== @@ -9,4 +9,7 @@ install: install -m 755 -o root -g wheel sebsd_loadpolicy /usr/sbin +clean: + rm -f $(OBJS) sebsd_loadpolicy + CFLAGS += -I../../apsl/xnu/security/sebsd ==== //depot/projects/trustedbsd/sedarwin/sebsd_cmds/newrole/Makefile#3 (text+ko) ==== @@ -9,4 +9,7 @@ install: install -m 755 -o root -g wheel sebsd_newrole /usr/sbin +clean: + rm -f $(OBJS) sebsd_newrole + CFLAGS += -I../../apsl/xnu/security/sebsd From owner-p4-projects@FreeBSD.ORG Tue Dec 2 08:35:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60FFB16A4D0; Tue, 2 Dec 2003 08:35:42 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 31BCB16A4CE for ; Tue, 2 Dec 2003 08:35:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BD8D43FA3 for ; Tue, 2 Dec 2003 08:35:41 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB2GZfXJ048415 for ; Tue, 2 Dec 2003 08:35:41 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB2GZeFx048412 for perforce@freebsd.org; Tue, 2 Dec 2003 08:35:40 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 2 Dec 2003 08:35:40 -0800 (PST) Message-Id: <200312021635.hB2GZeFx048412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 43303 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2003 16:35:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=43303 Change 43303 by rwatson@rwatson_powerbook on 2003/12/02 08:34:58 High level install targets for libraries, et al. Affected files ... .. //depot/projects/trustedbsd/sedarwin/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/Makefile#2 (text+ko) ==== @@ -3,8 +3,32 @@ dummy: @echo Please following the directions in bootstrap_instructions.txt -TBSDHEADERS=apsl/xnu/bsd/sys/extattr.h apsl/xnu/bsd/sys/mac.h apsl/xnu/bsd/sys/_label.h +TBSDHEADERS=apsl/xnu/bsd/sys/extattr.h apsl/xnu/bsd/sys/mac.h apsl/xnu/bsd/sys/_label.h \ + apsl/xnu/bsd/sys/ucred.h install-headers: install -m 444 -o root -g wheel $(TBSDHEADERS) /usr/include/sys cd libsebsd; make install-headers; cd .. + +libraries: + (cd libextattr ; make) + (cd libmac ; make) + (cd libsebsd ; make) + +install-libraries: + (cd libextattr ; make install) + (cd libmac ; make install) + (cd libsebsd ; make install) + +cmds: + (cd extattr_cmds ; make) + (cd mac_cmds ; make) + (cd sebsd_cmds ; make) + (cd sebsd_system ; make) + +install-cmds: + (cd extattr_cmds ; make install) + (cd mac_cmds ; make install) + (cd sebsd_cmds ; make install) + (cd sebsd_system ; make install) + From owner-p4-projects@FreeBSD.ORG Tue Dec 2 10:50:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4154116A4D0; Tue, 2 Dec 2003 10:50:40 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 19E8716A4CE for ; Tue, 2 Dec 2003 10:50:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5252443FD7 for ; Tue, 2 Dec 2003 10:50:39 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB2IodXJ060695 for ; Tue, 2 Dec 2003 10:50:39 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB2IocLr060692 for perforce@freebsd.org; Tue, 2 Dec 2003 10:50:38 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 2 Dec 2003 10:50:38 -0800 (PST) Message-Id: <200312021850.hB2IocLr060692@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 43311 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2003 18:50:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=43311 Change 43311 by rwatson@rwatson_paprika on 2003/12/02 10:50:03 Integrate mac_mls policy module into the SEDarwin branch. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/mac_mls/mac_mls.c#1 branch .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/mac_mls/mac_mls.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Dec 2 11:31:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83A9C16A4D2; Tue, 2 Dec 2003 11:31:39 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D01F16A4CF for ; Tue, 2 Dec 2003 11:31:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 234FD44005 for ; Tue, 2 Dec 2003 11:31:29 -0800 (PST) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB2JVSXJ063001 for ; Tue, 2 Dec 2003 11:31:28 -0800 (PST) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB2JVS0B062998 for perforce@freebsd.org; Tue, 2 Dec 2003 11:31:28 -0800 (PST) (envelope-from areisse@nailabs.com) Date: Tue, 2 Dec 2003 11:31:28 -0800 (PST) Message-Id: <200312021931.hB2JVS0B062998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 43312 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Dec 2003 19:31:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=43312 Change 43312 by areisse@areisse_ibook on 2003/12/02 11:31:28 don't use sebsd_ss_malloc, use kmalloc instead. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/ss/services.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/ss/services.c#4 (text+ko) ==== @@ -1379,9 +1379,9 @@ if (p->numsids == p->maxsids) { p->maxsids += 16; - security_id_t *sids = sebsd_ss_malloc (sizeof (security_id_t) * p->maxsids, 0); + security_id_t *sids = kmalloc (sizeof (security_id_t) * p->maxsids, GFP_KERNEL); memcpy (sids, p->sids, sizeof (security_id_t) * p->numsids); - sebsd_ss_free (p->sids); + kfree (p->sids); p->sids = sids; } p->sids[p->numsids++] = sid; @@ -1410,7 +1410,7 @@ goto out_err; p.sca = policydb.class_val_to_struct[sclass - 1]; p.maxsids = 32; - p.sids = sebsd_ss_malloc (sizeof (security_id_t) * p.maxsids, 0); + p.sids = kmalloc (sizeof (security_id_t) * p.maxsids, GFP_KERNEL); p.numsids = 0; avtab_map (&policydb.te_avtab, getfilesids1, &p); *sids = p.sids; From owner-p4-projects@FreeBSD.ORG Tue Dec 2 16:44:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C75B516A4D0; Tue, 2 Dec 2003 16:44:54 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9AB7916A4CE for ; Tue, 2 Dec 2003 16:44:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D43A243FBF for ; Tue, 2 Dec 2003 16:44:53 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB30irXJ083585 for ; Tue, 2 Dec 2003 16:44:53 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB30irgP083580 for perforce@freebsd.org; Tue, 2 Dec 2003 16:44:53 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 2 Dec 2003 16:44:53 -0800 (PST) Message-Id: <200312030044.hB30irgP083580@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 43324 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 00:44:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=43324 Change 43324 by rwatson@rwatson_powerbook on 2003/12/02 16:43:55 Recursive make. Affected files ... .. //depot/projects/trustedbsd/sedarwin/sebsd_system/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin/sebsd_system/wslogin/Makefile#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/sebsd_system/wslogin/Makefile#6 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Dec 2 16:46:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D87B816A4D0; Tue, 2 Dec 2003 16:46:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3FEC16A4CE for ; Tue, 2 Dec 2003 16:46:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A74043FBD for ; Tue, 2 Dec 2003 16:46:57 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB30kuXJ083739 for ; Tue, 2 Dec 2003 16:46:56 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB30kuT0083736 for perforce@freebsd.org; Tue, 2 Dec 2003 16:46:56 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 2 Dec 2003 16:46:56 -0800 (PST) Message-Id: <200312030046.hB30kuT0083736@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 43325 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 00:46:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=43325 Change 43325 by rwatson@rwatson_powerbook on 2003/12/02 16:45:55 force ln to succeed. Affected files ... .. //depot/projects/trustedbsd/sedarwin/mac_cmds/setfsmac/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/mac_cmds/setfsmac/Makefile#4 (text+ko) ==== @@ -5,6 +5,6 @@ gcc -o setfsmac setfsmac.o ../../libmac/libmac.a install: install -m 755 -o root -g wheel setfsmac /usr/sbin - ln /usr/sbin/setfsmac /usr/sbin/setfmac + ln -f /usr/sbin/setfsmac /usr/sbin/setfmac clean: rm -f setfsmac setfsmac.o From owner-p4-projects@FreeBSD.ORG Tue Dec 2 16:55:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 611EA16A4D0; Tue, 2 Dec 2003 16:55:11 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B89C16A4CE for ; Tue, 2 Dec 2003 16:55:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41E2443FB1 for ; Tue, 2 Dec 2003 16:55:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB30t8XJ089668 for ; Tue, 2 Dec 2003 16:55:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB30t7Uw089665 for perforce@freebsd.org; Tue, 2 Dec 2003 16:55:07 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Dec 2003 16:55:07 -0800 (PST) Message-Id: <200312030055.hB30t7Uw089665@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 43327 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 00:55:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=43327 Change 43327 by peter@peter_overcee on 2003/12/02 16:54:26 grumble. submit this before I lose it, since I still can't get a response from re@ about it. Affected files ... .. //depot/projects/hammer/lib/libc_r/uthread/uthread_create.c#5 edit .. //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#5 edit .. //depot/projects/hammer/lib/libc_r/uthread/uthread_sig.c#7 edit Differences ... ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_create.c#5 (text+ko) ==== @@ -73,6 +73,9 @@ pthread_t new_thread; pthread_attr_t pattr; void *stack; +#if !defined(__ia64__) + u_long stackp; +#endif if (thread == NULL) return(EINVAL); @@ -145,10 +148,12 @@ SET_RETURN_ADDR_JB(new_thread->ctx.jb, _thread_start); #if !defined(__ia64__) + stackp = (long)new_thread->stack + pattr->stacksize_attr - sizeof(double); +#if defined(__amd64__) + stackp &= ~0xFUL; +#endif /* The stack starts high and builds down: */ - SET_STACK_JB(new_thread->ctx.jb, - (long)new_thread->stack + pattr->stacksize_attr - - sizeof(double)); + SET_STACK_JB(new_thread->ctx.jb, stackp); #else SET_STACK_JB(new_thread->ctx.jb, (long)new_thread->stack, pattr->stacksize_attr); ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#5 (text+ko) ==== @@ -208,6 +208,9 @@ size_t len; int mib[2]; int sched_stack_size; /* Size of scheduler stack. */ +#if !defined(__ia64__) + u_long stackp; +#endif struct clockinfo clockinfo; struct sigaction act; @@ -374,8 +377,11 @@ /* Setup the context for the scheduler: */ _setjmp(_thread_kern_sched_jb); #if !defined(__ia64__) - SET_STACK_JB(_thread_kern_sched_jb, _thread_kern_sched_stack + - sched_stack_size - sizeof(double)); + stackp = (long)_thread_kern_sched_stack + sched_stack_size - sizeof(double); +#if defined(__amd64__) + stackp &= ~0xFUL; +#endif + SET_STACK_JB(_thread_kern_sched_jb, stackp); #else SET_STACK_JB(_thread_kern_sched_jb, _thread_kern_sched_stack, sched_stack_size); ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_sig.c#7 (text+ko) ==== @@ -1048,13 +1048,20 @@ * Leave a little space on the stack and round down to the * nearest aligned word: */ +#if defined(__amd64__) + stackp -= 128; /* Skip over 128 byte red-zone */ +#endif stackp -= sizeof(double); +#if defined(__amd64__) + stackp &= ~0xFUL; +#else stackp &= ~0x3UL; #endif +#endif /* Allocate room on top of the stack for a new signal frame: */ stackp -= sizeof(struct pthread_signal_frame); -#if defined(__ia64__) +#if defined(__ia64__) || defined(__amd64__) stackp &= ~0xFUL; #endif @@ -1087,6 +1094,9 @@ */ #if !defined(__ia64__) stackp -= sizeof(double); +#if defined(__amd64__) + stackp &= ~0xFUL; +#endif #endif _setjmp(thread->ctx.jb); #if !defined(__ia64__) From owner-p4-projects@FreeBSD.ORG Tue Dec 2 17:11:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EED4516A4D0; Tue, 2 Dec 2003 17:11:29 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CA5B316A4CE for ; Tue, 2 Dec 2003 17:11:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A920343FDF for ; Tue, 2 Dec 2003 17:11:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB31BSXJ091091 for ; Tue, 2 Dec 2003 17:11:28 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB31BSgb091088 for perforce@freebsd.org; Tue, 2 Dec 2003 17:11:28 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Dec 2003 17:11:28 -0800 (PST) Message-Id: <200312030111.hB31BSgb091088@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 43328 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 01:11:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=43328 Change 43328 by peter@peter_overcee on 2003/12/02 17:11:02 Allow disabling the apic code without having to disable acpi at the same time. IMHO, this should probably go in 5.2. Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#21 edit Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#21 (text+ko) ==== @@ -190,7 +190,7 @@ XSDT_DESCRIPTOR *xsdt; int i, count; - if (resource_disabled("acpi", 0)) + if (resource_disabled("acpi", 0) || resource_disabled("apic", 0)) return (ENXIO); /* From owner-p4-projects@FreeBSD.ORG Tue Dec 2 17:12:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8750D16A4D0; Tue, 2 Dec 2003 17:12:31 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 60F6716A4CE for ; Tue, 2 Dec 2003 17:12:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9316043F85 for ; Tue, 2 Dec 2003 17:12:30 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB31CUXJ091144 for ; Tue, 2 Dec 2003 17:12:30 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB31CUMd091141 for perforce@freebsd.org; Tue, 2 Dec 2003 17:12:30 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Dec 2003 17:12:30 -0800 (PST) Message-Id: <200312030112.hB31CUMd091141@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 43329 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 01:12:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=43329 Change 43329 by peter@peter_overcee on 2003/12/02 17:12:26 grrr. this is totally broken if you have a serial console attached and as the primary console, as it prevents ddb starting up if you crash while running X on the syscons console. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#13 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/db_interface.c#13 (text+ko) ==== @@ -78,6 +78,7 @@ u_long ef; volatile int ddb_mode = !(boothowto & RB_GDB); +#if 0 /* * XXX try to do nothing if the console is in graphics mode. * Handle trace traps (and hardware breakpoints...) by ignoring @@ -94,6 +95,7 @@ } return (0); } +#endif ef = read_rflags(); disable_intr(); From owner-p4-projects@FreeBSD.ORG Tue Dec 2 17:15:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C1DD16A4D0; Tue, 2 Dec 2003 17:15:36 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A4C616A4CE for ; Tue, 2 Dec 2003 17:15:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F05CE43FBF for ; Tue, 2 Dec 2003 17:15:34 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB31FYXJ091381 for ; Tue, 2 Dec 2003 17:15:34 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB31FYFt091378 for perforce@freebsd.org; Tue, 2 Dec 2003 17:15:34 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Dec 2003 17:15:34 -0800 (PST) Message-Id: <200312030115.hB31FYFt091378@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 43330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 01:15:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=43330 Change 43330 by peter@peter_overcee on 2003/12/02 17:14:53 do away with protection_codes array, this is more efficient anyway. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#48 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#48 (text+ko) ==== @@ -158,13 +158,6 @@ #define PMAP_INLINE #endif -/* - * Given a map and a machine independent protection code, - * convert to a vax protection code. - */ -#define pte_prot(m, p) (protection_codes[p]) -static pt_entry_t protection_codes[8]; - struct pmap kernel_pmap_store; LIST_HEAD(pmaplist, pmap); static struct pmaplist allpmaps; @@ -219,7 +212,6 @@ static PMAP_INLINE void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); -static void amd64_protection_init(void); static void pmap_clear_ptes(vm_page_t m, int bit) __always_inline; @@ -477,11 +469,6 @@ load_cr3(KPML4phys); /* - * Initialize protection array. - */ - amd64_protection_init(); - - /* * Initialize the kernel pmap (which is statically allocated). */ kernel_pmap->pm_pml4 = (pdp_entry_t *) (KERNBASE + KPML4phys); @@ -2095,8 +2082,13 @@ /* * Now validate mapping with desired protection/wiring. */ - newpte = (pt_entry_t)(pa | pte_prot(pmap, prot) | PG_V); - + newpte = (pt_entry_t)(pa | PG_V); + if ((prot & VM_PROT_WRITE) != 0) + newpte |= PG_RW; +#ifdef PG_NX + if ((prot & VM_PROT_EXECUTE) == 0) + newpte |= PG_NX; +#endif if (wired) newpte |= PG_W; if (va < VM_MAXUSER_ADDRESS) @@ -2845,40 +2837,6 @@ * Miscellaneous support routines follow */ -static void -amd64_protection_init() -{ - register long *kp, prot; - -#if 0 -#define PG_NX (1ul << 63) -#else -#define PG_NX 0 -#endif - - kp = protection_codes; - for (prot = 0; prot < 8; prot++) { - switch (prot) { - case VM_PROT_NONE | VM_PROT_NONE | VM_PROT_NONE: - case VM_PROT_READ | VM_PROT_NONE | VM_PROT_NONE: - *kp++ = PG_NX; - break; - case VM_PROT_READ | VM_PROT_NONE | VM_PROT_EXECUTE: - case VM_PROT_NONE | VM_PROT_NONE | VM_PROT_EXECUTE: - *kp++ = 0; - break; - case VM_PROT_NONE | VM_PROT_WRITE | VM_PROT_NONE: - case VM_PROT_READ | VM_PROT_WRITE | VM_PROT_NONE: - *kp++ = PG_RW | PG_NX; - break; - case VM_PROT_NONE | VM_PROT_WRITE | VM_PROT_EXECUTE: - case VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE: - *kp++ = PG_RW; - break; - } - } -} - /* * Map a set of physical memory pages into the kernel virtual * address space. Return a pointer to where it is mapped. This From owner-p4-projects@FreeBSD.ORG Tue Dec 2 17:16:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD7FA16A4D0; Tue, 2 Dec 2003 17:16:37 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8898216A4CE for ; Tue, 2 Dec 2003 17:16:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB5A043FF3 for ; Tue, 2 Dec 2003 17:16:36 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB31GaXJ091401 for ; Tue, 2 Dec 2003 17:16:36 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB31GaNN091398 for perforce@freebsd.org; Tue, 2 Dec 2003 17:16:36 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Dec 2003 17:16:36 -0800 (PST) Message-Id: <200312030116.hB31GaNN091398@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 43331 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 01:16:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=43331 Change 43331 by peter@peter_overcee on 2003/12/02 17:16:27 add bsfq/bsrq functions that work on 64 bit quantities. Affected files ... .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#12 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#12 (text+ko) ==== @@ -77,6 +77,15 @@ return (result); } +static __inline u_long +bsfq(u_long mask) +{ + u_long result; + + __asm __volatile("bsfq %1,%0" : "=r" (result) : "rm" (mask)); + return (result); +} + static __inline u_int bsrl(u_int mask) { @@ -86,6 +95,15 @@ return (result); } +static __inline u_long +bsrq(u_long mask) +{ + u_long result; + + __asm __volatile("bsrl %1,%0" : "=r" (result) : "rm" (mask)); + return (result); +} + static __inline void disable_intr(void) { From owner-p4-projects@FreeBSD.ORG Tue Dec 2 17:19:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AE4116A4D0; Tue, 2 Dec 2003 17:19:42 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB03F16A4CE for ; Tue, 2 Dec 2003 17:19:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31E4843FE1 for ; Tue, 2 Dec 2003 17:19:41 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB31JfXJ091513 for ; Tue, 2 Dec 2003 17:19:41 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB31JexD091510 for perforce@freebsd.org; Tue, 2 Dec 2003 17:19:40 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Dec 2003 17:19:40 -0800 (PST) Message-Id: <200312030119.hB31JexD091510@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 43332 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 01:19:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=43332 Change 43332 by peter@peter_overcee on 2003/12/02 17:19:39 replace the handrolled ffs() with __builtin_ffs(), which gcc does a better job of with instruction sets >= pentiumpro. For example, it uses the conditional move instructions to avoid branches. Affected files ... .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#13 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#13 (text+ko) ==== @@ -129,13 +129,18 @@ static __inline int ffs(int mask) { +#if 0 /* * Note that gcc-2's builtin ffs would be used if we didn't declare * this inline or turn off the builtin. The builtin is faster but * broken in gcc-2.4.5 and slower but working in gcc-2.5 and later * versions. */ - return (mask == 0 ? mask : (int)bsfl((u_int)mask) + 1); + return (mask == 0 ? mask : (int)bsfl((u_int)mask) + 1); +#else + /* Actually, the above is way out of date. The builtins use cmov etc */ + return (__builtin_ffs(mask)); +#endif } #define HAVE_INLINE_FLS From owner-p4-projects@FreeBSD.ORG Tue Dec 2 17:24:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C52E616A4D0; Tue, 2 Dec 2003 17:24:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A114E16A4CE for ; Tue, 2 Dec 2003 17:24:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0150543FE9 for ; Tue, 2 Dec 2003 17:24:48 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB31OlXJ091666 for ; Tue, 2 Dec 2003 17:24:47 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB31Ol8Q091663 for perforce@freebsd.org; Tue, 2 Dec 2003 17:24:47 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Dec 2003 17:24:47 -0800 (PST) Message-Id: <200312030124.hB31Ol8Q091663@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 43333 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 01:24:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=43333 Change 43333 by peter@peter_overcee on 2003/12/02 17:23:51 add 64 bit versions of ffs()/fls() (ffsl,flsl). I want to use this in the runq stuff. Affected files ... .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#14 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#14 (text+ko) ==== @@ -143,6 +143,14 @@ #endif } +#define HAVE_INLINE_FFSL + +static __inline int +ffsl(long mask) +{ + return (mask == 0 ? mask : (int)bsfq((u_long)mask) + 1); +} + #define HAVE_INLINE_FLS static __inline int @@ -151,6 +159,14 @@ return (mask == 0 ? mask : (int)bsrl((u_int)mask) + 1); } +#define HAVE_INLINE_FLSL + +static __inline int +flsl(long mask) +{ + return (mask == 0 ? mask : (int)bsrq((u_long)mask) + 1); +} + static __inline void halt(void) { From owner-p4-projects@FreeBSD.ORG Tue Dec 2 17:26:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59CB616A4D0; Tue, 2 Dec 2003 17:26:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 34D3C16A4CE for ; Tue, 2 Dec 2003 17:26:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20D7B43FA3 for ; Tue, 2 Dec 2003 17:26:51 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB31QoXJ091772 for ; Tue, 2 Dec 2003 17:26:50 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB31QoKU091769 for perforce@freebsd.org; Tue, 2 Dec 2003 17:26:50 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Dec 2003 17:26:50 -0800 (PST) Message-Id: <200312030126.hB31QoKU091769@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 43334 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 01:26:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=43334 Change 43334 by peter@peter_overcee on 2003/12/02 17:26:48 in theory, cause the double-ffs operations for the 64 run queues to be done with one ffsl rather than two ffs operations and a loop. Affected files ... .. //depot/projects/hammer/sys/amd64/include/runq.h#5 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/runq.h#5 (text+ko) ==== @@ -29,18 +29,18 @@ #ifndef _MACHINE_RUNQ_H_ #define _MACHINE_RUNQ_H_ -#define RQB_LEN (2) /* Number of priority status words. */ -#define RQB_L2BPW (5) /* Log2(sizeof(rqb_word_t) * NBBY)). */ +#define RQB_LEN (1) /* Number of priority status words. */ +#define RQB_L2BPW (6) /* Log2(sizeof(rqb_word_t) * NBBY)). */ #define RQB_BPW (1<> RQB_L2BPW) -#define RQB_FFS(word) (ffs(word) - 1) +#define RQB_FFS(word) (ffsl(word) - 1) /* * Type of run queue status word. */ -typedef u_int32_t rqb_word_t; +typedef u_int64_t rqb_word_t; #endif From owner-p4-projects@FreeBSD.ORG Tue Dec 2 17:33:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B3E416A4D0; Tue, 2 Dec 2003 17:33:00 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D97B316A4CE for ; Tue, 2 Dec 2003 17:32:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36F1943FDF for ; Tue, 2 Dec 2003 17:32:59 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB31WxXJ092014 for ; Tue, 2 Dec 2003 17:32:59 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB31WwQC092011 for perforce@freebsd.org; Tue, 2 Dec 2003 17:32:58 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Dec 2003 17:32:58 -0800 (PST) Message-Id: <200312030132.hB31WwQC092011@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 43335 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 01:33:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=43335 Change 43335 by peter@peter_overcee on 2003/12/02 17:32:38 actually, since we've already checked for zero in the loop, directly call bsfq() rather than "ffsl() - 1". In theory, gcc -O should optimize out the mask == 0 case (already tested) and the "- 1 + 1", but dont depend on it. This is why we have RQB_FFS() exposed like this anyway. Affected files ... .. //depot/projects/hammer/sys/amd64/include/runq.h#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/runq.h#6 (text+ko) ==== @@ -36,7 +36,7 @@ #define RQB_BIT(pri) (1 << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffsl(word) - 1) +#define RQB_FFS(word) (bsfq(word)) /* * Type of run queue status word. From owner-p4-projects@FreeBSD.ORG Tue Dec 2 17:39:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0D9216A4D0; Tue, 2 Dec 2003 17:39:09 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7508C16A4CE for ; Tue, 2 Dec 2003 17:39:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A074343FE0 for ; Tue, 2 Dec 2003 17:39:07 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB31d7XJ092215 for ; Tue, 2 Dec 2003 17:39:07 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB31d6Pa092212 for perforce@freebsd.org; Tue, 2 Dec 2003 17:39:06 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Dec 2003 17:39:06 -0800 (PST) Message-Id: <200312030139.hB31d6Pa092212@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 43336 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 01:39:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=43336 Change 43336 by peter@peter_overcee on 2003/12/02 17:38:17 snarf jhb's mp_maxid.patch Affected files ... .. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#9 edit .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#46 edit .. //depot/projects/hammer/sys/conf/files#40 edit .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#23 edit .. //depot/projects/hammer/sys/kern/sched_ule.c#20 edit .. //depot/projects/hammer/sys/kern/subr_smp.c#11 edit .. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#10 edit .. //depot/projects/hammer/sys/sys/smp.h#4 edit .. //depot/projects/hammer/sys/vm/uma_core.c#19 edit Differences ... ==== //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#9 (text+ko) ==== @@ -339,7 +339,6 @@ continue; mp_maxid = i; } - mp_maxid++; } int ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#46 (text+ko) ==== @@ -179,8 +179,8 @@ cpu_info[apic_id].cpu_bsp = 1; } mp_ncpus++; - if (apic_id >= mp_maxid) - mp_maxid = apic_id + 1; + if (apic_id > mp_maxid) + mp_maxid = apic_id; if (bootverbose) printf("SMP: Added CPU %d (%s)\n", apic_id, boot_cpu ? "BSP" : "AP"); ==== //depot/projects/hammer/sys/conf/files#40 (text+ko) ==== @@ -1152,7 +1152,7 @@ kern/subr_rman.c standard kern/subr_sbuf.c standard kern/subr_scanf.c standard -kern/subr_smp.c optional smp +kern/subr_smp.c standard kern/subr_taskqueue.c standard kern/subr_trap.c standard kern/subr_turnstile.c standard ==== //depot/projects/hammer/sys/i386/i386/mp_machdep.c#23 (text+ko) ==== @@ -258,7 +258,7 @@ cpu_mp_setmaxid(void) { - mp_maxid = MAXCPU; + mp_maxid = MAXCPU - 1; } int ==== //depot/projects/hammer/sys/kern/sched_ule.c#20 (text+ko) ==== @@ -418,7 +418,7 @@ if (smp_started == 0) goto out; - for (i = 0; i < mp_maxid; i++) { + for (i = 0; i <= mp_maxid; i++) { if (CPU_ABSENT(i) || (i & stopped_cpus) != 0) continue; kseq = KSEQ_CPU(i); ==== //depot/projects/hammer/sys/kern/subr_smp.c#11 (text+ko) ==== @@ -48,10 +48,13 @@ #include +#ifdef SMP volatile u_int stopped_cpus; volatile u_int started_cpus; void (*cpustop_restartfunc)(void); +#endif + int mp_ncpus; volatile int smp_started; @@ -73,6 +76,7 @@ SYSCTL_INT(_kern_smp, OID_AUTO, cpus, CTLFLAG_RD, &smp_cpus, 0, "Number of CPUs online"); +#ifdef SMP /* Enable forwarding of a signal to a process running on a different CPU */ static int forward_signal_enabled = 1; SYSCTL_INT(_kern_smp, OID_AUTO, forward_signal_enabled, CTLFLAG_RW, @@ -331,3 +335,35 @@ /* release lock */ mtx_unlock_spin(&smp_rv_mtx); } +#else /* !SMP */ + +/* + * Provide dummy SMP support for UP kernels. Modules that need to use SMP + * APIs will still work using this dummy support. + */ +static void +mp_setvariables_for_up(void *dummy) +{ + mp_ncpus = 1; + mp_maxid = PCPU_GET(cpuid); + all_cpus = PCPU_GET(cpumask); + KASSERT(PCPU_GET(cpuid) == 0, ("UP must have a CPU ID of zero")); +} +SYSINIT(cpu_mp_setvariables, SI_SUB_TUNABLES, SI_ORDER_FIRST, + mp_setvariables_for_up, NULL) + +void +smp_rendezvous(void (* setup_func)(void *), + void (* action_func)(void *), + void (* teardown_func)(void *), + void *arg) +{ + + if (setup_func != NULL) + setup_func(arg); + if (action_func != NULL) + action_func(arg); + if (teardown_func != NULL) + teardown_func(arg); +} +#endif /* SMP */ ==== //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#10 (text+ko) ==== @@ -159,14 +159,14 @@ strcmp(buf, "cpu") == 0) cpus++; } - mp_maxid = cpus; + mp_maxid = cpus - 1; } int cpu_mp_probe(void) { - return (mp_maxid > 1); + return (mp_maxid > 0); } static void ==== //depot/projects/hammer/sys/sys/smp.h#4 (text+ko) ==== @@ -45,14 +45,16 @@ extern struct cpu_top *smp_topology; extern void (*cpustop_restartfunc)(void); -extern int mp_ncpus; extern int smp_active; -extern volatile int smp_started; extern int smp_cpus; -extern u_int all_cpus; extern volatile u_int started_cpus; extern volatile u_int stopped_cpus; +#endif /* SMP */ + +extern u_int all_cpus; extern u_int mp_maxid; +extern int mp_ncpus; +extern volatile int smp_started; /* * Macro allowing us to determine whether a CPU is absent at any given @@ -61,6 +63,7 @@ */ #define CPU_ABSENT(x_cpu) ((all_cpus & (1 << (x_cpu))) == 0) +#ifdef SMP /* * Machine dependent functions used to initialize MP support. * @@ -78,7 +81,7 @@ * The cpu_setmaxid() function is called very early during the boot process * so that the MD code may set mp_maxid to provide an upper bound on CPU IDs * that other subsystems may use. If a platform is not able to determine - * the exact maximum ID that early, then it may set mp_maxid to MAXCPU. + * the exact maximum ID that early, then it may set mp_maxid to MAXCPU - 1. */ struct thread; @@ -92,13 +95,11 @@ int restart_cpus(u_int); int stop_cpus(u_int); void smp_rendezvous_action(void); +#endif /* SMP */ void smp_rendezvous(void (*)(void *), void (*)(void *), void (*)(void *), void *arg); -#else /* SMP */ -#define CPU_ABSENT(x_cpu) (0) -#endif /* SMP */ #endif /* !LOCORE */ #endif /* _KERNEL */ #endif /* _SYS_SMP_H_ */ ==== //depot/projects/hammer/sys/vm/uma_core.c#19 (text+ko) ==== @@ -127,14 +127,6 @@ static int booted = 0; /* - * Rather than #ifdef SMP all over, just give us a bogus definition for - * this on UP. - */ -#ifndef SMP -static int mp_maxid = 1; -#endif - -/* * This is the handle used to schedule events that need to happen * outside of the allocation fast path. */ @@ -350,7 +342,7 @@ * far out of sync. */ if (!(zone->uz_flags & UMA_ZFLAG_INTERNAL)) { - for (cpu = 0; cpu < mp_maxid; cpu++) { + for (cpu = 0; cpu <= mp_maxid; cpu++) { if (CPU_ABSENT(cpu)) continue; CPU_LOCK(cpu); @@ -577,7 +569,7 @@ /* * We have to lock each cpu cache before locking the zone */ - for (cpu = 0; cpu < mp_maxid; cpu++) { + for (cpu = 0; cpu <= mp_maxid; cpu++) { if (CPU_ABSENT(cpu)) continue; CPU_LOCK(cpu); @@ -609,7 +601,7 @@ LIST_REMOVE(bucket, ub_link); bucket_free(bucket); } - for (cpu = 0; cpu < mp_maxid; cpu++) { + for (cpu = 0; cpu <= mp_maxid; cpu++) { if (CPU_ABSENT(cpu)) continue; CPU_UNLOCK(cpu); @@ -1228,7 +1220,7 @@ /* "manually" Create the initial zone */ args.name = "UMA Zones"; args.size = sizeof(struct uma_zone) + - (sizeof(struct uma_cache) * mp_maxid); + (sizeof(struct uma_cache) * (mp_maxid + 1)); args.ctor = zone_ctor; args.dtor = zone_dtor; args.uminit = zero_init; @@ -1239,7 +1231,7 @@ zone_ctor(zones, sizeof(struct uma_zone), &args); /* Initialize the pcpu cache lock set once and for all */ - for (i = 0; i < mp_maxid; i++) + for (i = 0; i <= mp_maxid; i++) CPU_LOCK_INIT(i); #ifdef UMA_DEBUG printf("Filling boot free list.\n"); @@ -2105,7 +2097,7 @@ printf("Full slabs:\n"); LIST_FOREACH(slab, &zone->uz_full_slab, us_link) slab_print(slab); - for (i = 0; i < mp_maxid; i++) { + for (i = 0; i <= mp_maxid; i++) { if (CPU_ABSENT(i)) continue; cache = &zone->uz_cpu[i]; @@ -2153,7 +2145,7 @@ if (cnt == 0) /* list may have changed size */ break; if (!(z->uz_flags & UMA_ZFLAG_INTERNAL)) { - for (cpu = 0; cpu < mp_maxid; cpu++) { + for (cpu = 0; cpu <= mp_maxid; cpu++) { if (CPU_ABSENT(cpu)) continue; CPU_LOCK(cpu); @@ -2162,7 +2154,7 @@ ZONE_LOCK(z); cachefree = 0; if (!(z->uz_flags & UMA_ZFLAG_INTERNAL)) { - for (cpu = 0; cpu < mp_maxid; cpu++) { + for (cpu = 0; cpu <= mp_maxid; cpu++) { if (CPU_ABSENT(cpu)) continue; cache = &z->uz_cpu[cpu]; From owner-p4-projects@FreeBSD.ORG Tue Dec 2 17:40:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 533CC16A4D0; Tue, 2 Dec 2003 17:40:18 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C6B516A4CE for ; Tue, 2 Dec 2003 17:40:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E97E743FE0 for ; Tue, 2 Dec 2003 17:40:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB31e9XJ092244 for ; Tue, 2 Dec 2003 17:40:09 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB31e9p2092240 for perforce@freebsd.org; Tue, 2 Dec 2003 17:40:09 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Dec 2003 17:40:09 -0800 (PST) Message-Id: <200312030140.hB31e9p2092240@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 43337 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 01:40:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=43337 Change 43337 by peter@peter_overcee on 2003/12/02 17:39:49 IFC @43321 Affected files ... .. //depot/projects/hammer/bin/ls/ls.1#9 integrate .. //depot/projects/hammer/bin/ls/ls.c#9 integrate .. //depot/projects/hammer/contrib/ipfilter/ipt.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/kmem.c#4 integrate .. //depot/projects/hammer/lib/libc/sys/sendfile.2#4 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#9 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#7 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#40 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#13 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#10 integrate .. //depot/projects/hammer/sbin/Makefile#17 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#14 integrate .. //depot/projects/hammer/share/man/man4/wi.4#16 integrate .. //depot/projects/hammer/sys/conf/majors#17 integrate .. //depot/projects/hammer/sys/conf/options.i386#18 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#20 integrate .. //depot/projects/hammer/sys/dev/twe/twe.c#5 integrate .. //depot/projects/hammer/sys/dev/twe/twe_compat.h#6 integrate .. //depot/projects/hammer/sys/dev/twe/twe_freebsd.c#8 integrate .. //depot/projects/hammer/sys/dev/twe/twe_tables.h#3 integrate .. //depot/projects/hammer/sys/dev/twe/tweio.h#3 integrate .. //depot/projects/hammer/sys/dev/twe/twereg.h#5 integrate .. //depot/projects/hammer/sys/dev/twe/twevar.h#3 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#22 integrate .. //depot/projects/hammer/sys/i386/i386/apic_vector.s#5 integrate .. //depot/projects/hammer/sys/i386/isa/cy.c#7 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#13 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#22 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/hammer/sys/pci/cy_pci.c#4 integrate .. //depot/projects/hammer/usr.sbin/Makefile#34 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#10 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#19 integrate Differences ... ==== //depot/projects/hammer/bin/ls/ls.1#9 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.76 2003/08/08 17:04:17 schweikh Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.77 2003/12/01 19:10:29 obrien Exp $ .\" .Dd May 19, 2002 .Dt LS 1 @@ -186,6 +186,14 @@ not blocks. This option overrides the environment variable .Ev BLOCKSIZE . +Note that +.Fl k +is mutually exclusive to +.Fl h +and later +.Fl k +will nullify earlier +.Fl h . .It Fl l (The lowercase letter .Dq ell . ) ==== //depot/projects/hammer/bin/ls/ls.c#9 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.74 2003/05/03 16:39:33 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.75 2003/12/01 19:10:29 obrien Exp $"); #include #include @@ -267,6 +267,7 @@ f_inode = 1; break; case 'k': + f_humanval = 0; f_kblocks = 1; break; case 'm': ==== //depot/projects/hammer/contrib/ipfilter/ipt.c#3 (text+ko) ==== @@ -443,7 +443,8 @@ void *ptr; { #if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) #else char buf[32], *s; int len; @@ -458,7 +459,8 @@ if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1) return "X"; #if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) return strdup(netif.if_xname); #else if (kmemcpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1) ==== //depot/projects/hammer/contrib/ipfilter/kmem.c#4 (text+ko) ==== @@ -204,7 +204,8 @@ return ifname; #else # if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) #else char buf[32]; int len; @@ -219,7 +220,8 @@ if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1) return "X"; # if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) return strdup(netif.if_xname); # else if (kstrncpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1) ==== //depot/projects/hammer/lib/libc/sys/sendfile.2#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 1998, David Greenman +.\" Copyright (c) 2003, David G. Lawrence .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/sendfile.2,v 1.18 2003/05/22 13:02:28 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/sendfile.2,v 1.19 2003/12/01 22:12:50 dg Exp $ .\" .Dd November 5, 1998 .Dt SENDFILE 2 @@ -191,6 +191,10 @@ .Fa fd . .It Bq Er EFAULT An invalid address was specified for an argument. +.It Bq Er EINTR +A signal interrupted sendfile before it could be completed. If specified, the number +of bytes successfully sent will be returned in +.Fa *sbytes . .It Bq Er EAGAIN The socket is marked for non-blocking I/O and not all data was sent due to the socket buffer being filled. If specified, the number of bytes successfully sent will be returned in @@ -215,4 +219,4 @@ .Fn sendfile system call and this manual page were written by -.An David Greenman Aq dg@root.com . +.An David G. Lawrence Aq dg@dglawrence.com . ==== //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.10 2003/06/29 00:12:39 mtm Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.11 2003/12/02 16:00:26 mtm Exp $ */ #include @@ -90,7 +90,6 @@ union descriptor desc; void **ldt_entry; int ldt_index; - int error; *err = 0; @@ -128,7 +127,6 @@ * what the gs register will point to. */ *ldt_entry = (void *)thr; - ldt_index = LDT_INDEX(ldt_entry); bzero(&desc, sizeof(desc)); @@ -147,9 +145,10 @@ desc.sd.sd_gran = 0; desc.sd.sd_hibase = (unsigned int)ldt_entry >> 24; - error = i386_set_ldt(ldt_index, &desc, 1); - if (error == -1) - abort(); + /* Get a slot from the process' LDT list */ + ldt_index = i386_set_ldt(LDT_AUTO_ALLOC, &desc, 1); + if (ldt_index == -1) + abort(); /* * Set up our gs with the index into the ldt for this entry. ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#7 (text+ko) ==== @@ -22,6 +22,8 @@ X"> X"> + + ]> @@ -33,7 +35,7 @@ The &os; Release Engineering Team - $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.16 2003/09/08 14:53:01 simon Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.17 2003/12/02 05:54:35 bmah Exp $ 2002 @@ -84,11 +86,11 @@ with) possible regressions in the newer releases. Specifically, for more conservative users, we recommend running &release.4x; releases (such as - 4.8-RELEASE) for the near-term + &release.4last;) for the near-term future. We feel that such users are probably best served by upgrading to &release.5x; only after a 5-STABLE development branch has been created; this may be around - the time of 5.2-RELEASE. + the time of &release.5branchpoint;. (&os; &release.5x; suffers from what has been described as a chicken and egg problem. The entire project has @@ -132,9 +134,10 @@ it. This branch has the tag RELENG_4 in the CVS repository. - &os; 5.0 and 5.1 are based on the CURRENT branch. These - are the first releases from this branch in over two years (the - last was &os; 4.0, in March 2000). + &os; 5.0, 5.1, and 5.2 are based on the CURRENT branch. The + first of these releases was made after over two years of development + (prior to these, the + last release from HEAD was &os; 4.0, in March 2000). At some point after the release of &os; 5.0, a 5-STABLE branch will be created in the &os; @@ -154,8 +157,8 @@ there will be multiple releases in the &release.5x; series before this happens; we estimate - that the 5-STABLE branch will be created sometime after - 5.2-RELEASE. + that the 5-STABLE branch will be created around the time of + &release.5branchpoint;. More information on &os; release engineering processes can be found on the SMPng: The next generation support for - SMP machines (work in progress). There is now partial - support for multiple processors to be running in the kernel - at the same time. This work is ongoing. + SMP machines (work in progress). + Ongoing work aims to perform fine-grained locking of various + kernel subsystems to increase the number of threads of + execution that can be running in the kernel. More + information can be found on the + FreeBSD SMP + Project page. KSE: Kernel Scheduled Entities allow a single process to have multiple kernel-level threads, similar to Scheduler - Activations. The (experimental) libkse - and libthr libraries make this - feature available to multi-threaded userland programs. + Activations. The libkse + and libthr threading libraries make this + feature available to multi-threaded userland programs, + using the &man.pthread.3; API. - New architectures: Support for the &sparc64; and ia64 - architectures, in addition to the &i386;, pc98, and + New architectures: Support for the sparc64, ia64, and amd64 + architectures, in addition to the i386, pc98, and alpha. GCC: The compiler toolchain is now based on GCC - 3.2.2, rather than GCC + 3.3.X, rather than GCC 2.95.X. @@ -215,7 +223,7 @@ GEOM: A flexible framework for transformations of disk - I/O requests. An experimental disk encryption facility has + I/O requests. The GBDE experimental disk encryption facility has been developed based on GEOM. @@ -237,10 +245,14 @@ Cardbus: Support for Cardbus devices. + + Bluetooth: Support for Bluetooth devices. + + A more comprehensive list of new features can be found in - the release notes for &os; &release.prev; and &os; &release.current;. + the release notes for the various &os; &release.5x; releases. @@ -267,7 +279,10 @@ ABIs/APIs, third-party binary device drivers will require modifications to work correctly under &os; 5.0. There is a possibility of more minor ABI/API changes before the - 5-STABLE branch is created. + 5-STABLE branch is created, particularly on newer machine + architectures. In some (hopefully rare) cases, + user-visible structures may change, requiring recompiling of + applications or reinstallation of ports/packages. @@ -289,32 +304,35 @@ A number of ports and packages do not build or do not - run correctly under &os; 5.0, whereas they did under &os; + run correctly under &os; &release.5x;, whereas they did under &os; 4-STABLE. Generally these problems are caused by compiler - toolchain changes or cleanups of header files. + toolchain changes or cleanups of header files. In some + cases they are caused by changes in kernel or device + support. Many &os; &release.5x; features are seeing wide exposure for the first time. Many of these features (such as SMPng) have broad impacts on the - kernel. + kernel, and it may be difficult to gauge their effects on + stability and performance. A certain amount of debugging and diagnostic code is - still in place to help track down problems in &os; 5.0's new - features. This may cause &os; 5.0 to perform more slowly + still in place to help track down problems in &os; &release.5x;'s new + features. This may cause &os; &release.5x; to perform more slowly than 4-STABLE. Features are only added to the 4-STABLE development branch after a settling time in -CURRENT. - &os; 5.0 does not have the stabilizing influence of a + &os; &release.5x; does not have the stabilizing influence of a -STABLE branch. (It is likely that the 5-STABLE development branch will be created sometime after - 5.2-RELEASE.) + &release.5branchpoint;.) @@ -330,20 +348,25 @@ Because a number of these drawbacks affect system stability, the release engineering team recommends that more conservative sites and users stick to releases based on the 4-STABLE branch until - the &release.5x; series is more polished. + the &release.5x; series is more polished. While we believe that + many initial problems with stability have been fixed, some + issues with performance are still being addressed by + works-in-progress. We also note that best common practices in + system administration call for trying operating system upgrades + in a test environment before upgrading one's production, or + mission-critical systems. Plans for the 4-STABLE Branch - The release of &os; 5.0 does not mean the end of the - 4-STABLE branch. Indeed, &os; 4.8 was released two months after - 5.0, in April 2003. There will most likely be at least one more release on - this branch, namely 4.9-RELEASE, currently scheduled for summer - 2003. - A 4.10-RELEASE is a likely possibility as well. - Future releases from this branch will + It is important to note that even though releases are being + made in the &release.5x; series, support for &release.4x; + releases will continue for some time. + Indeed, &os; 4.8 was released two months after + 5.0, in April 2003, followed by 4.9, in October 2003. + Future releases from the 4-STABLE branch (if any) will depend on several factors. The most important of these is the existence and stability of the 5-STABLE branch. If CURRENT is not sufficiently stable to allow the creation of a @@ -358,7 +381,12 @@ account user demand for future 4-STABLE releases. This demand, however, will need to be balanced with release engineering resources (particularly developers' time, computing resources, and mirror - archive space). + archive space). We note that in general, the &os; community + (both users and developers) has shown a preference for + moving forward with new features in + the &release.5x; branch and beyond, due to the difficulty + involved in backporting (and maintaining) new functionality in + &release.4x;. The &a.security-officer; will continue to support releases made from the 4-STABLE branch in accordance with their published @@ -369,6 +397,20 @@ to security advisories and security fixes. At its discretion, the team may support other releases for specific issues. + At this point, the release engineering team has no specific + plans for future releases from the 4-STABLE development branch. + It seems likely that any future releases (if + any) from this branch will be lightweight, + point releases. These will probably carry + 4.9.X version numbers, to indicate + that they are not intended to provide large amount of new + functionality compared to &release.4last;. In general, these + releases will emphasize security fixes, bug fixes, and device + driver updates (particularly to accommodate new hardware easily + supported by existing drivers). Major new features (especially those + requiring infrastructure support added in &release.5x;) will + probably not be added in these releases. + @@ -399,12 +441,15 @@ recommended. In particular, a binary upgrade will leave behind a number of files that are present in &os; &release.4x; but not in &release.5x;. These obsolete - files may create some problems. + files may create some problems. Examples of these files + include old C++ headers, programs moved to the Ports + Collection, or shared libraries that have moved to support + dynamically-linked root filesystem executables. On the &i386; and pc98 platforms, a UserConfig utility exists on 4-STABLE to allow boot-time configuration of ISA devices when booting from installation media. Under &os; - 5.0, this functionality has been replaced in part by the + &release.5x;, this functionality has been replaced in part by the &man.device.hints.5; mechanism (it allows specifying the same parameters, but with a very different interface). @@ -455,8 +500,14 @@ &release.4x; executables under &release.5x;, but this requires the compat4x distribution to be installed. - Thus, using old ports may be - possible. + Using old ports may be possible in some cases, although there + are a number of known cases of backward incompatibility. As an + example, the + devel/gnomevfs2, + mail/postfix, and + security/cfs ports need to + be recompiled due to changes in the statfs + structure. When installing or upgrading over the top of an existing 4-STABLE-based system, it is extremely important to clear out ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#40 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.202 2003/11/30 23:54:59 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.203 2003/12/02 07:13:03 bmah Exp $ Supported Devices @@ -979,127 +979,11 @@ NCR / AT&T / Lucent Technologies WaveLan T1-speed ISA/radio LAN cards (&man.wl.4; driver) - Lucent Technologies WaveLAN/IEEE 802.11b PCMCIA and ISA - standard speed (2Mbps) and turbo speed (6Mbps) wireless network - adapters and workalikes (&man.wi.4; driver) - - The ISA versions of these adapters are actually PCMCIA - cards combined with an ISA to PCMCIA bridge card, so both kinds - of devices work with the same driver. - - - - 3COM 3crwe737A AirConnect Wireless LAN PC Card - - - Accton airDirect WN3301 - - - Addtron AWA100 - - - Adtec ADLINK340APC - - - Airway 802.11 Adapter - - - Avaya Wireless PC Card - - - Blue Concentric Circle CF Wireless LAN Model WL-379F - - - BreezeNET PC-DS.11 - - - Buffalo WLI-CF-S11G - - - Cabletron RoamAbout 802.11 DS - - - Compaq WL100, WL110 - - - Corega KK Wireless LAN PCC-11, PCCA-11, PCCB-11 - - - D-Link DWL-650 - - - Dell TrueMobile 1150 Series - - - ELECOM Air@Hawk/LD-WL11/PCC - - - ELSA AirLancer MC-11 - - - Farallon Skyline 11Mbps Wireless - - - ICOM SL-1100 - - - IBM High Rate Wireless LAN PC Card - - - Intel PRO/Wireless 2011 LAN PC Card - - - IO Data WN-B11/PCM - - - Laneed Wireless card - - - Linksys Instant Wireless WPC11 - - - Lucent WaveLAN/IEEE 802.11 - - - MELCO Airconnect WLI-PCM-S11, WLI-PCM-L11 - - - NCR WaveLAN/IEEE 802.11 - - - NEC Wireless Card CMZ-RT-WP - - - NEC Aterm WL11C (PC-WL/11C) - - - NEC PK-WL001 - - - Netgear MA401 - - - PLANEX GeoWave/GW-NS110 - - - Proxim Harmony, RangeLAN-DS - - - SMC 2632W, 2602W - - - Sony PCWA-C100 - - - TDK LAK-CD011WL - - - Toshiba Wireless LAN Card - - - US Robotics Wireless Card 2410 - - + Lucent Technologies WaveLAN/IEEE 802.11b + wireless network + adapters and workalikes using the Lucent Hermes, Intersil + PRISM-II, Intersil PRISM-2.5, Intersil Prism-3, and Symbol + Spectrum24 chipsets (&man.wi.4; driver) Cisco/Aironet 802.11b wireless adapters (&man.an.4; driver) ==== //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#13 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.50 2003/11/30 01:35:19 kris Exp $ +# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.51 2003/12/02 20:47:31 marcus Exp $ # # MAINTAINER: re # @@ -101,8 +101,8 @@ CDROM_SET_1="${CDROM_SET_1} x11/XFree86-4-documents" CDROM_SET_1="${CDROM_SET_1} x11/XFree86-4-libraries" CDROM_SET_1="${CDROM_SET_1} x11/XFree86-4-manuals" -CDROM_SET_1="${CDROM_SET_1} x11/gnome2" -CDROM_SET_1="${CDROM_SET_1} x11/kde3" +CDROM_SET_1="${CDROM_SET_1} x11/gnome2-lite" +CDROM_SET_1="${CDROM_SET_1} x11/kde-lite" CDROM_SET_1="${CDROM_SET_1} www/links" # This is the set of "people really want these" packages. Please add to ==== //depot/projects/hammer/rescue/rescue/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/rescue/rescue/Makefile,v 1.21 2003/11/09 01:22:27 obrien Exp $ +#$FreeBSD: src/rescue/rescue/Makefile,v 1.22 2003/12/02 21:52:14 brooks Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= rescue @@ -128,7 +128,7 @@ .endif .if !defined(NO_IPFILTER) -CRUNCH_PROGS_sbin+= ipf ipfs ipmon # ipnat +CRUNCH_PROGS_sbin+= ipf ipfs ipfstat ipmon ipnat .endif # crunchgen does not like C++ programs; this should be fixed someday ==== //depot/projects/hammer/sbin/Makefile#17 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.128 2003/10/31 18:54:46 brooks Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.129 2003/12/02 21:52:14 brooks Exp $ # XXX MISSING: icheck ncheck @@ -87,7 +87,9 @@ .if !defined(NO_IPFILTER) SUBDIR+=ipf \ ipfs \ - ipmon + ipfstat \ + ipmon \ + ipnat .endif .if !defined(NOINET6) ==== //depot/projects/hammer/sbin/ipfw/ipfw.8#14 (text+ko) ==== @@ -1,7 +1,7 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.133 2003/09/26 12:22:28 rse Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.134 2003/12/02 00:23:45 sam Exp $ .\" -.Dd August 13, 2002 +.Dd December 1, 2003 .Dt IPFW 8 .Os .Sh NAME @@ -987,6 +987,13 @@ .Cm proto Ar ipsec as the latter will only look at the specific IP protocol field, irrespective of IPSEC kernel support and the validity of the IPSEC data. +.Pp +Further note that this flag is silently ignored in kernels without +IPSEC support. +It does not affect rule processing when given and the +rules are handled as if with no +.Cm ipsec +flag. .It Cm iptos Ar spec Matches IP packets whose .Cm tos ==== //depot/projects/hammer/share/man/man4/wi.4#16 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wi.4,v 1.57 2003/09/22 05:36:32 imp Exp $ +.\" $FreeBSD: src/share/man/man4/wi.4,v 1.58 2003/12/02 07:07:45 bmah Exp $ .\" $OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $ .\" .Dd February 17, 2003 @@ -141,10 +141,12 @@ .Em "Card Chip Bus" 3Com AirConnect 3CRWE737A Spectrum24 PCMCIA 3Com AirConnect 3CRWE777A Prism-II PCI +Accton airDirect WN3301 PCMCIA ACTIONTEC HWC01170 Prism-2.5 PCMCIA Addtron AWP-100 Prism-II PCMCIA Adtec Adlink/340C Prism-II PCMCIA Airvast WN 100 Prism-3 PCMCIA +Airway 802.11 Adapter PCMCIA Agere Orinoco Hermes PCMCIA Allied Telesis WR211PCM Prism-II PCMCIA ArTem OnAir Prism? PCMCIA @@ -171,6 +173,8 @@ Dlink Air 660 Prism-II PCMCIA Dlink DWL520 Prism-2.5 PCI Dlink DWL650 Prism-2.5 PCMCIA +ELECOM Air@Hawk/LD-WL11/PCC PCMCIA +ELSA MC-11 PCMCIA ELSA XI300 Prism-II PCMCIA ELSA XI800 Prism-II CF EMTAC A2424i Prism-II PCMCIA @@ -185,6 +189,7 @@ Intel PRO/Wireless 2011 Spectrum24 PCMCIA Intersil Prism II Prism-II PCMCIA Intersil Mini-PCI Prism-2.5 PCI +Laneed Wireless PCMCIA Linksys Instant Wireless WPC11 Prism-II PCMCIA Linksys Instant Wireless WPC11 2.5 Prism-2.5 PCMCIA Linksys Instant Wireless WPC11 3.0 Prism-3 PCMCIA @@ -194,6 +199,7 @@ Melco Airconnect Prism-II PCMCIA Microsoft MN-520 WLAN Prism-II PCMCIA NANOSPEED ROOT-RZ2000 Prism-II PCMCIA +NCR WaveLAN/IEEE 802.11 PCMCIA NDC/Sohoware NCP130 Prism-II PCI NEC CMZ-RT-WP Prism-II PCMCIA NEC PK-WL001 Lucent PCMCIA ==== //depot/projects/hammer/sys/conf/majors#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/majors,v 1.182 2003/11/21 21:03:42 imp Exp $ +# $FreeBSD: src/sys/conf/majors,v 1.183 2003/12/02 04:40:33 imp Exp $ # # This list is semi-obsoleted by DEVFS, but for now it still contains # the current allocation of device major numbers. @@ -171,6 +171,7 @@ 183 *smapi SMAPI BIOS interface 184 dcons Dumb console driver 185 ce Cronyx Tau-32 E1 adapter +186 sx Specialix I/O8+ driver 200 ?? entries from 200-252 are reserved for local use 248 *isp dev/isp/isp_freebsd.c 252 ?? entries from 200-252 are reserved for local use ==== //depot/projects/hammer/sys/conf/options.i386#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.202 2003/11/11 17:14:25 jhb Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.203 2003/12/01 20:39:04 phk Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -49,6 +49,8 @@ CPU_DISABLE_CMPXCHG opt_global.h # XXX global, unlike other CPU_* CPU_DISABLE_SSE opt_cpu.h CPU_ELAN opt_cpu.h +CPU_ELAN_XTAL opt_cpu.h +CPU_ELAN_PPS opt_cpu.h CPU_ENABLE_SSE opt_cpu.h CPU_FASTER_5X86_FPU opt_cpu.h CPU_GEODE opt_cpu.h @@ -64,8 +66,6 @@ CPU_WT_ALLOC opt_cpu.h CYRIX_CACHE_REALLY_WORKS opt_cpu.h CYRIX_CACHE_WORKS opt_cpu.h -ELAN_PPS opt_cpu.h # XXX should be named CPU_* -ELAN_XTAL opt_cpu.h # XXX should be named CPU_* NO_F00F_HACK opt_cpu.h NO_MEMORY_HOLE opt_cpu.h ==== //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_log.c#4 (text+ko) ==== @@ -4,7 +4,7 @@ * See the IPFILTER.LICENCE file for details on licencing. * * $Id: ip_log.c,v 2.5.2.1 2000/07/19 13:11:47 darrenr Exp $ - * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.25 2003/10/31 18:31:56 brooks Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.26 2003/12/02 18:28:00 brooks Exp $ */ #include #if defined(KERNEL) && !defined(_KERNEL) @@ -253,8 +253,8 @@ mlen = (flags & FR_LOGBODY) ? MIN(msgdsize(m) - hlen, 128) : 0; # else # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \ - (defined(OpenBSD) && (OpenBSD >= 199603) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) ) + (defined(OpenBSD) && (OpenBSD >= 199603)) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) strncpy(ipfl.fl_ifname, ifp->if_xname, IFNAMSIZ); # else ipfl.fl_unit = (u_char)ifp->if_unit; ==== //depot/projects/hammer/sys/dev/em/if_em.c#20 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.34 2003/11/14 18:02:24 pdeuskar Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.35 2003/12/02 22:13:08 pdeuskar Exp $*/ #include @@ -712,7 +712,7 @@ em_initialize_receive_unit(adapter); } #ifdef DEVICE_POLLING - if (!(ifp->if_ipending & IFF_POLLING)) + if (!(ifp->if_flags & IFF_POLLING)) #endif em_enable_intr(adapter); EM_UNLOCK(adapter); @@ -852,7 +852,7 @@ * Only enable interrupts if we are not polling, make sure * they are off otherwise. */ - if (ifp->if_ipending & IFF_POLLING) + if (ifp->if_flags & IFF_POLLING) em_disable_intr(adapter); else #endif /* DEVICE_POLLING */ @@ -936,7 +936,7 @@ ifp = &adapter->interface_data.ac_if; #ifdef DEVICE_POLLING - if (ifp->if_ipending & IFF_POLLING) { + if (ifp->if_flags & IFF_POLLING) { EM_UNLOCK(adapter); return; } ==== //depot/projects/hammer/sys/dev/twe/twe.c#5 (text+ko) ==== @@ -1,5 +1,7 @@ /*- * Copyright (c) 2000 Michael Smith + * Copyright (c) 2003 Paul Saab + * Copyright (c) 2003 Vinod Kashyap * Copyright (c) 2000 BSDi * All rights reserved. * @@ -24,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twe/twe.c,v 1.17 2003/08/19 12:22:17 ps Exp $ + * $FreeBSD: src/sys/dev/twe/twe.c,v 1.18 2003/12/02 07:57:19 ps Exp $ */ /* @@ -60,8 +62,8 @@ static int twe_immediate_request(struct twe_request *tr); static void twe_completeio(struct twe_request *tr); static void twe_reset(struct twe_softc *sc); -static void twe_add_unit(struct twe_softc *sc, int unit); -static void twe_del_unit(struct twe_softc *sc, int unit); +static int twe_add_unit(struct twe_softc *sc, int unit); +static int twe_del_unit(struct twe_softc *sc, int unit); /* * Command I/O to controller. @@ -86,7 +88,7 @@ static int twe_fetch_aen(struct twe_softc *sc); static void twe_handle_aen(struct twe_request *tr); static void twe_enqueue_aen(struct twe_softc *sc, u_int16_t aen); -static int twe_dequeue_aen(struct twe_softc *sc); +static u_int16_t twe_dequeue_aen(struct twe_softc *sc); static int twe_drain_aen_queue(struct twe_softc *sc); static int twe_find_aen(struct twe_softc *sc, u_int16_t aen); @@ -192,17 +194,17 @@ return(0); } -static void +static int twe_add_unit(struct twe_softc *sc, int unit) { struct twe_drive *dr; - int table; + int table, error = 0; u_int16_t dsize; TWE_Param *drives = NULL, *param = NULL; TWE_Unit_Descriptor *ud; if (unit < 0 || unit > TWE_MAX_UNITS) - return; + return (EINVAL); /* * The controller is in a safe state, so try to find drives attached to it. @@ -210,30 +212,36 @@ if ((drives = twe_get_param(sc, TWE_PARAM_UNITSUMMARY, TWE_PARAM_UNITSUMMARY_Status, TWE_MAX_UNITS, NULL)) == NULL) { twe_printf(sc, "can't detect attached units\n"); - return; + return (EIO); } dr = &sc->twe_drive[unit]; /* check that the drive is online */ - if (!(drives->data[unit] & TWE_PARAM_UNITSTATUS_Online)) + if (!(drives->data[unit] & TWE_PARAM_UNITSTATUS_Online)) { + error = ENXIO; goto out; + } table = TWE_PARAM_UNITINFO + unit; if (twe_get_param_4(sc, table, TWE_PARAM_UNITINFO_Capacity, &dr->td_size)) { twe_printf(sc, "error fetching capacity for unit %d\n", unit); + error = EIO; goto out; } if (twe_get_param_1(sc, table, TWE_PARAM_UNITINFO_Status, &dr->td_state)) { twe_printf(sc, "error fetching state for unit %d\n", unit); + error = EIO; goto out; } if (twe_get_param_2(sc, table, TWE_PARAM_UNITINFO_DescriptorSize, &dsize)) { twe_printf(sc, "error fetching descriptor size for unit %d\n", unit); + error = EIO; goto out; } if ((param = twe_get_param(sc, table, TWE_PARAM_UNITINFO_Descriptor, dsize - 3, NULL)) == NULL) { twe_printf(sc, "error fetching descriptor for unit %d\n", unit); + error = EIO; goto out; } ud = (TWE_Unit_Descriptor *)param->data; @@ -248,25 +256,31 @@ dr->td_sectors = 32; } dr->td_cylinders = dr->td_size / (dr->td_heads * dr->td_sectors); - dr->td_unit = unit; + dr->td_twe_unit = unit; - twe_attach_drive(sc, dr); + error = twe_attach_drive(sc, dr); out: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 2 17:46:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 262D516A4D0; Tue, 2 Dec 2003 17:46:19 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE0F016A4CE for ; Tue, 2 Dec 2003 17:46:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 374A243FB1 for ; Tue, 2 Dec 2003 17:46:18 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB31kHXJ092523 for ; Tue, 2 Dec 2003 17:46:17 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB31kHHK092520 for perforce@freebsd.org; Tue, 2 Dec 2003 17:46:17 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Dec 2003 17:46:17 -0800 (PST) Message-Id: <200312030146.hB31kHHK092520@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 43338 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 01:46:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=43338 Change 43338 by peter@peter_overcee on 2003/12/02 17:45:38 integrate -I -b i386_hammer (yay! it worked) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#47 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#12 (text+ko) ==== @@ -104,13 +104,13 @@ SUPERALIGN_TEXT ; \ IDTVEC(vec_name) ; \ PUSH_FRAME ; \ + FAKE_MCOUNT(13*4(%esp)) ; /* XXX avoid double count */ \ movq lapic, %rdx ; /* pointer to local APIC */ \ movl LA_ISR + 16 * (index)(%rdx), %eax ; /* load ISR */ \ bsrl %eax, %eax ; /* index of highset set bit in ISR */ \ jz 2f ; \ addl $(32 * index),%eax ; \ 1: ; \ - FAKE_MCOUNT(13*4(%esp)) ; /* XXX avoid double count */ \ movq %rax, %rdi ; /* pass the IRQ */ \ call lapic_handle_intr ; \ MEXITCOUNT ; \ ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#47 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Dec 2 17:55:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 636E416A4D0; Tue, 2 Dec 2003 17:55:31 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3563316A4CE for ; Tue, 2 Dec 2003 17:55:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01CA443FBD for ; Tue, 2 Dec 2003 17:55:30 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB31tTXJ092877 for ; Tue, 2 Dec 2003 17:55:29 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB31tTX9092874 for perforce@freebsd.org; Tue, 2 Dec 2003 17:55:29 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 2 Dec 2003 17:55:29 -0800 (PST) Message-Id: <200312030155.hB31tTX9092874@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 43339 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 01:55:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=43339 Change 43339 by rwatson@rwatson_powerbook on 2003/12/02 17:54:52 Also install mac_policy.h so kext policy modules can reference it. Affected files ... .. //depot/projects/trustedbsd/sedarwin/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/Makefile#3 (text+ko) ==== @@ -3,7 +3,8 @@ dummy: @echo Please following the directions in bootstrap_instructions.txt -TBSDHEADERS=apsl/xnu/bsd/sys/extattr.h apsl/xnu/bsd/sys/mac.h apsl/xnu/bsd/sys/_label.h \ +TBSDHEADERS=apsl/xnu/bsd/sys/extattr.h apsl/xnu/bsd/sys/mac.h \ + apsl/xnu/bsd/sys/mac_policy.h apsl/xnu/bsd/sys/_label.h \ apsl/xnu/bsd/sys/ucred.h install-headers: From owner-p4-projects@FreeBSD.ORG Tue Dec 2 18:04:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E54616A4D0; Tue, 2 Dec 2003 18:04:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 476D816A4CE for ; Tue, 2 Dec 2003 18:04:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 85ED543F85 for ; Tue, 2 Dec 2003 18:04:42 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB324gXJ094061 for ; Tue, 2 Dec 2003 18:04:42 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB324fRB094058 for perforce@freebsd.org; Tue, 2 Dec 2003 18:04:41 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 2 Dec 2003 18:04:41 -0800 (PST) Message-Id: <200312030204.hB324fRB094058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 43341 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 02:04:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=43341 Change 43341 by rwatson@rwatson_powerbook on 2003/12/02 18:03:56 Also install headers in: /System/Library/Frameworks/Kernel.framework/Headers This way they can be used in kexts. Affected files ... .. //depot/projects/trustedbsd/sedarwin/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/Makefile#4 (text+ko) ==== @@ -3,12 +3,15 @@ dummy: @echo Please following the directions in bootstrap_instructions.txt -TBSDHEADERS=apsl/xnu/bsd/sys/extattr.h apsl/xnu/bsd/sys/mac.h \ - apsl/xnu/bsd/sys/mac_policy.h apsl/xnu/bsd/sys/_label.h \ - apsl/xnu/bsd/sys/ucred.h +TBSDHEADERS=extattr.h mac.h mac_policy.h _label.h ucred.h + +SRC1=apsl/xnu/bsd/sys +DEST1=/usr/include/sys +DEST2=/System/Library/Frameworks/Kernel.framework/Headers/sys install-headers: - install -m 444 -o root -g wheel $(TBSDHEADERS) /usr/include/sys + (cd $(SRC1) ; install -m 444 -o root -g wheel $(TBSDHEADERS) $(DEST1)) + (cd $(SRC1) ; install -m 444 -o root -g wheel $(TBSDHEADERS) $(DEST2)) cd libsebsd; make install-headers; cd .. libraries: From owner-p4-projects@FreeBSD.ORG Tue Dec 2 18:22:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9256C16A4D0; Tue, 2 Dec 2003 18:22:05 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E73016A4CE for ; Tue, 2 Dec 2003 18:22:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5FC943FDD for ; Tue, 2 Dec 2003 18:22:04 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB32M4XJ094720 for ; Tue, 2 Dec 2003 18:22:04 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB32M4eu094717 for perforce@freebsd.org; Tue, 2 Dec 2003 18:22:04 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Dec 2003 18:22:04 -0800 (PST) Message-Id: <200312030222.hB32M4eu094717@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 43343 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 02:22:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=43343 Change 43343 by peter@peter_overcee on 2003/12/02 18:21:59 catch up with procsig locking. I think this is what caused my panics yesterday. Affected files ... .. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#9 edit Differences ... ==== //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#9 (text+ko) ==== @@ -187,6 +187,7 @@ p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); psp = p->p_sigacts; + mtx_assert(&psp->ps_mtx, MA_OWNED); regs = td->td_frame; oonstack = sigonstack(regs->tf_rsp); @@ -250,6 +251,7 @@ sf.sf_addr = regs->tf_addr; sf.sf_ah = (u_int32_t)(uintptr_t)catcher; } + mtx_unlock(&psp->ps_mtx); PROC_UNLOCK(p); /* @@ -274,6 +276,7 @@ td->td_pcb->pcb_es = _udatasel; /* leave user %fs and %gs untouched */ PROC_LOCK(p); + mtx_lock(&psp->ps_mtx); } #endif /* COMPAT_FREEBSD4 */ @@ -298,6 +301,7 @@ return; } #endif + mtx_assert(&psp->ps_mtx, MA_OWNED); regs = td->td_frame; oonstack = sigonstack(regs->tf_rsp); @@ -366,6 +370,7 @@ sf.sf_addr = regs->tf_addr; sf.sf_ah = (u_int32_t)(uintptr_t)catcher; } + mtx_unlock(&psp->ps_mtx); PROC_UNLOCK(p); /* @@ -390,6 +395,7 @@ td->td_pcb->pcb_es = _udatasel; /* leave user %fs and %gs untouched */ PROC_LOCK(p); + mtx_lock(&psp->ps_mtx); } /* From owner-p4-projects@FreeBSD.ORG Tue Dec 2 18:47:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14DC216A4D0; Tue, 2 Dec 2003 18:47:37 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF1FC16A4CE for ; Tue, 2 Dec 2003 18:47:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24B5F43FE9 for ; Tue, 2 Dec 2003 18:47:36 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB32lZXJ096546 for ; Tue, 2 Dec 2003 18:47:35 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB32lZu0096543 for perforce@freebsd.org; Tue, 2 Dec 2003 18:47:35 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 2 Dec 2003 18:47:35 -0800 (PST) Message-Id: <200312030247.hB32lZu0096543@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 43344 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 02:47:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=43344 Change 43344 by peter@peter_overcee on 2003/12/02 18:47:17 capture this before I lose it too. Add -E (elapsed) time stamps. This is IMHO more useful than both -R and/or -T. Affected files ... .. //depot/projects/hammer/usr.bin/kdump/kdump.1#3 edit .. //depot/projects/hammer/usr.bin/kdump/kdump.c#6 edit Differences ... ==== //depot/projects/hammer/usr.bin/kdump/kdump.1#3 (text+ko) ==== @@ -40,7 +40,7 @@ .Nd display kernel trace data .Sh SYNOPSIS .Nm -.Op Fl dnlRT +.Op Fl dnlERT .Op Fl f Ar file .Op Fl m Ar maxdata .Op Fl p Ar pid @@ -89,6 +89,8 @@ .Ar pid . This may be useful when there are multiple processes recorded in the same trace file. +.It Fl E +Display elapsed timestamps (time since beginning of trace). .It Fl R Display relative timestamps (time since previous entry). .It Fl T ==== //depot/projects/hammer/usr.bin/kdump/kdump.c#6 (text+ko) ==== @@ -97,7 +97,7 @@ (void) setlocale(LC_CTYPE, ""); - while ((ch = getopt(argc,argv,"f:dlm:np:RTt:")) != -1) + while ((ch = getopt(argc,argv,"f:dlm:np:ERTt:")) != -1) switch((char)ch) { case 'f': tracefile = optarg; @@ -117,6 +117,9 @@ case 'p': pid = atoi(optarg); break; + case 'E': + timestamp = 3; /* elapsed timestamp */ + break; case 'R': timestamp = 2; /* relative timestamp */ break; @@ -249,6 +252,11 @@ (void)printf("%6d %-8.*s ", kth->ktr_pid, MAXCOMLEN, kth->ktr_comm); if (timestamp) { + if (timestamp == 3) { + if (prevtime.tv_sec == 0) + prevtime = kth->ktr_time; + timevalsub(&kth->ktr_time, &prevtime); + } if (timestamp == 2) { temp = kth->ktr_time; timevalsub(&kth->ktr_time, &prevtime); From owner-p4-projects@FreeBSD.ORG Wed Dec 3 09:13:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45C8216A4D0; Wed, 3 Dec 2003 09:13:27 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E3B916A4CE for ; Wed, 3 Dec 2003 09:13:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F1CE44008 for ; Wed, 3 Dec 2003 09:13:18 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB3HDIXJ062276 for ; Wed, 3 Dec 2003 09:13:18 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB3HDHYE062273 for perforce@freebsd.org; Wed, 3 Dec 2003 09:13:17 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Dec 2003 09:13:17 -0800 (PST) Message-Id: <200312031713.hB3HDHYE062273@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 43370 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 17:13:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=43370 Change 43370 by peter@peter_overcee on 2003/12/03 09:12:26 IFC @43369 Affected files ... .. //depot/projects/hammer/lib/libc_r/uthread/uthread_create.c#6 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#6 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_sig.c#8 integrate .. //depot/projects/hammer/sbin/sconfig/Makefile#1 branch .. //depot/projects/hammer/sbin/sconfig/sconfig.8#1 branch .. //depot/projects/hammer/sbin/sconfig/sconfig.c#1 branch .. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#10 integrate .. //depot/projects/hammer/sys/amd64/acpica/madt.c#22 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#48 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#10 integrate .. //depot/projects/hammer/sys/conf/files#41 integrate .. //depot/projects/hammer/sys/conf/ldscript.i386#5 integrate .. //depot/projects/hammer/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/hammer/sys/dev/ata/ata-isa.c#6 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#6 integrate .. //depot/projects/hammer/sys/dev/cx/cronyxfw.h#1 branch .. //depot/projects/hammer/sys/dev/cx/csigma.c#1 branch .. //depot/projects/hammer/sys/dev/cx/csigmafw.h#1 branch .. //depot/projects/hammer/sys/dev/cx/cxddk.c#1 branch .. //depot/projects/hammer/sys/dev/cx/cxddk.h#1 branch .. //depot/projects/hammer/sys/dev/cx/cxreg.h#1 branch .. //depot/projects/hammer/sys/dev/cx/if_cx.c#1 branch .. //depot/projects/hammer/sys/dev/cx/machdep.h#1 branch .. //depot/projects/hammer/sys/dev/cx/ng_cx.h#1 branch .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#24 integrate .. //depot/projects/hammer/sys/i386/include/cserial.h#1 branch .. //depot/projects/hammer/sys/kern/sched_ule.c#21 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#12 integrate .. //depot/projects/hammer/sys/modules/cx/Makefile#1 branch .. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#11 integrate .. //depot/projects/hammer/sys/sys/smp.h#5 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#20 integrate .. //depot/projects/hammer/usr.sbin/kernbb/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/kernbb/kernbb.c#5 integrate Differences ... ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_create.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_create.c,v 1.37 2003/01/06 00:56:23 marcel Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_create.c,v 1.38 2003/12/03 06:54:40 peter Exp $ */ #include #include ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.45 2003/01/11 00:43:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.46 2003/12/03 06:54:40 peter Exp $ */ /* Allocate space for global thread variables here: */ ==== //depot/projects/hammer/lib/libc_r/uthread/uthread_sig.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_sig.c,v 1.45 2003/03/05 04:28:08 marcel Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_sig.c,v 1.46 2003/12/03 06:54:40 peter Exp $ */ #include #include ==== //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.50 2003/11/30 22:08:24 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.51 2003/12/03 14:57:25 jhb Exp $"); #include "opt_kstack_pages.h" ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#22 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.7 2003/11/14 22:26:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.8 2003/12/03 06:58:48 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#48 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.229 2003/11/30 22:20:40 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.230 2003/12/03 14:57:25 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" ==== //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#10 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.6 2003/11/08 07:43:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.7 2003/12/03 07:00:30 peter Exp $"); #include "opt_compat.h" ==== //depot/projects/hammer/sys/conf/files#41 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.854 2003/11/20 20:07:37 andre Exp $ +# $FreeBSD: src/sys/conf/files,v 1.855 2003/12/03 14:55:30 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/hammer/sys/conf/ldscript.i386#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/conf/ldscript.i386,v 1.8 2003/10/01 23:46:07 peter Exp $ */ +/* $FreeBSD: src/sys/conf/ldscript.i386,v 1.9 2003/12/03 07:40:03 phk Exp $ */ OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd", "elf32-i386-freebsd") OUTPUT_ARCH(i386) ENTRY(btext) @@ -65,6 +65,7 @@ CONSTRUCTORS } .data1 : { *(.data1) } + . = ALIGN(32 / 8); _start_ctors = .; PROVIDE (start_ctors = .); .ctors : ==== //depot/projects/hammer/sys/dev/aac/aac_cam.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.13 2003/08/24 17:48:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.14 2003/12/03 15:42:12 scottl Exp $"); /* * CAM front-end for communicating with non-DASD devices @@ -116,11 +116,15 @@ camsc = (struct aac_cam *)device_get_softc(dev); + mtx_lock(&Giant); + xpt_async(AC_LOST_DEVICE, camsc->path, NULL); xpt_free_path(camsc->path); xpt_bus_deregister(cam_sim_path(camsc->sim)); cam_sim_free(camsc->sim, /*free_devq*/TRUE); - + + mtx_unlock(&Giant); + return (0); } @@ -491,7 +495,11 @@ aac_release_command(cm); + AAC_LOCK_RELEASE(&sc->aac_io_lock); + mtx_lock(&Giant); xpt_done(ccb); + mtx_unlock(&Giant); + AAC_LOCK_ACQUIRE(&sc->aac_io_lock); return; } ==== //depot/projects/hammer/sys/dev/ata/ata-isa.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.17 2003/08/25 09:01:49 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.18 2003/12/03 13:40:26 sos Exp $"); #include "opt_ata.h" #include @@ -64,7 +64,7 @@ static void ata_isa_setmode(struct ata_device *atadev, int mode) { - atadev->mode = min(mode, ATA_PIO_MAX); + atadev->mode = ata_limit_mode(atadev, mode, ATA_PIO_MAX); } static int ==== //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.23 2003/11/02 22:04:53 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.24 2003/12/03 15:32:53 sos Exp $"); #include "opt_ata.h" #include @@ -575,7 +575,7 @@ } } } - if (stat1 & ATA_S_BUSY) { + if (!((mask == 0x03) && (stat0 & ATA_S_BUSY)) && (stat1 & ATA_S_BUSY)) { ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_SLAVE); DELAY(10); err = ATA_IDX_INB(ch, ATA_ERROR); ==== //depot/projects/hammer/sys/i386/i386/mp_machdep.c#24 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.226 2003/11/21 22:23:25 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.227 2003/12/03 14:57:25 jhb Exp $"); #include "opt_apic.h" #include "opt_cpu.h" ==== //depot/projects/hammer/sys/kern/sched_ule.c#21 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.83 2003/11/17 08:27:11 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.84 2003/12/03 14:57:25 jhb Exp $"); #include #include ==== //depot/projects/hammer/sys/kern/subr_smp.c#12 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.179 2003/11/21 22:23:26 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_smp.c,v 1.180 2003/12/03 14:55:31 jhb Exp $"); #include #include ==== //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#11 (text+ko) ==== @@ -52,7 +52,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.24 2003/11/21 22:23:26 jhb Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.25 2003/12/03 14:57:25 jhb Exp $ */ #include "opt_ddb.h" ==== //depot/projects/hammer/sys/sys/smp.h#5 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/sys/smp.h,v 1.74 2003/11/21 22:23:26 jhb Exp $ + * $FreeBSD: src/sys/sys/smp.h,v 1.76 2003/12/03 14:57:25 jhb Exp $ */ #ifndef _SYS_SMP_H_ ==== //depot/projects/hammer/sys/vm/uma_core.c#20 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.88 2003/11/30 22:18:14 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.89 2003/12/03 14:57:26 jhb Exp $"); /* I should really use ktr.. */ /* ==== //depot/projects/hammer/usr.sbin/kernbb/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/usr.sbin/kernbb/Makefile,v 1.9 2003/01/06 07:46:26 phk Exp $ +# $FreeBSD: src/usr.sbin/kernbb/Makefile,v 1.10 2003/12/03 07:43:03 phk Exp $ PROG= kernbb MAN= kernbb.8 @@ -6,6 +6,8 @@ DPADD= ${LIBKVM} LDADD= -lkvm +CFLAGS+= -I${.CURDIR}/../../contrib/gcc + WARNS?= 3 .include ==== //depot/projects/hammer/usr.sbin/kernbb/kernbb.c#5 (text+ko) ==== @@ -9,7 +9,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/kernbb/kernbb.c,v 1.15 2003/05/03 21:06:37 obrien Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/kernbb/kernbb.c,v 1.16 2003/12/03 07:43:03 phk Exp $"); #include #include @@ -19,18 +19,28 @@ #include #include #include +#include +typedef long long gcov_type; + +#define PARAMS(foo) foo +#define ATTRIBUTE_UNUSED __unused +#include "gcov-io.h" + +struct bbf { + long checksum; + long arc_count; + u_long name; +}; + struct bb { u_long zero_one; u_long filename; u_long counts; u_long ncounts; u_long next; - u_long addr; - u_long nwords; - u_long func; - u_long lineno; - u_long file; + u_long sizeof_bb; + u_long funcs; }; struct nlist namelist[] = { @@ -43,10 +53,13 @@ int main(int argc __unused, char **argv __unused) { - int i; + int i, funcs; u_long l1,l2,l4; struct bb bb; + struct bbf bbf; char buf[BUFSIZ], *p; + gcov_type *q, *qr; + FILE *f; kv = kvm_open(NULL,NULL,NULL,O_RDWR,"dnc"); @@ -61,7 +74,22 @@ while(l2) { l1 += sizeof l1; kvm_read(kv,l2,&bb,sizeof bb); +#if 0 +printf("%lx\n%lx\n%lx\n%lx\n%lx\n%lx\n%lx\n", + bb.zero_one, bb.filename, bb.counts, bb.ncounts, bb.next, + bb.sizeof_bb, bb.funcs); +#endif + + funcs = 0; + for (l4 = bb.funcs; ; l4 += sizeof (bbf)) { + kvm_read(kv, l4, &bbf, sizeof(bbf)); + if (bbf.arc_count == -1) + break; + funcs++; + } + l2 = bb.next; + kvm_read(kv, bb.filename, buf, sizeof(buf)); p = buf; f = fopen(p, "w"); @@ -78,14 +106,40 @@ } if (f == NULL) err(1,"%s", p); - fwrite(&bb.ncounts, 4, 1, f); - l4 = 0; - fwrite(&l4, 4, 1, f); - p = malloc(bb.ncounts * 8); - kvm_read(kv, bb.counts, p, bb.ncounts * 8); - fwrite(p, 8, bb.ncounts, f); + __write_long(-123, f, 4); + + __write_long(funcs, f, 4); + + __write_long(4 + 8 + 8 + 4 + 8 + 8, f, 4); + + __write_long(bb.ncounts, f, 4); + __write_long(0, f, 8); + __write_long(0, f, 8); + + __write_long(bb.ncounts, f, 4); + __write_long(0, f, 8); + __write_long(0, f, 8); + + qr = malloc(bb.ncounts * 8); + kvm_read(kv, bb.counts, qr, bb.ncounts * 8); + q = qr; + for (l4 = bb.funcs; ; l4 += sizeof (bbf)) { + kvm_read(kv, l4, &bbf, sizeof(bbf)); + if (bbf.arc_count == -1) + break; + kvm_read(kv, bbf.name, buf, sizeof(buf)); + + __write_gcov_string(buf, strlen(buf), f, -1); + + __write_long(bbf.checksum, f, 4); + __write_long(bbf.arc_count, f, 4); + for (i = 0; i < bbf.arc_count; i++) { + __write_gcov_type(*q, f, 8); + q++; + } + } fclose(f); - free(p); + free(qr); } return 0; } From owner-p4-projects@FreeBSD.ORG Wed Dec 3 09:16:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5057B16A4D0; Wed, 3 Dec 2003 09:16:24 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C4B516A4CE for ; Wed, 3 Dec 2003 09:16:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F95C43FDF for ; Wed, 3 Dec 2003 09:16:23 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB3HGNXJ062447 for ; Wed, 3 Dec 2003 09:16:23 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB3HGMAg062444 for perforce@freebsd.org; Wed, 3 Dec 2003 09:16:22 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Dec 2003 09:16:22 -0800 (PST) Message-Id: <200312031716.hB3HGMAg062444@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 43372 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 17:16:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=43372 Change 43372 by peter@peter_overcee on 2003/12/03 09:16:19 integ -I -b i386_hammer (nop, just catching up state) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#49 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#49 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Dec 3 12:13:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02E8016A4D0; Wed, 3 Dec 2003 12:13:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CCD0816A4CE for ; Wed, 3 Dec 2003 12:13:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E44E44014 for ; Wed, 3 Dec 2003 12:13:01 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB3KD1XJ071044 for ; Wed, 3 Dec 2003 12:13:01 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB3KD0Bi071041 for perforce@freebsd.org; Wed, 3 Dec 2003 12:13:00 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Dec 2003 12:13:00 -0800 (PST) Message-Id: <200312032013.hB3KD0Bi071041@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 43379 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 20:13:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=43379 Change 43379 by peter@peter_daintree on 2003/12/03 12:12:21 diff reduction with -current Affected files ... .. //depot/projects/hammer/sys/dev/sio/sio.c#24 edit Differences ... ==== //depot/projects/hammer/sys/dev/sio/sio.c#24 (text+ko) ==== @@ -1161,9 +1161,6 @@ rid = 0; com->irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0ul, ~0ul, 1, RF_ACTIVE); - if (com->irqres == NULL) - com->irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0ul, - ~0ul, 1, RF_ACTIVE | RF_SHAREABLE); if (com->irqres) { ret = BUS_SETUP_INTR(device_get_parent(dev), dev, com->irqres, INTR_TYPE_TTY | INTR_FAST, From owner-p4-projects@FreeBSD.ORG Wed Dec 3 12:15:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F72716A4D1; Wed, 3 Dec 2003 12:15:05 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD9DA16A4CF for ; Wed, 3 Dec 2003 12:15:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38BC443FE3 for ; Wed, 3 Dec 2003 12:15:04 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB3KF4XJ071156 for ; Wed, 3 Dec 2003 12:15:04 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB3KF30S071153 for perforce@freebsd.org; Wed, 3 Dec 2003 12:15:03 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Dec 2003 12:15:03 -0800 (PST) Message-Id: <200312032015.hB3KF30S071153@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 43380 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 20:15:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=43380 Change 43380 by peter@peter_daintree on 2003/12/03 12:14:07 sync with -current Affected files ... .. //depot/projects/hammer/gnu/usr.bin/binutils/libbinutils/Makefile#6 edit .. //depot/projects/hammer/sbin/Makefile#18 edit Differences ... ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbinutils/Makefile#6 (text+ko) ==== @@ -14,7 +14,7 @@ .else BINUTILS_ARCH=${TARGET_ARCH} .endif -CFLAGS+= -DTARGET=\"${BINUTILS_ARCH}-undermyevildesk-freebsd\" +CFLAGS+= -DTARGET=\"${BINUTILS_ARCH}-unknown-freebsd\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd ==== //depot/projects/hammer/sbin/Makefile#18 (text+ko) ==== @@ -116,7 +116,6 @@ mca .endif -# XXX: should combine with i386 above .if ${MACHINE_ARCH} == "amd64" SUBDIR+=fdisk \ gpt From owner-p4-projects@FreeBSD.ORG Wed Dec 3 12:18:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2BC016A4D0; Wed, 3 Dec 2003 12:18:09 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49FDE16A4CE for ; Wed, 3 Dec 2003 12:18:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8DC0E43F85 for ; Wed, 3 Dec 2003 12:18:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB3KI8XJ071273 for ; Wed, 3 Dec 2003 12:18:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB3KI8wD071270 for perforce@freebsd.org; Wed, 3 Dec 2003 12:18:08 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Dec 2003 12:18:08 -0800 (PST) Message-Id: <200312032018.hB3KI8wD071270@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 43381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Dec 2003 20:18:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=43381 Change 43381 by peter@peter_daintree on 2003/12/03 12:18:07 diff reduction with current Affected files ... .. //depot/projects/hammer/sys/kern/kern_umtx.c#10 edit Differences ... ==== //depot/projects/hammer/sys/kern/kern_umtx.c#10 (text+ko) ==== @@ -251,7 +251,6 @@ intptr_t old; umtx = uap->umtx; - blocked = NULL; /* shut up gcc */ /* * Make sure we own this mtx. From owner-p4-projects@FreeBSD.ORG Wed Dec 3 16:22:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BB3A16A4D0; Wed, 3 Dec 2003 16:22:44 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from green.bikeshed.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B917616A4CE; Wed, 3 Dec 2003 16:22:43 -0800 (PST) Received: from green.bikeshed.org (green@localhost [127.0.0.1]) by green.bikeshed.org (8.12.10/8.12.9) with ESMTP id hB3H0srB001186; Wed, 3 Dec 2003 12:00:54 -0500 (EST) (envelope-from green@green.bikeshed.org) Received: from localhost (green@localhost)hB3H0saN001182; Wed, 3 Dec 2003 12:00:54 -0500 (EST) Message-Id: <200312031700.hB3H0saN001182@green.bikeshed.org> X-Mailer: exmh version 2.6.3 04/04/2003 with nmh-1.0.4 To: Peter Wemm In-Reply-To: Message from Peter Wemm <200312030112.hB31CUMd091141@repoman.freebsd.org> From: "Brian F. Feldman" Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 03 Dec 2003 12:00:53 -0500 Sender: green@green.bikeshed.org cc: Perforce Change Reviews Subject: Re: PERFORCE change 43329 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2003 00:22:44 -0000 Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=43329 > > Change 43329 by peter@peter_overcee on 2003/12/02 17:12:26 > > grrr. this is totally broken if you have a serial console > attached and as the primary console, as it prevents ddb > starting up if you crash while running X on the syscons > console. How about we change them all to do something like this? Yes, I'm aware that it contains levels of bogosity. I'd actually rather change consdev::cn_flags to have a flag for CN_FLAG_UNAVAIL, and then cnunavail() would be easier to call "correctish". (tty_cons.c) int cnunavail(void) { struct cn_device *cnd; cnd = STAILQ_FIRST(&cn_devlist); return (cnd == NULL || (cons_unavail && bcmp(cnd->cn_name, "ttyv", 4) == 0)); } -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ From owner-p4-projects@FreeBSD.ORG Wed Dec 3 18:01:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F7DA16A4D0; Wed, 3 Dec 2003 18:01:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F1F116A4CE for ; Wed, 3 Dec 2003 18:01:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C63A843FBD for ; Wed, 3 Dec 2003 18:01:16 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB421GXJ026443 for ; Wed, 3 Dec 2003 18:01:16 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB4219uK026282 for perforce@freebsd.org; Wed, 3 Dec 2003 18:01:09 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Wed, 3 Dec 2003 18:01:09 -0800 (PST) Message-Id: <200312040201.hB4219uK026282@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 43391 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2003 02:01:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=43391 Change 43391 by marcel@marcel_nfs on 2003/12/03 18:00:22 IFC @43390 Affected files ... .. //depot/projects/ia64/bin/ls/ls.1#19 integrate .. //depot/projects/ia64/bin/ls/ls.c#18 integrate .. //depot/projects/ia64/contrib/ipfilter/ipt.c#6 integrate .. //depot/projects/ia64/contrib/ipfilter/kmem.c#6 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#20 integrate .. //depot/projects/ia64/etc/mtree/BSD.local.dist#19 integrate .. //depot/projects/ia64/etc/mtree/BSD.sendmail.dist#2 integrate .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#29 integrate .. //depot/projects/ia64/etc/mtree/BSD.var.dist#10 integrate .. //depot/projects/ia64/etc/rc.d/cleartmp#5 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/Makefile#9 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/libc.so.4.bz2.uu#3 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/libc_r.so.4.bz2.uu#3 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/libdevstat.so.2.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat4x.i386/libedit.so.3.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/libgmp.so.3.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/libmp.so.3.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat4x.i386/libpam.so.1.bz2.uu#3 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/libperl.so.3.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/libposix1e.so.2.bz2.uu#2 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/libskey.so.2.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat4x.i386/libstdc++.so.3.bz2.uu#3 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/libusbhid.so.0.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat4x.i386/libutil.so.3.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat4x.i386/libvgl.so.2.bz2.uu#1 branch .. //depot/projects/ia64/lib/libc/sys/sendfile.2#6 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_create.c#9 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_init.c#11 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_sig.c#10 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/i386/thr_enter_uts.S#5 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_init.c#18 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#41 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#28 integrate .. //depot/projects/ia64/lib/libthr/arch/i386/i386/_setcurthread.c#8 integrate .. //depot/projects/ia64/release/Makefile#74 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#12 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#72 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#132 integrate .. //depot/projects/ia64/release/doc/share/sgml/release.ent#11 integrate .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#30 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#14 integrate .. //depot/projects/ia64/sbin/Makefile#33 integrate .. //depot/projects/ia64/sbin/cxconfig/Makefile#3 delete .. //depot/projects/ia64/sbin/cxconfig/cxconfig.8#2 delete .. //depot/projects/ia64/sbin/cxconfig/cxconfig.c#3 delete .. //depot/projects/ia64/sbin/dhclient/Makefile.inc#6 integrate .. //depot/projects/ia64/sbin/dumpfs/dumpfs.c#17 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#28 integrate .. //depot/projects/ia64/sbin/sconfig/Makefile#1 branch .. //depot/projects/ia64/sbin/sconfig/sconfig.8#1 branch .. //depot/projects/ia64/sbin/sconfig/sconfig.c#1 branch .. //depot/projects/ia64/share/man/man4/Makefile#63 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/CPU_ELAN.4#2 integrate .. //depot/projects/ia64/share/man/man4/stg.4#3 integrate .. //depot/projects/ia64/share/man/man4/wi.4#32 integrate .. //depot/projects/ia64/sys/alpha/alpha/db_trace.c#6 integrate .. //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#17 integrate .. //depot/projects/ia64/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/ia64/sys/amd64/ia32/ia32_signal.c#6 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.c#16 integrate .. //depot/projects/ia64/sys/conf/files#108 integrate .. //depot/projects/ia64/sys/conf/files.i386#48 integrate .. //depot/projects/ia64/sys/conf/files.pc98#40 integrate .. //depot/projects/ia64/sys/conf/ldscript.i386#5 integrate .. //depot/projects/ia64/sys/conf/majors#30 integrate .. //depot/projects/ia64/sys/conf/options.i386#23 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_log.c#8 integrate .. //depot/projects/ia64/sys/dev/aac/aac_cam.c#12 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cpu.c#12 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#46 integrate .. //depot/projects/ia64/sys/dev/ata/ata-card.c#16 integrate .. //depot/projects/ia64/sys/dev/ata/ata-isa.c#14 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#14 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_core.c#15 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_os.c#16 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_os.h#3 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_reg.h#4 integrate .. //depot/projects/ia64/sys/dev/cx/cronyxfw.h#1 branch .. //depot/projects/ia64/sys/dev/cx/csigma.c#1 branch .. //depot/projects/ia64/sys/dev/cx/csigmafw.h#1 branch .. //depot/projects/ia64/sys/dev/cx/cxddk.c#1 branch .. //depot/projects/ia64/sys/dev/cx/cxddk.h#1 branch .. //depot/projects/ia64/sys/dev/cx/cxreg.h#1 branch .. //depot/projects/ia64/sys/dev/cx/if_cx.c#1 branch .. //depot/projects/ia64/sys/dev/cx/machdep.h#1 branch .. //depot/projects/ia64/sys/dev/cx/ng_cx.h#1 branch .. //depot/projects/ia64/sys/dev/em/if_em.c#30 integrate .. //depot/projects/ia64/sys/dev/twe/twe.c#9 integrate .. //depot/projects/ia64/sys/dev/twe/twe_compat.h#9 integrate .. //depot/projects/ia64/sys/dev/twe/twe_freebsd.c#19 integrate .. //depot/projects/ia64/sys/dev/twe/twe_tables.h#4 integrate .. //depot/projects/ia64/sys/dev/twe/tweio.h#3 integrate .. //depot/projects/ia64/sys/dev/twe/twereg.h#6 integrate .. //depot/projects/ia64/sys/dev/twe/twevar.h#6 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#49 integrate .. //depot/projects/ia64/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#43 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#48 integrate .. //depot/projects/ia64/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/ia64/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#50 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#33 integrate .. //depot/projects/ia64/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/ia64/sys/i386/include/cserial.h#1 branch .. //depot/projects/ia64/sys/i386/isa/cronyx.c#3 delete .. //depot/projects/ia64/sys/i386/isa/cx.c#9 delete .. //depot/projects/ia64/sys/i386/isa/cxreg.h#3 delete .. //depot/projects/ia64/sys/i386/isa/cy.c#12 integrate .. //depot/projects/ia64/sys/i386/isa/if_cx.c#9 delete .. //depot/projects/ia64/sys/kern/sched_ule.c#28 integrate .. //depot/projects/ia64/sys/kern/subr_smp.c#17 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#41 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#24 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#58 integrate .. //depot/projects/ia64/sys/modules/Makefile#66 integrate .. //depot/projects/ia64/sys/modules/acpi/Makefile#16 integrate .. //depot/projects/ia64/sys/modules/cx/Makefile#1 branch .. //depot/projects/ia64/sys/netinet/ip_fw2.c#31 integrate .. //depot/projects/ia64/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#13 integrate .. //depot/projects/ia64/sys/pci/cy_pci.c#7 integrate .. //depot/projects/ia64/sys/pci/if_sk.c#20 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_machdep.c#20 integrate .. //depot/projects/ia64/sys/sys/smp.h#6 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#56 integrate .. //depot/projects/ia64/usr.sbin/Makefile#54 integrate .. //depot/projects/ia64/usr.sbin/kernbb/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/kernbb/kernbb.c#5 integrate .. //depot/projects/ia64/usr.sbin/mtree/specspec.c#2 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/config.c#19 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/help/securelevel.hlp#1 branch .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#39 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#27 integrate Differences ... ==== //depot/projects/ia64/bin/ls/ls.1#19 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.76 2003/08/08 17:04:17 schweikh Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.77 2003/12/01 19:10:29 obrien Exp $ .\" .Dd May 19, 2002 .Dt LS 1 @@ -186,6 +186,14 @@ not blocks. This option overrides the environment variable .Ev BLOCKSIZE . +Note that +.Fl k +is mutually exclusive to +.Fl h +and later +.Fl k +will nullify earlier +.Fl h . .It Fl l (The lowercase letter .Dq ell . ) ==== //depot/projects/ia64/bin/ls/ls.c#18 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.74 2003/05/03 16:39:33 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.75 2003/12/01 19:10:29 obrien Exp $"); #include #include @@ -267,6 +267,7 @@ f_inode = 1; break; case 'k': + f_humanval = 0; f_kblocks = 1; break; case 'm': ==== //depot/projects/ia64/contrib/ipfilter/ipt.c#6 (text+ko) ==== @@ -443,7 +443,8 @@ void *ptr; { #if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) #else char buf[32], *s; int len; @@ -458,7 +459,8 @@ if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1) return "X"; #if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) return strdup(netif.if_xname); #else if (kmemcpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1) ==== //depot/projects/ia64/contrib/ipfilter/kmem.c#6 (text+ko) ==== @@ -204,7 +204,8 @@ return ifname; #else # if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) #else char buf[32]; int len; @@ -219,7 +220,8 @@ if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1) return "X"; # if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) return strdup(netif.if_xname); # else if (kstrncpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1) ==== //depot/projects/ia64/etc/mtree/BSD.include.dist#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.76 2003/11/22 06:08:59 scottl Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.77 2003/11/29 18:22:01 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -9,6 +9,16 @@ .. bsnmp .. + c++ + 3.3 + backward + .. + bits + .. + ext + .. + .. + .. cam scsi .. @@ -18,12 +28,12 @@ dev an .. + firewire + .. ic .. iicbus .. - firewire - .. ofw .. ppbus @@ -58,23 +68,13 @@ .. smbfs .. - udf - .. + udf + .. umapfs .. unionfs .. .. - c++ - 3.3 - backward - .. - bits - .. - ext - .. - .. - .. geom .. isc ==== //depot/projects/ia64/etc/mtree/BSD.local.dist#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.103 2003/11/08 05:18:25 davidxu Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.104 2003/11/29 18:22:01 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -449,14 +449,14 @@ .. uk_UA.KOI8-U .. - zh_CN.eucCN - .. zh_CN.GB18030 .. zh_CN.GB2312 .. zh_CN.GBK .. + zh_CN.eucCN + .. zh_TW.Big5 .. .. ==== //depot/projects/ia64/etc/mtree/BSD.sendmail.dist#2 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/etc/mtree/BSD.sendmail.dist,v 1.1 2002/04/20 19:00:11 gshapiro Exp $ +# $FreeBSD: src/etc/mtree/BSD.sendmail.dist,v 1.2 2003/11/29 18:22:01 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # /set type=dir uname=root gname=wheel mode=0755 -. nochange - var nochange - spool nochange +. nochange + var nochange + spool nochange clientmqueue uname=smmsp gname=smmsp mode=0770 .. .. ==== //depot/projects/ia64/etc/mtree/BSD.usr.dist#29 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.286 2003/11/10 09:06:38 harti Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.287 2003/11/29 18:22:01 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -519,14 +519,14 @@ .. uk_UA.KOI8-U .. - zh_CN.eucCN + zh_CN.GB18030 .. - zh_CN.GB18030 - .. zh_CN.GB2312 .. zh_CN.GBK .. + zh_CN.eucCN + .. zh_TW.Big5 .. .. @@ -853,14 +853,14 @@ .. uk_UA.KOI8-U .. - zh_CN.eucCN - .. zh_CN.GB18030 .. zh_CN.GB2312 .. zh_CN.GBK .. + zh_CN.eucCN + .. zh_TW.Big5 .. .. @@ -890,8 +890,8 @@ Etc .. .. - security - .. + security + .. sendmail .. skel ==== //depot/projects/ia64/etc/mtree/BSD.var.dist#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.67 2002/11/04 07:50:48 markm Exp $ +# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.68 2003/11/29 18:22:01 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -33,12 +33,10 @@ pkg .. .. - empty mode=0555 flags=schg + empty mode=0555 flags=schg .. -/set gname=games mode=0775 - games + games gname=games mode=0775 .. -/set gname=wheel mode=0755 heimdal mode=0700 .. log ==== //depot/projects/ia64/etc/rc.d/cleartmp#5 (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.4 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.5 2003/12/01 16:35:57 mtm Exp $ # # PROVIDE: cleartmp @@ -27,20 +27,20 @@ (cd /tmp && rm -rf [a-km-pr-zA-Z]* && find -x . ! -name . ! -name lost+found ! -name quota.user \ ! -name quota.group -exec rm -rf -- {} \; -type d -prune) - - case ${OSTYPE} in - FreeBSD) - # Remove X lock files, since they will prevent you from - # restarting X - # - rm -f /tmp/.X*-lock - rm -fr /tmp/.X11-unix - mkdir -m 1777 /tmp/.X11-unix - ;; - NetBSD) - ;; - esac } load_rc_config $name run_rc_command "$1" + +case ${OSTYPE} in +FreeBSD) + # Remove X lock files, since they will prevent you from + # restarting X + # + rm -f /tmp/.X*-lock + rm -fr /tmp/.X11-unix + mkdir -m 1777 /tmp/.X11-unix + ;; +NetBSD) + ;; +esac ==== //depot/projects/ia64/lib/compat/compat4x.i386/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/compat/compat4x.i386/Makefile,v 1.21 2003/02/17 13:45:13 nectar Exp $ +# $FreeBSD: src/lib/compat/compat4x.i386/Makefile,v 1.22 2003/11/29 03:29:16 obrien Exp $ DISTRIBUTION= compat4x @@ -7,16 +7,22 @@ libc_r.so.4 \ libcrypto.so.1 \ libcrypto.so.2 \ + libdevstat.so.2 \ libgmp.so.3 \ libedit.so.3 \ libfetch.so.2 \ + libmp.so.3 \ libpam.so.1 \ libperl.so.3 \ libposix1e.so.2 \ + libskey.so.2 \ libssl.so.1 \ libssl.so.2 \ libstdc++.so.3 \ libusb.so.0 \ + libusbhid.so.0 \ + libutil.so.3 \ + libvgl.so.2 \ pam_cleartext_pass_ok.so \ pam_deny.so \ pam_opie.so \ ==== //depot/projects/ia64/lib/compat/compat4x.i386/libc.so.4.bz2.uu#3 (text+ko) ==== @@ -1,4245 +1,4276 @@ -$FreeBSD: src/lib/compat/compat4x.i386/libc.so.4.bz2.uu,v 1.2 2002/12/18 18:05:06 obrien Exp $ +$FreeBSD: src/lib/compat/compat4x.i386/libc.so.4.bz2.uu,v 1.3 2003/11/29 03:29:16 obrien Exp $ -begin-base64 444 libc.so.4.bz2 -QlpoOTFBWSZTWRIru2wCmBb/////////////////////////////////////////////45DFQAD7 -2eu4fe6PJfMjI8p6GNsAAIjb3Ad7egbp3B3ZoaoUAK0BfYABkWIMA4Ud9lOr2t9922aPXw7PAAIB -6XvdXE97dTT7dbt63oQKpE2+7va9s6N3alw9O54FyR2js76we9jc0qhZiZq97vPbXJnaQy2Q1uB1 -6e8aY+Weu7e+ghWAAAdCd3He88vebxuxrNthoRmAADtovcqqu4oANO9569vvtz20uOY6NLu6u192 -8H24vvYqn3nHvOURM6oGY7s17t569zDrPXNYD6MToFAM2AA2+1M7NvtxigABoAAAD0FBYxQSFBAU -QAAADQAMlACiqdABVAADQdAFABIct7aF3w3gdXt9fAAAAAAAAAAAHo+ntz17O29CteHPt54ECIAA -AAAB7OC9tdhs2pVTZ9d8QEAAA6ABvoBvN9m7ux0dAAC7AOIqUypKXVGVE93vPVVUKtdN7e76AAoA -B53T32e3wAAADgGun329vOfADvIMhdfYp1ezr533vRg8eAA3wAA7ucG+K3j5ziD21b2OhurMbl2T -3nPvvfOH3M6dhfO+2A085686u8fToPte3ANOV0drzj6r3prdutQrNU19xG93t4d12a4bxXNADCiq -JUBnndK7FFXqwACXWdmffWevGPSe7tvuPe2jMru8JtTNtVtd7PvOw331928eAATmhh7pinj3Z773 -Hs9txtmvui+to9u923hnYDu9mezW90vrDumPsx6E+dGte8LsPZh7pYG8292efd27Hsw0hDbD3pjv -evqHNn3mffdw+99cOrbLfRvSTz4T7ve+4PQ+2dO73uu8H0dQ9GNJZLWswR933eDmw+199u+5TXx5 -3vu77t6fB8Pdr0vrdfBvh3vfeuj0o3q2wO+fW998PHsCHi9uHIj7M5b7zeWe998Ph72cSAF97fav -r1777D7j1yrT04J1Z7YdO+e1573dPvdt94DPM2ZnZ9724+2d6NLTpKkzlUfe77w94rXsfeUhR6zP -o7TWtsKaB0BkULYNASAL1RlrSqjz4+g+PvrNoul0r7Pe+7PjdFaH21dOujt7Z95xvfWADr30e3uA -+97jJU1AdFMH3uPIns2e+90pa9yKCpVCBfW6nCuaHK4LuNNt9dHAdD1PvieAKOPnkzePIgAAAAUA -AGlN3c9sAem5X2TQoUUvqc3vIARnYU6KO8vNpRrffH0oqqfN8z7G33OwdOdbe9K+2dE7tL3zs7XT -XRXmwGV4x3vjyve77lWmz7K+ud3erz3OtZbvbBJc9fb3BpbJe3UAHPfNfGH0uHUFBPe03zK6+d87 -VUOj1Rp9PRJ1eRzttsmh9ddrO7t98+d4dy+3Pc33dz1XfOm48vWj3LcLjG21ER3XdfbVCrY577uv -opXQaPrxe+59mHu9m2a+mStNG5582TL0+zktmuX3nXp53y9Qbuiu1UWlVottNab67pKmjShRvoQj -d3DrIO5tr41dKvp9cfXHOujUo0pUnrFFaOpSOiMNA9rzvmeHE4MwiwmDnN94mffb59vnAc1Jnp7V -B3p9oHet8d8AGUQJ62+w1yUdO7S13cdp1kmILVur577ul3fDXlddOFaD6UiUTtfEPcojzOpdK1nn -SzAWsPqu6NKQduvMIAfQA6DTqQ66V0y2Z3YBQdCh0ZczKux7fXUSHi53ckT7vAfL25Zvnz6lFKAo -A7YDd3Bdobtt7N7yUO1yzLq97wY2nscdz248Pag52cVboClV0CkQAAaKABNgA6Bide53LWNfT3Nj -bbPol9tFdGywfRoAV21C1qCIFB1e+97rfSbUdHbO7nDodFwS2Is3XR0NdEqCQBXQyBVaOtFDoAdN -b3u6JHQZ2GnkAUAffDeG+i3FfXd6k56s2lOdvRoDJVGjVAXp3Kd03vr6ngvN6ZVThr4VX3d2eOtc -AAOzrX1QB06MlQNAAPLtoFu3WxYL48Wwo6+W3W4VVAK5sBbXyfce7nm8bjoA5oHvnxc9SHt025pu -3tm7muAXx7j7333m+b0+i9xuo+7fQ+95wPQm977crr733cr74dbvnd649h57r7sfd11599e3R253 -bd30N77B8nfL7O73h7eM9Sx3fX3tBtr3n11qVvke93Ub2333EDX2ONfVefAdHztz75x8PrrFZtb6 -vt7Yz1X16XsL3dxBpq0y1tvrtzx5jseed9AAAAY++zX13e3eh7sOph6+sjsd33YevPjeTPn2N09f -X3x8su2p73nrbzTdjq7HBu93g6GgN6b33H2rbT3Sl7d2Br770K3Pvb71M23WiB1IBKKKUooJHTKl -FSQkWzVSqBCBIBFJKlTR26u2SVltrJQi573nJ7bAdGvuZQUFeq9dAc+p99bYPs333V3u8r13vtvU -WIyr3zoT33J2Ofcj23TQO7l3deafee97eTvbWl3eG33PrrUw74tjtuVKADBPp83LBt3neAADyGgA -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 -v1q1YjxyB2HVQtyPAQW3S1QmnuDcvEt9/vZCHb8FPCPimCgZF2BlR2Xy5vZtHtOEhDRt9QcUpwtU -GBtU4ZQKbmxSyqdaFlOYwQkAvJ7OLTX9lPTG5iZVRxiVBGVcfP9+9pkHmTt94X7PITvO9nQY8PP3 -ulGj0uPHt8Ht8eZdJ98XlK+ixYSGOzMNUma0LjhziQETeGkRWzEDLYMspjm7PE0/6J8x+VFxMIdr -4IPLhDNcyrFu2owGQlX93AGKY1zDRJImtrBoHmzLDjRDBbgxTB/mdx0er4OHrFw7XAt6VOprdbd4 -hXzWOEm9wt6JQjLHAc1YL1/c70ipxoUJnTPsv/tBbT499kTl7gwVaDD4n40I22jq2lYbEGxp6qQw -GM7Gm/dhmLjaNk2C08f22N7wvyEklOSPIWGQyGQyGAjAwLy8vLy8vLy8Ly8vL6O8vLy8vLALy8vL -y8vLy8vLz6prAw6p4mJiYmJiYmCMC8vLy8vLy8vLrwZeXl5eXl5eXl5eXl5eXl5eXl50e5/hyCYT -CYTCYTCYTCYQEBAQEPrnERERERGtw5gJhMJjExMTExMS8vLy8vLy8vLy87IwMDAwMDAwMBERECgI -CAgICAgICBQEBAQEBAQEBAQGlEojAwMDAwMDAwLy8vLy8vLy8vLzlb2OKbMTExMTExMTEvLy8vLy -8vLy8vK3XjLy8oXl5eXkBAQEBAQEBAQEBAQEBAQEBAQEBAQGOIiIiIiIiIiIiIgICAgICAgICAgI -CAgICAgICAgIDfxERERERERERERGtERERERERERERGuIiImBgYGBgYGGbRjisTExMTExMTEwyY4m -JiYmJiYmJidjhgYGBgYGBgYGBeW2lshfsDh9kyB996OXS3nW3pkFyE18Q/0p7w22zZRcqJwCU4Uh -1ZCMmSoaEZgmLuTqMn1RcwmBbeJrSBXvxvQR5GWin00CnlScytTS1S5x8cJiY0ErGY3AvDNOeimx -Hf9383pbvOeMFZ7IPHF7I0sPMgefR31TyUvbnP7fa5+hcrqIs6/P07orlwux87Ag8tEIdwCOjfnm -qVYAmxsgrecwvD2C8pEAzLo/LapXMOLhp0rxSmIfYQ2OmWS4mLBMYViDlQRrYYMlpMatjLt5La1x -uwvIvtlW5xoUV9lKxBiZbOLbzjfqdtb/M3jgpt583GQ4HdICGoYYYGz95LP6UKLuX9xk+xgR9Wbe -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 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 3 18:37:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EF7716A4D0; Wed, 3 Dec 2003 18:37:35 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 772A316A4CE for ; Wed, 3 Dec 2003 18:37:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F016143FBF for ; Wed, 3 Dec 2003 18:37:28 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB42bSXJ034708 for ; Wed, 3 Dec 2003 18:37:28 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB42bHH5034696 for perforce@freebsd.org; Wed, 3 Dec 2003 18:37:17 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Wed, 3 Dec 2003 18:37:17 -0800 (PST) Message-Id: <200312040237.hB42bHH5034696@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 43394 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2003 02:37:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=43394 Change 43394 by marcel@marcel_nfs on 2003/12/03 18:36:30 IFC @43390 Affected files ... .. //depot/projects/tty/Makefile.inc1#11 integrate .. //depot/projects/tty/UPDATING#9 integrate .. //depot/projects/tty/bin/Makefile.inc#4 integrate .. //depot/projects/tty/bin/ls/ls.1#5 integrate .. //depot/projects/tty/bin/ls/ls.c#4 integrate .. //depot/projects/tty/contrib/bind/CHANGES#4 integrate .. //depot/projects/tty/contrib/bind/README#4 integrate .. //depot/projects/tty/contrib/bind/Version#4 integrate .. //depot/projects/tty/contrib/bind/bin/named/ns_init.c#3 integrate .. //depot/projects/tty/contrib/bind/bin/named/ns_resp.c#4 integrate .. //depot/projects/tty/contrib/bind/bin/nslookup/commands.l#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipt.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/kmem.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_ttyconv.c#4 integrate .. //depot/projects/tty/etc/defaults/rc.conf#8 integrate .. //depot/projects/tty/etc/mac.conf#4 integrate .. //depot/projects/tty/etc/mtree/BSD.include.dist#7 integrate .. //depot/projects/tty/etc/mtree/BSD.local.dist#6 integrate .. //depot/projects/tty/etc/mtree/BSD.sendmail.dist#2 integrate .. //depot/projects/tty/etc/mtree/BSD.usr.dist#9 integrate .. //depot/projects/tty/etc/mtree/BSD.var.dist#2 integrate .. //depot/projects/tty/etc/rc.d/cleartmp#2 integrate .. //depot/projects/tty/etc/rc.d/ike#1 branch .. //depot/projects/tty/gnu/usr.bin/gzip/Makefile#2 integrate .. //depot/projects/tty/gnu/usr.bin/tar/Makefile#2 integrate .. //depot/projects/tty/include/Makefile#8 integrate .. //depot/projects/tty/include/ifaddrs.h#2 integrate .. //depot/projects/tty/kerberos5/include/krb5-private.h#3 delete .. //depot/projects/tty/lib/compat/compat4x.i386/Makefile#3 integrate .. //depot/projects/tty/lib/compat/compat4x.i386/libc.so.4.bz2.uu#2 integrate .. //depot/projects/tty/lib/compat/compat4x.i386/libc_r.so.4.bz2.uu#2 integrate .. //depot/projects/tty/lib/compat/compat4x.i386/libdevstat.so.2.bz2.uu#1 branch .. //depot/projects/tty/lib/compat/compat4x.i386/libedit.so.3.bz2.uu#2 integrate .. //depot/projects/tty/lib/compat/compat4x.i386/libgmp.so.3.bz2.uu#2 integrate .. //depot/projects/tty/lib/compat/compat4x.i386/libmp.so.3.bz2.uu#1 branch .. //depot/projects/tty/lib/compat/compat4x.i386/libpam.so.1.bz2.uu#2 integrate .. //depot/projects/tty/lib/compat/compat4x.i386/libperl.so.3.bz2.uu#2 integrate .. //depot/projects/tty/lib/compat/compat4x.i386/libposix1e.so.2.bz2.uu#2 integrate .. //depot/projects/tty/lib/compat/compat4x.i386/libskey.so.2.bz2.uu#1 branch .. //depot/projects/tty/lib/compat/compat4x.i386/libstdc++.so.3.bz2.uu#2 integrate .. //depot/projects/tty/lib/compat/compat4x.i386/libusbhid.so.0.bz2.uu#1 branch .. //depot/projects/tty/lib/compat/compat4x.i386/libutil.so.3.bz2.uu#1 branch .. //depot/projects/tty/lib/compat/compat4x.i386/libvgl.so.2.bz2.uu#1 branch .. //depot/projects/tty/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt#2 integrate .. //depot/projects/tty/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#2 integrate .. //depot/projects/tty/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#2 integrate .. //depot/projects/tty/lib/libc/Makefile#5 integrate .. //depot/projects/tty/lib/libc/gen/initgroups.c#2 integrate .. //depot/projects/tty/lib/libc/locale/Makefile.inc#6 integrate .. //depot/projects/tty/lib/libc/locale/big5.5#2 integrate .. //depot/projects/tty/lib/libc/locale/euc.4#3 delete .. //depot/projects/tty/lib/libc/locale/euc.5#1 branch .. //depot/projects/tty/lib/libc/locale/gb18030.5#3 integrate .. //depot/projects/tty/lib/libc/locale/gb2312.5#2 integrate .. //depot/projects/tty/lib/libc/locale/gbk.5#3 integrate .. //depot/projects/tty/lib/libc/locale/mbrune.3#3 integrate .. //depot/projects/tty/lib/libc/locale/mskanji.5#2 integrate .. //depot/projects/tty/lib/libc/locale/multibyte.3#5 integrate .. //depot/projects/tty/lib/libc/locale/rune.3#3 integrate .. //depot/projects/tty/lib/libc/locale/setlocale.3#4 integrate .. //depot/projects/tty/lib/libc/locale/utf2.4#3 delete .. //depot/projects/tty/lib/libc/locale/utf2.5#1 branch .. //depot/projects/tty/lib/libc/locale/utf8.5#2 integrate .. //depot/projects/tty/lib/libc/net/Makefile.inc#5 integrate .. //depot/projects/tty/lib/libc/net/getifmaddrs.3#1 branch .. //depot/projects/tty/lib/libc/net/getifmaddrs.c#1 branch .. //depot/projects/tty/lib/libc/net/ip6opt.c#4 integrate .. //depot/projects/tty/lib/libc/posix1e/mac.c#4 integrate .. //depot/projects/tty/lib/libc/posix1e/mac_get.3#3 integrate .. //depot/projects/tty/lib/libc/posix1e/mac_get.c#3 integrate .. //depot/projects/tty/lib/libc/posix1e/mac_set.3#3 integrate .. //depot/projects/tty/lib/libc/posix1e/mac_text.3#3 integrate .. //depot/projects/tty/lib/libc/sparc64/sys/__sparc_utrap_setup.c#2 integrate .. //depot/projects/tty/lib/libc/stdlib/malloc.c#8 integrate .. //depot/projects/tty/lib/libc/stdtime/strptime.c#5 integrate .. //depot/projects/tty/lib/libc/sys/getfsstat.2#3 integrate .. //depot/projects/tty/lib/libc/sys/sendfile.2#4 integrate .. //depot/projects/tty/lib/libc/sys/setgroups.2#3 integrate .. //depot/projects/tty/lib/libc/sys/statfs.2#2 integrate .. //depot/projects/tty/lib/libc_r/uthread/uthread_create.c#2 integrate .. //depot/projects/tty/lib/libc_r/uthread/uthread_init.c#2 integrate .. //depot/projects/tty/lib/libc_r/uthread/uthread_sig.c#3 integrate .. //depot/projects/tty/lib/libdisk/write_ia64_disk.c#5 integrate .. //depot/projects/tty/lib/libpthread/arch/i386/i386/thr_enter_uts.S#4 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_init.c#7 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_kern.c#9 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_private.h#9 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_spinlock.c#5 integrate .. //depot/projects/tty/lib/libthr/arch/i386/i386/_setcurthread.c#5 integrate .. //depot/projects/tty/libexec/ftpd/ftpd.c#4 integrate .. //depot/projects/tty/libexec/pppoed/pppoed.c#2 integrate .. //depot/projects/tty/libexec/rtld-elf/rtld.c#9 integrate .. //depot/projects/tty/libexec/tftpd/tftpd.c#3 integrate .. //depot/projects/tty/release/Makefile#11 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#5 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#2 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#9 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/installation/common/install.sgml#3 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#13 integrate .. //depot/projects/tty/release/doc/share/sgml/release.ent#5 integrate .. //depot/projects/tty/release/i386/drivers.conf#8 integrate .. //depot/projects/tty/release/scripts/print-cdrom-packages.sh#6 integrate .. //depot/projects/tty/rescue/rescue/Makefile#4 integrate .. //depot/projects/tty/sbin/Makefile#8 integrate .. //depot/projects/tty/sbin/Makefile.inc#4 integrate .. //depot/projects/tty/sbin/cxconfig/Makefile#2 delete .. //depot/projects/tty/sbin/cxconfig/cxconfig.8#2 delete .. //depot/projects/tty/sbin/cxconfig/cxconfig.c#3 delete .. //depot/projects/tty/sbin/dhclient/Makefile.inc#4 integrate .. //depot/projects/tty/sbin/dump/Makefile#3 integrate .. //depot/projects/tty/sbin/dump/dump.8#6 integrate .. //depot/projects/tty/sbin/dump/dumprmt.c#3 integrate .. //depot/projects/tty/sbin/dump/main.c#5 integrate .. //depot/projects/tty/sbin/dumpfs/Makefile#3 integrate .. //depot/projects/tty/sbin/dumpfs/dumpfs.c#5 integrate .. //depot/projects/tty/sbin/fsck_ffs/setup.c#4 integrate .. //depot/projects/tty/sbin/gbde/gbde.8#3 integrate .. //depot/projects/tty/sbin/gpt/add.c#2 integrate .. //depot/projects/tty/sbin/gpt/migrate.c#2 integrate .. //depot/projects/tty/sbin/gpt/recover.c#2 integrate .. //depot/projects/tty/sbin/idmapd/Makefile#1 branch .. //depot/projects/tty/sbin/idmapd/idmapd.8#1 branch .. //depot/projects/tty/sbin/idmapd/idmapd.c#1 branch .. //depot/projects/tty/sbin/init/Makefile#2 integrate .. //depot/projects/tty/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/tty/sbin/mount_nfs4/Makefile#1 branch .. //depot/projects/tty/sbin/mount_nfs4/mount_nfs4.8#1 branch .. //depot/projects/tty/sbin/mount_nfs4/mount_nfs4.c#1 branch .. //depot/projects/tty/sbin/mount_udf/mount_udf.c#3 integrate .. //depot/projects/tty/sbin/newfs/mkfs.c#9 integrate .. //depot/projects/tty/sbin/newfs/newfs.c#5 integrate .. //depot/projects/tty/sbin/newfs/newfs.h#4 integrate .. //depot/projects/tty/sbin/nologin/Makefile#2 integrate .. //depot/projects/tty/sbin/nologin/nologin.8#2 integrate .. //depot/projects/tty/sbin/nologin/nologin.c#1 branch .. //depot/projects/tty/sbin/nologin/nologin.sh#2 delete .. //depot/projects/tty/sbin/sconfig/Makefile#1 branch .. //depot/projects/tty/sbin/sconfig/sconfig.8#1 branch .. //depot/projects/tty/sbin/sconfig/sconfig.c#1 branch .. //depot/projects/tty/sbin/umount/umount.c#5 integrate .. //depot/projects/tty/sbin/vinum/commands.c#6 integrate .. //depot/projects/tty/sbin/vinum/vinum.8#5 integrate .. //depot/projects/tty/share/examples/cvsup/cvs-supfile#6 integrate .. //depot/projects/tty/share/examples/cvsup/ports-supfile#4 integrate .. //depot/projects/tty/share/examples/cvsup/refuse#6 integrate .. //depot/projects/tty/share/examples/cvsup/refuse.README#6 integrate .. //depot/projects/tty/share/examples/netgraph/ngctl#3 integrate .. //depot/projects/tty/share/man/man4/Makefile#9 integrate .. //depot/projects/tty/share/man/man4/acpi.4#7 integrate .. //depot/projects/tty/share/man/man4/idt.4#1 branch .. //depot/projects/tty/share/man/man4/led.4#2 integrate .. //depot/projects/tty/share/man/man4/man4.i386/CPU_ELAN.4#1 branch .. //depot/projects/tty/share/man/man4/man4.i386/Makefile#6 integrate .. //depot/projects/tty/share/man/man4/miibus.4#4 integrate .. //depot/projects/tty/share/man/man4/ncv.4#1 branch .. //depot/projects/tty/share/man/man4/ng_atm.4#2 integrate .. //depot/projects/tty/share/man/man4/ng_bpf.4#2 integrate .. //depot/projects/tty/share/man/man4/ng_etf.4#2 integrate .. //depot/projects/tty/share/man/man4/ng_pppoe.4#3 integrate .. //depot/projects/tty/share/man/man4/nsp.4#1 branch .. //depot/projects/tty/share/man/man4/pcm.4#4 integrate .. //depot/projects/tty/share/man/man4/stg.4#2 integrate .. //depot/projects/tty/share/man/man4/uplcom.4#2 integrate .. //depot/projects/tty/share/man/man4/wi.4#9 integrate .. //depot/projects/tty/share/man/man5/make.conf.5#9 integrate .. //depot/projects/tty/share/man/man7/build.7#4 integrate .. //depot/projects/tty/share/man/man7/hier.7#6 integrate .. //depot/projects/tty/share/man/man9/mbuf.9#6 integrate .. //depot/projects/tty/share/syscons/keymaps/INDEX.keymaps#5 integrate .. //depot/projects/tty/sys/alpha/alpha/db_trace.c#3 integrate .. //depot/projects/tty/sys/alpha/alpha/interrupt.c#4 integrate .. //depot/projects/tty/sys/alpha/alpha/mp_machdep.c#4 integrate .. //depot/projects/tty/sys/alpha/alpha/vm_machdep.c#6 integrate .. //depot/projects/tty/sys/alpha/include/intr.h#2 integrate .. //depot/projects/tty/sys/alpha/include/sf_buf.h#1 branch .. //depot/projects/tty/sys/alpha/isa/isa.c#4 integrate .. //depot/projects/tty/sys/alpha/mcbus/mcpcia.c#4 integrate .. //depot/projects/tty/sys/alpha/osf1/osf1_mount.c#4 integrate .. //depot/projects/tty/sys/alpha/pci/apecs.c#3 integrate .. //depot/projects/tty/sys/alpha/pci/cia.c#3 integrate .. //depot/projects/tty/sys/alpha/pci/t2.c#3 integrate .. //depot/projects/tty/sys/alpha/pci/tsunami.c#3 integrate .. //depot/projects/tty/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/tty/sys/amd64/amd64/amd64_mem.c#3 integrate .. //depot/projects/tty/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/tty/sys/amd64/amd64/autoconf.c#4 integrate .. //depot/projects/tty/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/tty/sys/amd64/amd64/db_interface.c#3 integrate .. //depot/projects/tty/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/tty/sys/amd64/amd64/exception.S#7 integrate .. //depot/projects/tty/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/tty/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/tty/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/tty/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/tty/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/tty/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/tty/sys/amd64/amd64/legacy.c#3 integrate .. //depot/projects/tty/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/tty/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/tty/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/tty/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/tty/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/tty/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/tty/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/tty/sys/amd64/amd64/nexus.c#5 integrate .. //depot/projects/tty/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/tty/sys/amd64/amd64/support.S#5 integrate .. //depot/projects/tty/sys/amd64/amd64/sys_machdep.c#5 integrate .. //depot/projects/tty/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/tty/sys/amd64/amd64/tsc.c#4 integrate .. //depot/projects/tty/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/tty/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/tty/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/tty/sys/amd64/ia32/ia32_syscall.c#4 integrate .. //depot/projects/tty/sys/amd64/include/_limits.h#4 integrate .. //depot/projects/tty/sys/amd64/include/_stdint.h#2 integrate .. //depot/projects/tty/sys/amd64/include/acpica_machdep.h#3 integrate .. //depot/projects/tty/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/tty/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/tty/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/tty/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/tty/sys/amd64/include/bus_dma.h#5 integrate .. //depot/projects/tty/sys/amd64/include/clock.h#3 integrate .. //depot/projects/tty/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/tty/sys/amd64/include/limits.h#3 integrate .. //depot/projects/tty/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/tty/sys/amd64/include/mptable.h#1 branch .. //depot/projects/tty/sys/amd64/include/param.h#4 integrate .. //depot/projects/tty/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/tty/sys/amd64/include/pmap.h#6 integrate .. //depot/projects/tty/sys/amd64/include/proc.h#2 integrate .. //depot/projects/tty/sys/amd64/include/segments.h#4 integrate .. //depot/projects/tty/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/tty/sys/amd64/include/smp.h#2 integrate .. //depot/projects/tty/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/tty/sys/amd64/include/tss.h#2 integrate .. //depot/projects/tty/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/tty/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/tty/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/tty/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/tty/sys/amd64/isa/icu_ipl.S#2 delete .. //depot/projects/tty/sys/amd64/isa/icu_vector.S#4 delete .. //depot/projects/tty/sys/amd64/isa/intr_machdep.c#3 delete .. //depot/projects/tty/sys/amd64/isa/intr_machdep.h#2 delete .. //depot/projects/tty/sys/amd64/isa/isa.c#3 integrate .. //depot/projects/tty/sys/amd64/isa/isa_dma.c#3 integrate .. //depot/projects/tty/sys/amd64/isa/ithread.c#3 delete .. //depot/projects/tty/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/tty/sys/amd64/isa/vector.S#3 delete .. //depot/projects/tty/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/tty/sys/boot/i386/boot0/boot0.s#3 integrate .. //depot/projects/tty/sys/boot/i386/boot2/boot2.c#5 integrate .. //depot/projects/tty/sys/boot/i386/btx/btx/btx.s#2 integrate .. //depot/projects/tty/sys/boot/i386/loader/loader.rc#2 integrate .. //depot/projects/tty/sys/boot/pc98/btx/btxldr/btxldr.s#2 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_all.c#7 integrate .. //depot/projects/tty/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/tty/sys/compat/linux/linux_getcwd.c#5 integrate .. //depot/projects/tty/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_misc.c#8 integrate .. //depot/projects/tty/sys/conf/NOTES#13 integrate .. //depot/projects/tty/sys/conf/files#12 integrate .. //depot/projects/tty/sys/conf/files.amd64#7 integrate .. //depot/projects/tty/sys/conf/files.i386#11 integrate .. //depot/projects/tty/sys/conf/files.pc98#9 integrate .. //depot/projects/tty/sys/conf/files.sparc64#7 integrate .. //depot/projects/tty/sys/conf/kern.post.mk#9 integrate .. //depot/projects/tty/sys/conf/kmod.mk#8 integrate .. //depot/projects/tty/sys/conf/ldscript.i386#3 integrate .. //depot/projects/tty/sys/conf/majors#8 integrate .. //depot/projects/tty/sys/conf/newvers.sh#5 integrate .. //depot/projects/tty/sys/conf/options#11 integrate .. //depot/projects/tty/sys/conf/options.amd64#5 integrate .. //depot/projects/tty/sys/conf/options.i386#7 integrate .. //depot/projects/tty/sys/conf/options.pc98#7 integrate .. //depot/projects/tty/sys/contrib/dev/acpica/dsmthdat.c#4 integrate .. //depot/projects/tty/sys/contrib/dev/acpica/exfldio.c#5 integrate .. //depot/projects/tty/sys/contrib/dev/acpica/utdelete.c#4 integrate .. //depot/projects/tty/sys/contrib/dev/ath/ah.h#3 integrate .. //depot/projects/tty/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#3 integrate .. //depot/projects/tty/sys/contrib/dev/ath/version.h#3 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate .. //depot/projects/tty/sys/dev/aac/aac_cam.c#7 integrate .. //depot/projects/tty/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/tty/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/tty/sys/dev/acpica/acpi_package.c#1 branch .. //depot/projects/tty/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/tty/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/tty/sys/dev/acpica/acpivar.h#7 integrate .. //depot/projects/tty/sys/dev/aic7xxx/ahc_pci.c#6 integrate .. //depot/projects/tty/sys/dev/aic7xxx/ahd_pci.c#6 integrate .. //depot/projects/tty/sys/dev/an/if_an.c#8 integrate .. //depot/projects/tty/sys/dev/an/if_anreg.h#4 integrate .. //depot/projects/tty/sys/dev/ata/ata-all.c#12 integrate .. //depot/projects/tty/sys/dev/ata/ata-all.h#9 integrate .. //depot/projects/tty/sys/dev/ata/ata-card.c#8 integrate .. //depot/projects/tty/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/tty/sys/dev/ata/ata-dma.c#6 integrate .. //depot/projects/tty/sys/dev/ata/ata-isa.c#6 integrate .. //depot/projects/tty/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/tty/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/tty/sys/dev/ata/ata-raid.c#10 integrate .. //depot/projects/tty/sys/dev/ata/atapi-cd.c#8 integrate .. //depot/projects/tty/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/tty/sys/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/tty/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/tty/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/tty/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/tty/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/tty/sys/dev/bktr/bktr_core.c#4 integrate .. //depot/projects/tty/sys/dev/bktr/bktr_os.c#7 integrate .. //depot/projects/tty/sys/dev/bktr/bktr_os.h#2 integrate .. //depot/projects/tty/sys/dev/bktr/bktr_reg.h#3 integrate .. //depot/projects/tty/sys/dev/cx/cronyxfw.h#1 branch .. //depot/projects/tty/sys/dev/cx/csigma.c#1 branch .. //depot/projects/tty/sys/dev/cx/csigmafw.h#1 branch .. //depot/projects/tty/sys/dev/cx/cxddk.c#1 branch .. //depot/projects/tty/sys/dev/cx/cxddk.h#1 branch .. //depot/projects/tty/sys/dev/cx/cxreg.h#1 branch .. //depot/projects/tty/sys/dev/cx/if_cx.c#1 branch .. //depot/projects/tty/sys/dev/cx/machdep.h#1 branch .. //depot/projects/tty/sys/dev/cx/ng_cx.h#1 branch .. //depot/projects/tty/sys/dev/ed/if_ed.c#7 integrate .. //depot/projects/tty/sys/dev/em/if_em.c#8 integrate .. //depot/projects/tty/sys/dev/em/if_em.h#5 integrate .. //depot/projects/tty/sys/dev/em/if_em_hw.c#4 integrate .. //depot/projects/tty/sys/dev/em/if_em_hw.h#4 integrate .. //depot/projects/tty/sys/dev/firewire/fwohci_pci.c#9 integrate .. //depot/projects/tty/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/tty/sys/dev/idt/idt.c#4 integrate .. //depot/projects/tty/sys/dev/ips/ips.c#3 integrate .. //depot/projects/tty/sys/dev/ips/ips.h#3 integrate .. //depot/projects/tty/sys/dev/ips/ips_commands.c#4 integrate .. //depot/projects/tty/sys/dev/led/led.c#2 integrate .. //depot/projects/tty/sys/dev/lge/if_lge.c#6 integrate .. //depot/projects/tty/sys/dev/lnc/if_lnc.c#5 integrate .. //depot/projects/tty/sys/dev/md/md.c#9 integrate .. //depot/projects/tty/sys/dev/my/if_my.c#6 integrate .. //depot/projects/tty/sys/dev/nge/if_nge.c#6 integrate .. //depot/projects/tty/sys/dev/owi/if_owi.c#3 integrate .. //depot/projects/tty/sys/dev/owi/if_wivar.h#2 integrate .. //depot/projects/tty/sys/dev/pci/pci.c#7 integrate .. //depot/projects/tty/sys/dev/puc/puc_pci.c#4 integrate .. //depot/projects/tty/sys/dev/random/harvest.c#4 integrate .. //depot/projects/tty/sys/dev/random/hash.c#3 integrate .. //depot/projects/tty/sys/dev/random/randomdev.c#6 integrate .. //depot/projects/tty/sys/dev/random/randomdev.h#2 integrate .. //depot/projects/tty/sys/dev/random/yarrow.c#3 integrate .. //depot/projects/tty/sys/dev/re/if_re.c#4 integrate .. //depot/projects/tty/sys/dev/sio/sio.c#10 integrate .. //depot/projects/tty/sys/dev/sio/sio_pci.c#6 integrate .. //depot/projects/tty/sys/dev/sn/if_sn.c#7 integrate .. //depot/projects/tty/sys/dev/sound/pcm/buffer.c#6 integrate .. //depot/projects/tty/sys/dev/sound/pcm/buffer.h#5 integrate .. //depot/projects/tty/sys/dev/sound/pcm/channel.c#6 integrate .. //depot/projects/tty/sys/dev/twe/twe.c#4 integrate .. //depot/projects/tty/sys/dev/twe/twe_compat.h#6 integrate .. //depot/projects/tty/sys/dev/twe/twe_freebsd.c#7 integrate .. //depot/projects/tty/sys/dev/twe/twe_tables.h#3 integrate .. //depot/projects/tty/sys/dev/twe/tweio.h#3 integrate .. //depot/projects/tty/sys/dev/twe/twereg.h#4 integrate .. //depot/projects/tty/sys/dev/twe/twevar.h#3 integrate .. //depot/projects/tty/sys/dev/tx/if_tx.c#6 integrate .. //depot/projects/tty/sys/dev/uart/uart_bus_pci.c#4 integrate .. //depot/projects/tty/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/tty/sys/dev/usb/if_aue.c#8 integrate .. //depot/projects/tty/sys/dev/usb/if_cue.c#8 integrate .. //depot/projects/tty/sys/dev/usb/if_kue.c#7 integrate .. //depot/projects/tty/sys/dev/usb/ohci.c#5 integrate .. //depot/projects/tty/sys/dev/usb/ohci_pci.c#5 integrate .. //depot/projects/tty/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/tty/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/tty/sys/dev/usb/uhci_pci.c#6 integrate .. //depot/projects/tty/sys/dev/usb/umct.c#2 integrate .. //depot/projects/tty/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/tty/sys/dev/usb/usb_ethersubr.c#6 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs#11 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs.h#11 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs_data.h#11 integrate .. //depot/projects/tty/sys/dev/usb/uvscom.c#7 integrate .. //depot/projects/tty/sys/dev/vinum/vinuminterrupt.c#3 integrate .. //depot/projects/tty/sys/dev/vinum/vinumio.c#8 integrate .. //depot/projects/tty/sys/dev/vinum/vinumrequest.c#7 integrate .. //depot/projects/tty/sys/dev/wi/if_wi.c#8 integrate .. //depot/projects/tty/sys/dev/wl/if_wl.c#6 integrate .. //depot/projects/tty/sys/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/tty/sys/fs/fifofs/fifo_vnops.c#8 integrate .. //depot/projects/tty/sys/geom/geom_event.c#7 integrate .. //depot/projects/tty/sys/geom/geom_subr.c#10 integrate .. //depot/projects/tty/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/tty/sys/i386/conf/GENERIC#11 integrate .. //depot/projects/tty/sys/i386/conf/NOTES#12 integrate .. //depot/projects/tty/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/tty/sys/i386/i386/elan-mmcr.c#8 integrate .. //depot/projects/tty/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/tty/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/tty/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/tty/sys/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/tty/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/tty/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/tty/sys/i386/ibcs2/imgact_coff.c#5 integrate .. //depot/projects/tty/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/tty/sys/i386/include/atomic.h#2 integrate .. //depot/projects/tty/sys/i386/include/cserial.h#1 branch .. //depot/projects/tty/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/tty/sys/i386/include/mptable.h#2 integrate .. //depot/projects/tty/sys/i386/include/pcpu.h#4 integrate .. //depot/projects/tty/sys/i386/include/sf_buf.h#1 branch .. //depot/projects/tty/sys/i386/include/smptests.h#3 integrate .. //depot/projects/tty/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/tty/sys/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/tty/sys/i386/isa/cronyx.c#3 delete .. //depot/projects/tty/sys/i386/isa/cx.c#6 delete .. //depot/projects/tty/sys/i386/isa/cxreg.h#3 delete .. //depot/projects/tty/sys/i386/isa/cy.c#6 integrate .. //depot/projects/tty/sys/i386/isa/icu.h#3 integrate .. //depot/projects/tty/sys/i386/isa/if_cx.c#6 delete .. //depot/projects/tty/sys/i386/linux/linux_dummy.c#3 integrate .. //depot/projects/tty/sys/i386/linux/linux_proto.h#4 integrate .. //depot/projects/tty/sys/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/tty/sys/i386/linux/linux_sysent.c#5 integrate .. //depot/projects/tty/sys/i386/linux/syscalls.master#4 integrate .. //depot/projects/tty/sys/ia64/ia64/interrupt.c#6 integrate .. //depot/projects/tty/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/tty/sys/ia64/ia64/mp_machdep.c#6 integrate .. //depot/projects/tty/sys/ia64/ia64/vm_machdep.c#8 integrate .. //depot/projects/tty/sys/ia64/include/pcpu.h#3 integrate .. //depot/projects/tty/sys/ia64/include/sf_buf.h#1 branch .. //depot/projects/tty/sys/kern/kern_event.c#7 integrate .. //depot/projects/tty/sys/kern/kern_exit.c#8 integrate .. //depot/projects/tty/sys/kern/kern_intr.c#10 integrate .. //depot/projects/tty/sys/kern/kern_mac.c#10 integrate .. //depot/projects/tty/sys/kern/kern_physio.c#6 integrate .. //depot/projects/tty/sys/kern/kern_prot.c#7 integrate .. //depot/projects/tty/sys/kern/kern_switch.c#9 integrate .. //depot/projects/tty/sys/kern/kern_timeout.c#5 integrate .. //depot/projects/tty/sys/kern/sched_ule.c#8 integrate .. //depot/projects/tty/sys/kern/subr_smp.c#7 integrate .. //depot/projects/tty/sys/kern/subr_witness.c#11 integrate .. //depot/projects/tty/sys/kern/sysv_sem.c#8 integrate .. //depot/projects/tty/sys/kern/uipc_cow.c#5 integrate .. //depot/projects/tty/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/tty/sys/kern/uipc_socket2.c#8 integrate .. //depot/projects/tty/sys/kern/uipc_syscalls.c#10 integrate .. //depot/projects/tty/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/tty/sys/kern/vfs_aio.c#6 integrate .. //depot/projects/tty/sys/kern/vfs_bio.c#10 integrate .. //depot/projects/tty/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/tty/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/tty/sys/modules/Makefile#13 integrate .. //depot/projects/tty/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/tty/sys/modules/cx/Makefile#1 branch .. //depot/projects/tty/sys/modules/if_gre/Makefile#3 integrate .. //depot/projects/tty/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/tty/sys/modules/linux/Makefile#3 integrate .. //depot/projects/tty/sys/modules/nfs4client/Makefile#1 branch .. //depot/projects/tty/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/tty/sys/modules/null/Makefile#2 integrate .. //depot/projects/tty/sys/modules/nwfs/Makefile#2 integrate .. //depot/projects/tty/sys/modules/ppbus/Makefile#3 integrate .. //depot/projects/tty/sys/modules/ppi/Makefile#2 integrate .. //depot/projects/tty/sys/modules/pps/Makefile#2 integrate .. //depot/projects/tty/sys/modules/smbfs/Makefile#2 integrate .. //depot/projects/tty/sys/modules/streams/Makefile#2 integrate .. //depot/projects/tty/sys/modules/uplcom/Makefile#2 integrate .. //depot/projects/tty/sys/net/bpf.h#3 integrate .. //depot/projects/tty/sys/net/if_arcsubr.c#6 integrate .. //depot/projects/tty/sys/net/if_ef.c#6 integrate .. //depot/projects/tty/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/tty/sys/net/if_faith.c#7 integrate .. //depot/projects/tty/sys/net/if_fddisubr.c#6 integrate .. //depot/projects/tty/sys/net/if_gre.c#5 integrate .. //depot/projects/tty/sys/net/if_iso88025subr.c#6 integrate .. //depot/projects/tty/sys/net/if_loop.c#9 integrate .. //depot/projects/tty/sys/net/if_ppp.c#7 integrate .. //depot/projects/tty/sys/net/pfkeyv2.h#3 integrate .. //depot/projects/tty/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/tty/sys/net/route.c#7 integrate .. //depot/projects/tty/sys/net/route.h#6 integrate .. //depot/projects/tty/sys/net/rtsock.c#6 integrate .. //depot/projects/tty/sys/netatalk/at_control.c#3 integrate .. //depot/projects/tty/sys/netatalk/ddp_usrreq.c#5 integrate .. //depot/projects/tty/sys/netatm/atm_aal5.c#3 integrate .. //depot/projects/tty/sys/netatm/atm_usrreq.c#4 integrate .. //depot/projects/tty/sys/netatm/ipatm/ipatm_vcm.c#4 integrate .. //depot/projects/tty/sys/netgraph/bluetooth/socket/ng_btsocket.c#5 integrate .. //depot/projects/tty/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/tty/sys/netgraph/ng_etf.c#2 integrate .. //depot/projects/tty/sys/netgraph/ng_pptpgre.c#4 integrate .. //depot/projects/tty/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/tty/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/tty/sys/netinet/in_pcb.h#7 integrate .. //depot/projects/tty/sys/netinet/in_rmx.c#5 integrate .. //depot/projects/tty/sys/netinet/in_var.h#4 integrate .. //depot/projects/tty/sys/netinet/ip_divert.c#7 integrate .. //depot/projects/tty/sys/netinet/ip_dummynet.c#6 integrate .. //depot/projects/tty/sys/netinet/ip_fastfwd.c#1 branch .. //depot/projects/tty/sys/netinet/ip_flow.c#5 delete .. //depot/projects/tty/sys/netinet/ip_flow.h#3 delete .. //depot/projects/tty/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/tty/sys/netinet/ip_icmp.c#7 integrate .. //depot/projects/tty/sys/netinet/ip_input.c#10 integrate .. //depot/projects/tty/sys/netinet/ip_output.c#9 integrate .. //depot/projects/tty/sys/netinet/ip_var.h#7 integrate .. //depot/projects/tty/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/tty/sys/netinet/tcp_hostcache.c#1 branch .. //depot/projects/tty/sys/netinet/tcp_input.c#12 integrate .. //depot/projects/tty/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/tty/sys/netinet/tcp_subr.c#9 integrate .. //depot/projects/tty/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/tty/sys/netinet/tcp_timer.c#6 integrate .. //depot/projects/tty/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/tty/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/tty/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/tty/sys/netinet6/ah.h#3 integrate .. //depot/projects/tty/sys/netinet6/ah_core.c#5 integrate .. //depot/projects/tty/sys/netinet6/ah_input.c#6 integrate .. //depot/projects/tty/sys/netinet6/esp_core.c#5 integrate .. //depot/projects/tty/sys/netinet6/esp_input.c#6 integrate .. //depot/projects/tty/sys/netinet6/esp_output.c#5 integrate .. //depot/projects/tty/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/tty/sys/netinet6/in6_pcb.c#6 integrate .. //depot/projects/tty/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/tty/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/tty/sys/netinet6/ip6_forward.c#4 integrate .. //depot/projects/tty/sys/netinet6/ip6_input.c#6 integrate .. //depot/projects/tty/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/tty/sys/netinet6/raw_ip6.c#5 integrate .. //depot/projects/tty/sys/netinet6/udp6_output.c#5 integrate .. //depot/projects/tty/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/tty/sys/netipsec/keysock.c#5 integrate .. //depot/projects/tty/sys/netipx/ipx_usrreq.c#5 integrate .. //depot/projects/tty/sys/netipx/spx_usrreq.c#4 integrate .. //depot/projects/tty/sys/netkey/key.c#7 integrate .. //depot/projects/tty/sys/netkey/keysock.c#7 integrate .. //depot/projects/tty/sys/netnatm/natm.c#7 integrate .. //depot/projects/tty/sys/nfs/nfsproto.h#2 integrate .. //depot/projects/tty/sys/nfs/rpcv2.h#2 integrate .. //depot/projects/tty/sys/nfs4client/nfs4.h#1 branch .. //depot/projects/tty/sys/nfs4client/nfs4_dev.c#1 branch .. //depot/projects/tty/sys/nfs4client/nfs4_dev.h#1 branch .. //depot/projects/tty/sys/nfs4client/nfs4_idmap.c#1 branch .. //depot/projects/tty/sys/nfs4client/nfs4_idmap.h#1 branch .. //depot/projects/tty/sys/nfs4client/nfs4_socket.c#1 branch .. //depot/projects/tty/sys/nfs4client/nfs4_subs.c#1 branch .. //depot/projects/tty/sys/nfs4client/nfs4_vfs.h#1 branch .. //depot/projects/tty/sys/nfs4client/nfs4_vfs_subs.c#1 branch .. //depot/projects/tty/sys/nfs4client/nfs4_vfsops.c#1 branch .. //depot/projects/tty/sys/nfs4client/nfs4_vn.h#1 branch .. //depot/projects/tty/sys/nfs4client/nfs4_vn_subs.c#1 branch .. //depot/projects/tty/sys/nfs4client/nfs4_vnops.c#1 branch .. //depot/projects/tty/sys/nfs4client/nfs4m_subs.h#1 branch .. //depot/projects/tty/sys/nfsclient/bootp_subr.c#7 integrate .. //depot/projects/tty/sys/nfsclient/krpc_subr.c#5 integrate .. //depot/projects/tty/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/tty/sys/nfsclient/nfs_bio.c#6 integrate .. //depot/projects/tty/sys/nfsclient/nfs_diskless.c#4 integrate .. //depot/projects/tty/sys/nfsclient/nfs_lock.c#6 integrate .. //depot/projects/tty/sys/nfsclient/nfs_nfsiod.c#4 integrate .. //depot/projects/tty/sys/nfsclient/nfs_node.c#5 integrate .. //depot/projects/tty/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/tty/sys/nfsclient/nfs_subs.c#6 integrate .. //depot/projects/tty/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/tty/sys/nfsclient/nfs_vnops.c#9 integrate .. //depot/projects/tty/sys/nfsclient/nfsargs.h#2 integrate .. //depot/projects/tty/sys/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/tty/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/tty/sys/nfsclient/nfsnode.h#3 integrate .. //depot/projects/tty/sys/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/tty/sys/opencrypto/cryptodev.c#6 integrate .. //depot/projects/tty/sys/pc98/conf/NOTES#7 integrate .. //depot/projects/tty/sys/pc98/i386/machdep.c#9 integrate .. //depot/projects/tty/sys/pc98/pc98/sio.c#9 integrate .. //depot/projects/tty/sys/pci/cy_pci.c#4 integrate .. //depot/projects/tty/sys/pci/if_dc.c#10 integrate .. //depot/projects/tty/sys/pci/if_dcreg.h#6 integrate .. //depot/projects/tty/sys/pci/if_pcn.c#8 integrate .. //depot/projects/tty/sys/pci/if_pcnreg.h#2 integrate .. //depot/projects/tty/sys/pci/if_rl.c#8 integrate .. //depot/projects/tty/sys/pci/if_rlreg.h#6 integrate .. //depot/projects/tty/sys/pci/if_sf.c#7 integrate .. //depot/projects/tty/sys/pci/if_sfreg.h#2 integrate .. //depot/projects/tty/sys/pci/if_sis.c#9 integrate .. //depot/projects/tty/sys/pci/if_sisreg.h#4 integrate .. //depot/projects/tty/sys/pci/if_sk.c#8 integrate .. //depot/projects/tty/sys/pci/if_skreg.h#4 integrate .. //depot/projects/tty/sys/pci/if_ste.c#7 integrate .. //depot/projects/tty/sys/pci/if_stereg.h#2 integrate .. //depot/projects/tty/sys/pci/if_ti.c#9 integrate .. //depot/projects/tty/sys/pci/if_tireg.h#2 integrate .. //depot/projects/tty/sys/pci/if_tl.c#6 integrate .. //depot/projects/tty/sys/pci/if_tlreg.h#2 integrate .. //depot/projects/tty/sys/pci/if_vr.c#7 integrate .. //depot/projects/tty/sys/pci/if_vrreg.h#3 integrate .. //depot/projects/tty/sys/pci/if_wb.c#6 integrate .. //depot/projects/tty/sys/pci/if_wbreg.h#2 integrate .. //depot/projects/tty/sys/pci/if_xl.c#8 integrate .. //depot/projects/tty/sys/pci/if_xlreg.h#5 integrate .. //depot/projects/tty/sys/powerpc/include/intr_machdep.h#3 integrate .. //depot/projects/tty/sys/powerpc/include/sf_buf.h#1 branch .. //depot/projects/tty/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/tty/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/tty/sys/powerpc/powerpc/mp_machdep.c#3 integrate .. //depot/projects/tty/sys/powerpc/powerpc/openpic.c#4 integrate .. //depot/projects/tty/sys/powerpc/powerpc/vm_machdep.c#5 integrate .. //depot/projects/tty/sys/rpc/rpcclnt.c#1 branch .. //depot/projects/tty/sys/rpc/rpcclnt.h#1 branch .. //depot/projects/tty/sys/rpc/rpcm_subs.h#1 branch .. //depot/projects/tty/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/tty/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/tty/sys/security/mac_biba/mac_biba.c#8 integrate .. //depot/projects/tty/sys/security/mac_ifoff/mac_ifoff.c#4 integrate .. //depot/projects/tty/sys/security/mac_lomac/mac_lomac.c#8 integrate .. //depot/projects/tty/sys/security/mac_mls/mac_mls.c#8 integrate .. //depot/projects/tty/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/tty/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/tty/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/tty/sys/sparc64/include/sf_buf.h#1 branch .. //depot/projects/tty/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/tty/sys/sparc64/sparc64/vm_machdep.c#6 integrate .. //depot/projects/tty/sys/sys/buf.h#8 integrate .. //depot/projects/tty/sys/sys/interrupt.h#5 integrate .. //depot/projects/tty/sys/sys/mac.h#7 integrate .. //depot/projects/tty/sys/sys/mac_policy.h#5 integrate .. //depot/projects/tty/sys/sys/mbuf.h#9 integrate .. //depot/projects/tty/sys/sys/param.h#10 integrate .. //depot/projects/tty/sys/sys/pcpu.h#2 integrate .. //depot/projects/tty/sys/sys/proc.h#10 integrate .. //depot/projects/tty/sys/sys/protosw.h#3 integrate .. //depot/projects/tty/sys/sys/reboot.h#3 integrate .. //depot/projects/tty/sys/sys/sched.h#5 integrate .. //depot/projects/tty/sys/sys/sf_buf.h#1 branch .. //depot/projects/tty/sys/sys/smp.h#3 integrate .. //depot/projects/tty/sys/sys/socket.h#4 integrate .. //depot/projects/tty/sys/sys/socketvar.h#7 integrate .. //depot/projects/tty/sys/sys/soundcard.h#5 integrate .. //depot/projects/tty/sys/sys/sysctl.h#5 integrate .. //depot/projects/tty/sys/sys/timepps.h#2 integrate .. //depot/projects/tty/sys/ufs/ffs/ffs_rawread.c#5 integrate .. //depot/projects/tty/sys/ufs/ffs/fs.h#3 integrate .. //depot/projects/tty/sys/vm/uma_core.c#8 integrate .. //depot/projects/tty/sys/vm/vm_map.c#8 integrate .. //depot/projects/tty/sys/vm/vnode_pager.c#7 integrate .. //depot/projects/tty/tools/diag/ac/cknames.pl#2 integrate .. //depot/projects/tty/tools/diag/ac/ent.sh#2 integrate .. //depot/projects/tty/tools/tools/release/chk_dokern.sh_and_drivers.conf#2 integrate .. //depot/projects/tty/usr.bin/bzip2/Makefile#3 integrate .. //depot/projects/tty/usr.bin/locale/locale.1#2 integrate .. //depot/projects/tty/usr.bin/mklocale/mklocale.1#4 integrate .. //depot/projects/tty/usr.bin/netstat/if.c#5 integrate .. //depot/projects/tty/usr.bin/netstat/netstat.1#5 integrate .. //depot/projects/tty/usr.bin/netstat/route.c#5 integrate .. //depot/projects/tty/usr.sbin/IPXrouted/IPXrouted.8#4 integrate .. //depot/projects/tty/usr.sbin/IPXrouted/Makefile#2 integrate .. //depot/projects/tty/usr.sbin/IPXrouted/af.c#2 integrate .. //depot/projects/tty/usr.sbin/IPXrouted/if.c#2 integrate .. //depot/projects/tty/usr.sbin/IPXrouted/input.c#3 integrate .. //depot/projects/tty/usr.sbin/IPXrouted/main.c#2 integrate .. //depot/projects/tty/usr.sbin/IPXrouted/output.c#2 integrate .. //depot/projects/tty/usr.sbin/IPXrouted/sap_tables.c#2 integrate .. //depot/projects/tty/usr.sbin/IPXrouted/startup.c#2 integrate .. //depot/projects/tty/usr.sbin/IPXrouted/tables.c#2 integrate .. //depot/projects/tty/usr.sbin/IPXrouted/timer.c#2 integrate .. //depot/projects/tty/usr.sbin/IPXrouted/trace.c#3 integrate .. //depot/projects/tty/usr.sbin/Makefile#11 integrate .. //depot/projects/tty/usr.sbin/ancontrol/ancontrol.c#4 integrate .. //depot/projects/tty/usr.sbin/bluetooth/bt3cfw/bt3cfw.c#4 integrate .. //depot/projects/tty/usr.sbin/bluetooth/hcseriald/hcseriald.c#4 integrate .. //depot/projects/tty/usr.sbin/burncd/burncd.8#5 integrate .. //depot/projects/tty/usr.sbin/cdcontrol/cdcontrol.1#3 integrate .. //depot/projects/tty/usr.sbin/cdcontrol/cdcontrol.c#4 integrate .. //depot/projects/tty/usr.sbin/config/config.y#4 integrate .. //depot/projects/tty/usr.sbin/faithd/Makefile#2 integrate .. //depot/projects/tty/usr.sbin/faithd/README#2 integrate .. //depot/projects/tty/usr.sbin/faithd/faithd.8#2 integrate .. //depot/projects/tty/usr.sbin/faithd/faithd.c#2 integrate .. //depot/projects/tty/usr.sbin/faithd/faithd.h#2 integrate .. //depot/projects/tty/usr.sbin/faithd/ftp.c#2 integrate .. //depot/projects/tty/usr.sbin/faithd/prefix.c#3 integrate .. //depot/projects/tty/usr.sbin/faithd/rsh.c#2 delete .. //depot/projects/tty/usr.sbin/faithd/tcp.c#2 integrate .. //depot/projects/tty/usr.sbin/faithd/test/faithd.rb#2 integrate .. //depot/projects/tty/usr.sbin/jail/jail.8#6 integrate .. //depot/projects/tty/usr.sbin/kernbb/Makefile#2 integrate .. //depot/projects/tty/usr.sbin/kernbb/kernbb.c#3 integrate .. //depot/projects/tty/usr.sbin/moused/moused.c#3 integrate .. //depot/projects/tty/usr.sbin/mtree/spec.c#5 integrate .. //depot/projects/tty/usr.sbin/mtree/specspec.c#2 integrate .. //depot/projects/tty/usr.sbin/ppp/netgraph.c#2 integrate .. //depot/projects/tty/usr.sbin/ppp/tty.c#2 integrate .. //depot/projects/tty/usr.sbin/route6d/misc/chkrt#2 integrate .. //depot/projects/tty/usr.sbin/route6d/route6d.c#6 integrate .. //depot/projects/tty/usr.sbin/route6d/route6d.h#3 integrate .. //depot/projects/tty/usr.sbin/sysinstall/Makefile#5 integrate .. //depot/projects/tty/usr.sbin/sysinstall/config.c#6 integrate .. //depot/projects/tty/usr.sbin/sysinstall/help/securelevel.hlp#1 branch .. //depot/projects/tty/usr.sbin/sysinstall/help/security.hlp#2 delete .. //depot/projects/tty/usr.sbin/sysinstall/install.c#7 integrate .. //depot/projects/tty/usr.sbin/sysinstall/menus.c#9 integrate .. //depot/projects/tty/usr.sbin/sysinstall/sysinstall.h#9 integrate .. //depot/projects/tty/usr.sbin/syslogd/syslogd.c#6 integrate .. //depot/projects/tty/usr.sbin/tzsetup/tzsetup.c#2 integrate Differences ... ==== //depot/projects/tty/Makefile.inc1#11 (text+ko) ==== @@ -1,7 +1,8 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.396 2003/11/12 17:09:12 harti Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.397 2003/11/16 21:17:43 gordon Exp $ # # Make command line options: +# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) # -DNO_RESCUE do not build rescue binaries # -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -52,7 +53,7 @@ # When upgrading to a dynamically linked root, install the runtime # linker early into its new location before make(1) has a chance # to run the dynamically linked /bin/sh. -.if defined(WITH_DYNAMICROOT) && !defined(NOPIC) && \ +.if !defined(NO_DYNAMICROOT) && !defined(NOPIC) && \ (!defined(TARGET_ARCH) || ${TARGET_ARCH} == ${MACHINE_ARCH}) && \ !defined(DISTDIR) && \ (!defined(DESTDIR) || empty(DESTDIR) || ${DESTDIR} == "/") && \ ==== //depot/projects/tty/UPDATING#9 (text+ko) ==== @@ -20,15 +20,21 @@ 20031112: The statfs structure has been updated with 64-bit fields to allow accurate reporting of multi-terabyte filesystem - sizes. You should build and boot a new kernel BEFORE doing a - `make world' as the new kernel will know about binaries using - the old statfs structure, but an old kernel will not know - about the new system calls that support the new statfs - structure. Running an old kernel after a `make world' will - cause programs such as `df' that do a statfs system call to - fail with a bad system call. Marco Wertejuk - also reports that cfsd (ports/security/cfs) needs to be - recompiled after these changes are installed. + sizes. You should build world, then build and boot the new kernel + BEFORE doing a `installworld' as the new kernel will know about + binaries using the old statfs structure, but an old kernel will + not know about the new system calls that support the new statfs + structure. + Note that the backwards compatibility is only present when the + kernel is configured with the COMPAT_FREEBSD4 option. Since + even /bin/sh will not run with a new kernel without said option + you're pretty much dead in the water without it. Make sure you + have COMPAT_FREEBSD4! + Running an old kernel after a `make world' will cause programs + such as `df' that do a statfs system call to fail with a bad + system call. Marco Wertejuk also reports + that cfsd (ports/security/cfs) needs to be recompiled after + these changes are installed. ****************************DANGER******************************* @@ -1425,4 +1431,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.280 2003/11/14 08:07:13 mckusick Exp $ +$FreeBSD: src/UPDATING,v 1.282 2003/11/17 23:25:16 rwatson Exp $ ==== //depot/projects/tty/bin/Makefile.inc#4 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile.inc,v 1.18 2003/11/02 06:47:38 ru Exp $ +# $FreeBSD: src/bin/Makefile.inc,v 1.20 2003/11/19 16:59:00 marcel Exp $ BINDIR?= /bin WARNS?= 6 -.if !defined(WITH_DYNAMICROOT) +.if defined(NO_DYNAMICROOT) || ${MACHINE_ARCH} == "ia64" NOSHARED?= YES .endif ==== //depot/projects/tty/bin/ls/ls.1#5 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.76 2003/08/08 17:04:17 schweikh Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.77 2003/12/01 19:10:29 obrien Exp $ .\" .Dd May 19, 2002 .Dt LS 1 @@ -186,6 +186,14 @@ not blocks. This option overrides the environment variable .Ev BLOCKSIZE . +Note that +.Fl k +is mutually exclusive to +.Fl h +and later +.Fl k +will nullify earlier +.Fl h . .It Fl l (The lowercase letter .Dq ell . ) ==== //depot/projects/tty/bin/ls/ls.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.74 2003/05/03 16:39:33 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.75 2003/12/01 19:10:29 obrien Exp $"); #include #include @@ -267,6 +267,7 @@ f_inode = 1; break; case 'k': + f_humanval = 0; f_kblocks = 1; break; case 'm': ==== //depot/projects/tty/contrib/bind/CHANGES#4 (text+ko) ==== @@ -1,4 +1,9 @@ + --- 8.3.7-REL released --- (Wed Sep 3 21:01:37 PDT 2003) + +1581. [bug] apply anti-cache poison techniques to negative + answers. + --- 8.3.6-REL released --- (Sun Jun 8 15:11:32 PDT 2003) 1547. [port] cope with spurious EINVAL from evRead. ==== //depot/projects/tty/contrib/bind/README#4 (text+ko) ==== @@ -10,6 +10,9 @@ Note that BIND 8 is in "end-of-life", having been replaced by BIND 9. See http://www.isc.org/ for more details. +BIND 8.3.7 Highlights + Security release. + BIND 8.3.6 Highlights Maintenance release. ==== //depot/projects/tty/contrib/bind/Version#4 (text+ko) ==== @@ -1,1 +1,1 @@ -8.3.6-REL +8.3.7-REL ==== //depot/projects/tty/contrib/bind/bin/named/ns_init.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static const char sccsid[] = "@(#)ns_init.c 4.38 (Berkeley) 3/21/91"; -static const char rcsid[] = "$Id: ns_init.c,v 8.77 2002/08/20 04:27:23 marka Exp $"; +static const char rcsid[] = "$Id: ns_init.c,v 8.77.8.2 2003/09/04 04:09:09 marka Exp $"; #endif /* not lint */ /* ==== //depot/projects/tty/contrib/bind/bin/named/ns_resp.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static const char sccsid[] = "@(#)ns_resp.c 4.65 (Berkeley) 3/3/91"; -static const char rcsid[] = "$Id: ns_resp.c,v 8.186.6.4 2003/06/02 09:56:35 marka Exp $"; +static const char rcsid[] = "$Id: ns_resp.c,v 8.186.6.5 2003/09/04 03:03:18 marka Exp $"; #endif /* not lint */ /* @@ -271,7 +271,7 @@ int soacount; u_int qtype, qclass; int validanswer, dbflags; - int cname, lastwascname, externalcname; + int cname, lastwascname, externalcname, cachenegative; int count, founddata, foundname; int buflen; int newmsglen; @@ -911,6 +911,7 @@ cname = 0; lastwascname = 0; externalcname = 0; + cachenegative = 1; strcpy(aname, qname); if (count) { @@ -980,6 +981,7 @@ name); db_detach(&dp); validanswer = 0; + cachenegative = 0; continue; } if (type == T_CNAME && @@ -1014,6 +1016,7 @@ "last was cname, ignoring auth. and add."); db_detach(&dp); validanswer = 0; + cachenegative = 0; break; } if (i < arfirst) { @@ -1029,6 +1032,7 @@ sin_ntoa(from)); db_detach(&dp); validanswer = 0; + cachenegative = 0; continue; } else if (!ns_samedomain(name, qp->q_domain)) { @@ -1042,6 +1046,7 @@ sin_ntoa(from)); db_detach(&dp); validanswer = 0; + cachenegative = 0; continue; } if (type == T_NS) { @@ -1205,8 +1210,9 @@ ) ) { - cache_n_resp(msg, msglen, from, qp->q_name, - qp->q_class, qp->q_type); + if (cachenegative) + cache_n_resp(msg, msglen, from, qp->q_name, + qp->q_class, qp->q_type); if (!qp->q_cmsglen && validanswer) { ns_debug(ns_log_default, 3, ==== //depot/projects/tty/contrib/bind/bin/nslookup/commands.l#2 (text+ko) ==== @@ -1,5 +1,5 @@ %{ -/* $FreeBSD: src/contrib/bind/bin/nslookup/commands.l,v 1.10 2002/07/01 01:20:28 dougb Exp $ */ +/* $FreeBSD: src/contrib/bind/bin/nslookup/commands.l,v 1.11 2003/11/28 22:02:17 dougb Exp $ */ /* * Copyright (c) 1985 * The Regents of the University of California. All rights reserved. @@ -77,7 +77,6 @@ * exit - exit the program * root - set default server to the root * ls NAME - list the domain NAME - * view FILE - sorts and view the file with more * set OPTION - set an option * help - print help information * ? - print help information @@ -103,7 +102,6 @@ extern char rootServerName[]; extern void PrintHelp(); -extern void ViewList(char *); #define YY_INPUT(buf, result, max_size) \ { \ ==== //depot/projects/tty/contrib/ipfilter/ipt.c#3 (text+ko) ==== @@ -443,7 +443,8 @@ void *ptr; { #if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) #else char buf[32], *s; int len; @@ -458,7 +459,8 @@ if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1) return "X"; #if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) return strdup(netif.if_xname); #else if (kmemcpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1) ==== //depot/projects/tty/contrib/ipfilter/kmem.c#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 4 12:19:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B345E16A4D0; Thu, 4 Dec 2003 12:19:13 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8DDC616A4CE for ; Thu, 4 Dec 2003 12:19:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E330043F3F for ; Thu, 4 Dec 2003 12:19:12 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB4KJCXJ020828 for ; Thu, 4 Dec 2003 12:19:12 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB4KJCpK020825 for perforce@freebsd.org; Thu, 4 Dec 2003 12:19:12 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Thu, 4 Dec 2003 12:19:12 -0800 (PST) Message-Id: <200312042019.hB4KJCpK020825@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 43430 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2003 20:19:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=43430 Change 43430 by cvance@cvance_sony on 2003/12/04 12:18:37 Fix typo/mis-merge Affected files ... .. //depot/projects/trustedbsd/sebsd/lib/Makefile#9 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/lib/Makefile#9 (text+ko) ==== @@ -31,7 +31,7 @@ libnetgraph ${_libngatm} libopie libpam libpanel libpcap \ ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libufs libugidfw \ - ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz + ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz \ libsebsd .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) From owner-p4-projects@FreeBSD.ORG Thu Dec 4 12:43:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D600616A4D0; Thu, 4 Dec 2003 12:43:44 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AFCD916A4CE for ; Thu, 4 Dec 2003 12:43:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04C6B43F85 for ; Thu, 4 Dec 2003 12:43:44 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB4KhhXJ040200 for ; Thu, 4 Dec 2003 12:43:43 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB4KhhfX040197 for perforce@freebsd.org; Thu, 4 Dec 2003 12:43:43 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Thu, 4 Dec 2003 12:43:43 -0800 (PST) Message-Id: <200312042043.hB4KhhfX040197@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 43432 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Dec 2003 20:43:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=43432 Change 43432 by cvance@cvance_sony on 2003/12/04 12:43:19 Patch up mis-integ. This code really doesn't want to be here anymore. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#27 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#27 (text+ko) ==== @@ -888,25 +888,7 @@ sebsd_create_root_mount(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel) { - struct vnode *vp, *nvp; - /* - * Go through all open vnodes and reload their labels. - */ - mtx_lock(&mntvnode_mtx); - vp = TAILQ_FIRST(&mp->mnt_nvnodelist); - do { - nvp = TAILQ_NEXT(vp, v_nmntvnodes); - VI_LOCK(vp); - mtx_unlock(&mntvnode_mtx); - vn_lock(vp, LK_INTERLOCK | LK_EXCLUSIVE | LK_RETRY, curthread); - (void)sebsd_associate_vnode_extattr(mp, fslabel, vp, - vp->v_label); - VOP_UNLOCK(vp, 0, curthread); - mtx_lock(&mntvnode_mtx); - vp = nvp; - } while (vp != NULL); - mtx_unlock(&mntvnode_mtx); } static int From owner-p4-projects@FreeBSD.ORG Fri Dec 5 12:47:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B97516A4D0; Fri, 5 Dec 2003 12:47:06 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0410D16A4CE for ; Fri, 5 Dec 2003 12:47:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E9DBB43FDD for ; Fri, 5 Dec 2003 12:47:04 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB5Kl4XJ051202 for ; Fri, 5 Dec 2003 12:47:04 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB5Kl42P051049 for perforce@freebsd.org; Fri, 5 Dec 2003 12:47:04 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 5 Dec 2003 12:47:04 -0800 (PST) Message-Id: <200312052047.hB5Kl42P051049@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 43463 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Dec 2003 20:47:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=43463 Change 43463 by jhb@jhb_blue on 2003/12/05 12:46:37 - Axe acpi_SetPowerState() and use acpi_pwr_switch_consumer() instead. - Update notes. Affected files ... .. //depot/projects/power/notes#9 edit .. //depot/projects/power/sys/dev/acpica/acpi.c#7 edit .. //depot/projects/power/sys/dev/acpica/acpi_pci.c#5 edit .. //depot/projects/power/sys/dev/acpica/acpivar.h#5 edit Differences ... ==== //depot/projects/power/notes#9 (text+ko) ==== @@ -17,12 +17,13 @@ powerstate via _PSx + fix ACPI PCI bus driver to call _PSx outside of calling the default PCI powerstate functions - - XXX: need to handle _PRx and _SxD !! - - We should be able to hook the power resource stuff up once we have - our power shadow tree in the acpi_SetPowerState() function. - - Use the power resource consumer power state change stuff in + + Handle power resources (_PRx) + - Handle _SxD + - Handle _IRC? + + Use the power resource consumer power state change stuff in acpi_SetDevicePowerState(). We need to pre-register all the resources and consumers in a tree sweep though to do this properly. + - Add tree sweep to register consumers and producers. - define a bus method for powering up/down devices - bus_set_powerstate(parent, child, state) where state is on or off # actually on/off is insufficient for a power management daemon that ==== //depot/projects/power/sys/dev/acpica/acpi.c#7 (text+ko) ==== @@ -1457,33 +1457,6 @@ } /* - * Set a specified device's power state. - */ -ACPI_STATUS -acpi_SetPowerState(ACPI_HANDLE handle, int state) -{ - char *method; - - switch (state) { - case ACPI_STATE_D0: - method = "_PS0"; - break; - case ACPI_STATE_D1: - method = "_PS1"; - break; - case ACPI_STATE_D2: - method = "_PS2"; - break; - case ACPI_STATE_D3: - method = "_PS3"; - break; - default: - return (AE_BAD_PARAMETER); - } - return (AcpiEvaluateObject(handle, method, NULL, NULL)); -} - -/* * Set the system sleep state * * Currently we support S1-S5 but S4 is only S4BIOS ==== //depot/projects/power/sys/dev/acpica/acpi_pci.c#5 (text+ko) ==== @@ -177,7 +177,7 @@ if (error) return (error); } - status = acpi_SetPowerState(acpi_get_handle(child), acpi_state); + status = acpi_pwr_switch_consumer(acpi_get_handle(child), acpi_state); if (ACPI_FAILURE(status)) device_printf(dev, "Failed to set ACPI power state D%d on %s: %s\n", ==== //depot/projects/power/sys/dev/acpica/acpivar.h#5 (text+ko) ==== @@ -189,7 +189,6 @@ ACPI_RESOURCE *res); extern ACPI_STATUS acpi_OverrideInterruptLevel(UINT32 InterruptNumber); extern ACPI_STATUS acpi_SetIntrModel(int model); -extern ACPI_STATUS acpi_SetPowerState(ACPI_HANDLE handle, int state); extern ACPI_STATUS acpi_SetSleepState(struct acpi_softc *sc, int state); extern ACPI_STATUS acpi_Enable(struct acpi_softc *sc); extern ACPI_STATUS acpi_Disable(struct acpi_softc *sc); From owner-p4-projects@FreeBSD.ORG Fri Dec 5 12:59:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AC6A16A4D0; Fri, 5 Dec 2003 12:59:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 063AE16A4CE for ; Fri, 5 Dec 2003 12:59:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D5E243FDD for ; Fri, 5 Dec 2003 12:59:20 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB5KxKXJ055858 for ; Fri, 5 Dec 2003 12:59:20 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB5KxJAe055855 for perforce@freebsd.org; Fri, 5 Dec 2003 12:59:19 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 5 Dec 2003 12:59:19 -0800 (PST) Message-Id: <200312052059.hB5KxJAe055855@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 43464 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Dec 2003 20:59:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=43464 Change 43464 by jhb@jhb_blue on 2003/12/05 12:59:01 More updates. Closer to working than I thought. In theory PCI devices should all just work now. Affected files ... .. //depot/projects/power/notes#10 edit Differences ... ==== //depot/projects/power/notes#10 (text+ko) ==== @@ -24,6 +24,10 @@ acpi_SetDevicePowerState(). We need to pre-register all the resources and consumers in a tree sweep though to do this properly. - Add tree sweep to register consumers and producers. + - Actually, just so long as we turn all devices on before probing them, + that should be sufficient. + - The generic PCI bus driver already does this + - Need to turn on all non-PCI devices then when we probe/attach. - define a bus method for powering up/down devices - bus_set_powerstate(parent, child, state) where state is on or off # actually on/off is insufficient for a power management daemon that From owner-p4-projects@FreeBSD.ORG Fri Dec 5 14:08:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B7DC16A4D3; Fri, 5 Dec 2003 14:08:51 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D547416A4D1 for ; Fri, 5 Dec 2003 14:08:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 450E743F93 for ; Fri, 5 Dec 2003 14:08:45 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB5M8jXJ060445 for ; Fri, 5 Dec 2003 14:08:45 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB5M8iaZ060442 for perforce@freebsd.org; Fri, 5 Dec 2003 14:08:44 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 5 Dec 2003 14:08:44 -0800 (PST) Message-Id: <200312052208.hB5M8iaZ060442@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 43466 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Dec 2003 22:08:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=43466 Change 43466 by peter@peter_daintree on 2003/12/05 14:08:29 IFC @43465 Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/makecontext.c#4 integrate .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/enter_uts.S#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#10 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#41 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#50 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#11 integrate .. //depot/projects/hammer/sbin/Makefile#19 integrate .. //depot/projects/hammer/sbin/cxconfig/Makefile#2 delete .. //depot/projects/hammer/sbin/cxconfig/cxconfig.8#2 delete .. //depot/projects/hammer/sbin/cxconfig/cxconfig.c#3 delete .. //depot/projects/hammer/sbin/init/init.c#4 integrate .. //depot/projects/hammer/sbin/mount/mount.c#8 integrate .. //depot/projects/hammer/sbin/sconfig/Makefile#2 integrate .. //depot/projects/hammer/sbin/sconfig/sconfig.8#2 integrate .. //depot/projects/hammer/sbin/sconfig/sconfig.c#2 integrate .. //depot/projects/hammer/sbin/umount/umount.c#9 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#4 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC.hints#4 integrate .. //depot/projects/hammer/sys/conf/files.i386#18 integrate .. //depot/projects/hammer/sys/conf/files.pc98#19 integrate .. //depot/projects/hammer/sys/conf/options.i386#19 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#7 integrate .. //depot/projects/hammer/sys/i386/acpica/madt.c#6 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#17 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#24 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#28 integrate .. //depot/projects/hammer/sys/i386/i386/mptable.c#7 integrate .. //depot/projects/hammer/sys/i386/include/cronyx.h#2 delete .. //depot/projects/hammer/sys/i386/isa/cronyx.c#3 delete .. //depot/projects/hammer/sys/i386/isa/cx.c#7 delete .. //depot/projects/hammer/sys/i386/isa/cxreg.h#3 delete .. //depot/projects/hammer/sys/i386/isa/if_cx.c#7 delete .. //depot/projects/hammer/sys/modules/Makefile#31 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile#10 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#12 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/releng_5.rc#2 integrate Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/makecontext.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/makecontext.c,v 1.1 2003/07/19 04:41:08 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/makecontext.c,v 1.2 2003/12/05 01:36:44 peter Exp $"); #include #include @@ -70,8 +70,12 @@ /* Allocate space for a maximum of 6 arguments on the stack. */ args = sp - 6; - /* Account for arguments on stack and align to 16 bytes. */ - sp -= 8; + /* + * Account for arguments on stack and do the funky C entry alignment. + * This means that we need an 8-byte-odd alignment since the ABI expects + * the return address to be pushed, thus breaking the 16 byte alignment. + */ + sp -= 7; /* Add the arguments: */ va_start(ap, argc); ==== //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/enter_uts.S#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/amd64/amd64/enter_uts.S,v 1.3 2003/08/02 22:39:10 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/arch/amd64/amd64/enter_uts.S,v 1.4 2003/12/05 01:41:43 peter Exp $"); /* @@ -35,7 +35,7 @@ ENTRY(_amd64_enter_uts) addq %rcx, %rdx /* get stack base */ andq $~0xf, %rdx /* align to 16 bytes */ + subq $8, %rdx /* simulate "call" alignment */ movq %rdx, %rsp /* switch to UTS stack */ movq %rdx, %rbp /* set frame */ - pushq %rsi - ret + jmpq *%rsi ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#10 (text+ko) ==== @@ -38,7 +38,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.53 2003/10/06 04:20:26 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.54 2003/12/04 23:53:54 bmah Exp $ 2000 @@ -198,6 +198,14 @@ is unaffected, for example). More information can be found in security advisory FreeBSD-SA-03:18. + + BIND contains the potential for a + denial-of-service attack. This vulnerability has been addressed + by a vendor patch on the &release.prev; security fix branch and + by the import of a new version to the &release.branch; + development branch. For more information, see + FreeBSD-SA-03:19. + ]]> ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#41 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.203 2003/12/02 07:13:03 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.205 2003/12/05 21:04:51 bmah Exp $ Supported Devices @@ -1004,6 +1004,9 @@ Miscellaneous Networks + Cronyx-Sigma synchronous / asynchronous serial + adapters (&man.cx.4; driver) + Granch SBNI12 point-to-point communications adapters (&man.sbni.4; driver) @@ -1122,6 +1125,7 @@ Serial Interfaces + PC standard 8250, 16450, and 16550-based serial ports (&man.sio.4; driver) Serial ports based on the SAB82532 serial ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#50 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.658 2003/12/01 00:17:33 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.660 2003/12/05 21:34:31 bmah Exp $ 2000 @@ -195,6 +195,11 @@ is no longer needed when only a USB keyboard is connected. &merged; + The &man.cx.4; driver for Cronyx Sigmal + serial interfaces has been overhauled. As a part of this + update, the cxconfig userland configuration utility has been + replaced by a newer &man.sconfig.8; utility. + The DRM kernel modules have been updated from DRI CVS as of 12 November 2003. Among other changes, this change includes a newly-ported SiS 300/305/540/630/730 @@ -343,10 +348,18 @@ to support serial ports on certain architectures, such as ia64 and sparc64. + A new &man.utopia.4; driver supports 25MBit/sec, + 155MBit/sec and 622MBit/sec ATM physical layer configuration, + status and statistics reporting for the most commonly use + ATM-PHY chips. + The suspend/resume support for the &man.wi.4; driver now works correctly when the device is configured down. &merged; + The &man.wi.4; driver should once again work correctly + with Lucent 802.11b interfaces. + The 802.11 support layer has been rewritten to allow for future growth and new features. @@ -365,6 +378,18 @@ Network Protocols + The ip_flow feature in the IPv4 protocol + implementation has been replaced by the + ip_fastforward feature. + ip_fastforward attempts to speed up simple + cases of packet forwarding, processing a forwarded packet to + an outgoing interface without queues or netisrs. If it cannot + handle a particular packet, it passes that packet to the normal + ip_input routines for processing. This + feature can be enabled by setting the + net.inet.ip.fastforwarding sysctl variable + to 1. + The IP_ONESBCAST option has been added to enable undirected &man.ip.4; broadcasts to be sent to specific network interfaces. @@ -557,6 +582,11 @@ + Support for NFSv4 has been added with the import of the + University of Michigan's Citi NFSv4 client implementation. + More information can be found in the &man.mount.nfs4.8; and + &man.idmapd.8; manual pages. + @@ -843,6 +873,15 @@ The supported release of KDE has been updated from 3.1.2 to 3.1.4. &merged; + The versions of GNOME and + KDE included on release disc 1 + (and installable from the &man.sysinstall.8; X + Desktops menu) are now Lite Edition, + packages, rather than the more full-featured meta-packages. + These packages are streamlined to provide users with the core + essentials for each desktop, while still fitting within the + space constraints of release disc 1. + ==== //depot/projects/hammer/rescue/rescue/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/rescue/rescue/Makefile,v 1.22 2003/12/02 21:52:14 brooks Exp $ +#$FreeBSD: src/rescue/rescue/Makefile,v 1.23 2003/12/03 17:12:35 imp Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= rescue @@ -138,7 +138,7 @@ -lgeom -lkiconv -lmd -lreadline -lsbuf -lufs -lz .if ${MACHINE_ARCH} == "i386" -CRUNCH_PROGS_sbin+= cxconfig fdisk +CRUNCH_PROGS_sbin+= sconfig fdisk CRUNCH_ALIAS_bsdlabel= disklabel #CRUNCH_PROGS+= mount_nwfs mount_smbfs #CRUNCH_LIBS+= -lncp -lsmb ==== //depot/projects/hammer/sbin/Makefile#19 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.129 2003/12/02 21:52:14 brooks Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.130 2003/12/03 17:09:41 imp Exp $ # XXX MISSING: icheck ncheck @@ -102,7 +102,7 @@ .endif .if ${MACHINE_ARCH} == "i386" -SUBDIR+=cxconfig +SUBDIR+=sconfig .if ${MACHINE} == "pc98" SUBDIR+=fdisk_pc98 .else ==== //depot/projects/hammer/sbin/init/init.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 7/15/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/init/init.c,v 1.55 2002/12/17 21:23:36 green Exp $"; + "$FreeBSD: src/sbin/init/init.c,v 1.56 2003/12/05 04:28:03 imp Exp $"; #endif /* not lint */ #include @@ -1279,9 +1279,6 @@ int devlen; char *old_getty, *old_window, *old_type; - if (! sessions) - return (state_func_t) multi_user; - /* * mark all sessions for death, (!SE_PRESENT) * as we find or create new ones they'll be marked as keepers, ==== //depot/projects/hammer/sbin/mount/mount.c#8 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount/mount.c,v 1.54 2003/08/07 04:51:41 imp Exp $"; + "$FreeBSD: src/sbin/mount/mount.c,v 1.55 2003/12/05 09:36:56 iedowse Exp $"; #endif /* not lint */ #include @@ -292,8 +292,8 @@ * ':' will be correctly parsed only if the separator is '@'. * The definition of a valid hostname is taken from RFC 1034. */ - if (vfslist == NULL && ((ep = strchr(argv[0], '@')) != NULL) || - ((ep = strchr(argv[0], ':')) != NULL)) { + if (vfslist == NULL && ((ep = strchr(argv[0], '@')) != NULL || + (ep = strchr(argv[0], ':')) != NULL)) { if (*ep == '@') { cp = ep + 1; ep = cp + strlen(cp); @@ -393,8 +393,7 @@ const char *vfstype, *spec, *name, *options, *mntopts; int flags; { - const char *argv[100], **edir; - char *path, *cur; + const char *argv[100]; struct statfs sf; pid_t pid; int argc, i, status; @@ -468,7 +467,8 @@ (void)snprintf(execname, sizeof(execname), "mount_%s", vfstype); execvP(execname, _PATH_SYSPATH, (char * const *)argv); if (errno == ENOENT) { - warn("exec mount_%s not found in %s", vfstype, path); + warn("exec mount_%s not found in %s", vfstype, + _PATH_SYSPATH); } exit(1); /* NOTREACHED */ @@ -531,13 +531,15 @@ if (verbose) { if (sfp->f_syncwrites != 0 || sfp->f_asyncwrites != 0) (void)printf(", writes: sync %ld async %ld", - sfp->f_syncwrites, sfp->f_asyncwrites); + (long)sfp->f_syncwrites, (long)sfp->f_asyncwrites); if (sfp->f_syncreads != 0 || sfp->f_asyncreads != 0) (void)printf(", reads: sync %ld async %ld", - sfp->f_syncreads, sfp->f_asyncreads); - printf(", fsid "); - for (i = 0; i < sizeof(sfp->f_fsid); i++) - printf("%02x", ((u_char *)&sfp->f_fsid)[i]); + (long)sfp->f_syncreads, (long)sfp->f_asyncreads); + if (sfp->f_fsid.val[0] != 0 || sfp->f_fsid.val[1] != 0) { + printf(", fsid "); + for (i = 0; i < sizeof(sfp->f_fsid); i++) + printf("%02x", ((u_char *)&sfp->f_fsid)[i]); + } } (void)printf(")\n"); } ==== //depot/projects/hammer/sbin/sconfig/Makefile#2 (text+ko) ==== @@ -1,11 +1,5 @@ # Cronyx Id: sbin.sconfig.Makefile,v 1.1.4.1 2003/02/17 12:51:24 rik Exp $ -# $FreeBSD: src/sbin/sconfig/Makefile,v 1.1 2003/12/03 07:59:49 imp Exp $ - -PROG= sconfig -MAN= sconfig.8 - -.include -# $Id: sbin.sconfig.Makefile,v 1.1.4.1 2003/02/17 12:51:24 rik Exp $ +# $FreeBSD: src/sbin/sconfig/Makefile,v 1.2 2003/12/03 17:03:20 imp Exp $ PROG= sconfig MAN= sconfig.8 ==== //depot/projects/hammer/sbin/sconfig/sconfig.8#2 (text+ko) ==== @@ -1,458 +1,4 @@ -.\" $FreeBSD: src/sbin/sconfig/sconfig.8,v 1.1 2003/12/03 07:59:49 imp Exp $ -.Dd November 21, 2003 -.Dt SCONFIG 8 -.Os FreeBSD -.Sh NAME -.Nm sconfig -.Nd channel configuration utility for Cronyx adapters -.Sh SYNOPSIS -.Nm -.Op Fl aimsxeftuc -.Op Ar device name -.Op Ar data rate options -.Op Ar protocol options ... -.Op Ar interface options ... -.Sh DESCRIPTION -The -.Nm -utility is used for configuring the channel options of the Cronyx -adapters. In asynchronous mode all the parameters should be set by standard -.Xr stty 1 -utility, with -.Nm -you could set only few of them (see below). -.Pp -Some of the options could be set only on free channels, that is the -corresponding network interface in -.Ar down -state in the synchronous mode, and in the asynchronous mode the asynchronous -terminal device -.Pa /dev/tty* -closed. -.Pp -Other channel options could be changed -.Do on the fly -.Dc . -Generally, the channel options are set up during the operating system startup, -for example from the -.Pa /etc/rc -file. -.Pp -Note, that not all options have a sense for every particular -case, and an attempt to set some of them can hang up the channel or -the whole adapter. -.\"-------------------------------------------------------------- -.Ss "Information options" -You can specify only one of these options. If information option is specified, -sconfig will show corresponding information and will ignore all other options, -except -.Ar device name. -See also description of the -.Ar device name. -.Bl -tag -width 10n -.It -This will show settings of the channel. -.It Fl a -Print all settings of the channel. -.It Fl i -Print interface settings, equal to the output of -.Xr ifconfig 1 -command. -.It Fl m -Print modem signal status. The description of all signals can be found in -any document related to the modems. Only LE signal should be described. If -this signal is On, than some what use channel. If it is Off, than channel is -free. -.It Fl s -Print brief channel statistics. This is general statistics. See also -.Fl x -, -.Fl e -, -.Fl f -, -.Fl t -and -.Fl u -options. For the description of output, see below. -.Pp -This statistics is very useful if something goes wrong. For example, if you -have no any interrupts, than you use interrupt that is not registered in BIOS -for use with ISA bus. -.It Fl x -Print full channel statistics. This options allows to see some more counters, -but with less precision than with -.Pa -s -option. -.It Fl e -Print brief E1/G703 statistics. If you select this option, you will get -statistics accumulated for period of time equal to 15 minutes. For the -description of output, see below. -.It Fl f -Print full E1/G703 statistics. This option shows all E1/G703 statistics that -shows previous option( -.Fl e -), but also total statistics for whole period of time and statistics for 24 -hours (if available). For the description of output, see below. -.It Fl t -Print brief E3/T3/STS-1 statistics. If you select this option, you will -get statistics accumulated for period of time equal to 15 minutes. For -the description of output, see below. -.It Fl u -Print full E3/T3/STS-1 statistics. This option shows all E3/T3/STS-1 -statistics that shows previous option( -.Fl t -), but also total statistics for whole period of time and statistics for 24 -hours (if available). For the description of output, see below. -.It Fl c -Cleans all kind of statistics. -.El -.\"-------------------------------------------------------------- -.Ss "Device selection" -Device is equal to the name of the interface that is used for a name of -the interface that is sees -.Nm ifconfig. -The channel number depends on the order of loading drivers by the system. -Some times people confuse channel number and adapter number because of the -same spelling. Adapter number appears in kernel context, channel number -in configuration context. -.Bl -tag -width 10n -.It -You can omit device name only if you want to get information. This will cause -printing information about all available channels of Cronyx adapters. In the -case you want to make some settings you MUST specify device name. -.It cx## -This is the channel name for the Sigma family of Cronyx adapters. (ISA bus) -.It ct## -This is the channel name for the Tau family of Cronyx adapters. (ISA bus) -.It cp## -This is the channel name for the Tau-PCI family of Cronyx adapters. (PCI bus) -.It ce## -This is the channel name for the Tau32-PCI family of Cronyx adapters. (PCI bus) -.El -.\"-------------------------------------------------------------- -.Ss "Data rate options" -.Bl -tag -width 10n -.It value -If case of nonzero value it will cause setting data rate to given value and -setting the internal clock source of the synchronization (in synchronous mode). -Zero value is equal to the -.Ar extclock. -The transmitted data (TXD) are synchronized using the internal on-board timing -generator, the internally generated timing signal is driven on the TXCOUT pin, -and the signal on the TXCIN pin is ignored. This mode is used for direct -terminal-to-terminal communication, e.g. for connecting two computers together -in a synchronous mode via relatively short cable. This method should also be -used for testing channels with an external loopback connector. -.It extclock -Set the external timing clock source of synchronous channels. External clock -mode is the most common method for connecting external modem hardware. In this -mode the external timing signal is received on TXCIN pin of the connector, -and it is used as a synchronization clock for transmitting data (TXD). -.El -.\"-------------------------------------------------------------- -.Ss "Protocol options" -Note. These option could be set only if channel is free and they requires -specifying of the device name. -.Bl -tag -width 10n -.It async -Set asynchronous protocol (or mode). In this mode Cronyx adapters behave as a -usual serial devices and you may work with them using usual serial utilities. -All asynchronous settings are performed via serial configuration utilities. With -.Nm sconfig -you may set only a few of them. See also -.Xr stty 1 . -(Only for Sigma family) -.It cisco -Set the Cisco HDLC synchronous protocol. -.It fr -Set the Frame Relay synchronous protocol (ANSI T1.617 Annex D). -.It ppp -Set the PPP synchronous protocol. Parameters to the PPP could be set by the -command -.Xr spppcontrol 1 . -.It keepalive=on, keepalive=off -Turns on/off sending keepalive messages. This option is used only for -synchronous PPP. If this option is on, than PPP will periodically send -echo-request messages. If it would not receive any echo-reply messages for -some (definite) period of time it will break connection. It is used for -tracking line state. -.It idle -You are using NETGRAPH. Protocol depends on connected module. -.El -.\"-------------------------------------------------------------- -.Ss "Interface options" -Not all of these options could be set on running channel and not all of them -are suits to all kind of adapters/channels. In all dual state options off is -default value. All this options is not applicable in asynchronous mode, except -debug option. -.Bl -tag -width 10n -.It port=rs232, port=v35, port=rs449 -Set port type for old Sigma models. -.It cfg=A, cfg=B, cfg=C -Set configuration for the adapter. This option could be set only for Tau/E1 -and Tau/G703 and only if all channels are not running. -.Ar cfg=A -- Two independent E1/G703 channels. This is default setting. -.Ar cfg=B (Only for ISA models) -- For Tau/G703 this mean one G703 channel and one digital channel. -For Tau/E1 first physical channel divides on to subchannels. One of them -goes to the first logical channel and another one goes to the second physical -channel. Second (logical) channel is digital channel. -.Ar cfg=C -- This configuration is used only for E1 models. In this case first -physical channel consists of three data flows. Two of them go to two -(logical) channels. The last one goes to the second physical channel. On new -models (Tau32-PCI, Tau-PCI/2E1 and Tau-PCI/4E1) this configuration means single source -of synchronization and passing all unused (in both channels) timeslots from -one channel to other. For the detailed description of the configuration see -your documentation to the adapter. This option could not be set on running -channel. -.It loop=on, loop=off -Turn on/off internal loopback. This mode is useful for testing. Switch on this -option and try to send something. If you have no any interrupt, than, probably, -you forgot to switch using IRQ for PCI to ISA bus. Check your BIOS settings. -.It rloop=on, rloop=off (Only for Tau32-PCI and Tau-PCI/E3) -Turn on/off remote loopback. This mode is also useful for testing. -.It dpll=on, dpll=off -Turn on/off digital phase locked loop mode (DPLL). When enabled, the receiver -timing clock signal is derived from the received data. Must be used with NRZI -encoding, to avoid the synchronization loss. -.It nrzi=on, nrzi=off -Turn on/off nrzi encoding. In off state nrz encoding is used. NRZ - the zero -bit is transmitted by the zero signal level, the one bit - by the positive -signal level. NRZI - the bit number zero is transmitted by the change of the -signal level, the one bit - by the constant signal level. Commonly is used with -dpll=on option. -.It invclk=on, invclk=off -Invert the both transmit and receive clock signals (Tau and Tau-PCI only). -.It invrclk=on, invrclk=off -Invert the receive clock signals (Tau-PCI only). -.It invtclk=on, invtclk=off -Invert the transmit clock signals (Tau-PCI only). -.It higain=on, higain=off -Turn on/off increasing the E1 receiver non linear sensitivity to -30 dB (E1 -only). In of state the sensitivity is -12 dB. This allows increasing line -distance. -.It cablen=on, cablen=off (Only for Tau-PCI/T3 and Tau-PCI/STS-1) -Turn on/off adjusting transmit signal for long cable T3/STS-1. -.It monitor=on, monitor=off -Turn on/off increasing the E1 receiver lines sensitivity to -30 dB -(Tau32-PCI, Tau-PCI/2E1 and Tau-PCI/4E1 only). This could be used for interception -purposes. -.It phony=on, phony=off -Turn on/off the so-called phony mode (Tau32-PCI and Tau-PCI E1 family only). This mode allows -receiving raw CEPT frames from E1 line. Raw frames could be accessed, for -example, via raw protocol. Packets would come at rate of 500 frames per second -with length 16xN (for Tau-PCI/E1 model), where N is the number of timeslots. For -Tau-PCI/2E1 and Tau-PCI/4E1 N should be equal to 32 independently from number of -used timeslots. -.It unfram=on, unfram=off -Turn on/off unframed mode (Tau32-PCI, Tau-PCI/2E1 and Tau-PCI/4E1 only). -.Ar unfram=on -switches channel to unframed G.703 mode. -.Ar unfram=off -switches channel to framed E1 (G.704 mode). -.It scrambler=on, scrambler=off -Turn on/off the scrambling of G.703 data (Tau32-PCI, Tau-PCI/G.703 and Tau-PCI/2E1, -Tau-PCI/4E1 in unframed mode only). -.It use16=on, use16=off -Turn on/off the usage of 16-th timeslot for data transmission (Tau32-PCI and Tau-PCI E1 family only). -Normally 16-th timeslot is used for signaling information (multiframing CAS). -.It crc4=on, crc4=off -Turn on/off CRC4 superframe mode (E1 only). -.It syn=int, syn=rcv, syn=rcv0, syn=rcv1, syn=rcv2, sync=rcv3 -.Ar int -- use an internal clock generator for G703 transmitter -(clock master). -.Ar rcv -- use the G703 receiver data clock as the transmit clock -(clock slave). -.Ar rcv0, rcv1, rcv2, rcv3 -- use the G703 receiver clock of the other channel -(E1 models only). -.It dir= -Binds logical channel to the physical channel (Tau32-PCI, Tau-PCI/2E1 and Tau-PCI/4E1 -only). Using this parameter you could, for example, split E1 physical channel -into several channels. -.It ts=interval -Set up the list of timeslots to use by the channel (E1 only). The -timeslots are numbered from 1 to 31, and are separated by comma or minus sign, -giving an interval. For example: "ts=1-3,5,17". -.It pass=interval -Set up the list of timeslots, translated to the E1 subchannel in cfg=B and -cfg=C configurations (Tau/E1 only). -.It debug=0, debug=1, debug=2 -Turn on/off debug messages. -.Ar 0 -- turn off debug messages. -.Ar 1 -- turn on debug -messages, equal to the -.Ar debug -option to the -.Xr ifconfig 8 -utility. -.Ar 2 -- high intensive debug message, developers only. -.El -.\"-------------------------------------------------------------- -.Sh EXAMPLES -Set up the channel 1 for use with the HDSL modem or any other -synchronous leased-line modem, and PPP/HDLC protocol (for Sigma): -.Bd -literal -offset indent -sconfig cx1 ppp extclock -ifconfig cx1 158.250.244.2 158.250.244.1 up -.Ed -.Pp -Set up the channel 0 of Tau/E1 for use with the Cisco protocol -over E1 link, with the single virtual connection. -The DLCI number is detected automatically. -Use timeslots 1-10: -.Bd -literal -offset indent -sconfig ct0 cisco ts=1-10 -ifconfig ct0 158.250.244.2 158.250.244.1 up -.Ed -.Pp -Set up the channel 0 for the synchronous null-modem link to the nearby computer, -internal clock source, 256000 bits/sec, protocol Cisco/HDLC (for Tau): -.Bd -literal -offset indent -sconfig ct0 cisco 256000 -ifconfig ct0 200.1.1.1 200.1.1.2 up -.Ed -.Pp -Set up the channel 1 for the leased line link using data-only -null-modem cable (or modems like Zelax+ M115). Synchronous DPLL mode, 128000 -bits/sec, protocol PPP/HDLC, NRZI encoding (for Sigma): -.Bd -literal -offset indent -sconfig cx1 ppp 128000 nrzi=on dpll=on -ifconfig cx1 158.250.244.2 158.250.244.1 up -.Ed -.\"-------------------------------------------------------------- -.Sh DIAGNOSTICS -This section contains description of abbreviations used by -.Nm sconfig -while displaying various statistics. For description of options connected with -statistics see above. -.\"-------------------------------------------------------------- -.Ss Statistics -When running, the driver gathers the statistics about the channels, which -could be accessed via sconfig utility or by -.Xr ioctl 2 -call -.Ar SERIAL_GETSTAT. -.Bl -tag -width 10n -.It Rintr -The total number of receive interrupts. -.It Tintr -The total number of transmit interrupts. -.It Mintr -The total number of modem interrupts. -.It Ibytes -The total bytes received. -.It Ipkts -The total packets received (for HDLC mode). -.It Ierrs -The number of receive errors. -.It Obytes -The total bytes transmitted. -.It Opkts -The total packets transmitted (for HDLC mode). -.It Oerrs The number of transmit errors. -.El -.\"-------------------------------------------------------------- -.Ss E1/G.703 Statistics -For E1 and G.703 channels the SNMP-compatible statistics data are gathered -(see RFC 1406). It could be accessed via sconfig utility or by ioctl(2) call -.Ar SERIAL_GETESTAT . -.Bl -tag -width 10n -.It Unav (uas) -Unavailable seconds - receiving all ones, or loss of carrier, or loss of -signal. -.It Degr (dm) -Degraded minutes - having error rate more than 10e-6, not counting unavailable -and severely errored seconds. -.It Bpv (bpv) -HDB3 bipolar violation errors. -.It Fsyn (fse) -Frame synchronization errors (E1 only). -.It CRC (crce) -CRC4 errors (E1). -.It RCRC (rcrce) -Remote CRC4 errors: E-bit counter (E1). -.It Err (es) -Errored seconds - any framing errors, or out of frame sync, or any slip events. -.It Lerr (les) -Line errored seconds - any BPV. -.It Sev (ses) -Severely errored seconds - 832 or more framing errors, or 2048 or more bipolar -violations. -.It Bur (bes) -Bursty errored seconds - more than 1 framing error, but not severely errored. -.It Oof (oofs) -Severely errored framing seconds - out of frame sync. -.It Slp (css) -Controlled slip second -- any slip buffer overflow or underflow. -.El -.\"-------------------------------------------------------------- -.Ss E1/G.703 Status -.Nm sconfig -utility also prints the E1/G.703 channel status. The status could have the -following values (nonexclusive): -.Bl -tag -width 10n -.It Ok -The channel is in valid state, synchronized. -.It LOS -Loss of sync. -.It AIS -Receiving unframed all ones (E1 only). -.It LOF -Loss of framing (E1 only). -.It LOMF -Loss of multiframing (E1 only). -.It FARLOF -Receiving remote alarm (E1 only). -.It AIS16 -Receiving all ones in timeslot 16 (E1 only). -.It FARLOMF -Receiving distant multiframe alarm (E1 only). -.It TSTREQ -Receiving test request code (G.703 only). -.It TSTERR -Test error (G.703 only). -.El -.\"-------------------------------------------------------------- -.Sh SEE ALSO -.Xr stty 1 -.Xr ioctl 2 -.Xr sppp 4 -.Xr spppconrol 8 -.Xr ifconfig 8 -.Xr route 8 -.\"-------------------------------------------------------------- -.Sh HISTORY -This utility is a replacement of utilities -.Nm cxconfig -and -.Nm ctconfig -that was used in past with FreeBSD drivers. Those two utilities and the present -utility are not compatible. And therefore all scripts should be rewritten. More -over, Linux and FreeBSD version of present utility not fully compatible. -.\"-------------------------------------------------------------- -.Sh BUGS -All software produced by Cronyx Engineering is thoroughly tested. But -as created by the man it can contain some -.So -BUGS -.Sc . -If you have caught one, try to localize it and send a letter with description -of this bug and all operation that you have done. We will try to reproduce -an error and fix it. -.\"-------------------------------------------------------------- -.Sh CONTACT -E-mail: info@cronyx.ru -.Pp -http://www.cronyx.ru +.\" $FreeBSD: src/sbin/sconfig/sconfig.8,v 1.2 2003/12/03 17:03:20 imp Exp $ .Dd November 21, 2003 .Dt SCONFIG 8 .Os FreeBSD ==== //depot/projects/hammer/sbin/sconfig/sconfig.c#2 (text+ko) ==== @@ -15,1144 +15,7 @@ * all derivative works or modified versions. * * Cronyx Id: sconfig.c,v 1.2.2.4 2003/06/20 16:20:48 rik Exp $ - * $FreeBSD: src/sbin/sconfig/sconfig.c,v 1.1 2003/12/03 07:59:49 imp Exp $ - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define MAXCHAN 128 - -int vflag, eflag, sflag, mflag, cflag, fflag, iflag, aflag, xflag; -int tflag, uflag; -char mask[48]; -int adapter_type; /* 0-sigma, 1-tau, 2-tau */ -char chan_name[16]; - -extern char *optarg; -extern int optind; - -static void -usage (void) -{ - printf( -"Serial Adapter Configuration Utility\n" -"Copyright (C) 1998-1999 Cronyx Engineering Ltd.\n" -"See also man sconfig (8)\n" -"Usage:\n" -"\tsconfig [-aimsxeftuc] [device [parameters ...]]\n" -"\n" -"Options:\n" -"\t\t\t -- print channel options\n" -"\t-a\t\t\t -- print all settings of the channel\n" -"\t-i\t\t\t -- print network interface status\n" -"\t-m\t\t\t -- print modem signal status\n" -"\t-s\t\t\t -- print channel statistics\n" -"\t-x\t\t\t -- print extended channel statistics\n" -"\t-e\t\t\t -- print short E1/G703 statistics\n" -"\t-f\t\t\t -- print full E1/G703 statistics\n" -"\t-t\t\t\t -- print short E3/T3/STS-1 statistics\n" -"\t-u\t\t\t -- print full E3/T3/STS-1 statistics\n" -"\t-c\t\t\t -- clear statistics\n" -"\nParameters:\n" -"\t\t\t -- baud rate, internal clock\n" -"\textclock\t\t -- external clock (default)\n" -"\nProtocol options:\n" -"\tasync\t\t\t -- asynchronous protocol\n" -#ifdef __linux__ -"\tsync\t\t\t -- synchronous protocol\n" -#endif -"\tcisco\t\t\t -- Cisco/HDLC protocol\n" -"\tfr\t\t\t -- Frame Relay protocol\n" -#ifdef __linux__ -"\t dlci\t -- Add new DLCI\n" -#endif -"\tppp\t\t\t -- PPP protocol\n" -#ifdef __linux__ -"\trbrg\t\t\t -- Remote bridge\n" -"\traw\t\t\t -- raw HDLC protocol\n" -"\tpacket\t\t\t -- packetized HDLC protocol\n" -"\tidle\t\t\t -- no protocol\n" -#else -"\t keepalive={on,of}\t -- Enable/disable keepalive\n" -#endif -"\nInterface options:\n" -"\tport={rs232,v35,rs449}\t -- port type (for old models of Sigma)\n" -"\tcfg={A,B,C}\t\t -- adapter configuration\n" -"\tloop={on,off}\t\t -- internal loopback\n" -"\trloop={on,off}\t\t -- remote loopback\n" -"\tdpll={on,off}\t\t -- DPLL mode\n" -"\tnrzi={on,off}\t\t -- NRZI encoding\n" -"\tinvclk={on,off}\t\t -- invert receive and transmit clock\n" -"\tinvrclk={on,off}\t -- invert receive clock\n" -"\tinvtclk={on,off}\t -- invert transmit clock\n" -"\thigain={on,off}\t\t -- E1 high non linear input sensitivity \n\t\t\t\t (long line)\n" -"\tmonitor={on,off}\t -- E1 high linear input sensitivity \n\t\t\t\t (interception mode)\n" -"\tphony={on,off}\t\t -- E1 telepnony mode\n" -"\tunfram={on,off}\t\t -- E1 unframed mode\n" -"\tscrambler={on,off}\t -- G.703 scrambling mode\n" -"\tuse16={on,off}\t\t -- E1 timeslot 16 usage\n" -"\tcrc4={on,off}\t\t -- E1 CRC4 mode\n" -"\tsyn={int,rcv,rcvX}\t -- G.703 transmit clock\n" -"\tts=...\t\t\t -- E1 timeslots\n" -"\tpass=...\t\t -- E1 subchannel timeslots\n" -"\tdir=\t\t -- connect channel to link\n" -/*"\tcablen={on,off}\t\t -- T3/STS-1 high transmitter output for long cable\n"*/ -"\tdebug={0,1,2}\t\t -- enable/disable debug messages\n" - ); - exit (0); -} - -static unsigned long -scan_timeslots (char *s) -{ - char *e; - long v; - int i; - unsigned long ts, lastv; - - ts = lastv = 0; - for (;;) { - v = strtol (s, &e, 10); - if (e == s) - break; - if (*e == '-') { - lastv = v; - s = e+1; - continue; - } - if (*e == ',') - ++e; - - if (lastv) - for (i=lastv; i>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 5 14:23:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FD1F16A4D0; Fri, 5 Dec 2003 14:23:04 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 43CC816A4CE for ; Fri, 5 Dec 2003 14:23:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B1CF43FDF for ; Fri, 5 Dec 2003 14:23:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB5MN3XJ060981 for ; Fri, 5 Dec 2003 14:23:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB5MN2uC060978 for perforce@freebsd.org; Fri, 5 Dec 2003 14:23:02 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 5 Dec 2003 14:23:02 -0800 (PST) Message-Id: <200312052223.hB5MN2uC060978@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 43467 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Dec 2003 22:23:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=43467 Change 43467 by peter@peter_daintree on 2003/12/05 14:22:30 Integ -b i386_hammer -I. This catches up with jhb's changes. One change isn't relevant because there is no way to compile out the apic code on amd64, so we dont need the apic stubs. Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#23 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#26 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#74 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#18 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#27 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#23 (text+ko) ==== @@ -190,7 +190,7 @@ XSDT_DESCRIPTOR *xsdt; int i, count; - if (resource_disabled("acpi", 0) || resource_disabled("apic", 0)) + if (resource_disabled("acpi", 0)) return (ENXIO); /* @@ -351,8 +351,7 @@ apic_register_enumerator(&madt_enumerator); } -SYSINIT(madt_register, SI_SUB_TUNABLES - 1, SI_ORDER_FIRST, - madt_register, NULL) +SYSINIT(madt_register, SI_SUB_CPU - 1, SI_ORDER_FIRST, madt_register, NULL) /* * Call the handler routine for each entry in the MADT table. @@ -644,7 +643,7 @@ if (madt == NULL) return; - for (i = 0; i < MAXCPU; i++) { + for (i = 0; i <= mp_maxid; i++) { if (CPU_ABSENT(i)) continue; pc = pcpu_find(i); ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#26 (text+ko) ==== @@ -542,9 +542,8 @@ } /* - * We have to look for CPU's very, very early because certain subsystems - * want to know how many CPU's we have extremely early on in the boot - * process. + * Probe the APIC enumerators, enumerate CPUs, and initialize the + * local APIC. */ static void apic_init(void *dummy __unused) @@ -556,6 +555,10 @@ if (!(cpu_feature & CPUID_APIC)) return; + /* Don't probe if APIC mode is disabled. */ + if (resource_disabled("apic", 0)) + return; + /* First, probe all the enumerators to find the best match. */ best_enum = NULL; best = 0; @@ -583,26 +586,14 @@ if (retval != 0) printf("%s: Failed to probe CPUs: returned %d\n", best_enum->apic_name, retval); -} -SYSINIT(apic_init, SI_SUB_TUNABLES - 1, SI_ORDER_SECOND, apic_init, NULL) -/* - * Setup the local APIC. We have to do this prior to starting up the APs - * in the SMP case. - */ -static void -apic_setup_local(void *dummy __unused) -{ - int retval; - - if (best_enum == NULL) - return; + /* Third, initialize the local APIC. */ retval = best_enum->apic_setup_local(); if (retval != 0) printf("%s: Failed to setup the local APIC: returned %d\n", best_enum->apic_name, retval); } -SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL) +SYSINIT(apic_init, SI_SUB_CPU, SI_ORDER_FIRST, apic_init, NULL) /* * Setup the I/O APICs. ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#74 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#18 (text+ko) ==== @@ -370,8 +370,8 @@ apic_register_enumerator(&mptable_enumerator); } -SYSINIT(mptable_register, SI_SUB_TUNABLES - 1, SI_ORDER_FIRST, - mptable_register, NULL) +SYSINIT(mptable_register, SI_SUB_CPU - 1, SI_ORDER_FIRST, mptable_register, + NULL) /* * Call the handler routine for each entry in the MP config table. ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#27 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Dec 5 15:36:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED8B616A4D0; Fri, 5 Dec 2003 15:36:47 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A8A8316A4CE for ; Fri, 5 Dec 2003 15:36:47 -0800 (PST) Received: from rootlabs.com (root.org [67.118.192.226]) by mx1.FreeBSD.org (Postfix) with SMTP id C45F843FDD for ; Fri, 5 Dec 2003 15:36:45 -0800 (PST) (envelope-from nate@rootlabs.com) Received: (qmail 27859 invoked by uid 1000); 5 Dec 2003 23:36:47 -0000 Date: Fri, 5 Dec 2003 15:36:47 -0800 (PST) From: Nate Lawson To: John Baldwin In-Reply-To: <200312052059.hB5KxJAe055855@repoman.freebsd.org> Message-ID: <20031205152304.D27817@root.org> References: <200312052059.hB5KxJAe055855@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Perforce Change Reviews Subject: Re: PERFORCE change 43464 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Dec 2003 23:36:48 -0000 On Fri, 5 Dec 2003, John Baldwin wrote: > Change 43464 by jhb@jhb_blue on 2003/12/05 12:59:01 > > More updates. Closer to working than I thought. In theory > PCI devices should all just work now. This handles PCI. Are you ok with me adding the call to acpi_pwr_switch_consumer() for non-PCI devices like the embedded controller? I think we need to do this at the top \\_SB level. I'm a bit confused as to the handoff between the general tree walk and the ACPI-PCI driver though. -Nate From owner-p4-projects@FreeBSD.ORG Sat Dec 6 13:42:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C85B316A4D0; Sat, 6 Dec 2003 13:42:36 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3E3816A4CE for ; Sat, 6 Dec 2003 13:42:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CD4343FEA for ; Sat, 6 Dec 2003 13:42:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB6LgTXJ068986 for ; Sat, 6 Dec 2003 13:42:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB6LgSJK068983 for perforce@freebsd.org; Sat, 6 Dec 2003 13:42:28 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 6 Dec 2003 13:42:28 -0800 (PST) Message-Id: <200312062142.hB6LgSJK068983@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 43502 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Dec 2003 21:42:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=43502 Change 43502 by peter@peter_daintree on 2003/12/06 13:41:59 IFC @43501 Affected files ... .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#42 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#7 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#14 integrate .. //depot/projects/hammer/share/man/man4/dc.4#8 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#17 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#28 integrate .. //depot/projects/hammer/sys/pci/if_dcreg.h#13 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#14 integrate Differences ... ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#42 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.205 2003/12/05 21:04:51 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.206 2003/12/06 20:43:48 bmah Exp $ Supported Devices @@ -274,16 +274,6 @@ C, S, and A Series Host Adapters (&man.bt.4; driver) - - BusLogic/Mylex Flashpoint adapters are not yet - supported. - - - - AMI FastDisk controllers that are true BusLogic - MultiMaster clones are also supported. - - The Buslogic/Bustek BT-640 and Storage Dimensions SDC3211B and SDC3211F Microchannel (MCA) bus adapters are @@ -336,11 +326,6 @@ Mylex AcceleRAID/eXtremeRAID family PCI to SCSI RAID controllers with 6.x firmware (&man.mly.4; driver) - - - Compatible Mylex controllers not listed should work, but - have not been verified. - 3ware Escalade ATA RAID controllers (&man.twe.4; driver) @@ -793,7 +778,7 @@ (&man.ste.4; driver) - SysKonnect SK-984x PCI Gigabit Ethernet cards (&man.sk.4; drivers) + SysKonnect SK-984x PCI Gigabit Ethernet cards (&man.sk.4; driver) Texas Instruments ThunderLAN PCI NICs (&man.tl.4; driver) @@ -919,16 +904,6 @@ drivers), plus NICs supported by the Intel 82540EM, 82544, 82545EM, and 82546EB controller chips (&man.em.4; driver only) - - - Intel PRO/1000 Gigabit Ethernet - - - - - The &man.em.4; driver is officially supported by Intel, - but is only supported on the i386. - Sun HME and QFE Ethernet NICs (&man.hme.4; driver) @@ -1173,14 +1148,6 @@ STB 4 port card using shared IRQ DigiBoard intelligent serial cards (&man.dgb.4; driver) - - - DigiBoard PC/Xe series - - - DigiBoard PC/Xi series - - PCI-Based multi-port serial boards (&man.puc.4; @@ -1271,23 +1238,7 @@ Stallion Technologies multiport serial boards - - - EasyIO (&man.stl.4; driver) - - - EasyConnection 8/32 (&man.stl.4; driver) - - - EasyConnection 8/64 (&man.stli.4; driver) - - - ONboard 4/16 (&man.stli.4; driver) - - - Brumby (&man.stli.4; driver) - - + (&man.stl.4; and &man.stli.4; drivers) Specialix SI/XIO/SX multiport serial cards, with both the @@ -1807,44 +1758,7 @@ - Audio Devices (uaudio driver) - - - Audio-Technica USB Digital Headphone ATC-HA4USB - - - - Ergo Systems AUDIOTRAK OPTOPlay USB - - - - KENWOOD MD Personal Stereo System MDX-G7 - - - - KENWOOD/SOTEC VH-7PC - - - - I-O DATA Analog to Digital USB Audio Adapter DAVOX - - - - ONKYO PC Speaker GX-R5U(W) - - - - ONKYO USB Digital Audio Processor SE-U55X(S) - - - - Roland UA-5 USB Audio Interface Audio Capture - - - - Sony PC Active Speaker System SRS-T100PC - - + Audio Devices (&man.uaudio.4; driver) Handspring Visor and other PalmOS ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#7 (text+ko) ==== @@ -1,5 +1,5 @@ Supported Processors and Motherboards @@ -42,8 +42,9 @@ additional physical processors; in other words, no attempt is made to optimize scheduling decisions given the shared resources between logical processors within the same CPU. Because this - naive scheduling can result in suboptimal performance, the logical - CPUs are halted by default at startup. They can be enabled with + naive scheduling can result in suboptimal performance, under + certain circumstances it may be useful to disable the logical + processors with the the machdep.hlt_logical_cpus sysctl variable. It is also possible to halt any CPU in the idle loop with the machdep.hlt_cpus sysctl variable. The ==== //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#14 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.51 2003/12/02 20:47:31 marcus Exp $ +# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.52 2003/12/06 04:15:13 scottl Exp $ # # MAINTAINER: re # @@ -79,7 +79,6 @@ CDROM_SET_1="${CDROM_SET_1} mail/exim" CDROM_SET_1="${CDROM_SET_1} mail/postfix" CDROM_SET_1="${CDROM_SET_1} net/pcnfsd" -CDROM_SET_1="${CDROM_SET_1} net/rsync" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-font100dpi" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-font75dpi" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-fontCyrillic" @@ -110,13 +109,10 @@ CDROM_SET_1="${CDROM_SET_1} astro/xearth" CDROM_SET_1="${CDROM_SET_1} editors/emacs21" CDROM_SET_1="${CDROM_SET_1} editors/vim" +CDROM_SET_1="${CDROM_SET_1} editors/vim-lite" CDROM_SET_1="${CDROM_SET_1} emulators/mtools" -CDROM_SET_1="${CDROM_SET_1} ftp/ncftp" -CDROM_SET_1="${CDROM_SET_1} graphics/gimp1" -CDROM_SET_1="${CDROM_SET_1} graphics/xpdf" CDROM_SET_1="${CDROM_SET_1} graphics/xv" CDROM_SET_1="${CDROM_SET_1} irc/xchat2" -CDROM_SET_1="${CDROM_SET_1} mail/exim" CDROM_SET_1="${CDROM_SET_1} mail/fetchmail" CDROM_SET_1="${CDROM_SET_1} mail/mutt" CDROM_SET_1="${CDROM_SET_1} mail/pine4" @@ -125,6 +121,7 @@ CDROM_SET_1="${CDROM_SET_1} misc/bsdiff" CDROM_SET_1="${CDROM_SET_1} misc/screen" CDROM_SET_1="${CDROM_SET_1} net/cvsup" +CDROM_SET_1="${CDROM_SET_1} net/rsync" CDROM_SET_1="${CDROM_SET_1} net/samba" CDROM_SET_1="${CDROM_SET_1} news/slrn" CDROM_SET_1="${CDROM_SET_1} news/tin" @@ -137,7 +134,6 @@ fi CDROM_SET_1="${CDROM_SET_1} print/apsfilter" CDROM_SET_1="${CDROM_SET_1} print/ghostscript-gnu-nox11" -CDROM_SET_1="${CDROM_SET_1} print/ghostview" CDROM_SET_1="${CDROM_SET_1} print/gv" CDROM_SET_1="${CDROM_SET_1} print/psutils-letter" CDROM_SET_1="${CDROM_SET_1} security/sudo" @@ -147,10 +143,6 @@ CDROM_SET_1="${CDROM_SET_1} shells/zsh" CDROM_SET_1="${CDROM_SET_1} sysutils/portupgrade" CDROM_SET_1="${CDROM_SET_1} www/lynx" -CDROM_SET_1="${CDROM_SET_1} www/mozilla" -CDROM_SET_1="${CDROM_SET_1} www/netscape-remote" -CDROM_SET_1="${CDROM_SET_1} www/netscape-wrapper" -CDROM_SET_1="${CDROM_SET_1} www/netscape48-communicator" CDROM_SET_1="${CDROM_SET_1} www/opera" CDROM_SET_1="${CDROM_SET_1} x11/rxvt" ==== //depot/projects/hammer/share/man/man4/dc.4#8 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/dc.4,v 1.24 2003/11/13 17:01:08 simon Exp $ +.\" $FreeBSD: src/share/man/man4/dc.4,v 1.25 2003/12/06 02:29:31 sanpei Exp $ .\" .Dd November 20, 1999 .Dt DC 4 @@ -133,6 +133,8 @@ .It Digital DE500-BA 10/100 (21143, non-MII) .It +ELECOM Laneed LD-CBL/TXA (ADMtek AN985) +.It Hawking CB102 CardBus .It IBM EtherJet Cardbus Adapter ==== //depot/projects/hammer/sys/netinet/ip_dummynet.c#17 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.74 2003/11/23 18:13:41 sam Exp $ + * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.75 2003/12/06 09:01:25 emax Exp $ */ #define DUMMYNET_DEBUG @@ -1386,7 +1386,6 @@ heap_free(&ready_heap); heap_free(&wfq_ready_heap); heap_free(&extract_heap); - DUMMYNET_UNLOCK(); /* * Now purge all queued pkts and delete all pipes @@ -1403,6 +1402,7 @@ p = p->next ; free(curr_p, M_DUMMYNET); } + DUMMYNET_UNLOCK(); } ==== //depot/projects/hammer/sys/pci/if_dc.c#28 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_dc.c,v 1.136 2003/11/28 05:28:29 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_dc.c,v 1.137 2003/12/06 02:29:31 sanpei Exp $"); /* * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 @@ -196,6 +196,8 @@ "Xircom X3201 10/100BaseTX" }, { DC_VENDORID_ABOCOM, DC_DEVICEID_FE2500, "Abocom FE2500 10/100BaseTX" }, + { DC_VENDORID_ABOCOM, DC_DEVICEID_FE2500MX, + "Abocom FE2500MX 10/100BaseTX" }, { DC_VENDORID_CONEXANT, DC_DEVICEID_RS7112, "Conexant LANfinity MiniPCI 10/100BaseTX" }, { DC_VENDORID_HAWKING, DC_DEVICEID_HAWKING_PN672TX, ==== //depot/projects/hammer/sys/pci/if_dcreg.h#13 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_dcreg.h,v 1.39 2003/11/14 19:00:31 sam Exp $ + * $FreeBSD: src/sys/pci/if_dcreg.h,v 1.40 2003/12/06 02:29:31 sanpei Exp $ */ /* @@ -953,6 +953,7 @@ * Abocom device IDs. */ #define DC_DEVICEID_FE2500 0xAB02 +#define DC_DEVICEID_FE2500MX 0xab08 /* * Conexant vendor ID. ==== //depot/projects/hammer/sys/vm/vm_mmap.c#14 (text+ko) ==== @@ -45,7 +45,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.173 2003/11/14 08:22:38 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.174 2003/12/06 05:45:32 alc Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -433,7 +433,6 @@ goto done; } - mtx_unlock(&Giant); error = 0; #ifdef MAC if (handle != NULL && (flags & MAP_SHARED) != 0) { @@ -441,6 +440,11 @@ (struct vnode *)handle, prot); } #endif + if (vp != NULL) { + vput(vp); + vp = NULL; + } + mtx_unlock(&Giant); if (error == 0) error = vm_mmap(&vms->vm_map, &addr, size, prot, maxprot, flags, handle, pos); @@ -1164,7 +1168,7 @@ objtype_t type; int rv = KERN_SUCCESS; vm_ooffset_t objsize; - int docow; + int docow, error; struct thread *td = curthread; if (size == 0) @@ -1211,16 +1215,20 @@ } else { vp = (struct vnode *) handle; mtx_lock(&Giant); - ASSERT_VOP_LOCKED(vp, "vm_mmap"); + error = vget(vp, LK_EXCLUSIVE, td); + if (error) { + mtx_unlock(&Giant); + return (error); + } if (vp->v_type == VCHR) { type = OBJT_DEVICE; handle = vp->v_rdev; } else { struct vattr vat; - int error; error = VOP_GETATTR(vp, &vat, td->td_ucred, td); if (error) { + vput(vp); mtx_unlock(&Giant); return (error); } @@ -1234,6 +1242,7 @@ flags |= MAP_NOSYNC; } } + vput(vp); mtx_unlock(&Giant); } From owner-p4-projects@FreeBSD.ORG Sat Dec 6 14:47:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF65E16A4D0; Sat, 6 Dec 2003 14:47:56 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8AC1016A4CE for ; Sat, 6 Dec 2003 14:47:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3FF343FB1 for ; Sat, 6 Dec 2003 14:47:50 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB6MloXJ072525 for ; Sat, 6 Dec 2003 14:47:50 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB6Mln9u072522 for perforce@freebsd.org; Sat, 6 Dec 2003 14:47:49 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sat, 6 Dec 2003 14:47:49 -0800 (PST) Message-Id: <200312062247.hB6Mln9u072522@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 43505 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Dec 2003 22:47:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=43505 Change 43505 by marcel@marcel_nfs on 2003/12/06 14:47:03 IFC @43504 Affected files ... .. //depot/projects/ia64/lib/libc/amd64/gen/makecontext.c#2 integrate .. //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/enter_uts.S#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#29 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#73 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#9 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#133 integrate .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#31 integrate .. //depot/projects/ia64/sbin/init/init.c#6 integrate .. //depot/projects/ia64/sbin/mount/mount.c#12 integrate .. //depot/projects/ia64/sbin/umount/umount.c#10 integrate .. //depot/projects/ia64/share/man/man4/dc.4#7 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/cx.4#4 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC.hints#4 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cam.c#21 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/channel.c#15 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#49 integrate .. //depot/projects/ia64/sys/i386/include/cronyx.h#2 delete .. //depot/projects/ia64/sys/kern/kern_prot.c#32 integrate .. //depot/projects/ia64/sys/modules/acpi/Makefile#17 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#26 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#53 integrate .. //depot/projects/ia64/sys/pci/if_dcreg.h#19 integrate .. //depot/projects/ia64/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#24 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#17 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#24 integrate .. //depot/projects/ia64/sys/security/mac_partition/mac_partition.c#7 integrate .. //depot/projects/ia64/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/ia64/sys/security/mac_test/mac_test.c#16 integrate .. //depot/projects/ia64/sys/sys/mac.h#23 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#19 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#28 integrate .. //depot/projects/ia64/tools/tools/tinderbox/etc/releng_5.rc#2 integrate Differences ... ==== //depot/projects/ia64/lib/libc/amd64/gen/makecontext.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/makecontext.c,v 1.1 2003/07/19 04:41:08 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/makecontext.c,v 1.2 2003/12/05 01:36:44 peter Exp $"); #include #include @@ -70,8 +70,12 @@ /* Allocate space for a maximum of 6 arguments on the stack. */ args = sp - 6; - /* Account for arguments on stack and align to 16 bytes. */ - sp -= 8; + /* + * Account for arguments on stack and do the funky C entry alignment. + * This means that we need an 8-byte-odd alignment since the ABI expects + * the return address to be pushed, thus breaking the 16 byte alignment. + */ + sp -= 7; /* Add the arguments: */ va_start(ap, argc); ==== //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/enter_uts.S#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/amd64/amd64/enter_uts.S,v 1.3 2003/08/02 22:39:10 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/arch/amd64/amd64/enter_uts.S,v 1.4 2003/12/05 01:41:43 peter Exp $"); /* @@ -35,7 +35,7 @@ ENTRY(_amd64_enter_uts) addq %rcx, %rdx /* get stack base */ andq $~0xf, %rdx /* align to 16 bytes */ + subq $8, %rdx /* simulate "call" alignment */ movq %rdx, %rsp /* switch to UTS stack */ movq %rdx, %rbp /* set frame */ - pushq %rsi - ret + jmpq *%rsi ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#29 (text+ko) ==== @@ -38,7 +38,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.53 2003/10/06 04:20:26 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.54 2003/12/04 23:53:54 bmah Exp $ 2000 @@ -198,6 +198,14 @@ is unaffected, for example). More information can be found in security advisory FreeBSD-SA-03:18. + + BIND contains the potential for a + denial-of-service attack. This vulnerability has been addressed + by a vendor patch on the &release.prev; security fix branch and + by the import of a new version to the &release.branch; + development branch. For more information, see + FreeBSD-SA-03:19. + ]]> ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#73 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.203 2003/12/02 07:13:03 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.206 2003/12/06 20:43:48 bmah Exp $ Supported Devices @@ -274,16 +274,6 @@ C, S, and A Series Host Adapters (&man.bt.4; driver) - - BusLogic/Mylex Flashpoint adapters are not yet - supported. - - - - AMI FastDisk controllers that are true BusLogic - MultiMaster clones are also supported. - - The Buslogic/Bustek BT-640 and Storage Dimensions SDC3211B and SDC3211F Microchannel (MCA) bus adapters are @@ -336,11 +326,6 @@ Mylex AcceleRAID/eXtremeRAID family PCI to SCSI RAID controllers with 6.x firmware (&man.mly.4; driver) - - - Compatible Mylex controllers not listed should work, but - have not been verified. - 3ware Escalade ATA RAID controllers (&man.twe.4; driver) @@ -793,7 +778,7 @@ (&man.ste.4; driver) - SysKonnect SK-984x PCI Gigabit Ethernet cards (&man.sk.4; drivers) + SysKonnect SK-984x PCI Gigabit Ethernet cards (&man.sk.4; driver) Texas Instruments ThunderLAN PCI NICs (&man.tl.4; driver) @@ -919,16 +904,6 @@ drivers), plus NICs supported by the Intel 82540EM, 82544, 82545EM, and 82546EB controller chips (&man.em.4; driver only) - - - Intel PRO/1000 Gigabit Ethernet - - - - - The &man.em.4; driver is officially supported by Intel, - but is only supported on the i386. - Sun HME and QFE Ethernet NICs (&man.hme.4; driver) @@ -1004,6 +979,9 @@ Miscellaneous Networks + Cronyx-Sigma synchronous / asynchronous serial + adapters (&man.cx.4; driver) + Granch SBNI12 point-to-point communications adapters (&man.sbni.4; driver) @@ -1122,6 +1100,7 @@ Serial Interfaces + PC standard 8250, 16450, and 16550-based serial ports (&man.sio.4; driver) Serial ports based on the SAB82532 serial @@ -1169,14 +1148,6 @@ STB 4 port card using shared IRQ DigiBoard intelligent serial cards (&man.dgb.4; driver) - - - DigiBoard PC/Xe series - - - DigiBoard PC/Xi series - - PCI-Based multi-port serial boards (&man.puc.4; @@ -1267,23 +1238,7 @@ Stallion Technologies multiport serial boards - - - EasyIO (&man.stl.4; driver) - - - EasyConnection 8/32 (&man.stl.4; driver) - - - EasyConnection 8/64 (&man.stli.4; driver) - - - ONboard 4/16 (&man.stli.4; driver) - - - Brumby (&man.stli.4; driver) - - + (&man.stl.4; and &man.stli.4; drivers) Specialix SI/XIO/SX multiport serial cards, with both the @@ -1803,44 +1758,7 @@ - Audio Devices (uaudio driver) - - - Audio-Technica USB Digital Headphone ATC-HA4USB - - - - Ergo Systems AUDIOTRAK OPTOPlay USB - - - - KENWOOD MD Personal Stereo System MDX-G7 - - - - KENWOOD/SOTEC VH-7PC - - - - I-O DATA Analog to Digital USB Audio Adapter DAVOX - - - - ONKYO PC Speaker GX-R5U(W) - - - - ONKYO USB Digital Audio Processor SE-U55X(S) - - - - Roland UA-5 USB Audio Interface Audio Capture - - - - Sony PC Active Speaker System SRS-T100PC - - + Audio Devices (&man.uaudio.4; driver) Handspring Visor and other PalmOS ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#9 (text+ko) ==== @@ -1,5 +1,5 @@ Supported Processors and Motherboards @@ -42,8 +42,9 @@ additional physical processors; in other words, no attempt is made to optimize scheduling decisions given the shared resources between logical processors within the same CPU. Because this - naive scheduling can result in suboptimal performance, the logical - CPUs are halted by default at startup. They can be enabled with + naive scheduling can result in suboptimal performance, under + certain circumstances it may be useful to disable the logical + processors with the the machdep.hlt_logical_cpus sysctl variable. It is also possible to halt any CPU in the idle loop with the machdep.hlt_cpus sysctl variable. The ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#133 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.658 2003/12/01 00:17:33 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.660 2003/12/05 21:34:31 bmah Exp $ 2000 @@ -195,6 +195,11 @@ is no longer needed when only a USB keyboard is connected. &merged; + The &man.cx.4; driver for Cronyx Sigmal + serial interfaces has been overhauled. As a part of this + update, the cxconfig userland configuration utility has been + replaced by a newer &man.sconfig.8; utility. + The DRM kernel modules have been updated from DRI CVS as of 12 November 2003. Among other changes, this change includes a newly-ported SiS 300/305/540/630/730 @@ -343,10 +348,18 @@ to support serial ports on certain architectures, such as ia64 and sparc64. + A new &man.utopia.4; driver supports 25MBit/sec, + 155MBit/sec and 622MBit/sec ATM physical layer configuration, + status and statistics reporting for the most commonly use + ATM-PHY chips. + The suspend/resume support for the &man.wi.4; driver now works correctly when the device is configured down. &merged; + The &man.wi.4; driver should once again work correctly + with Lucent 802.11b interfaces. + The 802.11 support layer has been rewritten to allow for future growth and new features. @@ -365,6 +378,18 @@ Network Protocols + The ip_flow feature in the IPv4 protocol + implementation has been replaced by the + ip_fastforward feature. + ip_fastforward attempts to speed up simple + cases of packet forwarding, processing a forwarded packet to + an outgoing interface without queues or netisrs. If it cannot + handle a particular packet, it passes that packet to the normal + ip_input routines for processing. This + feature can be enabled by setting the + net.inet.ip.fastforwarding sysctl variable + to 1. + The IP_ONESBCAST option has been added to enable undirected &man.ip.4; broadcasts to be sent to specific network interfaces. @@ -557,6 +582,11 @@ + Support for NFSv4 has been added with the import of the + University of Michigan's Citi NFSv4 client implementation. + More information can be found in the &man.mount.nfs4.8; and + &man.idmapd.8; manual pages. + @@ -843,6 +873,15 @@ The supported release of KDE has been updated from 3.1.2 to 3.1.4. &merged; + The versions of GNOME and + KDE included on release disc 1 + (and installable from the &man.sysinstall.8; X + Desktops menu) are now Lite Edition, + packages, rather than the more full-featured meta-packages. + These packages are streamlined to provide users with the core + essentials for each desktop, while still fitting within the + space constraints of release disc 1. + ==== //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#31 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.51 2003/12/02 20:47:31 marcus Exp $ +# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.52 2003/12/06 04:15:13 scottl Exp $ # # MAINTAINER: re # @@ -79,7 +79,6 @@ CDROM_SET_1="${CDROM_SET_1} mail/exim" CDROM_SET_1="${CDROM_SET_1} mail/postfix" CDROM_SET_1="${CDROM_SET_1} net/pcnfsd" -CDROM_SET_1="${CDROM_SET_1} net/rsync" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-font100dpi" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-font75dpi" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-fontCyrillic" @@ -110,13 +109,10 @@ CDROM_SET_1="${CDROM_SET_1} astro/xearth" CDROM_SET_1="${CDROM_SET_1} editors/emacs21" CDROM_SET_1="${CDROM_SET_1} editors/vim" +CDROM_SET_1="${CDROM_SET_1} editors/vim-lite" CDROM_SET_1="${CDROM_SET_1} emulators/mtools" -CDROM_SET_1="${CDROM_SET_1} ftp/ncftp" -CDROM_SET_1="${CDROM_SET_1} graphics/gimp1" -CDROM_SET_1="${CDROM_SET_1} graphics/xpdf" CDROM_SET_1="${CDROM_SET_1} graphics/xv" CDROM_SET_1="${CDROM_SET_1} irc/xchat2" -CDROM_SET_1="${CDROM_SET_1} mail/exim" CDROM_SET_1="${CDROM_SET_1} mail/fetchmail" CDROM_SET_1="${CDROM_SET_1} mail/mutt" CDROM_SET_1="${CDROM_SET_1} mail/pine4" @@ -125,6 +121,7 @@ CDROM_SET_1="${CDROM_SET_1} misc/bsdiff" CDROM_SET_1="${CDROM_SET_1} misc/screen" CDROM_SET_1="${CDROM_SET_1} net/cvsup" +CDROM_SET_1="${CDROM_SET_1} net/rsync" CDROM_SET_1="${CDROM_SET_1} net/samba" CDROM_SET_1="${CDROM_SET_1} news/slrn" CDROM_SET_1="${CDROM_SET_1} news/tin" @@ -137,7 +134,6 @@ fi CDROM_SET_1="${CDROM_SET_1} print/apsfilter" CDROM_SET_1="${CDROM_SET_1} print/ghostscript-gnu-nox11" -CDROM_SET_1="${CDROM_SET_1} print/ghostview" CDROM_SET_1="${CDROM_SET_1} print/gv" CDROM_SET_1="${CDROM_SET_1} print/psutils-letter" CDROM_SET_1="${CDROM_SET_1} security/sudo" @@ -147,10 +143,6 @@ CDROM_SET_1="${CDROM_SET_1} shells/zsh" CDROM_SET_1="${CDROM_SET_1} sysutils/portupgrade" CDROM_SET_1="${CDROM_SET_1} www/lynx" -CDROM_SET_1="${CDROM_SET_1} www/mozilla" -CDROM_SET_1="${CDROM_SET_1} www/netscape-remote" -CDROM_SET_1="${CDROM_SET_1} www/netscape-wrapper" -CDROM_SET_1="${CDROM_SET_1} www/netscape48-communicator" CDROM_SET_1="${CDROM_SET_1} www/opera" CDROM_SET_1="${CDROM_SET_1} x11/rxvt" ==== //depot/projects/ia64/sbin/init/init.c#6 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 7/15/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/init/init.c,v 1.55 2002/12/17 21:23:36 green Exp $"; + "$FreeBSD: src/sbin/init/init.c,v 1.56 2003/12/05 04:28:03 imp Exp $"; #endif /* not lint */ #include @@ -1279,9 +1279,6 @@ int devlen; char *old_getty, *old_window, *old_type; - if (! sessions) - return (state_func_t) multi_user; - /* * mark all sessions for death, (!SE_PRESENT) * as we find or create new ones they'll be marked as keepers, ==== //depot/projects/ia64/sbin/mount/mount.c#12 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount/mount.c,v 1.54 2003/08/07 04:51:41 imp Exp $"; + "$FreeBSD: src/sbin/mount/mount.c,v 1.55 2003/12/05 09:36:56 iedowse Exp $"; #endif /* not lint */ #include @@ -292,8 +292,8 @@ * ':' will be correctly parsed only if the separator is '@'. * The definition of a valid hostname is taken from RFC 1034. */ - if (vfslist == NULL && ((ep = strchr(argv[0], '@')) != NULL) || - ((ep = strchr(argv[0], ':')) != NULL)) { + if (vfslist == NULL && ((ep = strchr(argv[0], '@')) != NULL || + (ep = strchr(argv[0], ':')) != NULL)) { if (*ep == '@') { cp = ep + 1; ep = cp + strlen(cp); @@ -393,8 +393,7 @@ const char *vfstype, *spec, *name, *options, *mntopts; int flags; { - const char *argv[100], **edir; - char *path, *cur; + const char *argv[100]; struct statfs sf; pid_t pid; int argc, i, status; @@ -468,7 +467,8 @@ (void)snprintf(execname, sizeof(execname), "mount_%s", vfstype); execvP(execname, _PATH_SYSPATH, (char * const *)argv); if (errno == ENOENT) { - warn("exec mount_%s not found in %s", vfstype, path); + warn("exec mount_%s not found in %s", vfstype, + _PATH_SYSPATH); } exit(1); /* NOTREACHED */ @@ -531,13 +531,15 @@ if (verbose) { if (sfp->f_syncwrites != 0 || sfp->f_asyncwrites != 0) (void)printf(", writes: sync %ld async %ld", - sfp->f_syncwrites, sfp->f_asyncwrites); + (long)sfp->f_syncwrites, (long)sfp->f_asyncwrites); if (sfp->f_syncreads != 0 || sfp->f_asyncreads != 0) (void)printf(", reads: sync %ld async %ld", - sfp->f_syncreads, sfp->f_asyncreads); - printf(", fsid "); - for (i = 0; i < sizeof(sfp->f_fsid); i++) - printf("%02x", ((u_char *)&sfp->f_fsid)[i]); + (long)sfp->f_syncreads, (long)sfp->f_asyncreads); + if (sfp->f_fsid.val[0] != 0 || sfp->f_fsid.val[1] != 0) { + printf(", fsid "); + for (i = 0; i < sizeof(sfp->f_fsid); i++) + printf("%02x", ((u_char *)&sfp->f_fsid)[i]); + } } (void)printf(")\n"); } ==== //depot/projects/ia64/sbin/umount/umount.c#10 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)umount.c 8.8 (Berkeley) 5/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/umount/umount.c,v 1.41 2003/11/16 16:48:18 iedowse Exp $"; + "$FreeBSD: src/sbin/umount/umount.c,v 1.43 2003/12/05 09:29:42 iedowse Exp $"; #endif /* not lint */ #include @@ -365,8 +365,9 @@ warn("unmount of %s failed", sfs->f_mntonname); if (errno != ENOENT) return (1); - /* Compatability for old kernels. */ - warnx("retrying using path instead of file system ID"); + /* Compatibility for old kernels. */ + if (sfs->f_fsid.val[0] != 0 || sfs->f_fsid.val[1] != 0) + warnx("retrying using path instead of file system ID"); if (unmount(sfs->f_mntonname, fflag) != 0) { warn("unmount of %s failed", sfs->f_mntonname); return (1); @@ -557,7 +558,7 @@ } /* - * Convert a hexidecimal filesystem ID to an fsid_t. + * Convert a hexadecimal filesystem ID to an fsid_t. * Returns 0 on success. */ int ==== //depot/projects/ia64/share/man/man4/dc.4#7 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/dc.4,v 1.24 2003/11/13 17:01:08 simon Exp $ +.\" $FreeBSD: src/share/man/man4/dc.4,v 1.25 2003/12/06 02:29:31 sanpei Exp $ .\" .Dd November 20, 1999 .Dt DC 4 @@ -133,6 +133,8 @@ .It Digital DE500-BA 10/100 (21143, non-MII) .It +ELECOM Laneed LD-CBL/TXA (ADMtek AN985) +.It Hawking CB102 CardBus .It IBM EtherJet Cardbus Adapter ==== //depot/projects/ia64/share/man/man4/man4.i386/cx.4#4 (text+ko) ==== @@ -1,15 +1,31 @@ +.\" Copyright (c) 2003 Roman Kurakin +.\" Copyright (c) 2003 Cronyx Engineering +.\" All rights reserved. +.\" +.\" This software is distributed with NO WARRANTIES, not even the implied +.\" warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +.\" +.\" Authors grant any other persons or organisations a permission to use, +.\" modify and redistribute this software in source and binary forms, +.\" as long as this message is kept with the software, all derivative +.\" works or modified versions. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/cx.4,v 1.16 2003/05/18 21:05:21 ru Exp $ +.\" Cronyx Id: cp.4,v 1.1.2.2 2003/09/11 14:56:50 rik Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/cx.4,v 1.17 2003/12/05 07:03:58 imp Exp $ .\" -.Dd December 12, 1994 -.Dt CX 4 i386 +.Dd November 27, 2003 +.Dt Cronyx-Sigma 4 .Os .Sh NAME .Nm cx -.Nd asynchronous/synchronous Cronyx-Sigma adapter driver +.Nd driver for synchronous/asynchronous Cronyx-Sigma WAN adapters .Sh SYNOPSIS -.Cd "device cx 1" -.Cd device sppp +.Cd "device cx" +.Pp +Additional options: +.Cd "device sppp" +.Cd "options NETGRAPH" +.Cd "options NETGRAPH_CRONYX" .Pp In .Pa /boot/device.hints : @@ -17,261 +33,70 @@ .Cd hint.cx.0.port="0x240" .Cd hint.cx.0.irq="15" .Cd hint.cx.0.drq="7" +.Sh DESCRIPTION +The +.Nm +driver needs either +.Xr sppp 4 +or +.Xr netgraph 4 . +Which one to use is determined by NETGRAPH_CRONYX option. +If this option is present in your kernel configuration file, the +.Nm +driver will be compiled with +.Xr netgraph 4 +support, else driver will be compiled with +.Xr sppp 4 +support. .Pp The base i/o port address specified in .Pa /boot/device.hints must match the port address set by jumpers on the board. The DMA i/o channel and interrupt request numbers are configured -by software at adapter initialization. Legal values are: +by software at adapter initialization. +Legal values are: .Pp -.Bl -tag -compact -width Port -.It Port +.Bl -tag -compact -width Port: +.It Port : 0x240, 0x260, 0x280, 0x300, 0x320, 0x380 -.It IRQ +.It IRQ : 3, 5, 7, 10, 11, 12, 15 -.It DMA +.It DMA : 5, 6, 7 .El -.Sh DESCRIPTION -The Cronyx-Sigma driver supports the adapters of models 100, -400, 500, 401, 404, 410, 440, 703, 801, 810, 840. Different models have -different set of channels: .Pp -.Bl -tag -compact -width Cronyx-Sigma-999 -.It Model -Channels -.It Cronyx-Sigma-100 -0 -.It Cronyx-Sigma-400 -4, 5, 6, 7 -.It Cronyx-Sigma-500 -0, 4, 5, 6, 7 -.It Cronyx-Sigma-401 -0, 1, 2, 3 -.It Cronyx-Sigma-404 -0, 1, 2, 3 -.It Cronyx-Sigma-410 -0, 1, 2, 3 -.It Cronyx-Sigma-440 -0, 1, 2, 3 -.It Cronyx-Sigma-703 -0, 1, 2, 4, 5, 6, 7 -.It Cronyx-Sigma-801 -0, 1, 2, 3, 4, 5, 6, 7 -.It Cronyx-Sigma-810 -0, 1, 2, 3, 4, 5, 6, 7 -.It Cronyx-Sigma-840 -0, 1, 2, 3, 4, 5, 6, 7 -.El +The +.Nm +driver supports autodetection. +As for all non-PNP hardware using of +autodetection could lead to some potential problems with other devices during +detection of hardware. +It is alway better to specify hardware resources manualy. .Pp -A pair of two adapters can be united together by the special -short inter-board cable. Two united adapters use the same -IRQ and DMA channels and from the point of driver works -as the single 16-channel multiplexer. One of the united -boards is ``master'' and the other is ``slave''. -.Pp -The channels of the slave united board are numbered by the driver -beginning with 8, for example, the united adapter of the model 100/500 -has channels 0, 8, 12, 13, 14, 15. -.Pp -The channels which have the RS-232 interface can be used -both in synchronous and asynchronous modes (software selectable -by cxconfig utility) and hence are called ``universal'' channels. -.Sh "Asynchronous driver" -The asynchronous channel device files have the names: -.Pa /dev/ttyx# -- for adapter cx0, -.Pa /dev/ttyy# -- for adapter cx1, -.Pa /dev/ttyz# -- for cx2. -Here # is the channel number in hexadecimal form, 0-9-a-f. -.Pp -The driver fulfills the following standard ioctl requests (see -.Xr ioctl 2 ) : -.Pp -.Bl -tag -width TIOCXXXXX -compact -.It Dv TIOCSBRK -Start sending BREAK. -.It Dv TIOCCBRK -Stop sending BREAK. -.It Dv TIOCSDTR -Set DTR signal (DTR := 1). The DTR signal is always set -on the first -.Xr open 2 -and could be changed by -.Dv TIOCCDTR , -.Dv TIOCSDTR , -.Dv TIOCMSET , -.Dv TIOCMBIS , -.Dv TIOCMBIC -ioctl calls. -.It TIOCCDTR -Clear DTR signal (DTR := 0). -.It TIOCMSET -Set the given values of DTR and RTS signals ( := data). -The signals DTR and RTS are controlled by -.Dv TIOCM_DTR -and -.Dv TIOCM_RTS -bits of the data argument of the ioctl system call. -.It TIOCMBIS -Set DTR and RTS signals ( |= data). -The signals DTR and RTS are controlled by -.Dv TIOCM_DTR -and -.Dv TIOCM_RTS -bits of the data argument of the ioctl system call. -.It TIOCMBIC -Clear DTR and RTS signals ( &= ~data). -The signals DTR and RTS are controlled by -.Dv TIOCM_DTR -and -.Dv TIOCM_RTS -bits of the data argument of the ioctl system call. -.It TIOCMGET -Determine the state of the modem signals of the line. -After the call the data argument contains the following bits: -.Pp -.Bl -tag -width TIOCM_XXX -compact -.It TIOCM_LE -always set (Line Enabled) -.It TIOCM_DSR -Data Set Ready signal received -.It TIOCM_CTS -Clear To Send signal received -.It TIOCM_CD -Data Carrier Detect signal received -.It TIOCM_DTR -Data Terminal Ready signal transmitted -.It TIOCM_RTS -Request To Send signal transmitted -.El -.El -.Sh "Synchronous driver" -The synchronous channels and universal channels, turned to the synchronous -mode by the -.Xr cxconfig 8 -utility, are accessible as network -interfaces named ``cx#'' where # is the channel number, 0..47. -All standard network interface parameters could be set by -.Xr ifconfig 8 -utility. +Refere to +.Xr sconfig 8 +for information about the +.Nm +adapter configuration. +.Sh SEE ALSO +.Xr cx 4 , +.Xr sppp 4 , +.Xr ifconfig 8 , +.Xr sconfig 8 , +.Xr spppcontrol 8 +.Sh HISTORY The -.Xr cxconfig 8 -command is used to change some extended channel -options, and also for setting the high-level software protocol -(e.g. PpP or Cisco HDLC). -.Pp -The universal channels could be used both in asynchronous and synchronous modes. -By default the asynchronous mode is set. -The mode could be changed by -.Xr cxconfig 8 -utility. -The mode is blocked while the channel is busy (an asynchronous channel -in open state or the network interface is up). -.Sh "Synchronous Point-to-Point protocol" -The Cronyx-Sigma driver uses the built-in implementation of the synchronous -Point-to-Point protocol (sppp). It includes the support for such -protocols as PpP/HDLC and Cisco/HDLC, and also the automatic -connection loss test (via keepalive packets). -The sppp protocol set is implemented as an independent module -and could be used by other drivers of synchronous serial channels. -The version of the driver for BSD/386 (BSDI) operating system -also supports the usage of the general set of synchronous -protocols, implemented inside the OS. -The external protocol set could be selected by ``cxconfig ext'' command -(see -.Xr cxconfig 8 ) . -.Sh "Channel Options Management" +.Nm +driver was updated in +.Fx 5.2 . +In most of previous versions of +.Fx +the +.Nm +driver is out of date. The -.Xr cxconfig 8 -utility is used for setting the channels options. -The channel options are generally set at the start of the operating -system (for example, from the file -.Pa /etc/rc ) . -Note, that not all options have a sense for every particular -case, and an attempt to set some of them can hang up the channel or -the whole adapter. -.Pp -The actual channel options control functions are implemented via -the ioctl-s on the special device file /dev/cronyx. -There are the following ioctl-s available: -.Pp -.Bl -tag -width CXIOCXXXXXXX -compact -.It CXIOCGETMODE -Get the channel option values. -.It CXIOCSETMODE -Set the channel option values. -.El -.Pp -The data argument of the ioctl call has an address of the options structure: -.Bd -literal -typedef struct { - unsigned char board; /* adapter number, 0..2 */ - unsigned char channel; /* channel number, 0..15 */ - unsigned char type; /* channel type (read only) */ - unsigned char iftype; /* chan0 interface */ - unsigned long rxbaud; /* receiver speed */ - unsigned long txbaud; /* transmitter speed */ - cx_chan_mode_t mode; /* channel mode */ - cx_chan_opt_t opt; /* common channel options */ - cx_opt_async_t aopt; /* async mode options */ - cx_opt_hdlc_t hopt; /* hdlc mode options */ - cx_opt_bisync_t bopt; /* bisync mode options */ - cx_opt_x21_t xopt; /* x.21 mode options */ - cx_soft_opt_t sopt; /* software options and state flags */ -} cx_options_t; /* user settable options */ -.Ed -.Pp -.Bl -tag -width rxbaudxxx -.It Fa board -The adapter number, 0..2. -.It Fa channel -The channel number, 0..15. -.It Fa type -The type of the channel (read-only argument). -.It Fa iftype -The interface type of the zero (and also the eight) channel: 0 - RS-232, -1 - RS-449/V.35. -.It Fa rxbaud -The receiver data baud rate. -.It Fa txbaud -The transmitter data baud rate. -.It Fa mode -The channel mode: asynchronous/HDLC/Bisync/X.21. -.It Fa opt -The general channel options. -.It Fa aopt -The asynchronous mode options. -.It Fa hopt -The HDLC mode options. -.It Fa bopt -The Bisync mode options. -.It Fa xopt -The X.21 mode options. -.It Fa sopt -The software protocol options. -.El -.Sh FILES -.Bl -tag -width /dev/cxXXXX -compact -.It Pa /dev/cx?? -Asynchronous channels. -.It Pa /dev/cronyx -The special device file for the channel options management. -.El -.Pp -The sources for the driver reside in: -.Pp -.Bl -tag -width /dev/cxXXXX -compact -.It Pa /sys/i386/isa/cronyx.c -.It Pa /sys/i386/isa/cx.c -.It Pa /sys/i386/isa/if_cx.c -.It Pa /sys/i386/isa/cronyx.h -.It Pa /sys/i386/isa/cxreg.h -.It Pa /sys/net/if_spppsubr.c -.It Pa /sys/net/if_sppp.h -.El -.Sh SEE ALSO -.Xr cxconfig 8 , -.Xr ifconfig 8 +.Nm +driver for previous versions of +.Fx +is available from +.Pa http://www.cronyx.ru/ . ==== //depot/projects/ia64/sys/alpha/conf/GENERIC.hints#4 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.6 2002/11/14 14:59:27 jhb Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.7 2003/12/05 00:57:11 des Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" hint.fdc.0.drq="2" hint.fd.0.at="fdc0" hint.fd.0.drive="0" +hint.fd.0.flags="4" hint.ata.0.at="isa" hint.ata.0.port="0x1F0" hint.ata.0.irq="14" ==== //depot/projects/ia64/sys/dev/ata/atapi-cam.c#21 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.28 2003/11/11 14:55:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.29 2003/12/05 01:02:46 scottl Exp $"); #include #include @@ -409,7 +409,7 @@ request_flags |= ATA_R_WRITE|ATA_R_DMA; break; case CAM_DIR_NONE: - request_flags |= ATA_R_CONTROL; + /* No flags need to be set */ break; default: ata_prtdev(dev, "unknown IO operation\n"); ==== //depot/projects/ia64/sys/dev/sound/pcm/channel.c#15 (text+ko) ==== @@ -29,7 +29,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 6 14:49:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC5AD16A4D1; Sat, 6 Dec 2003 14:49:54 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A814616A4CF for ; Sat, 6 Dec 2003 14:49:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E702543F3F for ; Sat, 6 Dec 2003 14:49:53 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB6MnrXJ073180 for ; Sat, 6 Dec 2003 14:49:53 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB6MnrWj073177 for perforce@freebsd.org; Sat, 6 Dec 2003 14:49:53 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 6 Dec 2003 14:49:53 -0800 (PST) Message-Id: <200312062249.hB6MnrWj073177@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 43506 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Dec 2003 22:49:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=43506 Change 43506 by peter@peter_overcee on 2003/12/06 14:48:57 use the right size spec on the bsrq inline Affected files ... .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#15 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#15 (text+ko) ==== @@ -100,7 +100,7 @@ { u_long result; - __asm __volatile("bsrl %1,%0" : "=r" (result) : "rm" (mask)); + __asm __volatile("bsrq %1,%0" : "=r" (result) : "rm" (mask)); return (result); } From owner-p4-projects@FreeBSD.ORG Sat Dec 6 14:49:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BC0216A4D1; Sat, 6 Dec 2003 14:49:56 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 768BA16A4CF for ; Sat, 6 Dec 2003 14:49:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A01D43F75 for ; Sat, 6 Dec 2003 14:49:55 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB6MntXJ073193 for ; Sat, 6 Dec 2003 14:49:55 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB6MnsDk073190 for perforce@freebsd.org; Sat, 6 Dec 2003 14:49:54 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 6 Dec 2003 14:49:54 -0800 (PST) Message-Id: <200312062249.hB6MnsDk073190@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 43508 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Dec 2003 22:49:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=43508 Change 43508 by peter@peter_overcee on 2003/12/06 14:49:23 Don't shift an int to bits > 32 Affected files ... .. //depot/projects/hammer/sys/amd64/include/runq.h#7 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/runq.h#7 (text+ko) ==== @@ -33,7 +33,7 @@ #define RQB_L2BPW (6) /* Log2(sizeof(rqb_word_t) * NBBY)). */ #define RQB_BPW (1<> RQB_L2BPW) #define RQB_FFS(word) (bsfq(word)) From owner-p4-projects@FreeBSD.ORG Sat Dec 6 15:29:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 552AC16A4D0; Sat, 6 Dec 2003 15:29:50 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1793B16A4CE for ; Sat, 6 Dec 2003 15:29:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63A7643FD7 for ; Sat, 6 Dec 2003 15:29:46 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB6NTkXJ076045 for ; Sat, 6 Dec 2003 15:29:46 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB6NTjOA076042 for perforce@freebsd.org; Sat, 6 Dec 2003 15:29:45 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 6 Dec 2003 15:29:45 -0800 (PST) Message-Id: <200312062329.hB6NTjOA076042@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 43512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Dec 2003 23:29:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=43512 Change 43512 by peter@peter_overcee on 2003/12/06 15:29:30 IFC @43511 Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/amd64-gdbstub.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/critical.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#27 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#75 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#20 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#49 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#16 integrate .. //depot/projects/hammer/sys/amd64/include/critical.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/mutex.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/runq.h#8 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#12 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#11 integrate .. //depot/projects/hammer/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#21 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#15 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#21 integrate .. //depot/projects/hammer/sys/security/mac_partition/mac_partition.c#6 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#5 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#18 integrate .. //depot/projects/hammer/sys/sys/mac.h#16 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#15 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#24 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.8 2003/12/03 06:58:48 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.9 2003/12/06 23:14:44 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/amd64-gdbstub.c#8 (text+ko) ==== @@ -13,7 +13,7 @@ ****************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.25 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.26 2003/12/06 23:19:46 peter Exp $"); /**************************************************************************** * Header: remcom.c,v 1.34 91/03/09 12:29:49 glenne Exp $ ==== //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.23 2003/11/22 01:11:07 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.24 2003/12/06 23:19:46 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#13 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.95 2003/11/17 08:58:12 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.96 2003/12/06 23:19:47 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/critical.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.12 2003/08/12 23:24:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.13 2003/12/06 23:13:22 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.146 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.147 2003/12/06 23:19:47 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#27 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.4 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.5 2003/12/06 23:14:44 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#75 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.600 2003/11/20 22:54:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.601 2003/12/06 23:19:47 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#14 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.111 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.112 2003/12/06 23:19:47 peter Exp $"); /* * Memory special file ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#20 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.57 2003/11/21 03:00:05 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.58 2003/12/06 23:19:47 peter Exp $"); /* * This code implements a `root nexus' for Intel Architecture ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#49 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.447 2003/11/21 03:01:59 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.448 2003/12/06 23:18:42 peter Exp $"); /* * Manages physical address maps. ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#16 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.137 2003/11/08 04:39:22 peter Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.138 2003/12/06 23:22:43 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/include/critical.h#11 (text+ko) ==== @@ -33,7 +33,7 @@ * related support functions residing * in //critical.c - prototyped * - * $FreeBSD: src/sys/amd64/include/critical.h,v 1.5 2003/08/12 23:24:04 imp Exp $ + * $FreeBSD: src/sys/amd64/include/critical.h,v 1.6 2003/12/06 23:13:22 peter Exp $ */ #ifndef _MACHINE_CRITICAL_H_ ==== //depot/projects/hammer/sys/amd64/include/mutex.h#7 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: src/sys/amd64/include/mutex.h,v 1.37 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/mutex.h,v 1.38 2003/12/06 23:17:18 peter Exp $ */ #ifndef _MACHINE_MUTEX_H_ ==== //depot/projects/hammer/sys/amd64/include/runq.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/runq.h,v 1.2 2002/06/20 06:21:20 peter Exp $ + * $FreeBSD: src/sys/amd64/include/runq.h,v 1.3 2003/12/06 23:24:18 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.105 2003/11/17 08:58:15 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.106 2003/12/06 23:19:47 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.103 2003/07/25 21:19:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.104 2003/12/06 23:19:47 peter Exp $"); #include /* XXX trim includes */ #include ==== //depot/projects/hammer/sys/kern/kern_prot.c#11 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_prot.c,v 1.178 2003/11/17 20:20:53 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_prot.c,v 1.179 2003/12/06 21:48:01 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1804,7 +1804,7 @@ if (jailed(dest)) prison_hold(dest->cr_prison); #ifdef MAC - mac_create_cred(src, dest); + mac_copy_cred(src, dest); #endif } ==== //depot/projects/hammer/sys/security/mac/mac_process.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/security/mac/mac_process.c,v 1.104 2003/11/12 03:14:30 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/security/mac/mac_process.c,v 1.105 2003/12/06 21:48:01 rwatson Exp $"); #include "opt_mac.h" @@ -222,10 +222,10 @@ * deltas. This function allows that processing to take place. */ void -mac_create_cred(struct ucred *parent_cred, struct ucred *child_cred) +mac_copy_cred(struct ucred *src, struct ucred *dest) { - MAC_PERFORM(create_cred, parent_cred, child_cred); + MAC_PERFORM(copy_cred_label, src->cr_label, dest->cr_label); } int ==== //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#21 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.71 2003/11/18 04:11:52 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.72 2003/12/06 21:48:02 rwatson Exp $ */ /* @@ -1328,18 +1328,6 @@ * Labeling event operations: processes. */ static void -mac_biba_create_cred(struct ucred *cred_parent, struct ucred *cred_child) -{ - struct mac_biba *source, *dest; - - source = SLOT(cred_parent->cr_label); - dest = SLOT(cred_child->cr_label); - - mac_biba_copy_single(source, dest); - mac_biba_copy_range(source, dest); -} - -static void mac_biba_create_proc0(struct ucred *cred) { struct mac_biba *dest; @@ -2668,6 +2656,7 @@ .mpo_destroy_socket_label = mac_biba_destroy_label, .mpo_destroy_socket_peer_label = mac_biba_destroy_label, .mpo_destroy_vnode_label = mac_biba_destroy_label, + .mpo_copy_cred_label = mac_biba_copy_label, .mpo_copy_mbuf_label = mac_biba_copy_label, .mpo_copy_pipe_label = mac_biba_copy_label, .mpo_copy_socket_label = mac_biba_copy_label, @@ -2719,7 +2708,6 @@ .mpo_relabel_ifnet = mac_biba_relabel_ifnet, .mpo_update_ipq = mac_biba_update_ipq, .mpo_inpcb_sosetlabel = mac_biba_inpcb_sosetlabel, - .mpo_create_cred = mac_biba_create_cred, .mpo_create_proc0 = mac_biba_create_proc0, .mpo_create_proc1 = mac_biba_create_proc1, .mpo_relabel_cred = mac_biba_relabel_cred, ==== //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_lomac/mac_lomac.c,v 1.24 2003/11/18 00:39:06 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_lomac/mac_lomac.c,v 1.25 2003/12/06 21:48:02 rwatson Exp $ */ /* @@ -1468,18 +1468,6 @@ * Labeling event operations: processes. */ static void -mac_lomac_create_cred(struct ucred *cred_parent, struct ucred *cred_child) -{ - struct mac_lomac *source, *dest; - - source = SLOT(cred_parent->cr_label); - dest = SLOT(cred_child->cr_label); - - mac_lomac_copy_single(source, dest); - mac_lomac_copy_range(source, dest); -} - -static void mac_lomac_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp, struct label *vnodelabel, struct label *interpvnodelabel, struct image_params *imgp, @@ -2648,6 +2636,7 @@ .mpo_destroy_socket_label = mac_lomac_destroy_label, .mpo_destroy_socket_peer_label = mac_lomac_destroy_label, .mpo_destroy_vnode_label = mac_lomac_destroy_label, + .mpo_copy_cred_label = mac_lomac_copy_label, .mpo_copy_mbuf_label = mac_lomac_copy_label, .mpo_copy_pipe_label = mac_lomac_copy_label, .mpo_copy_socket_label = mac_lomac_copy_label, @@ -2702,7 +2691,6 @@ .mpo_relabel_ifnet = mac_lomac_relabel_ifnet, .mpo_update_ipq = mac_lomac_update_ipq, .mpo_inpcb_sosetlabel = mac_lomac_inpcb_sosetlabel, - .mpo_create_cred = mac_lomac_create_cred, .mpo_execve_transition = mac_lomac_execve_transition, .mpo_execve_will_transition = mac_lomac_execve_will_transition, .mpo_create_proc0 = mac_lomac_create_proc0, ==== //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#21 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.58 2003/11/18 04:11:52 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.59 2003/12/06 21:48:02 rwatson Exp $ */ /* @@ -1258,18 +1258,6 @@ * Labeling event operations: processes. */ static void -mac_mls_create_cred(struct ucred *cred_parent, struct ucred *cred_child) -{ - struct mac_mls *source, *dest; - - source = SLOT(cred_parent->cr_label); - dest = SLOT(cred_child->cr_label); - - mac_mls_copy_single(source, dest); - mac_mls_copy_range(source, dest); -} - -static void mac_mls_create_proc0(struct ucred *cred) { struct mac_mls *dest; @@ -2440,6 +2428,7 @@ .mpo_destroy_socket_label = mac_mls_destroy_label, .mpo_destroy_socket_peer_label = mac_mls_destroy_label, .mpo_destroy_vnode_label = mac_mls_destroy_label, + .mpo_copy_cred_label = mac_mls_copy_label, .mpo_copy_mbuf_label = mac_mls_copy_label, .mpo_copy_pipe_label = mac_mls_copy_label, .mpo_copy_socket_label = mac_mls_copy_label, @@ -2491,7 +2480,6 @@ .mpo_relabel_ifnet = mac_mls_relabel_ifnet, .mpo_update_ipq = mac_mls_update_ipq, .mpo_inpcb_sosetlabel = mac_mls_inpcb_sosetlabel, - .mpo_create_cred = mac_mls_create_cred, .mpo_create_proc0 = mac_mls_create_proc0, .mpo_create_proc1 = mac_mls_create_proc1, .mpo_relabel_cred = mac_mls_relabel_cred, ==== //depot/projects/hammer/sys/security/mac_partition/mac_partition.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_partition/mac_partition.c,v 1.8 2003/11/12 03:14:31 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_partition/mac_partition.c,v 1.9 2003/12/06 21:48:02 rwatson Exp $ */ /* @@ -101,6 +101,13 @@ SLOT(label) = 0; } +static void +mac_partition_copy_label(struct label *src, struct label *dest) +{ + + SLOT(dest) = SLOT(src); +} + static int mac_partition_externalize_label(struct label *label, char *element_name, struct sbuf *sb, int *claimed) @@ -131,13 +138,6 @@ } static void -mac_partition_create_cred(struct ucred *cred_parent, struct ucred *cred_child) -{ - - SLOT(cred_child->cr_label) = SLOT(cred_parent->cr_label); -} - -static void mac_partition_create_proc0(struct ucred *cred) { @@ -271,9 +271,9 @@ .mpo_init = mac_partition_init, .mpo_init_cred_label = mac_partition_init_label, .mpo_destroy_cred_label = mac_partition_destroy_label, + .mpo_copy_cred_label = mac_partition_copy_label, .mpo_externalize_cred_label = mac_partition_externalize_label, .mpo_internalize_cred_label = mac_partition_internalize_label, - .mpo_create_cred = mac_partition_create_cred, .mpo_create_proc0 = mac_partition_create_proc0, .mpo_create_proc1 = mac_partition_create_proc1, .mpo_relabel_cred = mac_partition_relabel_cred, ==== //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_stub/mac_stub.c,v 1.35 2003/11/18 00:39:07 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_stub/mac_stub.c,v 1.36 2003/12/06 21:48:02 rwatson Exp $ */ /* @@ -439,12 +439,6 @@ * Labeling event operations: processes. */ static void -stub_create_cred(struct ucred *cred_parent, struct ucred *cred_child) -{ - -} - -static void stub_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp, struct label *vnodelabel, struct label *interpvnodelabel, struct image_params *imgp, @@ -1055,6 +1049,7 @@ .mpo_destroy_socket_label = stub_destroy_label, .mpo_destroy_socket_peer_label = stub_destroy_label, .mpo_destroy_vnode_label = stub_destroy_label, + .mpo_copy_cred_label = stub_copy_label, .mpo_copy_mbuf_label = stub_copy_label, .mpo_copy_pipe_label = stub_copy_label, .mpo_copy_socket_label = stub_copy_label, @@ -1109,7 +1104,6 @@ .mpo_relabel_ifnet = stub_relabel_ifnet, .mpo_update_ipq = stub_update_ipq, .mpo_inpcb_sosetlabel = stub_inpcb_sosetlabel, - .mpo_create_cred = stub_create_cred, .mpo_execve_transition = stub_execve_transition, .mpo_execve_will_transition = stub_execve_will_transition, .mpo_create_proc0 = stub_create_proc0, ==== //depot/projects/hammer/sys/security/mac_test/mac_test.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.37 2003/11/18 00:39:07 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.38 2003/12/06 21:48:02 rwatson Exp $ */ /* @@ -591,6 +591,14 @@ } static void +mac_test_copy_cred_label(struct label *src, struct label *dest) +{ + + ASSERT_CRED_LABEL(src); + ASSERT_CRED_LABEL(dest); +} + +static void mac_test_copy_mbuf_label(struct label *src, struct label *dest) { @@ -1021,14 +1029,6 @@ * Labeling event operations: processes. */ static void -mac_test_create_cred(struct ucred *cred_parent, struct ucred *cred_child) -{ - - ASSERT_CRED_LABEL(cred_parent->cr_label); - ASSERT_CRED_LABEL(cred_child->cr_label); -} - -static void mac_test_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp, struct label *filelabel, struct label *interpvnodelabel, struct image_params *imgp, @@ -1879,6 +1879,7 @@ .mpo_destroy_socket_label = mac_test_destroy_socket_label, .mpo_destroy_socket_peer_label = mac_test_destroy_socket_peer_label, .mpo_destroy_vnode_label = mac_test_destroy_vnode_label, + .mpo_copy_cred_label = mac_test_copy_cred_label, .mpo_copy_mbuf_label = mac_test_copy_mbuf_label, .mpo_copy_pipe_label = mac_test_copy_pipe_label, .mpo_copy_socket_label = mac_test_copy_socket_label, @@ -1932,7 +1933,6 @@ .mpo_relabel_ifnet = mac_test_relabel_ifnet, .mpo_update_ipq = mac_test_update_ipq, .mpo_inpcb_sosetlabel = mac_test_inpcb_sosetlabel, - .mpo_create_cred = mac_test_create_cred, .mpo_execve_transition = mac_test_execve_transition, .mpo_execve_will_transition = mac_test_execve_will_transition, .mpo_create_proc0 = mac_test_create_proc0, ==== //depot/projects/hammer/sys/sys/mac.h#16 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/mac.h,v 1.51 2003/11/18 00:39:07 rwatson Exp $ + * $FreeBSD: src/sys/sys/mac.h,v 1.52 2003/12/06 21:48:03 rwatson Exp $ */ /* * Userland/kernel interface for Mandatory Access Control. @@ -229,7 +229,7 @@ /* * Labeling event operations: processes. */ -void mac_create_cred(struct ucred *cred_parent, struct ucred *cred_child); +void mac_copy_cred(struct ucred *cr1, struct ucred *cr2); int mac_execve_enter(struct image_params *imgp, struct mac *mac_p); void mac_execve_exit(struct image_params *imgp); void mac_execve_transition(struct ucred *old, struct ucred *new, ==== //depot/projects/hammer/sys/sys/mac_policy.h#15 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/mac_policy.h,v 1.45 2003/11/18 00:39:07 rwatson Exp $ + * $FreeBSD: src/sys/sys/mac_policy.h,v 1.46 2003/12/06 21:48:03 rwatson Exp $ */ /* * Kernel interface for MAC policy modules. @@ -111,6 +111,8 @@ void (*mpo_destroy_pipe_label)(struct label *label); void (*mpo_destroy_proc_label)(struct label *label); void (*mpo_destroy_vnode_label)(struct label *label); + void (*mpo_copy_cred_label)(struct label *src, + struct label *dest); void (*mpo_copy_mbuf_label)(struct label *src, struct label *dest); void (*mpo_copy_pipe_label)(struct label *src, @@ -264,8 +266,6 @@ /* * Labeling event operations: processes. */ - void (*mpo_create_cred)(struct ucred *parent_cred, - struct ucred *child_cred); void (*mpo_execve_transition)(struct ucred *old, struct ucred *new, struct vnode *vp, struct label *vnodelabel, struct label *interpvnodelabel, From owner-p4-projects@FreeBSD.ORG Sat Dec 6 16:30:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C39516A4D1; Sat, 6 Dec 2003 16:30:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 267BA16A4CF for ; Sat, 6 Dec 2003 16:30:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1227343FDD for ; Sat, 6 Dec 2003 16:30:01 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB70U0XJ079067 for ; Sat, 6 Dec 2003 16:30:00 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB70U0HE079064 for perforce@freebsd.org; Sat, 6 Dec 2003 16:30:00 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 6 Dec 2003 16:30:00 -0800 (PST) Message-Id: <200312070030.hB70U0HE079064@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 43515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Dec 2003 00:30:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=43515 Change 43515 by peter@peter_overcee on 2003/12/06 16:29:31 WHAT HAPPEN! SOMEONE SET UP US THE BOMB! Translation: revert jhb's i386 changes that I merged over. They depend on the quirk that cpu_mp_setmaxid sets mp_maxid to MAXCPU - 1; unconditionally. This is not the case here since we set it correctly because we have acpi from the start. Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#25 edit .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#28 edit .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#19 edit Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#25 (text+ko) ==== @@ -351,7 +351,8 @@ apic_register_enumerator(&madt_enumerator); } -SYSINIT(madt_register, SI_SUB_CPU - 1, SI_ORDER_FIRST, madt_register, NULL) +SYSINIT(madt_register, SI_SUB_TUNABLES - 1, SI_ORDER_FIRST, + madt_register, NULL) /* * Call the handler routine for each entry in the MADT table. @@ -643,7 +644,7 @@ if (madt == NULL) return; - for (i = 0; i <= mp_maxid; i++) { + for (i = 0; i < MAXCPU; i++) { if (CPU_ABSENT(i)) continue; pc = pcpu_find(i); ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#28 (text+ko) ==== @@ -542,8 +542,9 @@ } /* - * Probe the APIC enumerators, enumerate CPUs, and initialize the - * local APIC. + * We have to look for CPU's very, very early because certain subsystems + * want to know how many CPU's we have extremely early on in the boot + * process. */ static void apic_init(void *dummy __unused) @@ -586,14 +587,26 @@ if (retval != 0) printf("%s: Failed to probe CPUs: returned %d\n", best_enum->apic_name, retval); +} +SYSINIT(apic_init, SI_SUB_TUNABLES - 1, SI_ORDER_SECOND, apic_init, NULL) - /* Third, initialize the local APIC. */ +/* + * Setup the local APIC. We have to do this prior to starting up the APs + * in the SMP case. + */ +static void +apic_setup_local(void *dummy __unused) +{ + int retval; + + if (best_enum == NULL) + return; retval = best_enum->apic_setup_local(); if (retval != 0) printf("%s: Failed to setup the local APIC: returned %d\n", best_enum->apic_name, retval); } -SYSINIT(apic_init, SI_SUB_CPU, SI_ORDER_FIRST, apic_init, NULL) +SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL) /* * Setup the I/O APICs. ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#19 (text+ko) ==== @@ -370,8 +370,8 @@ apic_register_enumerator(&mptable_enumerator); } -SYSINIT(mptable_register, SI_SUB_CPU - 1, SI_ORDER_FIRST, mptable_register, - NULL) +SYSINIT(mptable_register, SI_SUB_TUNABLES - 1, SI_ORDER_FIRST, + mptable_register, NULL) /* * Call the handler routine for each entry in the MP config table. From owner-p4-projects@FreeBSD.ORG Sat Dec 6 17:11:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22DCD16A4D0; Sat, 6 Dec 2003 17:11:59 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D785D16A4CE for ; Sat, 6 Dec 2003 17:11:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 334A943F75 for ; Sat, 6 Dec 2003 17:11:54 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB71BsXJ088140 for ; Sat, 6 Dec 2003 17:11:54 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB71BrZI088137 for perforce@freebsd.org; Sat, 6 Dec 2003 17:11:53 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 6 Dec 2003 17:11:53 -0800 (PST) Message-Id: <200312070111.hB71BrZI088137@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 43519 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Dec 2003 01:11:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=43519 Change 43519 by peter@peter_overcee on 2003/12/06 17:11:07 IFC @43518 Affected files ... .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#43 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#51 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.ent#8 integrate .. //depot/projects/hammer/share/man/man4/Makefile#29 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.history#9 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.1#4 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#7 integrate Differences ... ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#43 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.206 2003/12/06 20:43:48 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.209 2003/12/07 00:54:22 bmah Exp $ Supported Devices @@ -1104,7 +1104,7 @@ PC standard 8250, 16450, and 16550-based serial ports (&man.sio.4; driver) Serial ports based on the SAB82532 serial - chip, console only (sab driver) + chip, console only (&man.sab.4; driver) Serial ports based on the Zilog 8530 dual uart, console only (zs driver) @@ -1484,73 +1484,9 @@ linkend="bluetooth">Bluetooth section. - Host Controllers (&man.ohci.4; and &man.uhci.4; drivers) - - - ALi Aladdin-V - - - AMD-756 - - - Belkin USB 2.0 High Speed Host Controller - (&man.ehci.4; driver) - - - CMD Tech 670 & 673 - - - Intel 82371SB (PIIX3) - - - Intel 82371AB and EB (PIIX4) - - - Intel 82801AA (ICH) - - - Intel 82801AB (ICH0) - - - Intel 82801BA/BAM (ICH2) - - - Intel 82443MX - - - NEC uPD 9210 (&man.ehci.4; driver) - - - OPTi 82C861 (FireLink) - - - SiS 5571 - - - VIA 83C572 USB - - - UHCI or OHCI compliant motherboard chipsets (no - exceptions known) - - - NEC PC-9821V200 etc (&man.ohci.4; driver) - - - - USB host controllers (PCI) - - - ADS Electronics PCI plug-in card (2 ports) - - - Entrega PCI plug-in card (4 ports) - - - TRY CORPORATION JUS-02 (&man.uhci.4; driver) - - - + OHCI 1.0-compliant host controllers (&man.ohci.4; driver) + + UHCI 1.1-compliant host controllers (&man.uhci.4; driver) USB 2.0 controllers using the EHCI interface (&man.ehci.4; driver) @@ -1624,36 +1560,8 @@ - Serial devices - - - Belkin F5U103 and F5U120 (&man.ubsa.4; driver) - - - e-Tek Labs Kwik232 (&man.ubsa.4; driver) - - - GoHubs GoCOM232 (&man.ubsa.4; driver) - - - HP USB-Serial adapter (&man.uftdi.4; driver) - - - Inland UAS111 (&man.uftdi.4; driver) - - - Peracom single port serial adapter (&man.ubsa.4; driver) - - - Prolific PL-2303 serial adapter (&man.uplcom.4; driver) - - - QVS USC-1000 (&man.uftdi.4; driver) - - - SUNTAC Slipper U VS-10U (&man.uvscom.4; driver) - - + Serial devices (&man.ubsa.4;, + &man.uftdi.4; and &man.uplcom.4; drivers) Scanners (through SANE) (&man.uscanner.4; driver) @@ -1782,39 +1690,10 @@ Host Controllers (&man.fwohci.4; driver) - - - - Ricoh R5C552 chipset - - - Sony CX3022 chipset - - - TI TSB12LV22, LV23, 26 and TSB43AA22 chipsets - - - uPD72861 chipset - - - VIA VT6306 chipset - - - - Storage (&man.sbp.4; driver) - - - - Apple iPod - - - Apple Macintosh G4 (target mode) - - - - + Serial Bus Protocol 2 (SBP-2) + storage devices (&man.sbp.4; driver) @@ -1914,8 +1793,7 @@ Standard keyboards - USB keyboards (specific instances are listed in the - section describing USB devices) + USB keyboards (&man.ukbd.4; driver) @@ -1933,8 +1811,7 @@ Serial mice and compatible devices - USB mice (specific instances are listed in the - section describing USB devices) + USB mice (&man.ums.4; driver) ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#51 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.660 2003/12/05 21:34:31 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.662 2003/12/07 01:08:23 bmah Exp $ 2000 @@ -195,7 +195,7 @@ is no longer needed when only a USB keyboard is connected. &merged; - The &man.cx.4; driver for Cronyx Sigmal + The &man.cx.4; driver for Cronyx-Sigma serial interfaces has been overhauled. As a part of this update, the cxconfig userland configuration utility has been replaced by a newer &man.sconfig.8; utility. @@ -207,7 +207,7 @@ The &man.dcons.4; dumb console driver has been added to provide a local and remote console. It can be - accessed over Firewire using the &man.dcons.crom.4; driver. A + accessed over FireWire using the &man.dcons.crom.4; driver. A &man.dconschat.8; utility provides user access to &man.dcons.4; devices. @@ -228,9 +228,9 @@ symmetric crypto for the 7955 and 7956 chipsets. &merged; - The &man.puc.4;, + The &man.puc.4; PCI Universal Communications driver now supports - to connect parallel ports to the &man.ppc.4; driver. + connecting parallel ports to the &man.ppc.4; driver. The &man.safe.4; driver has been added to support SafeNet 1141- and 1741-based crypto accelerators. @@ -251,6 +251,13 @@ (e.g. Ultra 30) can now run XFree86. + The &man.uart.4; driver has been added to support various + classes of UART (Universal Asynchronous Receiver/Transmitter) + devices. It is an analog of the &man.sio.4; driver but + supports a wider range of devices. This driver is necessary + to support serial ports on certain architectures, such as + ia64 and sparc64. + A kernel software watchdog facility has been implemented. For more information, see &man.watchdog.4; and &man.watchdogd.8;. @@ -291,6 +298,10 @@ Typically these manifested themselves as memory corruption or unexplained crashes. + Logical CPUs (with HyperThreading) are + now enabled according to BIOS settings (previously, they were + disabled by default and had to be enabled explicitly). + @@ -324,7 +335,7 @@ The &man.harp.4; driver has been added. This is a pseudo physical interface driver for HARP, - which attaches to all netgraph ATM interface in the + which attaches to all NetGraph ATM interface in the system and presents a physical interface to the HARP stack for each of these interfaces. @@ -341,13 +352,6 @@ &man.sk.4; now supports SK-9521 V2.0 and 3COM 3C940 based Gigabit Ethernet NICs. &merged; - The &man.uart.4; driver has been added to support various - classes of UART (Universal Asynchronous Receiver/Transmitter) - devices. It is an analog of the &man.sio.4; driver but - supports a wider range of devices. This driver is necessary - to support serial ports on certain architectures, such as - ia64 and sparc64. - A new &man.utopia.4; driver supports 25MBit/sec, 155MBit/sec and 622MBit/sec ATM physical layer configuration, status and statistics reporting for the most commonly use @@ -364,7 +368,7 @@ future growth and new features. The &man.xe.4; driver now supports CE2, CEM28, - and CEM33 cards, and &man.multicast.4; datagram. Also several + and CEM33 cards, and &man.multicast.4; datagrams. Also several bugs in the driver have been fixed. A number of network drivers have had their interrupt @@ -394,6 +398,10 @@ to enable undirected &man.ip.4; broadcasts to be sent to specific network interfaces. + Enabling the options IPFILTER feature + also requires enabling options + PFIL_HOOKS. + A bug in &man.ipfw.4; limit rule processing that could cause various panics has been fixed. &merged; @@ -448,7 +456,7 @@ - A netgraph timeout problem in the &man.ng.hci.4; and + A NetGraph timeout problem in the &man.ng.hci.4; and &man.ng.l2cap.4; kernel modules, which could cause access to a data structure that was already freed, has been fixed. @@ -510,7 +518,7 @@ &man.geom.4; providers. The &man.da.4; driver no longer tries to send 6-byte - commands to USB and Firewire devices. The quirks for these + commands to USB and FireWire devices. The quirks for these devices (which hopefully are now unnecessary) have been disabled; to restore the old behavior, add options DA_OLD_QUIRKS to the kernel configuration. &merged; @@ -601,6 +609,12 @@ Userland Changes + The last bits of the i386-only, a.out compiler + toolchain have been removed. + + &man.acpiconf.8; now supports a option + to print battery information. + &man.acpidb.8;, an ACPI DSDT debugger, has been added. @@ -610,6 +624,10 @@ operations only. It should be useful on routers with numerous network interfaces. &merged; + The &man.asf.8; utility, which helps load + the symbol files from KLDs into a &man.gdb.1; debugging + environment, has been added. + The &man.atmconfig.8; program has been added for configuration of the ATM drivers and IP-over-ATM functionality. @@ -635,6 +653,15 @@ directory of &man.fsck.8; is now 0700 instead of 01777. &merged; + &man.fsck.ffs.8; and &man.newfs.8; now create a + .snap directory in the root directory of + each filesystem, with group operator. + &man.fsck.ffs.8;, &man.mksnap.ffs.8;, and &man.dump.8; will + write their filesystem snapshots to this directory. This change + avoids locking access to the root directory of a filesystem + during snapshot creation and also helps + non-root users create snapshots. + The &man.ffsinfo.8; utility has been updated to understand UFS2 filesystems and has been re-enabled. @@ -654,6 +681,13 @@ to test the syntax of commands without actually changing anything. &merged; + &man.kdump.1; now supports a option to + display only the trace events corresponding to a specific + process. + + &man.last.1; now supports a flag to + limit the number of lines in its output report. + The libalias library, &man.natd.8;, and &man.ppp.8; now support Cisco Skinny Station protocol, which is the protocol used by Cisco IP phones to talk to Cisco Call @@ -676,6 +710,11 @@ The libthr 1:1 threading library is now built by default. + libwrap and &man.tcpdchk.8; are now + configured to support the extended + tcp_wrappers syntax by + default. + The &man.locale.1; utility has been re-implemented and is now POSIX-compliant. A new option shows all available codesets. @@ -725,11 +764,18 @@ A bug that &man.rarpd.8; does not recognize removable Ethernet NICs has been fixed. + &man.repquota.8; now supports a flag to + display users and groups numerically. + &man.rtld.1; now includes libmap functionality by default; the WITH_LIBMAP compile knob is unnecessary and has been retired. More information can be found in &man.libmap.conf.5;. + &man.savecore.8; now supports a flag + that merely indicates the existence or absence of a coredump + file. + The symorder utility has been removed. It is unnecessary now that all kernels use ELF format and there is no a.out format toolchain. @@ -747,6 +793,10 @@ &man.systat.1; now includes displays for IPv6 and ICMPv6 traffic. &merged; + &man.uname.1; now supports a flag to + return the kernel identification. This name is also available + via the kern.ident sysctl variable. + A number of utilities available in /bin and /sbin are now available as a statically-linked crunched binary that lives in @@ -758,7 +808,7 @@ &man.rescue.8;. - Executables in /bin and + Many executables in /bin and /sbin are now built using dynamic, rather than static linking. This feature brings support for loadable PAM and NSS modules to base system utilities located in @@ -801,15 +851,6 @@ - The GCC - option, which formerly controlled linking of the threading - library, has been removed. This flag is confusing in the - presence of multiple threading libraries (specifically - libc_r, libkse, and - libthr). Ports should use the - PTHREAD_LIBS variable to select the correct - threading library. - GNU Readline has been updated from 4.2 to 4.3. @@ -887,7 +928,14 @@ Documentation - + To reduce duplication of information (and subsequent + difficulty in maintaining consistency), many instances of + specific devices supported in the Hardware Notes have been moved + to system manual pages. This project is ongoing as of this + release. + + A Turkish (tr_TR.ISO8859-9) translation project has been + started. ==== //depot/projects/hammer/release/doc/share/sgml/release.ent#8 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -20,7 +20,7 @@ - + ==== //depot/projects/hammer/share/man/man4/Makefile#29 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.243 2003/11/29 18:14:04 ru Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.244 2003/12/07 00:46:37 bmah Exp $ MAN= aac.4 \ acpi.4 \ @@ -221,6 +221,7 @@ rp.4 \ rue.4 \ sa.4 \ + sab.4 \ safe.4 \ sbc.4 \ sbp.4 \ ==== //depot/projects/hammer/usr.bin/calendar/calendars/calendar.history#9 (text+ko) ==== @@ -1,7 +1,7 @@ /* * History * - * $FreeBSD: src/usr.bin/calendar/calendars/calendar.history,v 1.30 2003/10/26 01:18:08 grog Exp $ + * $FreeBSD: src/usr.bin/calendar/calendars/calendar.history,v 1.31 2003/12/06 22:49:30 grog Exp $ */ #ifndef _calendar_history_ @@ -445,6 +445,7 @@ 12/05 Phi Beta Kappa founded, 1776 12/05 The Eighteenth Amendment repealed, ending Prohibition, 1933 12/07 Japan bombs Pearl Harbor, 1941 +12/08 Japan enters Second World War with invasion of Pantai Sabak, Kelantan, 1941 12/09 Ball-bearing roller skates patented, 1884 12/10 Metric system established in France, 1799 12/10 Nobel Peace Prize awarded each year ==== //depot/projects/hammer/usr.bin/kdump/kdump.1#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)kdump.1 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.bin/kdump/kdump.1,v 1.8 2003/06/03 01:44:43 peter Exp $ +.\" $FreeBSD: src/usr.bin/kdump/kdump.1,v 1.9 2003/12/07 01:06:32 peter Exp $ .\" .Dd June 6, 1993 .Dt KDUMP 1 ==== //depot/projects/hammer/usr.bin/kdump/kdump.c#7 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/usr.bin/kdump/kdump.c,v 1.22 2003/06/03 01:44:43 peter Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/kdump/kdump.c,v 1.23 2003/12/07 01:06:32 peter Exp $"); #define _KERNEL extern int errno;