From owner-p4-projects@FreeBSD.ORG Sun Sep 27 17:47:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5F001065694; Sun, 27 Sep 2009 17:47:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9974B106568F for ; Sun, 27 Sep 2009 17:47:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 872798FC17 for ; Sun, 27 Sep 2009 17:47:23 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8RHlNVC032854 for ; Sun, 27 Sep 2009 17:47:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8RHlNwm032852 for perforce@freebsd.org; Sun, 27 Sep 2009 17:47:23 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 27 Sep 2009 17:47:23 GMT Message-Id: <200909271747.n8RHlNwm032852@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 168932 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2009 17:47:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=168932 Change 168932 by hselasky@hselasky_laptop001 on 2009/09/27 17:46:25 USB serial: - add support for polled mode during DDB. - NOTE: not tested yet. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/uark.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uch341.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uslcom.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uvscom.c#12 edit .. //depot/projects/usb/src/sys/modules/usb/ucom/Makefile#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/uark.c#11 (text+ko) ==== @@ -114,6 +114,7 @@ uint8_t *); static void uark_cfg_set_break(struct ucom_softc *, uint8_t); static void uark_cfg_write(struct uark_softc *, uint16_t, uint16_t); +static void uark_poll(struct ucom_softc *ucom); static const struct usb_config uark_xfer_config[UARK_N_TRANSFER] = { @@ -146,6 +147,7 @@ .ucom_stop_read = &uark_stop_read, .ucom_start_write = &uark_start_write, .ucom_stop_write = &uark_stop_write, + .ucom_poll = &uark_poll, }; static device_method_t uark_methods[] = { @@ -431,3 +433,10 @@ "(ignored)\n", usbd_errstr(err)); } } + +static void +uark_poll(struct ucom_softc *ucom) +{ + struct uark_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_xfer, UARK_N_TRANSFER); +} ==== //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#12 (text+ko) ==== @@ -194,6 +194,7 @@ static void ubsa_stop_write(struct ucom_softc *); static void ubsa_cfg_get_status(struct ucom_softc *, uint8_t *, uint8_t *); +static void ubsa_poll(struct ucom_softc *ucom); static const struct usb_config ubsa_config[UBSA_N_TRANSFER] = { @@ -236,6 +237,7 @@ .ucom_stop_read = &ubsa_stop_read, .ucom_start_write = &ubsa_start_write, .ucom_stop_write = &ubsa_stop_write, + .ucom_poll = &ubsa_poll, }; static const struct usb_device_id ubsa_devs[] = { @@ -659,3 +661,11 @@ } } + +static void +ubsa_poll(struct ucom_softc *ucom) +{ + struct ubsa_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_xfer, UBSA_N_TRANSFER); + +} ==== //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#15 (text+ko) ==== @@ -163,6 +163,7 @@ static void ubser_stop_read(struct ucom_softc *); static void ubser_start_write(struct ucom_softc *); static void ubser_stop_write(struct ucom_softc *); +static void ubser_poll(struct ucom_softc *ucom); static const struct usb_config ubser_config[UBSER_N_TRANSFER] = { @@ -193,6 +194,7 @@ .ucom_stop_read = &ubser_stop_read, .ucom_start_write = &ubser_start_write, .ucom_stop_write = &ubser_stop_write, + .ucom_poll = &ubser_poll, }; static device_method_t ubser_methods[] = { @@ -535,3 +537,10 @@ usbd_transfer_stop(sc->sc_xfer[UBSER_BULK_DT_WR]); } + +static void +ubser_poll(struct ucom_softc *ucom) +{ + struct ubser_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_xfer, UBSER_N_TRANSFER); +} ==== //depot/projects/usb/src/sys/dev/usb/serial/uch341.c#2 (text+ko) ==== @@ -118,6 +118,7 @@ static void uch341_stop_read(struct ucom_softc *); static void uch341_start_write(struct ucom_softc *); static void uch341_stop_write(struct ucom_softc *); +static void uch341_poll(struct ucom_softc *ucom); static const struct usb_config uch341_config[UCH341_N_TRANSFER] = { @@ -152,6 +153,7 @@ .ucom_stop_read = &uch341_stop_read, .ucom_start_write = &uch341_start_write, .ucom_stop_write = &uch341_stop_write, + .ucom_poll = &uch341_poll, }; static device_method_t uch341_methods[] = { @@ -519,3 +521,10 @@ usbd_transfer_stop(sc->sc_xfer[UCH341_BULK_DT_WR]); } + +static void +uch341_poll(struct ucom_softc *ucom) +{ + struct uch341_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_xfer, UCH341_N_TRANSFER); +} ==== //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#12 (text+ko) ==== @@ -230,6 +230,7 @@ static void uchcom_set_line_control(struct uchcom_softc *, tcflag_t); static void uchcom_clear_chip(struct uchcom_softc *); static void uchcom_reset_chip(struct uchcom_softc *); +static void uchcom_poll(struct ucom_softc *ucom); static device_probe_t uchcom_probe; static device_attach_t uchcom_attach; @@ -280,6 +281,7 @@ .ucom_stop_read = &uchcom_stop_read, .ucom_start_write = &uchcom_start_write, .ucom_stop_write = &uchcom_stop_write, + .ucom_poll = &uchcom_poll, }; /* ---------------------------------------------------------------------- @@ -888,6 +890,13 @@ } } +static void +uchcom_poll(struct ucom_softc *ucom) +{ + struct uchcom_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_xfer, UCHCOM_N_TRANSFER); +} + static device_method_t uchcom_methods[] = { /* Device interface */ DEVMETHOD(device_probe, uchcom_probe), ==== //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#14 (text+ko) ==== @@ -124,6 +124,7 @@ static void ucycom_cfg_write(struct ucycom_softc *, uint32_t, uint8_t); static int ucycom_pre_param(struct ucom_softc *, struct termios *); static void ucycom_cfg_param(struct ucom_softc *, struct termios *); +static void ucycom_poll(struct ucom_softc *ucom); static const struct usb_config ucycom_config[UCYCOM_N_TRANSFER] = { @@ -154,6 +155,7 @@ .ucom_stop_read = &ucycom_stop_read, .ucom_start_write = &ucycom_start_write, .ucom_stop_write = &ucycom_stop_write, + .ucom_poll = &ucycom_poll, }; static device_method_t ucycom_methods[] = { @@ -578,3 +580,10 @@ } } + +static void +ucycom_poll(struct ucom_softc *ucom) +{ + struct ucycom_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_xfer, UCYCOM_N_TRANSFER); +} ==== //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#13 (text+ko) ==== @@ -230,13 +230,13 @@ static void ufoma_stop_read(struct ucom_softc *); static void ufoma_start_write(struct ucom_softc *); static void ufoma_stop_write(struct ucom_softc *); +static void ufoma_poll(struct ucom_softc *ucom); /*sysctl stuff*/ static int ufoma_sysctl_support(SYSCTL_HANDLER_ARGS); static int ufoma_sysctl_current(SYSCTL_HANDLER_ARGS); static int ufoma_sysctl_open(SYSCTL_HANDLER_ARGS); - static const struct usb_config ufoma_ctrl_config[UFOMA_CTRL_ENDPT_MAX] = { @@ -304,6 +304,7 @@ .ucom_stop_read = &ufoma_stop_read, .ucom_start_write = &ufoma_start_write, .ucom_stop_write = &ufoma_stop_write, + .ucom_poll = &ufoma_poll, }; static device_method_t ufoma_methods[] = { @@ -1241,3 +1242,11 @@ return EINVAL; } + +static void +ufoma_poll(struct ucom_softc *ucom) +{ + struct ufoma_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_ctrl_xfer, UFOMA_CTRL_ENDPT_MAX); + usbd_transfer_poll(sc->sc_bulk_xfer, UFOMA_BULK_ENDPT_MAX); +} ==== //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#15 (text+ko) ==== @@ -156,6 +156,7 @@ static void uftdi_start_write(struct ucom_softc *); static void uftdi_stop_write(struct ucom_softc *); static uint8_t uftdi_8u232am_getrate(uint32_t, uint16_t *); +static void uftdi_poll(struct ucom_softc *ucom); static const struct usb_config uftdi_config[UFTDI_N_TRANSFER] = { @@ -190,6 +191,7 @@ .ucom_stop_read = &uftdi_stop_read, .ucom_start_write = &uftdi_start_write, .ucom_stop_write = &uftdi_stop_write, + .ucom_poll = &uftdi_poll, }; static device_method_t uftdi_methods[] = { @@ -811,3 +813,10 @@ *rate = result; return (0); } + +static void +uftdi_poll(struct ucom_softc *ucom) +{ + struct uftdi_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_xfer, UFTDI_N_TRANSFER); +} ==== //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#14 (text+ko) ==== @@ -110,9 +110,9 @@ static void ugensa_stop_read(struct ucom_softc *); static void ugensa_start_write(struct ucom_softc *); static void ugensa_stop_write(struct ucom_softc *); +static void ugensa_poll(struct ucom_softc *ucom); -static const struct usb_config - ugensa_xfer_config[UGENSA_N_TRANSFER] = { +static const struct usb_config ugensa_xfer_config[UGENSA_N_TRANSFER] = { [UGENSA_BULK_DT_WR] = { .type = UE_BULK, @@ -138,6 +138,7 @@ .ucom_stop_read = &ugensa_stop_read, .ucom_start_write = &ugensa_start_write, .ucom_stop_write = &ugensa_stop_write, + .ucom_poll = &ugensa_poll, }; static device_method_t ugensa_methods[] = { @@ -369,3 +370,12 @@ usbd_transfer_stop(ssc->sc_xfer[UGENSA_BULK_DT_WR]); } + +static void +ugensa_poll(struct ucom_softc *ucom) +{ + struct ugensa_softc *sc = ucom->sc_parent; + struct ugensa_sub_softc *ssc = sc->sc_sub + ucom->sc_portno; + + usbd_transfer_poll(ssc->sc_xfer, UGENSA_N_TRANSFER); +} ==== //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#15 (text+ko) ==== @@ -122,6 +122,7 @@ static void uipaq_cfg_set_dtr(struct ucom_softc *, uint8_t); static void uipaq_cfg_set_rts(struct ucom_softc *, uint8_t); static void uipaq_cfg_set_break(struct ucom_softc *, uint8_t); +static void uipaq_poll(struct ucom_softc *ucom); static const struct usb_config uipaq_config_data[UIPAQ_N_TRANSFER] = { @@ -152,6 +153,7 @@ .ucom_stop_read = &uipaq_stop_read, .ucom_start_write = &uipaq_start_write, .ucom_stop_write = &uipaq_stop_write, + .ucom_poll = &uipaq_poll, }; /* @@ -1342,3 +1344,10 @@ return; } } + +static void +uipaq_poll(struct ucom_softc *ucom) +{ + struct uipaq_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_xfer, UIPAQ_N_TRANSFER); +} ==== //depot/projects/usb/src/sys/dev/usb/serial/umct.c#17 (text+ko) ==== @@ -145,6 +145,7 @@ static void umct_stop_read(struct ucom_softc *); static void umct_start_write(struct ucom_softc *); static void umct_stop_write(struct ucom_softc *); +static void umct_poll(struct ucom_softc *ucom); static const struct usb_config umct_config[UMCT_N_TRANSFER] = { @@ -189,6 +190,7 @@ .ucom_stop_read = &umct_stop_read, .ucom_start_write = &umct_start_write, .ucom_stop_write = &umct_stop_write, + .ucom_poll = &umct_poll, }; static const struct usb_device_id umct_devs[] = { @@ -626,3 +628,10 @@ return; } } + +static void +umct_poll(struct ucom_softc *ucom) +{ + struct umct_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_xfer, UMCT_N_TRANSFER); +} ==== //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#17 (text+ko) ==== @@ -196,6 +196,7 @@ static void *umodem_get_desc(struct usb_attach_arg *, uint8_t, uint8_t); static usb_error_t umodem_set_comm_feature(struct usb_device *, uint8_t, uint16_t, uint16_t); +static void umodem_poll(struct ucom_softc *ucom); static const struct usb_config umodem_config[UMODEM_N_TRANSFER] = { @@ -242,6 +243,7 @@ .ucom_stop_read = &umodem_stop_read, .ucom_start_write = &umodem_start_write, .ucom_stop_write = &umodem_stop_write, + .ucom_poll = &umodem_poll, }; static device_method_t umodem_methods[] = { @@ -810,3 +812,10 @@ return (0); } + +static void +umodem_poll(struct ucom_softc *ucom) +{ + struct umodem_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_xfer, UMODEM_N_TRANSFER); +} ==== //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#12 (text+ko) ==== @@ -210,6 +210,7 @@ static void umoscom_stop_read(struct ucom_softc *); static void umoscom_start_write(struct ucom_softc *); static void umoscom_stop_write(struct ucom_softc *); +static void umoscom_poll(struct ucom_softc *ucom); static const struct usb_config umoscom_config_data[UMOSCOM_N_TRANSFER] = { @@ -257,6 +258,7 @@ .ucom_stop_read = &umoscom_stop_read, .ucom_start_write = &umoscom_start_write, .ucom_stop_write = &umoscom_stop_write, + .ucom_poll = &umoscom_poll, }; static device_method_t umoscom_methods[] = { @@ -694,3 +696,10 @@ return; } } + +static void +umoscom_poll(struct ucom_softc *ucom) +{ + struct umoscom_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_xfer, UMOSCOM_N_TRANSFER); +} ==== //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#14 (text+ko) ==== @@ -186,6 +186,7 @@ static void uplcom_stop_write(struct ucom_softc *); static void uplcom_cfg_get_status(struct ucom_softc *, uint8_t *, uint8_t *); +static void uplcom_poll(struct ucom_softc *ucom); static device_probe_t uplcom_probe; static device_attach_t uplcom_attach; @@ -239,6 +240,7 @@ .ucom_stop_read = &uplcom_stop_read, .ucom_start_write = &uplcom_start_write, .ucom_stop_write = &uplcom_stop_write, + .ucom_poll = &uplcom_poll, }; #define USB_UPL(v,p,rl,rh,t) \ @@ -862,3 +864,10 @@ return; } } + +static void +uplcom_poll(struct ucom_softc *ucom) +{ + struct uplcom_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_xfer, UPLCOM_N_TRANSFER); +} ==== //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#12 (text+ko) ==== @@ -86,6 +86,8 @@ #include #include #include +#include +#include #include #include @@ -98,14 +100,40 @@ #include +#include "opt_gdb.h" + +SYSCTL_NODE(_hw_usb, OID_AUTO, ucom, CTLFLAG_RW, 0, "USB ucom"); + #if USB_DEBUG static int ucom_debug = 0; -SYSCTL_NODE(_hw_usb, OID_AUTO, ucom, CTLFLAG_RW, 0, "USB ucom"); SYSCTL_INT(_hw_usb_ucom, OID_AUTO, debug, CTLFLAG_RW, &ucom_debug, 0, "ucom debug level"); #endif +#define UCOM_CONS_BUFSIZE 1024 + +static uint8_t ucom_cons_rx_buf[UCOM_CONS_BUFSIZE]; +static uint8_t ucom_cons_tx_buf[UCOM_CONS_BUFSIZE]; + +static unsigned int ucom_cons_rx_low = 0; +static unsigned int ucom_cons_rx_high = 0; + +static unsigned int ucom_cons_tx_low = 0; +static unsigned int ucom_cons_tx_high = 0; + +static int ucom_cons_unit = -1; +static int ucom_cons_baud = 9600; +static struct ucom_softc *ucom_cons_softc = NULL; + +TUNABLE_INT("hw.usb.ucom.cons_unit", &ucom_cons_unit); +SYSCTL_INT(_hw_usb_ucom, OID_AUTO, cons_unit, CTLFLAG_RW, + &ucom_cons_unit, 0, "console unit number"); + +TUNABLE_INT("hw.usb.ucom.cons_baud", &ucom_cons_baud); +SYSCTL_INT(_hw_usb_ucom, OID_AUTO, cons_baud, CTLFLAG_RW, + &ucom_cons_baud, 0, "console baud rate"); + static usb_proc_callback_t ucom_cfg_start_transfers; static usb_proc_callback_t ucom_cfg_open; static usb_proc_callback_t ucom_cfg_close; @@ -121,6 +149,7 @@ usb_proc_callback_t *, struct termios *pt, struct usb_proc_msg *t0, struct usb_proc_msg *t1); static void ucom_shutdown(struct ucom_softc *); +static void ucom_ring(struct ucom_softc *, uint8_t); static void ucom_break(struct ucom_softc *, uint8_t); static void ucom_dtr(struct ucom_softc *, uint8_t); static void ucom_rts(struct ucom_softc *, uint8_t); @@ -147,7 +176,7 @@ MODULE_DEPEND(ucom, usb, 1, 1, 1); MODULE_VERSION(ucom, 1); -#define UCOM_UNIT_MAX 0x1000 /* exclusive */ +#define UCOM_UNIT_MAX 0x200 /* exclusive */ #define UCOM_SUB_UNIT_MAX 0x100 /* exclusive */ static uint8_t ucom_bitmap[(UCOM_UNIT_MAX + 7) / 8]; @@ -346,6 +375,29 @@ DPRINTF("ttycreate: %s\n", buf); cv_init(&sc->sc_cv, "ucom"); + /* Check if this device should be a console */ + if ((ucom_cons_softc == NULL) && + (sc->sc_unit == ucom_cons_unit)) { + + struct termios t; + + ucom_cons_softc = sc; + + memset(&t, 0, sizeof(t)); + t.c_ispeed = ucom_cons_baud; + t.c_ospeed = t.c_ispeed; + t.c_cflag = CS8; + + mtx_lock(ucom_cons_softc->sc_mtx); + ucom_cons_rx_low = 0; + ucom_cons_rx_high = 0; + ucom_cons_tx_low = 0; + ucom_cons_tx_high = 0; + sc->sc_flag |= UCOM_FLAG_CONSOLE; + ucom_open(ucom_cons_softc->sc_tty); + ucom_param(ucom_cons_softc->sc_tty, &t); + mtx_unlock(ucom_cons_softc->sc_mtx); + } done: return (error); } @@ -357,12 +409,18 @@ DPRINTF("sc = %p, tp = %p\n", sc, sc->sc_tty); + if (sc->sc_flag & UCOM_FLAG_CONSOLE) { + mtx_lock(ucom_cons_softc->sc_mtx); + ucom_close(ucom_cons_softc->sc_tty); + mtx_unlock(ucom_cons_softc->sc_mtx); + ucom_cons_softc = NULL; + } + /* the config thread has been stopped when we get here */ mtx_lock(sc->sc_mtx); sc->sc_flag |= UCOM_FLAG_GONE; - sc->sc_flag &= ~(UCOM_FLAG_HL_READY | - UCOM_FLAG_LL_READY); + sc->sc_flag &= ~(UCOM_FLAG_HL_READY | UCOM_FLAG_LL_READY); mtx_unlock(sc->sc_mtx); if (tp) { tty_lock(tp); @@ -588,6 +646,8 @@ ucom_modem(tp, SER_DTR | SER_RTS, 0); + ucom_ring(sc, 0); + ucom_break(sc, 0); ucom_status_change(sc); @@ -653,6 +713,16 @@ DPRINTF("cmd = 0x%08lx\n", cmd); switch (cmd) { +#if 0 + case TIOCSRING: + ucom_ring(sc, 1); + error = 0; + break; + case TIOCCRING: + ucom_ring(sc, 0); + error = 0; + break; +#endif case TIOCSBRK: ucom_break(sc, 1); error = 0; @@ -751,6 +821,8 @@ mask |= UCOM_LS_RTS; if (sc->sc_callback->ucom_cfg_set_break) mask |= UCOM_LS_BREAK; + if (sc->sc_callback->ucom_cfg_set_ring) + mask |= UCOM_LS_RING; /* compute the bits we are to program */ notch_bits = (sc->sc_pls_set & sc->sc_pls_clr) & mask; @@ -773,6 +845,9 @@ if (notch_bits & UCOM_LS_BREAK) sc->sc_callback->ucom_cfg_set_break(sc, (prev_value & UCOM_LS_BREAK) ? 1 : 0); + if (notch_bits & UCOM_LS_RING) + sc->sc_callback->ucom_cfg_set_ring(sc, + (prev_value & UCOM_LS_RING) ? 1 : 0); /* set last value */ if (any_bits & UCOM_LS_DTR) @@ -784,6 +859,9 @@ if (any_bits & UCOM_LS_BREAK) sc->sc_callback->ucom_cfg_set_break(sc, (last_value & UCOM_LS_BREAK) ? 1 : 0); + if (any_bits & UCOM_LS_RING) + sc->sc_callback->ucom_cfg_set_ring(sc, + (last_value & UCOM_LS_RING) ? 1 : 0); } static void @@ -811,6 +889,17 @@ } static void +ucom_ring(struct ucom_softc *sc, uint8_t onoff) +{ + DPRINTF("onoff = %d\n", onoff); + + if (onoff) + ucom_line_state(sc, UCOM_LS_RING, 0); + else + ucom_line_state(sc, 0, UCOM_LS_RING); +} + +static void ucom_break(struct ucom_softc *sc, uint8_t onoff) { DPRINTF("onoff = %d\n", onoff); @@ -895,6 +984,9 @@ { mtx_assert(sc->sc_mtx, MA_OWNED); + if (sc->sc_flag & UCOM_FLAG_CONSOLE) + return; /* not supported */ + if (!(sc->sc_flag & UCOM_FLAG_HL_READY)) { return; } @@ -1033,6 +1125,38 @@ mtx_assert(sc->sc_mtx, MA_OWNED); + if (sc->sc_flag & UCOM_FLAG_CONSOLE) { + unsigned int temp; + + /* get total TX length */ + + temp = ucom_cons_tx_high - ucom_cons_tx_low; + temp %= UCOM_CONS_BUFSIZE; + + /* limit TX length */ + + if (temp > (UCOM_CONS_BUFSIZE - ucom_cons_tx_low)) + temp = (UCOM_CONS_BUFSIZE - ucom_cons_tx_low); + + if (temp > len) + temp = len; + + /* copy in data */ + + usbd_copy_in(pc, offset, ucom_cons_tx_buf + ucom_cons_tx_low, temp); + + /* update counters */ + + ucom_cons_tx_low += temp; + ucom_cons_tx_low %= UCOM_CONS_BUFSIZE; + + /* store actual length */ + + *actlen = temp; + + return (temp ? 1 : 0); + } + if (tty_gone(tp) || !(sc->sc_flag & UCOM_FLAG_GP_DATA)) { actlen[0] = 0; @@ -1080,6 +1204,34 @@ mtx_assert(sc->sc_mtx, MA_OWNED); + if (sc->sc_flag & UCOM_FLAG_CONSOLE) { + unsigned int temp; + + /* get maximum RX length */ + + temp = (UCOM_CONS_BUFSIZE - 1) - ucom_cons_rx_high + ucom_cons_rx_low; + temp %= UCOM_CONS_BUFSIZE; + + /* limit RX length */ + + if (temp > (UCOM_CONS_BUFSIZE - ucom_cons_rx_high)) + temp = (UCOM_CONS_BUFSIZE - ucom_cons_rx_high); + + if (temp > len) + temp = len; + + /* copy out data */ + + usbd_copy_out(pc, offset, ucom_cons_rx_buf + ucom_cons_rx_high, temp); + + /* update counters */ + + ucom_cons_rx_high += temp; + ucom_cons_rx_high %= UCOM_CONS_BUFSIZE; + + return; + } + if (tty_gone(tp)) return; /* multiport device polling */ @@ -1136,3 +1288,138 @@ cv_signal(&sc->sc_cv); mtx_unlock(sc->sc_mtx); } + +static cn_probe_t ucom_cnprobe; +static cn_init_t ucom_cninit; +static cn_term_t ucom_cnterm; +static cn_getc_t ucom_cngetc; +static cn_putc_t ucom_cnputc; + +CONSOLE_DRIVER(ucom); + +static void +ucom_cnprobe(struct consdev *cp) +{ + cp->cn_pri = CN_NORMAL; +} + +static void +ucom_cninit(struct consdev *cp) +{ +} + +static void +ucom_cnterm(struct consdev *cp) +{ +} + +static int +ucom_cngetc(struct consdev *cd) +{ + struct ucom_softc *sc = ucom_cons_softc; + int c; + + if (sc == NULL) + return (-1); + + mtx_lock(sc->sc_mtx); + + if (ucom_cons_rx_low != ucom_cons_rx_high) { + c = ucom_cons_rx_buf[ucom_cons_rx_low]; + ucom_cons_rx_low ++; + ucom_cons_rx_low %= UCOM_CONS_BUFSIZE; + } else { + c = -1; + } + + /* start USB transfers */ + ucom_outwakeup(sc->sc_tty); + + mtx_unlock(sc->sc_mtx); + + /* poll if necessary */ + if (kdb_active && sc->sc_callback->ucom_poll) + (sc->sc_callback->ucom_poll) (sc); + + return (c); +} + +static void +ucom_cnputc(struct consdev *cd, int c) +{ + struct ucom_softc *sc = ucom_cons_softc; + unsigned int temp; + + if (sc == NULL) + return; + + repeat: + + mtx_lock(sc->sc_mtx); + + /* compute maximum TX length */ + + temp = (UCOM_CONS_BUFSIZE - 1) - ucom_cons_tx_high + ucom_cons_tx_low; + temp %= UCOM_CONS_BUFSIZE; + + if (temp) { + ucom_cons_tx_buf[ucom_cons_tx_high] = c; + ucom_cons_tx_high ++; + ucom_cons_tx_high %= UCOM_CONS_BUFSIZE; + } + + /* start USB transfers */ + ucom_outwakeup(sc->sc_tty); + + mtx_unlock(sc->sc_mtx); + + /* poll if necessary */ + if (kdb_active && sc->sc_callback->ucom_poll) { + (sc->sc_callback->ucom_poll) (sc); + /* simple flow control */ + if (temp == 0) + goto repeat; + } +} + +#if defined(GDB) + +#include + +static gdb_probe_f ucom_gdbprobe; +static gdb_init_f ucom_gdbinit; +static gdb_term_f ucom_gdbterm; +static gdb_getc_f ucom_gdbgetc; +static gdb_putc_f ucom_gdbputc; + +GDB_DBGPORT(sio, ucom_gdbprobe, ucom_gdbinit, ucom_gdbterm, ucom_gdbgetc, ucom_gdbputc); + +static int +ucom_gdbprobe(void) +{ + return ((ucom_cons_softc != NULL) ? 0 : -1); +} + +static void +ucom_gdbinit(void) +{ +} + +static void +ucom_gdbterm(void) +{ +} + +static void +ucom_gdbputc(int c) +{ + ucom_cnputc(NULL, c); +} + +static int +ucom_gdbgetc(void) +{ + return (ucom_cngetc(NULL)); +} + +#endif ==== //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.h#7 (text+ko) ==== @@ -94,6 +94,7 @@ void (*ucom_cfg_set_dtr) (struct ucom_softc *, uint8_t); void (*ucom_cfg_set_rts) (struct ucom_softc *, uint8_t); void (*ucom_cfg_set_break) (struct ucom_softc *, uint8_t); + void (*ucom_cfg_set_ring) (struct ucom_softc *, uint8_t); void (*ucom_cfg_param) (struct ucom_softc *, struct termios *); void (*ucom_cfg_open) (struct ucom_softc *); void (*ucom_cfg_close) (struct ucom_softc *); @@ -105,6 +106,7 @@ void (*ucom_start_write) (struct ucom_softc *); void (*ucom_stop_write) (struct ucom_softc *); void (*ucom_tty_name) (struct ucom_softc *, char *pbuf, uint16_t buflen, uint16_t local_subunit); + void (*ucom_poll) (struct ucom_softc *); }; /* Line status register */ @@ -162,13 +164,14 @@ uint32_t sc_unit; uint32_t sc_local_unit; uint16_t sc_portno; - uint8_t sc_flag; + uint16_t sc_flag; #define UCOM_FLAG_RTS_IFLOW 0x01 /* use RTS input flow control */ #define UCOM_FLAG_GONE 0x02 /* the device is gone */ #define UCOM_FLAG_ATTACHED 0x04 /* set if attached */ #define UCOM_FLAG_GP_DATA 0x08 /* set if get and put data is possible */ #define UCOM_FLAG_LL_READY 0x20 /* set if low layer is ready */ #define UCOM_FLAG_HL_READY 0x40 /* set if high layer is ready */ +#define UCOM_FLAG_CONSOLE 0x80 /* set if device is a console */ uint8_t sc_lsr; uint8_t sc_msr; uint8_t sc_mcr; @@ -180,6 +183,7 @@ #define UCOM_LS_DTR 0x01 #define UCOM_LS_RTS 0x02 #define UCOM_LS_BREAK 0x04 +#define UCOM_LS_RING 0x08 }; #define ucom_cfg_do_request(udev,com,req,ptr,flags,timo) \ ==== //depot/projects/usb/src/sys/dev/usb/serial/uslcom.c#12 (text+ko) ==== @@ -135,6 +135,7 @@ static void uslcom_stop_read(struct ucom_softc *); static void uslcom_start_write(struct ucom_softc *); static void uslcom_stop_write(struct ucom_softc *); +static void uslcom_poll(struct ucom_softc *ucom); static const struct usb_config uslcom_config[USLCOM_N_TRANSFER] = { @@ -170,6 +171,7 @@ .ucom_stop_read = &uslcom_stop_read, .ucom_start_write = &uslcom_start_write, .ucom_stop_write = &uslcom_stop_write, + .ucom_poll = &uslcom_poll, }; static const struct usb_device_id uslcom_devs[] = { @@ -562,3 +564,10 @@ usbd_transfer_stop(sc->sc_xfer[USLCOM_BULK_DT_WR]); } + +static void +uslcom_poll(struct ucom_softc *ucom) +{ + struct uslcom_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_xfer, USLCOM_N_TRANSFER); +} ==== //depot/projects/usb/src/sys/dev/usb/serial/uvscom.c#12 (text+ko) ==== @@ -185,6 +185,7 @@ uint8_t *); static void uvscom_cfg_write(struct uvscom_softc *, uint8_t, uint16_t); static uint16_t uvscom_cfg_read_status(struct uvscom_softc *); +static void uvscom_poll(struct ucom_softc *ucom); static const struct usb_config uvscom_config[UVSCOM_N_TRANSFER] = { @@ -230,6 +231,7 @@ .ucom_stop_read = &uvscom_stop_read, .ucom_start_write = &uvscom_start_write, .ucom_stop_write = &uvscom_stop_write, + .ucom_poll = &uvscom_poll, }; static const struct usb_device_id uvscom_devs[] = { @@ -734,3 +736,10 @@ } return (data[0] | (data[1] << 8)); } + +static void +uvscom_poll(struct ucom_softc *ucom) +{ + struct uvscom_softc *sc = ucom->sc_parent; + usbd_transfer_poll(sc->sc_xfer, UVSCOM_N_TRANSFER); +} ==== //depot/projects/usb/src/sys/modules/usb/ucom/Makefile#2 (text+ko) ==== @@ -30,7 +30,7 @@ .PATH: $S/dev/usb/serial KMOD= ucom -SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ +SRCS= opt_bus.h opt_usb.h opt_gdb.h device_if.h bus_if.h usb_if.h usbdevs.h \ usb_serial.c >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 27 18:10:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 964761065670; Sun, 27 Sep 2009 18:10:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42DF61065679 for ; Sun, 27 Sep 2009 18:10:49 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 317A68FC1C for ; Sun, 27 Sep 2009 18:10:49 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8RIAmNK035658 for ; Sun, 27 Sep 2009 18:10:48 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8RIAmEl035656 for perforce@freebsd.org; Sun, 27 Sep 2009 18:10:48 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 27 Sep 2009 18:10:48 GMT Message-Id: <200909271810.n8RIAmEl035656@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 168933 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2009 18:10:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=168933 Change 168933 by pgj@beehive on 2009/09/27 18:09:53 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#12 integrate .. //depot/projects/docproj_hu/www/en/releases/8.0R/docbook.css#1 branch .. //depot/projects/docproj_hu/www/en/releases/8.0R/schedule.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/releases/Makefile#4 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#53 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#16 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#12 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.86 2009/09/23 08:19:30 erwin Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.87 2009/09/23 10:08:43 erwin Exp $ @@ -102,7 +102,7 @@ ftp14.FreeBSD.org ftp://ftp14.FreeBSD.org/pub/FreeBSD/ - ftp://ftp14.FreeBSD.org/pub/FreeBSD/ + http://ftp14.FreeBSD.org/pub/FreeBSD/ ==== //depot/projects/docproj_hu/www/en/releases/8.0R/schedule.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -96,34 +96,41 @@ BETA3 13 July 2009 - - + 24 August 2009 Third beta test snapshot. + BETA4 builds + 5 September 2009 + 7 September 2009 + Begin BETA4 builds. + + + RC1 - 27 July 2009 - - + 14 September 2009 + 21 September 2009 First release candidate. RC2 - 17 August 2009 + 21 September 2009 - Second release candidate. RELEASE build - 31 August 2009 + 28 September 2009 - 8.0-RELEASE built. RELEASE announcement - 4 September 2009 + TBD - 8.0-RELEASE announced. ==== //depot/projects/docproj_hu/www/en/releases/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/releases/Makefile,v 1.53 2009/03/17 13:40:36 rwatson Exp $ +# $FreeBSD: www/en/releases/Makefile,v 1.54 2009/09/23 20:03:59 blackend Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -15,7 +15,7 @@ SUBDIR+= 4.6.2R 4.7R 4.8R 4.9R 4.10R 4.11R SUBDIR+= 5.0R 5.1R 5.2R 5.2.1R 5.3R 5.4R 5.5R SUBDIR+= 6.0R 6.1R 6.2R 6.3R 6.4R -SUBDIR+= 7.0R 7.1R 7.2R +SUBDIR+= 7.0R 7.1R 7.2R 8.0R .if defined $(NEW_BUILD) SUBDIR= ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#53 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.21 2009/09/20 19:54:35 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.22 2009/09/23 10:50:07 pgj Exp $ ==== //depot/projects/docproj_hu/www/share/sgml/release.ent#16 (text+ko) ==== @@ -1,4 +1,4 @@ - + - + - - - - + + + + @@ -190,19 +190,19 @@ hozzáadás - Tegyük fel, hogy a jelenleg egyetlen meghajtót - tartalmazó rendszerünket szeretnénk - bõvíteni egy új SCSI-lemez - hozzáadásával. Ehhez elsõként - kapcsoljuk ki a számítógépünket - és szereljük be a helyére az új - meghajtót a számítógép, a - lemezvezérlõ és a meghajtó - gyártójának utasításai - alapján. Mivel ezt a mûveletet rengeteg módon - lehet elvégezni, ezért ennek pontos - részleteivel ez a leírás most nem - foglalkozik. + Ebben a szakaszban arról lesz szó, hogy a + jelenleg egyetlen meghajtót tartalmazó + rendszerünket hogyan tudjuk bõvíteni egy + új SCSI-lemez hozzáadásával. Ehhez + elsõként kapcsoljuk ki a + számítógépünket és + szereljük be a helyére az új meghajtót a + számítógép, a lemezvezérlõ + és a meghajtó gyártójának + utasításai alapján. Mivel ezt a + mûveletet rengeteg módon lehet elvégezni, + ezért ennek pontos részleteivel ez a + leírás most nem foglalkozik. Jelentkezzünk be root felhasználóként. Miután ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#16 (text+ko) ==== @@ -6,7 +6,7 @@ @@ -856,10 +856,10 @@ információkat tudunk átadni a &man.gcc.1; fordítónak. - options SCHED_4BSD # 4BSD ütemezõ + options SCHED_ULE # ULE ütemezõ - A &os; tradicionális és alapértelmezett - rendszerütemezõje. Ne változtassuk meg! + A &os; alapértelmezett rendszerütemezõje. Ne + változtassuk meg! options PREEMPTION # a rendszerszálak megszakíthatóságának engedélyezése From owner-p4-projects@FreeBSD.ORG Sun Sep 27 19:03:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 720F6106568F; Sun, 27 Sep 2009 19:03:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1DF661065672 for ; Sun, 27 Sep 2009 19:03:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0B21D8FC32 for ; Sun, 27 Sep 2009 19:03:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8RJ3lre040537 for ; Sun, 27 Sep 2009 19:03:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8RJ3lH8040535 for perforce@freebsd.org; Sun, 27 Sep 2009 19:03:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 27 Sep 2009 19:03:47 GMT Message-Id: <200909271903.n8RJ3lH8040535@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 Cc: Subject: PERFORCE change 168936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2009 19:03:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=168936 Change 168936 by rwatson@rwatson_cinnamon on 2009/09/27 19:03:30 Declare ourselves OpenBSM 1.2alpha1 -- we don't have much to show for the new version number yet, but we're arguably into new feature territory rather than patching 1.1 further. If we do need further 1.1 patch releases, we can branch from the previous revision. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#44 edit .. //depot/projects/trustedbsd/openbsm/VERSION#27 edit .. //depot/projects/trustedbsd/openbsm/configure#56 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#55 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#44 (text+ko) ==== @@ -1,5 +1,7 @@ OpenBSM Version History +OpenBSM 1.2 alpha 1 + OpenBSM 1.1p2 - Fix audit_event definitions of AUE_OPENAT_RWT and AUE_OPENAT_RWTC. @@ -464,4 +466,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#43 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#44 $ ==== //depot/projects/trustedbsd/openbsm/VERSION#27 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_1p2 +OPENBSM_1_2alpha1 ==== //depot/projects/trustedbsd/openbsm/configure#56 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#53 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#54 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for OpenBSM 1.1p2. +# Generated by GNU Autoconf 2.62 for OpenBSM 1.2alpha1. # # Report bugs to . # @@ -751,8 +751,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.1p2' -PACKAGE_STRING='OpenBSM 1.1p2' +PACKAGE_VERSION='1.2alpha1' +PACKAGE_STRING='OpenBSM 1.2alpha1' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -1492,7 +1492,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.1p2 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.2alpha1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1562,7 +1562,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.1p2:";; + short | recursive ) echo "Configuration of OpenBSM 1.2alpha1:";; esac cat <<\_ACEOF @@ -1671,7 +1671,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.1p2 +OpenBSM configure 1.2alpha1 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1685,7 +1685,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.1p2, which was +It was created by OpenBSM $as_me 1.2alpha1, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -19662,7 +19662,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.1p2 + VERSION=1.2alpha1 cat >>confdefs.h <<_ACEOF @@ -24400,7 +24400,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenBSM $as_me 1.1p2, which was +This file was extended by OpenBSM $as_me 1.2alpha1, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24453,7 +24453,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -OpenBSM config.status 1.1p2 +OpenBSM config.status 1.2alpha1 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/trustedbsd/openbsm/configure.ac#55 (text+ko) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.1p2], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#54 $]) +AC_INIT([OpenBSM], [1.2alpha1], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#55 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) From owner-p4-projects@FreeBSD.ORG Sun Sep 27 19:05:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DA81106568B; Sun, 27 Sep 2009 19:05:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0232D1065672 for ; Sun, 27 Sep 2009 19:05:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C98A58FC1F for ; Sun, 27 Sep 2009 19:05:49 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8RJ5nbf040745 for ; Sun, 27 Sep 2009 19:05:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8RJ5ndw040743 for perforce@freebsd.org; Sun, 27 Sep 2009 19:05:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 27 Sep 2009 19:05:49 GMT Message-Id: <200909271905.n8RJ5ndw040743@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 Cc: Subject: PERFORCE change 168937 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2009 19:05:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=168937 Change 168937 by rwatson@rwatson_cinnamon on 2009/09/27 19:04:52 Add audit events for FreeBSD process descriptor system calls. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#45 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#42 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#45 (text+ko) ==== @@ -2,6 +2,8 @@ OpenBSM 1.2 alpha 1 +- Add audit events for FreeBSD process descriptor system calls. + OpenBSM 1.1p2 - Fix audit_event definitions of AUE_OPENAT_RWT and AUE_OPENAT_RWTC. @@ -466,4 +468,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#44 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#45 $ ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#42 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#41 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#42 $ # # The mapping between event identifiers and values is also hard-coded in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, @@ -557,6 +557,10 @@ 43194:AUE_FSCTL:fsctl():fm 43195:AUE_FFSCTL:ffsctl():fm 43196:AUE_LPATHCONF:lpathconf(2):fa +43197:AUE_PDFORK:pdfork(2):pc +43198:AUE_PDKILL:pdkill(2):pc +43199:AUE_PDGETPID:pdgetpid(2):pc +43200:AUE_PDWAIT:pdwait(2):pc # # Solaris userspace events. # ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#9 (text+ko) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#8 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#9 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -597,6 +597,10 @@ #define AUE_FSCTL 43194 /* Darwin. */ #define AUE_FFSCTL 43195 /* Darwin. */ #define AUE_LPATHCONF 43196 /* FreeBSD. */ +#define AUE_PDFORK 43197 /* FreeBSD. */ +#define AUE_PDKILL 43198 /* FreeBSD. */ +#define AUE_PDGETPID 43199 /* FreeBSD. */ +#define AUE_PDWAIT 43200 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-p4-projects@FreeBSD.ORG Sun Sep 27 19:56:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 405241065695; Sun, 27 Sep 2009 19:56:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF1451065692 for ; Sun, 27 Sep 2009 19:56:45 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CDC068FC0A for ; Sun, 27 Sep 2009 19:56:45 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8RJuj9W044349 for ; Sun, 27 Sep 2009 19:56:45 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8RJujhF044347 for perforce@freebsd.org; Sun, 27 Sep 2009 19:56:45 GMT (envelope-from gabor@freebsd.org) Date: Sun, 27 Sep 2009 19:56:45 GMT Message-Id: <200909271956.n8RJujhF044347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 168939 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2009 19:56:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=168939 Change 168939 by gabor@gabor_aspire on 2009/09/27 19:56:14 MFHg: - man page improvements Affected files ... .. //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/iconv.3#6 edit .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/iconv.1#5 edit .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkcsmapper/Makefile#7 edit .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkesdb/Makefile#7 edit Differences ... ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/libiconv/iconv.3#6 (text+ko) ==== @@ -27,16 +27,13 @@ .Dd August 1, 2004 .Dt ICONV 3 .Os -.\" ---------------------------------------------------------------------- .Sh NAME .Nm iconv_open , .Nm iconv_close , .Nm iconv .Nd codeset conversion functions -.\" ---------------------------------------------------------------------- .Sh LIBRARY .Lb libc -.\" ---------------------------------------------------------------------- .Sh SYNOPSIS .In iconv.h .Ft iconv_t @@ -45,7 +42,6 @@ .Fn iconv_close "iconv_t cd" .Ft size_t .Fn iconv "iconv_t cd" "const char ** restrict src" "size_t * restrict srcleft" "char ** restrict dst" "size_t * restrict dstleft" -.\" ---------------------------------------------------------------------- .Sh DESCRIPTION The .Fn iconv_open @@ -152,7 +148,6 @@ In this case, the shift sequence for the destination switching to the initial state is discarded. .El -.\" ---------------------------------------------------------------------- .Sh RETURN VALUES Upon successful completion of .Fn iconv_open , @@ -176,7 +171,6 @@ Otherwise, .Fn iconv returns (size_t)\-1 and sets errno to indicate the error. -.\" ---------------------------------------------------------------------- .Sh ERRORS The .Fn iconv_open @@ -223,10 +217,10 @@ .Fa *src terminates with an incomplete character or shift sequence. .El -.\" ---------------------------------------------------------------------- .Sh SEE ALSO -.Xr iconv 1 -.\" ---------------------------------------------------------------------- +.Xr iconv 1 , +.Xr mkcsmapper 1 , +.Xr mkesdb 1 .Sh STANDARDS .Fn iconv_open , .Fn iconv_close , @@ -234,7 +228,6 @@ .Fn iconv conform to .St -p1003.1-2001 . -.\" ---------------------------------------------------------------------- .Sh BUGS If .Fn iconv ==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/iconv.1#5 (text+ko) ==== @@ -27,11 +27,9 @@ .Dd March 20, 2008 .Dt ICONV 1 .Os -.\" ---------------------------------------------------------------------- .Sh NAME .Nm iconv .Nd codeset conversion utility -.\" ---------------------------------------------------------------------- .Sh SYNOPSIS .Nm .Op Fl cs @@ -54,7 +52,6 @@ .Op Ar file ... .Nm .Fl l -.\" ---------------------------------------------------------------------- .Sh DESCRIPTION The .Nm @@ -104,19 +101,18 @@ Specifies the destination codeset name as .Ar to_name . .El -.\" ---------------------------------------------------------------------- .Sh EXIT STATUS .Ex -std iconv -.\" ---------------------------------------------------------------------- .Sh SEE ALSO +.Xr mkcsmapper 1 , +.Xr mkesdb 1 , .Xr iconv 3 -.\" ---------------------------------------------------------------------- .Sh STANDARDS .Nm conform to .St -p1003.1-2001 . -.\" ---------------------------------------------------------------------- .Sh HISTORY .Nm first appeared in -.Nx 2.0 . +.Nx 2.0 , and made its appearance in +.Fx 9.0 . ==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkcsmapper/Makefile#7 (text+ko) ==== @@ -3,7 +3,6 @@ PROG= mkcsmapper SRCS= yacc.y lex.l CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libiconv -I${.CURDIR}/../../lib/libiconv_modules/mapper_std -NO_MAN= yes WARNS?= 6 LDADD+= -liconv ==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkesdb/Makefile#7 (text+ko) ==== @@ -3,7 +3,6 @@ PROG= mkesdb SRCS= yacc.y lex.l CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libiconv -NO_MAN= yes WARNS?= 6 LDADD+= -liconv From owner-p4-projects@FreeBSD.ORG Sun Sep 27 19:57:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EF971065693; Sun, 27 Sep 2009 19:57:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 03B3A106568D for ; Sun, 27 Sep 2009 19:57:47 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CD3998FC0A for ; Sun, 27 Sep 2009 19:57:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8RJvkhn044406 for ; Sun, 27 Sep 2009 19:57:46 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8RJvkjA044404 for perforce@freebsd.org; Sun, 27 Sep 2009 19:57:46 GMT (envelope-from gabor@freebsd.org) Date: Sun, 27 Sep 2009 19:57:46 GMT Message-Id: <200909271957.n8RJvkjA044404@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 168940 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2009 19:57:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=168940 Change 168940 by gabor@gabor_aspire on 2009/09/27 19:56:56 MFHg: - add some new man pages Affected files ... .. //depot/projects/soc2009/gabor_iconv/extracted/share/man/man5/csmapper.5#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/share/man/man5/esdb.5#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkcsmapper/mkcsmapper.1#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkesdb/mkesdb.1#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Sep 27 20:48:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFDCD1065672; Sun, 27 Sep 2009 20:48:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73073106566C for ; Sun, 27 Sep 2009 20:48:42 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 60E8A8FC0C for ; Sun, 27 Sep 2009 20:48:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8RKmgs4059190 for ; Sun, 27 Sep 2009 20:48:42 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8RKmgMc059188 for perforce@freebsd.org; Sun, 27 Sep 2009 20:48:42 GMT (envelope-from lulf@FreeBSD.org) Date: Sun, 27 Sep 2009 20:48:42 GMT Message-Id: <200909272048.n8RKmgMc059188@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 168941 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2009 20:48:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=168941 Change 168941 by lulf@lulf_nobby on 2009/09/27 20:48:24 - Rework devclock interface by putting the device itself responsible for storing a pointer to it's clock. This is necessary due to some devices having more than one clock, therefore there is no transparent way for for a the handler to know which clock a device wants. This also allows for a cleaner interface on both sides. - Introduce a machine-dependent handler of device clock requests, which the devclk implementation will use in order to lookup the appropriate clock for a device. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/at32.c#12 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_hmatrix.c#3 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_intc.c#2 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_pio.c#3 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_pm.c#9 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_rtc.c#4 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_sdramc.c#3 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_smc.c#2 edit .. //depot/projects/avr32/src/sys/avr32/avr32/clock.c#7 edit .. //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap700x.hints#7 edit .. //depot/projects/avr32/src/sys/dev/mmc/atmel_mci.c#7 edit .. //depot/projects/avr32/src/sys/dev/uart/uart_dev_atmel.c#9 edit .. //depot/projects/avr32/src/sys/kern/devclk_if.m#7 edit .. //depot/projects/avr32/src/sys/kern/subr_devclk.c#8 edit .. //depot/projects/avr32/src/sys/sys/devclk.h#7 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/at32.c#12 (text+ko) ==== @@ -123,9 +123,6 @@ int rid; struct at32_softc *sc = device_get_softc(dev); - /* Initialize devclk manager. */ - devclk_init(); - /* Resource list for IRQ */ /* Reserve irqs from nexus ? */ sc->sc_irq_rman.rm_type = RMAN_ARRAY; ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_hmatrix.c#3 (text+ko) ==== @@ -104,6 +104,7 @@ int regs_rid; bus_space_tag_t bst; bus_space_handle_t bsh; + devclk_t clk; }; static device_method_t at32_hmatrix_methods[] = { /* Device interface */ @@ -131,10 +132,16 @@ static int at32_hmatrix_attach(device_t dev) { + struct at32_hmatrix_softc *sc = device_get_softc(dev); int err; + sc->clk = devclk_alloc(dev); + if (sc->clk == NULL) + return (ENOMEM); + err = at32_hmatrix_activate(dev); if (err) { + devclk_free(sc->clk); return (err); } @@ -162,7 +169,9 @@ static int at32_hmatrix_detach(device_t dev) { + struct at32_hmatrix_softc *sc = device_get_softc(dev); at32_hmatrix_deactivate(dev); + devclk_free(sc->clk); return (0); } @@ -171,9 +180,6 @@ { struct at32_hmatrix_softc *sc = device_get_softc(dev); - /* Make sure device clock is enabled before writing */ - devclk_enable(dev); - /* Set private data and map register space */ sc->regs_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->regs_rid, 0, ~0, 0, RF_ACTIVE); @@ -182,7 +188,7 @@ } sc->bsh = rman_get_bushandle(sc->regs_res); sc->bst = rman_get_bustag(sc->regs_res); - + devclk_enable(sc->clk); return (0); err: @@ -200,8 +206,7 @@ rman_get_rid(sc->regs_res), sc->regs_res); } - /* Turn off device clock */ - devclk_disable(dev); + devclk_disable(sc->clk); } #ifdef notyet ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_intc.c#2 (text+ko) ==== @@ -69,6 +69,7 @@ int regs_rid; bus_space_tag_t bst; bus_space_handle_t bsh; + devclk_t clk; }; static device_method_t at32_intc_methods[] = { /* Device interface */ @@ -96,10 +97,15 @@ static int at32_intc_attach(device_t dev) { + struct at32_intc_softc *sc = device_get_softc(dev); int err; + sc->clk = devclk_alloc(dev); + if (sc->clk == NULL) + return (ENOMEM); err = at32_intc_activate(dev); if (err) { + devclk_free(sc->clk); return (err); } @@ -109,7 +115,10 @@ static int at32_intc_detach(device_t dev) { + struct at32_intc_softc *sc = device_get_softc(dev); + at32_intc_deactivate(dev); + devclk_free(sc->clk); return (0); } @@ -119,9 +128,6 @@ struct at32_intc_softc *sc = device_get_softc(dev); int err = ENOMEM; - /* Make sure device clock is enabled before writing */ - devclk_enable(dev); - /* Set private data and map register space */ sc->regs_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->regs_rid, 0, ~0, 0, RF_ACTIVE); @@ -131,6 +137,9 @@ sc->bsh = rman_get_bushandle(sc->regs_res); sc->bst = rman_get_bustag(sc->regs_res); + /* Make sure device clock is enabled before writing */ + devclk_enable(sc->clk); + return (0); err: @@ -149,5 +158,5 @@ } /* Turn off device clock */ - devclk_disable(dev); + devclk_disable(sc->clk); } ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_pio.c#3 (text+ko) ==== @@ -55,6 +55,7 @@ /* Driver variables and private data */ struct at32_pio_softc { device_t dev; /* Myself */ + devclk_t clk; }; static device_method_t at32_pio_methods[] = { /* Device interface */ @@ -108,7 +109,10 @@ sc->dev = dev; /* Make sure clock is active before doing anything */ - devclk_enable(dev); + sc->clk = devclk_alloc(dev); + if (sc->clk == NULL) + return (ENOMEM); + devclk_enable(sc->clk); return 0; } @@ -116,6 +120,10 @@ static int at32_pio_detach(device_t dev) { + struct at32_pio_softc *sc = device_get_softc(dev); + + devclk_disable(sc->clk); + devclk_free(sc->clk); return (EBUSY); } ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_pm.c#9 (text+ko) ==== @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -58,6 +59,84 @@ #define WR4(off, val) \ bus_space_write_4(sc->bst, sc->bsh, (off), (val)) +/* Tables to look up the mask index of a particular clock. */ +#define CPUMASK_LENGTH 1 +char *cpumask[1] = { + "PICO" +}; + +#define HSBMASK_LENGTH 10 +char *hsbmask[10] = { + "EBI", + "PBA", + "PBB", + "HRAMC", + "HSB", + "ISI", + "USB", + "LCDC", + "MACB0", + "DMA" +}; + +#define PBAMASK_LENGTH 17 +char *pbamask[17] = { + "SPI0", + "SPI1", + "TWI", + "USART0", + "USART1", + "USART2", + "USART3", + "SSC0", + "SSC1", + "SSC2", + "PIOA", + "PIOB", + "PIOC", + "PIOD", + "PIOE", + "PSIF", + "PDC" +}; + +#define PBBMASK_LENGTH 16 +char *pbbmask[16] = { + "PM", + "INTC", + "HMATRIX", + "TC0", + "TC1", + "PWM", + "MACB0", + "MACB1", + "DAC", + "MCI", + "AC97C", + "ISI", + "USB", + "SMC", + "SDRAMC", + "ECC" +}; + +/* + * Private devclk data for avr32. + */ +struct avr32_devclk { + uint16_t mask; + uint16_t index; +}; + +/* Driver variables and private data */ +struct at32_pm_softc { + struct resource *regs_res; + int regs_rid; + bus_space_tag_t bst; + bus_space_handle_t bsh; + devclk_list_t devclks; +}; + /* Prototypes */ static int at32_pm_probe(device_t); static int at32_pm_attach(device_t); @@ -65,10 +144,10 @@ static int at32_pm_activate(device_t); static void at32_pm_deactivate(device_t); -static void at32_mci_enable(devclk_t); -static void at32_mci_disable(devclk_t); -static uint64_t at32_mci_get_rate(devclk_t); -static int at32_mci_set_rate(devclk_t, uint64_t); +static void at32_devclk_enable(devclk_t); +static void at32_devclk_disable(devclk_t); +static uint64_t at32_devclk_get_rate(devclk_t); +static int at32_devclk_set_rate(devclk_t, uint64_t); static void at32_pll_enable(devclk_t); static void at32_pll_disable(devclk_t); @@ -80,21 +159,10 @@ static uint64_t at32_osc_get_rate(devclk_t); static int at32_osc_set_rate(devclk_t, uint64_t); -/* Driver variables and private data */ -struct at32_pm_softc { - struct resource *regs_res; - int regs_rid; - bus_space_tag_t bst; - bus_space_handle_t bsh; -}; - -#if 0 -struct at32_clk_softc { - const char *name; - int index; - devclk_t clk; -}; -#endif +struct devclk *at32_pm_alloc_devclk(device_t, const char *); +void at32_pm_free_devclk(device_t, devclk_t); +static void at32_clk_enable(struct at32_pm_softc *, uint16_t, uint16_t); +static void at32_clk_disable(struct at32_pm_softc *, uint16_t, uint16_t); static device_method_t at32_pm_methods[] = { /* Device interface */ @@ -102,6 +170,9 @@ DEVMETHOD(device_attach, at32_pm_attach), DEVMETHOD(device_detach, at32_pm_detach), + DEVMETHOD(devclk_alloc, at32_pm_alloc_devclk), + DEVMETHOD(devclk_free, at32_pm_free_devclk), + {0, 0}, }; static driver_t at32_pm_driver = { @@ -133,15 +204,15 @@ }; DEFINE_CLASS(at32_pll, at32_pll_methods, sizeof(struct devclk)); -/* Class defining the mci device clock. */ -static kobj_method_t at32_mci_methods[] = { - KOBJMETHOD(devclk_enable, at32_mci_enable), - KOBJMETHOD(devclk_disable, at32_mci_disable), - KOBJMETHOD(devclk_set_rate, at32_mci_set_rate), - KOBJMETHOD(devclk_get_rate, at32_mci_get_rate), +/* Class for all device clocks. */ +static kobj_method_t at32_devclk_methods[] = { + KOBJMETHOD(devclk_enable, at32_devclk_enable), + KOBJMETHOD(devclk_disable, at32_devclk_disable), + KOBJMETHOD(devclk_set_rate, at32_devclk_set_rate), + KOBJMETHOD(devclk_get_rate, at32_devclk_get_rate), {0, 0}, }; -DEFINE_CLASS(at32_mci, at32_mci_methods, sizeof(struct devclk)); +DEFINE_CLASS(at32_devclk, at32_devclk_methods, sizeof(struct devclk)); /* Code */ static int @@ -178,31 +249,28 @@ devclk_t clk; int err = ENOMEM; + devclk_register_handler(dev); /* Set private data and map register space */ sc->regs_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->regs_rid, 0, ~0, 0, RF_ACTIVE); -/* sc->clock_res = bus_alloc_resource(dev, SYS_RES_CLOCK, &sc->clock_res, - RF_ACTIVE);*/ if (!sc->regs_res) { goto err; } sc->bsh = rman_get_bushandle(sc->regs_res); sc->bst = rman_get_bustag(sc->regs_res); + STAILQ_INIT(&sc->devclks); /* Register main clocks. */ - //devclk_register_clock(dev, "osc32", NULL); - devclk_register_clock(dev, &at32_osc_class, "osc0"); - //devclk_register_clock(dev, &sc->osc1, "osc1", NULL); + clk = devclk_create(dev, &at32_osc_class, "osc0"); + STAILQ_INSERT_HEAD(&sc->devclks, clk, link); + clk = devclk_create(dev, &at32_osc_class, "osc1"); + STAILQ_INSERT_HEAD(&sc->devclks, clk, link); + clk = devclk_create(dev, &at32_osc_class, "osc32"); + STAILQ_INSERT_HEAD(&sc->devclks, clk, link); /* Register prescalers. */ - clk = devclk_register_clock(dev, &at32_pll_class, "pll0"); - devclk_set_parent(clk, "osc0"); //devclk_register_clock(dev, &sc->pll1, "pll1", &sc->osc0); - - /* Register master device clocks. */ - clk = devclk_register_clock(dev, &at32_mci_class, "mci"); - devclk_set_parent(clk, "pll0"); - /* XXX: Implement rest of device clocks. */ + /* XXX: Implement PLLs */ return (0); err: @@ -219,50 +287,109 @@ bus_release_resource(dev, SYS_RES_MEMORY, rman_get_rid(sc->regs_res), sc->regs_res); } +} + +struct devclk * +at32_pm_alloc_devclk(device_t dev, const char *name) +{ + struct devclk *clk; + struct avr32_devclk *mclk; + uint16_t mask; + uint16_t i; + + /* Lookup if we have the clock. */ + for (i = 0; i < CPUMASK_LENGTH; i++) { + if (strcmp(cpumask[i], name) == 0) { + clk = devclk_create(dev, &at32_devclk_class, name); + mask = AT32_PM_CPUMASK; + goto found; + } + } + for (i = 0; i < HSBMASK_LENGTH; i++) { + if (strcmp(hsbmask[i], name) == 0) { + clk = devclk_create(dev, &at32_devclk_class, name); + mask = AT32_PM_HSBMASK; + goto found; + } + } + for (i = 0; i < PBAMASK_LENGTH; i++) { + if (strcmp(pbamask[i], name) == 0) { + clk = devclk_create(dev, &at32_devclk_class, name); + mask = AT32_PM_PBAMASK; + goto found; + } + } + for (i = 0; i < PBBMASK_LENGTH; i++) { + if (strcmp(pbbmask[i], name) == 0) { + clk = devclk_create(dev, &at32_devclk_class, name); + mask = AT32_PM_PBBMASK; + goto found; + } + } + return (NULL); /* Not found */ +found: + mclk = malloc(sizeof(struct avr32_devclk), M_DEVBUF, M_ZERO | M_WAITOK); + if (mclk == NULL) + return (NULL); + mclk->mask = mask; + mclk->index = i; + clk->data = mclk; + printf("Found clock %s in mask %x and index %d!\n", name, mclk->mask, mclk->index); + return (clk); +} - /* Turn off device clock */ - devclk_disable(dev); +void +at32_pm_free_devclk(device_t dev, devclk_t clk) +{ + struct avr32_devclk *mclk; + + mclk = clk->data; + free(mclk, M_DEVBUF); } static void -at32_mci_enable(devclk_t clk) +at32_devclk_enable(devclk_t clk) { - struct at32_pm_softc *sc; - uint32_t reg; + KASSERT(clk != NULL, ("NULL clk")); + struct at32_pm_softc *sc = device_get_softc(clk->dev); + struct avr32_devclk *mclk = clk->data; + + printf("Enabling %s: %d %d\n", clk->name, mclk->mask, mclk->index); - KASSERT(clk != NULL, ("NULL clk")); - sc = device_get_softc(clk->dev); - reg = RD4(AT32_PM_PBBMASK); - WR4(AT32_PM_PBBMASK, reg | (1 << 9)); + at32_clk_enable(sc, mclk->mask, mclk->index); } static void -at32_mci_disable(devclk_t clk) +at32_devclk_disable(devclk_t clk) { - struct at32_pm_softc *sc; - uint32_t reg; + KASSERT(clk != NULL, ("NULL clk")); + struct at32_pm_softc *sc = device_get_softc(clk->dev); + struct avr32_devclk *mclk = clk->data; - KASSERT(clk != NULL, ("NULL clk")); - sc = device_get_softc(clk->dev); - reg = RD4(AT32_PM_PBBMASK); - WR4(AT32_PM_PBBMASK, reg & ~(1 << 9)); + at32_clk_disable(sc, mclk->mask, mclk->index); } static uint64_t -at32_mci_get_rate(devclk_t clk) +at32_devclk_get_rate(devclk_t clk) { -/* unsigned long cksel, shift = 0; - clksel = RD4(AT32_PM_CKSEL); +#if 0 + struct at32_pm_softc *sc = device_get_softc(clk->dev); + unsigned long cksel, shift = 0; + cksel = RD4(AT32_PM_CKSEL); - if (clksel & (1 << AT32_PM_CKSEL_PBBDIV)) { + if (cksel & (1 << AT32_PM_CKSEL_PBBDIV)) { shift = 0; // XXX: Need to take divider into account - }*/ - // XXX: Assume OSC0 for now. Fix later. + } + devclk_t parent = clk->parent; + uint64_t rate = DEVCLK_GET_RATE(clk->parent); + return (rate >> shift); + return (20000000); +#endif return (20000000); } static int -at32_mci_set_rate(devclk_t clk, uint64_t rate) +at32_devclk_set_rate(devclk_t clk, uint64_t rate) { return (0); } @@ -270,7 +397,7 @@ static void at32_osc_enable(devclk_t clk) { -} +} static void at32_osc_disable(devclk_t clk) @@ -292,7 +419,7 @@ static void at32_pll_enable(devclk_t clk) { -} +} static void at32_pll_disable(devclk_t clk) @@ -310,3 +437,23 @@ { return (0); } + +static void +at32_clk_enable(struct at32_pm_softc *sc, uint16_t mask, uint16_t index) +{ + uint32_t reg; + + KASSERT(sc != NULL, ("NULL sc")); + reg = RD4(mask); + WR4(mask, reg | (1 << index)); +} + +static void +at32_clk_disable(struct at32_pm_softc *sc, uint16_t mask, uint16_t index) +{ + uint32_t reg; + + KASSERT(sc != NULL, ("NULL sc")); + reg = RD4(mask); + WR4(mask, reg & ~(1 << index)); +} ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_rtc.c#4 (text+ko) ==== @@ -75,6 +75,7 @@ int regs_rid; bus_space_tag_t bst; bus_space_handle_t bsh; + devclk_t clk; }; static device_method_t at32_rtc_methods[] = { /* Device interface */ @@ -108,8 +109,13 @@ struct at32_rtc_softc *sc = device_get_softc(dev); int err; + sc->clk = devclk_alloc(dev); + if (sc->clk == NULL) + return (ENOMEM); + err = at32_rtc_activate(dev); if (err) { + devclk_free(sc->clk); return (err); } @@ -135,6 +141,7 @@ WR4(AT32_RTC_IER, bit_offset(RTC, IER, TOPI)); at32_rtc_deactivate(dev); + devclk_free(sc->clk); return (0); } @@ -161,9 +168,6 @@ struct at32_rtc_softc *sc = device_get_softc(dev); int err = ENOMEM; - /* Make sure device clock is enabled before writing */ - devclk_enable(dev); - /* Set private data and map register space */ sc->regs_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->regs_rid, 0, ~0, 0, RF_ACTIVE); @@ -173,6 +177,9 @@ sc->bsh = rman_get_bushandle(sc->regs_res); sc->bst = rman_get_bustag(sc->regs_res); + /* Make sure device clock is enabled before writing */ + devclk_enable(sc->clk); + return (0); err: @@ -191,5 +198,5 @@ } /* Turn off device clock */ - devclk_disable(dev); + devclk_disable(sc->clk); } ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_sdramc.c#3 (text+ko) ==== @@ -71,6 +71,7 @@ int regs_rid; bus_space_tag_t bst; bus_space_handle_t bsh; + devclk_t clk; }; static device_method_t at32_sdramc_methods[] = { /* Device interface */ @@ -103,8 +104,12 @@ register_t reg; char *type; + sc->clk = devclk_alloc(dev); + if (sc->clk == NULL) + return (ENOMEM); err = at32_sdramc_activate(dev); if (err) { + devclk_free(sc->clk); return (err); } @@ -146,7 +151,10 @@ static int at32_sdramc_detach(device_t dev) { + struct at32_sdramc_softc *sc = device_get_softc(dev); + at32_sdramc_deactivate(dev); + devclk_free(sc->clk); return (0); } @@ -156,9 +164,6 @@ struct at32_sdramc_softc *sc = device_get_softc(dev); int err = ENOMEM; - /* Make sure device clock is enabled before writing */ - devclk_enable(dev); - /* Set private data and map register space */ sc->dev = dev; sc->regs_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->regs_rid, 0, @@ -170,6 +175,9 @@ sc->bsh = rman_get_bushandle(sc->regs_res); sc->bst = rman_get_bustag(sc->regs_res); + /* Make sure device clock is enabled before writing */ + devclk_enable(sc->clk); + /* TODO: Setup timer to call at32_sdramc_intr() */ return (0); @@ -190,7 +198,7 @@ } /* Turn off device clock */ - devclk_disable(dev); + devclk_disable(sc->clk); } #ifdef notyet ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_smc.c#2 (text+ko) ==== @@ -87,6 +87,7 @@ bus_space_handle_t bsh; struct resource *mem_res; struct rman mem_rman; + devclk_t clk; }; struct at32_smc_ivar { struct resource_list resources; @@ -142,8 +143,9 @@ struct at32_smc_softc *sc = device_get_softc(dev); int err = ENOMEM; - /* Make sure device clock is enabled before writing */ - devclk_enable(dev); + sc->clk = devclk_alloc(dev); + if (sc->clk == NULL) + return (ENOMEM); /* Set private data and map register space */ sc->regs_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->regs_rid, 0, @@ -165,9 +167,12 @@ bus_generic_probe(dev); bus_enumerate_hinted_children(dev); bus_generic_attach(dev); + + devclk_enable(sc->clk); return (0); err: + devclk_free(sc->clk); at32_smc_deactivate(dev); return (err); } @@ -175,6 +180,7 @@ static int at32_smc_detach(device_t dev) { + at32_smc_deactivate(dev); return (0); } @@ -188,9 +194,6 @@ bus_release_resource(dev, SYS_RES_MEMORY, rman_get_rid(sc->regs_res), sc->regs_res); } - - /* Turn off device clock */ - devclk_disable(dev); } static device_t ==== //depot/projects/avr32/src/sys/avr32/avr32/clock.c#7 (text+ko) ==== @@ -46,7 +46,6 @@ #include #include #include -#include #include #include @@ -122,9 +121,6 @@ struct clock_softc *sc = device_get_softc(dev); int rid, err = ENOMEM; - /* Make sure device clock is enabled before writing */ - devclk_enable(dev); - /* Setup register space */ rid = 0; sc->regs_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, @@ -176,8 +172,6 @@ sc->regs_res = NULL; } - /* Turn off device clock */ - devclk_disable(dev); return (0); } ==== //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap700x.hints#7 (text+ko) ==== @@ -39,25 +39,25 @@ hint.uart.0.maddr="0xFFE00C00" hint.uart.0.msize="0x400" hint.uart.0.irq="6" -hint.uart.0.clk="pba:3" +hint.uart.0.clk="USART0" hint.uart.1.at="at32bus0" hint.uart.1.maddr="0xFFE01000" hint.uart.1.msize="0x400" hint.uart.1.irq="7" -hint.uart.1.clk="pba:4" +hint.uart.1.clk="USART1" hint.uart.2.at="at32bus0" hint.uart.2.maddr="0xFFE01400" hint.uart.2.msize="0x400" hint.uart.2.irq="8" -hint.uart.2.clk="pba:5" +hint.uart.2.clk="USART2" hint.uart.3.at="at32bus0" hint.uart.3.maddr="0xFFE01800" hint.uart.3.msize="0x400" hint.uart.3.irq="9" -hint.uart.3.clk="pba:6" +hint.uart.3.clk="USART3" hint.atmel_ssc.0.at="at32bus0" hint.atmel_ssc.0.maddr="0xFFE01C00" @@ -117,7 +117,7 @@ hint.at32_rtc.0.maddr="0xFFF00080" hint.at32_rtc.0.msize="0x30" hint.at32_rtc.0.irq="21" -hint.at32_rtc.0.clk="pbb:0" +hint.at32_rtc.0.clk="PM" hint.at32_wdt.0.at="at32bus0" hint.at32_wdt.0.maddr="0xFFF000B0" @@ -133,12 +133,12 @@ hint.at32_intc.0.at="at32bus0" hint.at32_intc.0.maddr="0xFFF00400" hint.at32_intc.0.msize="0x400" -hint.at32_intc.0.clk="pbb:1" +hint.at32_intc.0.clk="INTC" hint.at32_hmatrix.0.at="at32bus0" hint.at32_hmatrix.0.maddr="0xFFF00800" hint.at32_hmatrix.0.msize="0x400" -hint.at32_hmatrix.0.clk="pbb:2" +hint.at32_hmatrix.0.clk="HMATRIX" hint.at32_tc.0.at="at32bus0" hint.at32_tc.0.maddr="0xFFF00C00" @@ -187,7 +187,7 @@ hint.atmel_mci.0.maddr="0xFFF02400" hint.atmel_mci.0.msize="0x400" hint.atmel_mci.0.irq="28" -hint.atmel_mci.0.clk="mci" +hint.atmel_mci.0.clk="MCI" hint.at32_ac97c.0.at="at32bus0" hint.at32_ac97c.0.maddr="0xFFF02800" @@ -204,12 +204,12 @@ hint.at32_smc.0.at="at32bus0" hint.at32_smc.0.maddr="0xFFF03400" hint.at32_smc.0.msize="0x400" -hint.at32_smc.0.clk="pbb:13" +hint.at32_smc.0.clk="SMC" hint.at32_sdramc.0.at="at32bus0" hint.at32_sdramc.0.maddr="0xFFF03800" hint.at32_sdramc.0.msize="0x400" -hint.at32_sdramc.0.clk="pbb:14" +hint.at32_sdramc.0.clk="SDRAMC" hint.at32_eec.0.at="at32bus0" hint.at32_eec.0.maddr="0xFFF03C00" ==== //depot/projects/avr32/src/sys/dev/mmc/atmel_mci.c#7 (text+ko) ==== @@ -74,6 +74,7 @@ #define STOP_STARTED 2 struct resource *irq_res; /* IRQ resource */ struct resource *mem_res; /* Memory resource */ + struct devclk *clk; /* Device clock. */ struct mtx sc_mtx; bus_dma_tag_t dmatag; bus_dmamap_t map; @@ -169,6 +170,9 @@ device_t child; sc->dev = dev; + sc->clk = devclk_alloc(dev); + if (sc->clk == NULL) + return (ENOMEM); err = atmel_mci_activate(dev); if (err) goto out; @@ -199,7 +203,7 @@ ATMEL_MCI_LOCK_DESTROY(sc); goto out; } - mci_clockfreq = devclk_get_rate(dev); + mci_clockfreq = devclk_get_rate(sc->clk); #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) sc->host.f_min = DIV_ROUND_UP(mci_clockfreq, 512); sc->host.f_max = mci_clockfreq / 2; @@ -214,14 +218,19 @@ out:; if (err) atmel_mci_deactivate(dev); + devclk_free(sc->clk); return (err); } static int atmel_mci_detach(device_t dev) { + struct atmel_mci_softc *sc; + + sc = device_get_softc(dev); atmel_mci_fini(dev); atmel_mci_deactivate(dev); + devclk_free(sc->clk); return (EBUSY); /* XXX */ } @@ -231,9 +240,6 @@ struct atmel_mci_softc *sc; int rid; - /* Enable device clock before writing. */ - devclk_enable(dev); - sc = device_get_softc(dev); rid = 0; sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, @@ -245,6 +251,7 @@ RF_ACTIVE); if (sc->irq_res == NULL) goto errout; + devclk_enable(sc->clk); return (0); errout: atmel_mci_deactivate(dev); @@ -271,7 +278,7 @@ sc->irq_res = 0; /* Turn off device clock. */ - devclk_disable(dev); + devclk_disable(sc->clk); return; } @@ -439,12 +446,10 @@ // assert locked if (!(sc->flags & CMD_STARTED)) { sc->flags |= CMD_STARTED; - printf("Starting CMD\n"); atmel_mci_start_cmd(sc, req->cmd); return; } if (!(sc->flags & STOP_STARTED) && req->stop) { - printf("Starting Stop\n"); sc->flags |= STOP_STARTED; atmel_mci_start_cmd(sc, req->stop); return; @@ -550,7 +555,6 @@ ATMEL_MCI_LOCK(sc); sr = RD4(sc, MCI_SR) & RD4(sc, MCI_IMR); - printf("i 0x%x\n", sr); cmd = sc->curcmd; if (sr & MCI_SR_ERROR) { // Ignore CRC errors on CMD2 and ACMD47, per relevant standards @@ -572,40 +576,40 @@ } } else { if (sr & MCI_SR_TXBUFE) { - printf("TXBUFE\n"); + //printf("TXBUFE\n"); atmel_mci_xmit_done(sc); } if (sr & MCI_SR_RXBUFF) { - printf("RXBUFF\n"); + //printf("RXBUFF\n"); WR4(sc, MCI_IDR, MCI_SR_RXBUFF); WR4(sc, MCI_IER, MCI_SR_CMDRDY); } if (sr & MCI_SR_ENDTX) { - printf("ENDTX\n"); + //printf("ENDTX\n"); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 27 20:59:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C4361065679; Sun, 27 Sep 2009 20:59:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60E46106566C for ; Sun, 27 Sep 2009 20:59:55 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 35EBC8FC0A for ; Sun, 27 Sep 2009 20:59:55 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8RKxsuo059963 for ; Sun, 27 Sep 2009 20:59:54 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8RKxseQ059961 for perforce@freebsd.org; Sun, 27 Sep 2009 20:59:54 GMT (envelope-from lulf@FreeBSD.org) Date: Sun, 27 Sep 2009 20:59:54 GMT Message-Id: <200909272059.n8RKxseQ059961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 168944 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2009 20:59:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=168944 Change 168944 by lulf@lulf_nobby on 2009/09/27 20:58:55 - Enable devclk for timer/counter. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/at32_tc.c#4 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_tc_channel.c#4 edit .. //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap700x.hints#8 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_tc.c#4 (text+ko) ==== @@ -77,6 +77,7 @@ struct rman irq_rman; bus_space_tag_t bst; bus_space_handle_t bsh; + devclk_t clk; }; struct at32_tc_ivar { struct resource_list resources; @@ -125,7 +126,9 @@ int rid, err = ENOMEM; /* Make sure device clock is enabled before writing */ - //devclk_enable(dev); + sc->clk = devclk_alloc(dev); + if (sc->clk == NULL) + return (ENOMEM); /* Setup register space */ rid = 0; @@ -167,6 +170,7 @@ bus_generic_probe(dev); bus_enumerate_hinted_children(dev); bus_generic_attach(dev); + devclk_enable(sc->clk); return (0); errout: @@ -189,9 +193,9 @@ rman_get_rid(sc->regs_res), sc->regs_res); sc->regs_res = NULL; } + devclk_disable(sc->clk); + devclk_free(sc->clk); - /* Turn off device clock */ - //devclk_disable(dev); return (0); } ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_tc_channel.c#4 (text+ko) ==== @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include @@ -103,9 +102,6 @@ struct at32_tc_channel_softc *sc = device_get_softc(dev); int rid, err = ENOMEM; - /* Make sure device clock is enabled before writing */ - //devclk_enable(dev); - /* Setup register space */ rid = 0; sc->regs_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, @@ -156,8 +152,6 @@ sc->regs_res = NULL; } - /* Turn off device clock */ - //devclk_disable(dev); return (0); } ==== //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap700x.hints#8 (text+ko) ==== @@ -144,7 +144,7 @@ hint.at32_tc.0.maddr="0xFFF00C00" hint.at32_tc.0.msize="0x400" hint.at32_tc.0.irq="22" -hint.at32_tc.0.clk="pbb:3" +hint.at32_tc.0.clk="TC0" hint.at32_tc_channel.0.at="at32_tc0" hint.at32_tc_channel.0.offset="0x00" @@ -159,7 +159,7 @@ hint.at32_tc.1.maddr="0xFFF01000" hint.at32_tc.1.msize="0x400" hint.at32_tc.1.irq="23" -hint.at32_tc.1.clk="pbb:4" +hint.at32_tc.1.clk="TC1" hint.at32_tc_channel.3.at="at32_tc1" hint.at32_tc_channel.3.offset="0x00" From owner-p4-projects@FreeBSD.ORG Sun Sep 27 21:12:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D20A61065694; Sun, 27 Sep 2009 21:12:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9677F106568B for ; Sun, 27 Sep 2009 21:12:08 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6BCEF8FC20 for ; Sun, 27 Sep 2009 21:12:08 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8RLC8uR061985 for ; Sun, 27 Sep 2009 21:12:08 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8RLC8iD061983 for perforce@freebsd.org; Sun, 27 Sep 2009 21:12:08 GMT (envelope-from anchie@FreeBSD.org) Date: Sun, 27 Sep 2009 21:12:08 GMT Message-Id: <200909272112.n8RLC8iD061983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 168945 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2009 21:12:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=168945 Change 168945 by anchie@p4imunes on 2009/09/27 21:11:59 The introduction of vnet_sysctl_handle_long() and vnet_sysctl_handle_ulong() functions. Affected files ... .. //depot/projects/vimage/src/sys/net/vnet.c#5 edit .. //depot/projects/vimage/src/sys/net/vnet.h#32 edit Differences ... ==== //depot/projects/vimage/src/sys/net/vnet.c#5 (text+ko) ==== @@ -458,6 +458,15 @@ } int +vnet_sysctl_handle_long(SYSCTL_HANDLER_ARGS) +{ + + if (arg1 != NULL) + arg1 = (void *)(curvnet->vnet_data_base + (uintptr_t)arg1); + return (sysctl_handle_long(oidp, arg1, arg2, req)); +} + +int vnet_sysctl_handle_opaque(SYSCTL_HANDLER_ARGS) { @@ -484,6 +493,15 @@ return (sysctl_handle_int(oidp, arg1, arg2, req)); } +int +vnet_sysctl_handle_ulong(SYSCTL_HANDLER_ARGS) +{ + + if (arg1 != NULL) + arg1 = (void *)(curvnet->vnet_data_base + (uintptr_t)arg1); + return (sysctl_handle_long(oidp, arg1, arg2, req)); +} + /* * Support for special SYSINIT handlers registered via VNET_SYSINIT() * and VNET_SYSUNINIT(). ==== //depot/projects/vimage/src/sys/net/vnet.h#32 (text+ko) ==== @@ -227,6 +227,8 @@ int vnet_sysctl_handle_opaque(SYSCTL_HANDLER_ARGS); int vnet_sysctl_handle_string(SYSCTL_HANDLER_ARGS); int vnet_sysctl_handle_uint(SYSCTL_HANDLER_ARGS); +int vnet_sysctl_handle_long(SYSCTL_HANDLER_ARGS); +int vnet_sysctl_handle_ulong(SYSCTL_HANDLER_ARGS); #define SYSCTL_VNET_INT(parent, nbr, name, access, ptr, val, descr) \ SYSCTL_OID(parent, nbr, name, \ @@ -249,6 +251,14 @@ SYSCTL_OID(parent, nbr, name, \ CTLTYPE_UINT|CTLFLAG_MPSAFE|CTLFLAG_VNET|(access), \ ptr, val, vnet_sysctl_handle_uint, "IU", descr) +#define SYSCTL_VNET_LONG(parent, nbr, name, access, ptr, val, descr) \ + SYSCTL_OID(parent, nbr, name, \ + CTLTYPE_LONG|CTLFLAG_MPSAFE|CTLFLAG_VNET|(access), \ + ptr, val, vnet_sysctl_handle_long, "L", descr) +#define SYSCTL_VNET_ULONG(parent, nbr, name, access, ptr, val, descr) \ + SYSCTL_OID(parent, nbr, name, \ + CTLTYPE_ULONG|CTLFLAG_MPSAFE|CTLFLAG_VNET|(access), \ + ptr, val, vnet_sysctl_handle_ulong, "LU", descr) #define VNET_SYSCTL_ARG(req, arg1) do { \ if (arg1 != NULL) \ arg1 = (void *)(TD_TO_VNET((req)->td)->vnet_data_base + \ From owner-p4-projects@FreeBSD.ORG Sun Sep 27 21:52:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5AC11065670; Sun, 27 Sep 2009 21:52:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68214106566C for ; Sun, 27 Sep 2009 21:52:55 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5456B8FC16 for ; Sun, 27 Sep 2009 21:52:55 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8RLqtOS064939 for ; Sun, 27 Sep 2009 21:52:55 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8RLqqMI064937 for perforce@freebsd.org; Sun, 27 Sep 2009 21:52:52 GMT (envelope-from lulf@FreeBSD.org) Date: Sun, 27 Sep 2009 21:52:52 GMT Message-Id: <200909272152.n8RLqqMI064937@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 168947 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2009 21:52:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=168947 Change 168947 by lulf@lulf_nobby on 2009/09/27 21:52:30 IFC Affected files ... .. //depot/projects/avr32/src/Makefile.inc1#9 integrate .. //depot/projects/avr32/src/ObsoleteFiles.inc#11 integrate .. //depot/projects/avr32/src/UPDATING#13 integrate .. //depot/projects/avr32/src/bin/chmod/chmod.c#4 integrate .. //depot/projects/avr32/src/bin/cp/utils.c#3 integrate .. //depot/projects/avr32/src/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/avr32/src/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/avr32/src/bin/ls/print.c#2 integrate .. //depot/projects/avr32/src/bin/mv/mv.c#2 integrate .. //depot/projects/avr32/src/bin/setfacl/mask.c#2 integrate .. //depot/projects/avr32/src/bin/setfacl/merge.c#2 integrate .. //depot/projects/avr32/src/bin/setfacl/remove.c#2 integrate .. //depot/projects/avr32/src/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/avr32/src/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/avr32/src/bin/setfacl/setfacl.h#2 integrate .. //depot/projects/avr32/src/bin/sh/eval.c#5 integrate .. //depot/projects/avr32/src/bin/sh/exec.c#4 integrate .. //depot/projects/avr32/src/bin/sh/exec.h#2 integrate .. //depot/projects/avr32/src/bin/sh/mknodes.c#2 integrate .. //depot/projects/avr32/src/bin/sh/nodes.c.pat#2 integrate .. //depot/projects/avr32/src/bin/sh/sh.1#4 integrate .. //depot/projects/avr32/src/cddl/compat/opensolaris/include/assert.h#1 branch .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/head/assert.h#2 delete .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/avr32/src/contrib/ee/ee.c#2 integrate .. //depot/projects/avr32/src/contrib/gdtoa/gdtoaimp.h#3 integrate .. //depot/projects/avr32/src/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/avr32/src/contrib/traceroute/as.c#2 integrate .. //depot/projects/avr32/src/contrib/traceroute/as.h#2 integrate .. //depot/projects/avr32/src/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/avr32/src/crypto/openssl/crypto/pqueue/pqueue.c#2 integrate .. //depot/projects/avr32/src/crypto/openssl/crypto/pqueue/pqueue.h#2 integrate .. //depot/projects/avr32/src/crypto/openssl/ssl/d1_both.c#3 integrate .. //depot/projects/avr32/src/crypto/openssl/ssl/d1_pkt.c#3 integrate .. //depot/projects/avr32/src/etc/Makefile#3 integrate .. //depot/projects/avr32/src/etc/defaults/periodic.conf#2 integrate .. //depot/projects/avr32/src/etc/defaults/rc.conf#6 integrate .. //depot/projects/avr32/src/etc/inetd.conf#2 integrate .. //depot/projects/avr32/src/etc/mtree/BSD.local.dist#3 delete .. //depot/projects/avr32/src/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/avr32/src/etc/mtree/BSD.x11-4.dist#2 delete .. //depot/projects/avr32/src/etc/mtree/BSD.x11.dist#2 delete .. //depot/projects/avr32/src/etc/mtree/Makefile#2 integrate .. //depot/projects/avr32/src/etc/network.subr#6 integrate .. //depot/projects/avr32/src/etc/rc.d/Makefile#5 integrate .. //depot/projects/avr32/src/etc/rc.d/NETWORKING#3 integrate .. //depot/projects/avr32/src/etc/rc.d/addswap#2 integrate .. //depot/projects/avr32/src/etc/rc.d/auto_linklocal#2 delete .. //depot/projects/avr32/src/etc/rc.d/defaultroute#3 integrate .. //depot/projects/avr32/src/etc/rc.d/devd#2 integrate .. //depot/projects/avr32/src/etc/rc.d/faith#1 branch .. //depot/projects/avr32/src/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/avr32/src/etc/rc.d/ipsec#2 integrate .. //depot/projects/avr32/src/etc/rc.d/mroute6d#2 integrate .. //depot/projects/avr32/src/etc/rc.d/netif#4 integrate .. //depot/projects/avr32/src/etc/rc.d/netoptions#2 integrate .. //depot/projects/avr32/src/etc/rc.d/network_ipv6#3 delete .. //depot/projects/avr32/src/etc/rc.d/ppp#2 integrate .. //depot/projects/avr32/src/etc/rc.d/route6d#2 integrate .. //depot/projects/avr32/src/etc/rc.d/routed#2 integrate .. //depot/projects/avr32/src/etc/rc.d/routing#2 integrate .. //depot/projects/avr32/src/etc/rc.d/rtadvd#2 integrate .. //depot/projects/avr32/src/etc/rc.d/static_arp#1 branch .. //depot/projects/avr32/src/etc/rc.d/stf#1 branch .. //depot/projects/avr32/src/etc/rc.d/sysctl#2 integrate .. //depot/projects/avr32/src/etc/rc.d/wpa_supplicant#2 integrate .. //depot/projects/avr32/src/etc/rc.subr#3 integrate .. //depot/projects/avr32/src/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/avr32/src/gnu/usr.bin/patch/common.h#3 integrate .. //depot/projects/avr32/src/gnu/usr.bin/patch/pch.c#3 integrate .. //depot/projects/avr32/src/lib/Makefile#4 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read.c#6 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_format_iso9660.c#5 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_compat_zip.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_isojoliet_bz2.c#4 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_isorr_bz2.c#5 integrate .. //depot/projects/avr32/src/lib/libc/Versions.def#2 integrate .. //depot/projects/avr32/src/lib/libc/db/hash/hash.c#3 integrate .. //depot/projects/avr32/src/lib/libc/gen/Makefile.inc#6 integrate .. //depot/projects/avr32/src/lib/libc/gen/Symbol.map#6 integrate .. //depot/projects/avr32/src/lib/libc/gen/getpagesizes.3#1 branch .. //depot/projects/avr32/src/lib/libc/gen/getpagesizes.c#1 branch .. //depot/projects/avr32/src/lib/libc/locale/ctype.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/digittoint.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/isalnum.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/isalpha.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/isascii.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/isblank.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/iscntrl.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/isdigit.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/isgraph.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/isideogram.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/islower.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/isphonogram.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/isprint.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/ispunct.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/isrune.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/isspace.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/isspecial.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/isupper.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/isxdigit.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/toascii.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/tolower.3#2 integrate .. //depot/projects/avr32/src/lib/libc/locale/toupper.3#2 integrate .. //depot/projects/avr32/src/lib/libc/net/getifaddrs.c#2 integrate .. //depot/projects/avr32/src/lib/libc/nls/Makefile.inc#3 integrate .. //depot/projects/avr32/src/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch .. //depot/projects/avr32/src/lib/libc/posix1e/acl_calc_mask.c#3 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl_support.c#4 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl_to_text.c#3 integrate .. //depot/projects/avr32/src/lib/libc/regex/engine.c#2 integrate .. //depot/projects/avr32/src/lib/libc/regex/grot/tests#2 integrate .. //depot/projects/avr32/src/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/avr32/src/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/avr32/src/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/avr32/src/lib/libc/stdlib/ptsname.3#3 integrate .. //depot/projects/avr32/src/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/avr32/src/lib/libc/stdtime/strptime.c#3 integrate .. //depot/projects/avr32/src/lib/libc/sys/intro.2#2 integrate .. //depot/projects/avr32/src/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/avr32/src/lib/libc/sys/setfib.2#3 integrate .. //depot/projects/avr32/src/lib/libc/sys/stack_protector.c#4 integrate .. //depot/projects/avr32/src/lib/libdevinfo/devinfo.h#2 integrate .. //depot/projects/avr32/src/lib/libdisk/change.c#3 integrate .. //depot/projects/avr32/src/lib/libjail/jail.3#2 integrate .. //depot/projects/avr32/src/lib/libkvm/kvm_proc.c#4 integrate .. //depot/projects/avr32/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate .. //depot/projects/avr32/src/lib/libpmc/pmc.3#2 integrate .. //depot/projects/avr32/src/lib/libpmc/pmc.atom.3#2 integrate .. //depot/projects/avr32/src/lib/libpmc/pmc.core.3#2 integrate .. //depot/projects/avr32/src/lib/libpmc/pmc.core2.3#3 integrate .. //depot/projects/avr32/src/lib/libpmc/pmc.iaf.3#2 integrate .. //depot/projects/avr32/src/lib/libpmc/pmc.k7.3#2 integrate .. //depot/projects/avr32/src/lib/libpmc/pmc.k8.3#2 integrate .. //depot/projects/avr32/src/lib/libpmc/pmc.p4.3#2 integrate .. //depot/projects/avr32/src/lib/libpmc/pmc.p5.3#2 integrate .. //depot/projects/avr32/src/lib/libpmc/pmc.p6.3#2 integrate .. //depot/projects/avr32/src/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/avr32/src/lib/libpmc/pmc_read.3#2 integrate .. //depot/projects/avr32/src/lib/libradius/libradius.3#2 integrate .. //depot/projects/avr32/src/lib/libradius/radlib.c#2 integrate .. //depot/projects/avr32/src/lib/libradius/radlib.h#2 integrate .. //depot/projects/avr32/src/lib/libradius/radlib_private.h#2 integrate .. //depot/projects/avr32/src/lib/libstand/net.c#2 integrate .. //depot/projects/avr32/src/lib/libstand/nfs.c#2 integrate .. //depot/projects/avr32/src/lib/libstand/rpc.c#3 integrate .. //depot/projects/avr32/src/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/avr32/src/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/avr32/src/libexec/Makefile#4 integrate .. //depot/projects/avr32/src/libexec/rpc.rquotad/rquotad.c#2 integrate .. //depot/projects/avr32/src/release/Makefile#5 integrate .. //depot/projects/avr32/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 integrate .. //depot/projects/avr32/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/avr32/src/release/picobsd/bridge/crunch.conf#4 integrate .. //depot/projects/avr32/src/release/scripts/lib32-make.sh#2 integrate .. //depot/projects/avr32/src/release/scripts/mm-mtree.sh#1 branch .. //depot/projects/avr32/src/release/scripts/package-split.py#3 integrate .. //depot/projects/avr32/src/sbin/camcontrol/camcontrol.8#3 integrate .. //depot/projects/avr32/src/sbin/camcontrol/camcontrol.c#3 integrate .. //depot/projects/avr32/src/sbin/geom/class/label/glabel.8#4 integrate .. //depot/projects/avr32/src/sbin/geom/class/mirror/geom_mirror.c#2 integrate .. //depot/projects/avr32/src/sbin/geom/class/mirror/gmirror.8#2 integrate .. //depot/projects/avr32/src/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/avr32/src/sbin/geom/core/geom.c#4 integrate .. //depot/projects/avr32/src/sbin/ifconfig/Makefile#4 integrate .. //depot/projects/avr32/src/sbin/ifconfig/af_inet6.c#3 integrate .. //depot/projects/avr32/src/sbin/ifconfig/af_nd6.c#1 branch .. //depot/projects/avr32/src/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/avr32/src/sbin/ifconfig/ifgif.c#3 integrate .. //depot/projects/avr32/src/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/avr32/src/sbin/mksnap_ffs/mksnap_ffs.8#3 integrate .. //depot/projects/avr32/src/sbin/mount/mount.8#3 integrate .. //depot/projects/avr32/src/sbin/mount/mount.c#4 integrate .. //depot/projects/avr32/src/sbin/mount_nfs/mount_nfs.c#6 integrate .. //depot/projects/avr32/src/sbin/route/route.8#2 integrate .. //depot/projects/avr32/src/sbin/route/route.c#4 integrate .. //depot/projects/avr32/src/sbin/savecore/savecore.8#3 integrate .. //depot/projects/avr32/src/sbin/savecore/savecore.c#2 integrate .. //depot/projects/avr32/src/share/colldef/Makefile#3 integrate .. //depot/projects/avr32/src/share/colldef/la_LN.ISO8859-13.src#1 branch .. //depot/projects/avr32/src/share/colldef/lt_LT.ISO8859-13.src#2 delete .. //depot/projects/avr32/src/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/avr32/src/share/examples/scsi_target/scsi_target.c#2 integrate .. //depot/projects/avr32/src/share/examples/scsi_target/scsi_target.h#2 integrate .. //depot/projects/avr32/src/share/man/man4/Makefile#10 integrate .. //depot/projects/avr32/src/share/man/man4/acpi_panasonic.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/ahci.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/dpms.4#1 branch .. //depot/projects/avr32/src/share/man/man4/ed.4#5 integrate .. //depot/projects/avr32/src/share/man/man4/inet6.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/ip6.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/ips.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/lindev.4#1 branch .. //depot/projects/avr32/src/share/man/man4/man4.i386/Makefile#3 integrate .. //depot/projects/avr32/src/share/man/man4/man4.i386/dpms.4#2 delete .. //depot/projects/avr32/src/share/man/man4/mfi.4#3 integrate .. //depot/projects/avr32/src/share/man/man4/pts.4#4 integrate .. //depot/projects/avr32/src/share/man/man4/pty.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/syscons.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/textdump.4#3 integrate .. //depot/projects/avr32/src/share/man/man5/device.hints.5#2 integrate .. //depot/projects/avr32/src/share/man/man5/make.conf.5#2 integrate .. //depot/projects/avr32/src/share/man/man5/procfs.5#3 integrate .. //depot/projects/avr32/src/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/avr32/src/share/man/man5/tmpfs.5#2 integrate .. //depot/projects/avr32/src/share/man/man9/Makefile#10 integrate .. //depot/projects/avr32/src/share/man/man9/VOP_ACCESS.9#5 integrate .. //depot/projects/avr32/src/share/man/man9/acl.9#4 integrate .. //depot/projects/avr32/src/share/man/man9/fail.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/ieee80211.9#3 integrate .. //depot/projects/avr32/src/share/man/man9/ieee80211_amrr.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/ieee80211_beacon.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/ieee80211_bmiss.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/ieee80211_crypto.9#3 integrate .. //depot/projects/avr32/src/share/man/man9/ieee80211_ddb.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/ieee80211_input.9#3 integrate .. //depot/projects/avr32/src/share/man/man9/ieee80211_node.9#3 integrate .. //depot/projects/avr32/src/share/man/man9/ieee80211_output.9#3 integrate .. //depot/projects/avr32/src/share/man/man9/ieee80211_proto.9#3 integrate .. //depot/projects/avr32/src/share/man/man9/ieee80211_radiotap.9#3 integrate .. //depot/projects/avr32/src/share/man/man9/ieee80211_regdomain.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/ieee80211_scan.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/ieee80211_vap.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/kproc.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/kthread.9#3 integrate .. //depot/projects/avr32/src/share/man/man9/vaccess.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/vaccess_acl_nfs4.9#1 branch .. //depot/projects/avr32/src/share/misc/bsd-family-tree#5 integrate .. //depot/projects/avr32/src/share/misc/iso3166#5 integrate .. //depot/projects/avr32/src/share/mklocale/Makefile#3 integrate .. //depot/projects/avr32/src/share/mklocale/la_LN.ISO8859-13.src#1 branch .. //depot/projects/avr32/src/share/mklocale/lt_LT.ISO8859-13.src#2 delete .. //depot/projects/avr32/src/share/monetdef/Makefile#3 integrate .. //depot/projects/avr32/src/share/monetdef/lv_LV.ISO8859-13.src#1 branch .. //depot/projects/avr32/src/share/monetdef/zh_CN.GB18030.src#2 integrate .. //depot/projects/avr32/src/share/monetdef/zh_CN.GB2312.src#2 integrate .. //depot/projects/avr32/src/share/msgdef/Makefile#3 integrate .. //depot/projects/avr32/src/share/msgdef/lv_LV.ISO8859-13.src#1 branch .. //depot/projects/avr32/src/share/msgdef/lv_LV.UTF-8.src#1 branch .. //depot/projects/avr32/src/share/numericdef/Makefile#3 integrate .. //depot/projects/avr32/src/share/timedef/Makefile#4 integrate .. //depot/projects/avr32/src/share/timedef/hi_IN.ISCII-DEV.src#2 integrate .. //depot/projects/avr32/src/share/timedef/ja_JP.UTF-8.src#2 integrate .. //depot/projects/avr32/src/share/timedef/lv_LV.ISO8859-13.src#1 branch .. //depot/projects/avr32/src/share/timedef/lv_LV.UTF-8.src#1 branch .. //depot/projects/avr32/src/share/zoneinfo/africa#5 integrate .. //depot/projects/avr32/src/share/zoneinfo/asia#8 integrate .. //depot/projects/avr32/src/share/zoneinfo/australasia#3 integrate .. //depot/projects/avr32/src/share/zoneinfo/europe#4 integrate .. //depot/projects/avr32/src/share/zoneinfo/leapseconds#3 integrate .. //depot/projects/avr32/src/sys/amd64/acpica/acpi_machdep.c#4 integrate .. //depot/projects/avr32/src/sys/amd64/acpica/madt.c#4 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/elf_machdep.c#4 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/msi.c#6 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/avr32/src/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/avr32/src/sys/amd64/include/_align.h#1 branch .. //depot/projects/avr32/src/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/include/apm_bios.h#1 branch .. //depot/projects/avr32/src/sys/amd64/include/param.h#7 integrate .. //depot/projects/avr32/src/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/avr32/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/avr32/src/sys/amd64/pci/pci_cfgreg.c#4 integrate .. //depot/projects/avr32/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/avr32/src/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/avr32/src/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/avr32/src/sys/arm/conf/CAMBRIA#6 integrate .. //depot/projects/avr32/src/sys/arm/conf/SHEEVAPLUG#1 branch .. //depot/projects/avr32/src/sys/arm/include/_align.h#1 branch .. //depot/projects/avr32/src/sys/arm/include/md_var.h#2 integrate .. //depot/projects/avr32/src/sys/arm/include/param.h#5 integrate .. //depot/projects/avr32/src/sys/arm/mv/common.c#4 integrate .. //depot/projects/avr32/src/sys/arm/mv/discovery/db78xxx.c#3 integrate .. //depot/projects/avr32/src/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate .. //depot/projects/avr32/src/sys/arm/mv/kirkwood/files.db88f6xxx#2 integrate .. //depot/projects/avr32/src/sys/arm/mv/kirkwood/files.kirkwood#1 branch .. //depot/projects/avr32/src/sys/arm/mv/kirkwood/files.sheevaplug#1 branch .. //depot/projects/avr32/src/sys/arm/mv/kirkwood/sheevaplug.c#1 branch .. //depot/projects/avr32/src/sys/arm/mv/kirkwood/std.db88f6xxx#2 integrate .. //depot/projects/avr32/src/sys/arm/mv/kirkwood/std.kirkwood#1 branch .. //depot/projects/avr32/src/sys/arm/mv/kirkwood/std.sheevaplug#1 branch .. //depot/projects/avr32/src/sys/arm/mv/mv_machdep.c#4 integrate .. //depot/projects/avr32/src/sys/arm/mv/mvreg.h#5 integrate .. //depot/projects/avr32/src/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/avr32/src/sys/arm/mv/orion/db88f5xxx.c#3 integrate .. //depot/projects/avr32/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/avr32/src/sys/boot/forth/loader.conf#8 integrate .. //depot/projects/avr32/src/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/avr32/src/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/avr32/src/sys/cam/ata/ata_all.c#2 integrate .. //depot/projects/avr32/src/sys/cam/ata/ata_all.h#2 integrate .. //depot/projects/avr32/src/sys/cam/ata/ata_da.c#2 integrate .. //depot/projects/avr32/src/sys/cam/ata/ata_xpt.c#2 integrate .. //depot/projects/avr32/src/sys/cam/cam_periph.c#6 integrate .. //depot/projects/avr32/src/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/avr32/src/sys/cam/cam_xpt_internal.h#2 integrate .. //depot/projects/avr32/src/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/avr32/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/avr32/src/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/sys/mutex.h#4 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate .. //depot/projects/avr32/src/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/avr32/src/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/avr32/src/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/avr32/src/sys/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_ioctl.c#8 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_misc.c#6 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/avr32/src/sys/compat/x86bios/x86bios.c#1 branch .. //depot/projects/avr32/src/sys/compat/x86bios/x86bios.h#1 branch .. //depot/projects/avr32/src/sys/compat/x86bios/x86bios_alloc.c#1 branch .. //depot/projects/avr32/src/sys/conf/NOTES#12 integrate .. //depot/projects/avr32/src/sys/conf/files#15 integrate .. //depot/projects/avr32/src/sys/conf/files.amd64#8 integrate .. //depot/projects/avr32/src/sys/conf/files.i386#9 integrate .. //depot/projects/avr32/src/sys/conf/files.ia64#5 integrate .. //depot/projects/avr32/src/sys/conf/files.pc98#7 integrate .. //depot/projects/avr32/src/sys/conf/files.powerpc#9 integrate .. //depot/projects/avr32/src/sys/conf/files.sparc64#4 integrate .. //depot/projects/avr32/src/sys/conf/newvers.sh#4 integrate .. //depot/projects/avr32/src/sys/conf/options#11 integrate .. //depot/projects/avr32/src/sys/conf/options.amd64#5 integrate .. //depot/projects/avr32/src/sys/conf/options.arm#3 integrate .. //depot/projects/avr32/src/sys/contrib/altq/altq/altq_subr.c#8 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/asldefine.h#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/aslload.c#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/avr32/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/avr32/src/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/pf/net/pf_if.c#6 integrate .. //depot/projects/avr32/src/sys/contrib/x86emu/x86emu.c#1 branch .. //depot/projects/avr32/src/sys/contrib/x86emu/x86emu.h#1 branch .. //depot/projects/avr32/src/sys/contrib/x86emu/x86emu_regs.h#1 branch .. //depot/projects/avr32/src/sys/contrib/x86emu/x86emu_util.c#1 branch .. //depot/projects/avr32/src/sys/dev/aac/aac.c#5 integrate .. //depot/projects/avr32/src/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/avr32/src/sys/dev/acpi_support/acpi_aiboost.c#3 integrate .. //depot/projects/avr32/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/avr32/src/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/avr32/src/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/avr32/src/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/avr32/src/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/avr32/src/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/avr32/src/sys/dev/ae/if_ae.c#4 integrate .. //depot/projects/avr32/src/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ahci/ahci.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ahci/ahci.h#2 integrate .. //depot/projects/avr32/src/sys/dev/alc/if_alc.c#4 integrate .. //depot/projects/avr32/src/sys/dev/amdtemp/amdtemp.c#3 integrate .. //depot/projects/avr32/src/sys/dev/amr/amr.c#4 integrate .. //depot/projects/avr32/src/sys/dev/asmc/asmc.c#4 integrate .. //depot/projects/avr32/src/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-disk.c#5 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ata/chipsets/ata-acerlabs.c#6 integrate .. //depot/projects/avr32/src/sys/dev/ata/chipsets/ata-marvell.c#6 integrate .. //depot/projects/avr32/src/sys/dev/ath/ah_osdep.c#5 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ah.c#7 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ah_regdomain.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ath/if_ath.c#11 integrate .. //depot/projects/avr32/src/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/avr32/src/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/avr32/src/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/avr32/src/sys/dev/ciss/cissreg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/ciss/cissvar.h#3 integrate .. //depot/projects/avr32/src/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/avr32/src/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/avr32/src/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/avr32/src/sys/dev/de/if_de.c#4 integrate .. //depot/projects/avr32/src/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/avr32/src/sys/dev/dpms/dpms.c#1 branch .. //depot/projects/avr32/src/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/avr32/src/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/avr32/src/sys/dev/drm/drm_drv.c#7 integrate .. //depot/projects/avr32/src/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/avr32/src/sys/dev/drm/drm_sysctl.c#4 integrate .. //depot/projects/avr32/src/sys/dev/drm/r600_blit.c#1 branch .. //depot/projects/avr32/src/sys/dev/drm/r600_cp.c#4 integrate .. //depot/projects/avr32/src/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/avr32/src/sys/dev/drm/radeon_cs.c#1 branch .. //depot/projects/avr32/src/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/avr32/src/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/avr32/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/avr32/src/sys/dev/e1000/if_em.c#9 integrate .. //depot/projects/avr32/src/sys/dev/e1000/if_igb.c#8 integrate .. //depot/projects/avr32/src/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ep/if_epreg.h#3 integrate .. //depot/projects/avr32/src/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/avr32/src/sys/dev/fb/vesa.c#1 branch .. //depot/projects/avr32/src/sys/dev/fb/vesa.h#1 branch .. //depot/projects/avr32/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/avr32/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/avr32/src/sys/dev/firewire/fwdev.c#3 integrate .. //depot/projects/avr32/src/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/avr32/src/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/avr32/src/sys/dev/hwpmc/hwpmc_core.c#4 integrate .. //depot/projects/avr32/src/sys/dev/hwpmc/pmc_events.h#3 integrate .. //depot/projects/avr32/src/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/avr32/src/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/avr32/src/sys/dev/iir/iir.c#3 integrate .. //depot/projects/avr32/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/avr32/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/avr32/src/sys/dev/isp/isp_stds.h#3 integrate .. //depot/projects/avr32/src/sys/dev/isp/isp_tpublic.h#2 delete .. //depot/projects/avr32/src/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/avr32/src/sys/dev/ixgbe/ixgbe.c#5 integrate .. //depot/projects/avr32/src/sys/dev/kbd/kbd.c#3 integrate .. //depot/projects/avr32/src/sys/dev/lindev/full.c#1 branch .. //depot/projects/avr32/src/sys/dev/lindev/lindev.c#1 branch .. //depot/projects/avr32/src/sys/dev/lindev/lindev.h#1 branch .. //depot/projects/avr32/src/sys/dev/mge/if_mge.c#6 integrate .. //depot/projects/avr32/src/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/avr32/src/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/avr32/src/sys/dev/mwl/if_mwl.c#4 integrate .. //depot/projects/avr32/src/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/avr32/src/sys/dev/mxge/if_mxge_var.h#6 integrate .. //depot/projects/avr32/src/sys/dev/null/null.c#2 integrate .. //depot/projects/avr32/src/sys/dev/pci/pci.c#10 integrate .. //depot/projects/avr32/src/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/avr32/src/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/avr32/src/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/avr32/src/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/avr32/src/sys/dev/pty/pty.c#1 branch .. //depot/projects/avr32/src/sys/dev/re/if_re.c#8 integrate .. //depot/projects/avr32/src/sys/dev/rp/rp_pci.c#3 integrate .. //depot/projects/avr32/src/sys/dev/siis/siis.c#2 integrate .. //depot/projects/avr32/src/sys/dev/snp/snp.c#5 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/es137x.h#2 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/hda/hdac_reg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/avr32/src/sys/dev/syscons/daemon/daemon_saver.c#4 integrate .. //depot/projects/avr32/src/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/avr32/src/sys/dev/syscons/scterm-teken.c#6 integrate .. //depot/projects/avr32/src/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/avr32/src/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/avr32/src/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/avr32/src/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/avr32/src/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/avr32/src/sys/dev/syscons/teken/Makefile#2 delete .. //depot/projects/avr32/src/sys/dev/syscons/teken/gensequences#2 delete .. //depot/projects/avr32/src/sys/dev/syscons/teken/sequences#3 delete .. //depot/projects/avr32/src/sys/dev/syscons/teken/teken.c#5 delete .. //depot/projects/avr32/src/sys/dev/syscons/teken/teken.h#5 delete .. //depot/projects/avr32/src/sys/dev/syscons/teken/teken_demo.c#3 delete .. //depot/projects/avr32/src/sys/dev/syscons/teken/teken_scs.h#2 delete .. //depot/projects/avr32/src/sys/dev/syscons/teken/teken_stress.c#3 delete .. //depot/projects/avr32/src/sys/dev/syscons/teken/teken_subr.h#3 delete .. //depot/projects/avr32/src/sys/dev/syscons/teken/teken_subr_compat.h#3 delete .. //depot/projects/avr32/src/sys/dev/syscons/teken/teken_wcwidth.h#2 delete .. //depot/projects/avr32/src/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/avr32/src/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/avr32/src/sys/dev/twe/twe.c#3 integrate .. //depot/projects/avr32/src/sys/dev/twe/twevar.h#2 integrate .. //depot/projects/avr32/src/sys/dev/txp/if_txp.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/usb_controller.c#10 integrate .. //depot/projects/avr32/src/sys/dev/usb/input/ukbd.c#9 integrate .. //depot/projects/avr32/src/sys/dev/usb/misc/ufm.c#8 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_aue.c#9 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_cdce.c#9 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uipaq.c#8 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uvisor.c#8 integrate .. //depot/projects/avr32/src/sys/dev/usb/storage/umass.c#8 integrate .. //depot/projects/avr32/src/sys/dev/usb/storage/urio.c#9 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb.h#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_busdma.c#8 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_dev.c#10 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_device.c#11 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_device.h#10 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_handle_request.c#10 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_hub.c#10 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_process.c#8 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_process.h#8 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_transfer.c#10 integrate .. //depot/projects/avr32/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_rum.c#10 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_rumreg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_upgt.c#7 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_urtw.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_zyd.c#10 integrate .. //depot/projects/avr32/src/sys/dev/wi/if_wi.c#7 integrate .. //depot/projects/avr32/src/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/avr32/src/sys/dev/xen/console/console.c#7 integrate .. //depot/projects/avr32/src/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/avr32/src/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clnode.c#4 integrate .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clport.c#4 integrate .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clvnops.c#6 integrate .. //depot/projects/avr32/src/sys/fs/procfs/procfs.c#3 integrate .. //depot/projects/avr32/src/sys/fs/procfs/procfs.h#2 integrate .. //depot/projects/avr32/src/sys/fs/procfs/procfs_osrel.c#1 branch .. //depot/projects/avr32/src/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/avr32/src/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate .. //depot/projects/avr32/src/sys/geom/geom_dev.c#4 integrate .. //depot/projects/avr32/src/sys/geom/geom_disk.c#3 integrate .. //depot/projects/avr32/src/sys/geom/geom_io.c#4 integrate .. //depot/projects/avr32/src/sys/geom/geom_vfs.c#3 integrate .. //depot/projects/avr32/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/avr32/src/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/avr32/src/sys/geom/part/g_part.c#7 integrate .. //depot/projects/avr32/src/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/avr32/src/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/avr32/src/sys/i386/acpica/madt.c#4 integrate .. //depot/projects/avr32/src/sys/i386/conf/NOTES#8 integrate .. //depot/projects/avr32/src/sys/i386/cpufreq/hwpstate.c#4 integrate .. //depot/projects/avr32/src/sys/i386/i386/elf_machdep.c#5 integrate .. //depot/projects/avr32/src/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/avr32/src/sys/i386/i386/local_apic.c#7 integrate .. //depot/projects/avr32/src/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/avr32/src/sys/i386/i386/msi.c#6 integrate .. //depot/projects/avr32/src/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/avr32/src/sys/i386/i386/trap.c#5 integrate .. //depot/projects/avr32/src/sys/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/avr32/src/sys/i386/include/_align.h#1 branch .. //depot/projects/avr32/src/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/avr32/src/sys/i386/include/apm_bios.h#2 integrate .. //depot/projects/avr32/src/sys/i386/include/param.h#6 integrate .. //depot/projects/avr32/src/sys/i386/include/pc/vesa.h#2 delete .. //depot/projects/avr32/src/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/avr32/src/sys/i386/include/pmap.h#6 integrate .. //depot/projects/avr32/src/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/avr32/src/sys/i386/include/xen/xen-os.h#2 integrate .. //depot/projects/avr32/src/sys/i386/isa/dpms.c#2 delete .. //depot/projects/avr32/src/sys/i386/isa/vesa.c#3 delete .. //depot/projects/avr32/src/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/avr32/src/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/avr32/src/sys/i386/pci/pci_cfgreg.c#4 integrate .. //depot/projects/avr32/src/sys/i386/xen/locore.s#2 integrate .. //depot/projects/avr32/src/sys/i386/xen/pmap.c#6 integrate .. //depot/projects/avr32/src/sys/ia64/include/_align.h#1 branch .. //depot/projects/avr32/src/sys/ia64/include/param.h#5 integrate .. //depot/projects/avr32/src/sys/isa/isahint.c#2 integrate .. //depot/projects/avr32/src/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/avr32/src/sys/kern/kern_conf.c#6 integrate .. //depot/projects/avr32/src/sys/kern/kern_cons.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_event.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_exec.c#7 integrate .. //depot/projects/avr32/src/sys/kern/kern_exit.c#8 integrate .. //depot/projects/avr32/src/sys/kern/kern_fork.c#7 integrate .. //depot/projects/avr32/src/sys/kern/kern_jail.c#10 integrate .. //depot/projects/avr32/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_linker.c#8 integrate .. //depot/projects/avr32/src/sys/kern/kern_lock.c#8 integrate .. //depot/projects/avr32/src/sys/kern/kern_mib.c#7 integrate .. //depot/projects/avr32/src/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/avr32/src/sys/kern/kern_proc.c#6 integrate .. //depot/projects/avr32/src/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/avr32/src/sys/kern/kern_sig.c#6 integrate .. //depot/projects/avr32/src/sys/kern/kern_subr.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_sx.c#7 integrate .. //depot/projects/avr32/src/sys/kern/kern_thr.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_thread.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_uuid.c#7 integrate .. //depot/projects/avr32/src/sys/kern/sched_ule.c#6 integrate .. //depot/projects/avr32/src/sys/kern/subr_acl_nfs4.c#2 integrate .. //depot/projects/avr32/src/sys/kern/subr_bus.c#7 integrate .. //depot/projects/avr32/src/sys/kern/subr_devstat.c#3 integrate .. //depot/projects/avr32/src/sys/kern/subr_smp.c#6 integrate .. //depot/projects/avr32/src/sys/kern/subr_witness.c#7 integrate .. //depot/projects/avr32/src/sys/kern/sys_generic.c#7 integrate .. //depot/projects/avr32/src/sys/kern/sys_pipe.c#5 integrate .. //depot/projects/avr32/src/sys/kern/tty.c#12 integrate .. //depot/projects/avr32/src/sys/kern/tty_pts.c#9 integrate .. //depot/projects/avr32/src/sys/kern/tty_pty.c#5 delete .. //depot/projects/avr32/src/sys/kern/tty_ttydisc.c#5 integrate .. //depot/projects/avr32/src/sys/kern/uipc_domain.c#5 integrate .. //depot/projects/avr32/src/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/avr32/src/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/avr32/src/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/avr32/src/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/avr32/src/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/avr32/src/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/avr32/src/sys/kern/vfs_vnops.c#9 integrate .. //depot/projects/avr32/src/sys/mips/include/_align.h#1 branch .. //depot/projects/avr32/src/sys/mips/include/param.h#5 integrate .. //depot/projects/avr32/src/sys/modules/Makefile#11 integrate .. //depot/projects/avr32/src/sys/modules/acpi/acpi/Makefile#4 integrate .. //depot/projects/avr32/src/sys/modules/dpms/Makefile#2 integrate .. //depot/projects/avr32/src/sys/modules/drm/radeon/Makefile#3 integrate .. //depot/projects/avr32/src/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/avr32/src/sys/modules/lindev/Makefile#1 branch .. //depot/projects/avr32/src/sys/modules/nfslockd/Makefile#2 integrate .. //depot/projects/avr32/src/sys/modules/procfs/Makefile#2 integrate .. //depot/projects/avr32/src/sys/modules/pty/Makefile#1 branch .. //depot/projects/avr32/src/sys/modules/vesa/Makefile#2 integrate .. //depot/projects/avr32/src/sys/modules/x86bios/Makefile#1 branch .. //depot/projects/avr32/src/sys/net/bpf.c#7 integrate .. //depot/projects/avr32/src/sys/net/bridgestp.c#7 integrate .. //depot/projects/avr32/src/sys/net/flowtable.c#6 integrate .. //depot/projects/avr32/src/sys/net/if.c#12 integrate .. //depot/projects/avr32/src/sys/net/if_arp.h#2 integrate .. //depot/projects/avr32/src/sys/net/if_bridge.c#8 integrate .. //depot/projects/avr32/src/sys/net/if_ef.c#7 integrate .. //depot/projects/avr32/src/sys/net/if_llatbl.c#6 integrate .. //depot/projects/avr32/src/sys/net/if_llatbl.h#4 integrate .. //depot/projects/avr32/src/sys/net/if_var.h#10 integrate .. //depot/projects/avr32/src/sys/net/if_vlan.c#8 integrate .. //depot/projects/avr32/src/sys/net/route.h#5 integrate .. //depot/projects/avr32/src/sys/net/rtsock.c#9 integrate .. //depot/projects/avr32/src/sys/net/vnet.c#2 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211.h#8 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_action.c#2 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_dfs.c#3 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_hwmp.c#2 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_mesh.c#2 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_mesh.h#2 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_proto.h#8 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_sta.c#7 integrate .. //depot/projects/avr32/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/avr32/src/sys/netgraph/ng_gif.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/if_ether.c#10 integrate .. //depot/projects/avr32/src/sys/netinet/if_ether.h#3 integrate .. //depot/projects/avr32/src/sys/netinet/in.c#9 integrate .. //depot/projects/avr32/src/sys/netinet/in.h#4 integrate .. //depot/projects/avr32/src/sys/netinet/in_mcast.c#9 integrate .. //depot/projects/avr32/src/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/avr32/src/sys/netinet/in_proto.c#6 integrate .. //depot/projects/avr32/src/sys/netinet/ip_divert.c#8 integrate .. //depot/projects/avr32/src/sys/netinet/ip_divert.h#2 integrate .. //depot/projects/avr32/src/sys/netinet/ip_fastfwd.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/ip_mroute.c#8 integrate .. //depot/projects/avr32/src/sys/netinet/ip_output.c#12 integrate .. //depot/projects/avr32/src/sys/netinet/ipfw/ip_fw2.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/raw_ip.c#10 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_input.c#7 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_structs.h#6 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_sysctl.c#6 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/sctputil.c#7 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_subr.c#9 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_timer.c#6 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_usrreq.c#8 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/avr32/src/sys/netinet6/icmp6.c#10 integrate .. //depot/projects/avr32/src/sys/netinet6/in6.c#10 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_ifattach.c#11 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_proto.c#6 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/avr32/src/sys/netinet6/ip6_input.c#10 integrate .. //depot/projects/avr32/src/sys/netinet6/ip6_output.c#9 integrate .. //depot/projects/avr32/src/sys/netinet6/nd6.c#10 integrate .. //depot/projects/avr32/src/sys/netinet6/nd6.h#5 integrate .. //depot/projects/avr32/src/sys/netinet6/nd6_nbr.c#7 integrate .. //depot/projects/avr32/src/sys/netinet6/nd6_rtr.c#9 integrate .. //depot/projects/avr32/src/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/avr32/src/sys/netipsec/ipsec.h#5 integrate .. //depot/projects/avr32/src/sys/netipsec/key.c#10 integrate .. //depot/projects/avr32/src/sys/netipsec/xform_ipip.c#6 integrate .. //depot/projects/avr32/src/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/avr32/src/sys/nfsclient/bootp_subr.c#7 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_node.c#4 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_vnops.c#10 integrate .. //depot/projects/avr32/src/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/avr32/src/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/avr32/src/sys/pc98/conf/NOTES#6 integrate .. //depot/projects/avr32/src/sys/pc98/include/_align.h#1 branch .. //depot/projects/avr32/src/sys/pc98/include/pc/vesa.h#2 delete .. //depot/projects/avr32/src/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/avr32/src/sys/pci/intpm.c#3 integrate .. //depot/projects/avr32/src/sys/pci/intpmreg.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/avr32/src/sys/powerpc/include/_align.h#1 branch .. //depot/projects/avr32/src/sys/powerpc/include/param.h#5 integrate .. //depot/projects/avr32/src/sys/rpc/clnt_dg.c#4 integrate .. //depot/projects/avr32/src/sys/rpc/clnt_rc.c#6 integrate .. //depot/projects/avr32/src/sys/rpc/clnt_vc.c#4 integrate .. //depot/projects/avr32/src/sys/rpc/rpc_generic.c#2 integrate .. //depot/projects/avr32/src/sys/rpc/svc_dg.c#3 integrate .. //depot/projects/avr32/src/sys/rpc/svc_generic.c#3 integrate .. //depot/projects/avr32/src/sys/rpc/svc_vc.c#3 integrate .. //depot/projects/avr32/src/sys/security/audit/audit_bsm_token.c#5 integrate .. //depot/projects/avr32/src/sys/sparc64/conf/GENERIC#9 integrate .. //depot/projects/avr32/src/sys/sparc64/include/_align.h#1 branch .. //depot/projects/avr32/src/sys/sparc64/include/param.h#5 integrate .. //depot/projects/avr32/src/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/avr32/src/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/avr32/src/sys/sparc64/pci/schizo.c#3 integrate .. //depot/projects/avr32/src/sys/sparc64/sparc64/jbusppm.c#3 integrate .. //depot/projects/avr32/src/sys/sun4v/include/_align.h#1 branch .. //depot/projects/avr32/src/sys/sun4v/include/param.h#5 integrate .. //depot/projects/avr32/src/sys/sys/_sockaddr_storage.h#1 branch .. //depot/projects/avr32/src/sys/sys/ata.h#3 integrate .. //depot/projects/avr32/src/sys/sys/bus.h#4 integrate .. //depot/projects/avr32/src/sys/sys/conf.h#5 integrate .. //depot/projects/avr32/src/sys/sys/cons.h#2 integrate .. //depot/projects/avr32/src/sys/sys/event.h#4 integrate .. //depot/projects/avr32/src/sys/sys/imgact_aout.h#2 integrate .. //depot/projects/avr32/src/sys/sys/imgact_elf.h#4 integrate .. //depot/projects/avr32/src/sys/sys/ioctl_compat.h#3 integrate .. //depot/projects/avr32/src/sys/sys/kbio.h#2 integrate .. //depot/projects/avr32/src/sys/sys/mman.h#2 integrate .. //depot/projects/avr32/src/sys/sys/param.h#13 integrate .. //depot/projects/avr32/src/sys/sys/proc.h#7 integrate .. //depot/projects/avr32/src/sys/sys/smp.h#5 integrate .. //depot/projects/avr32/src/sys/sys/socket.h#2 integrate .. //depot/projects/avr32/src/sys/sys/syscallsubr.h#7 integrate .. //depot/projects/avr32/src/sys/sys/sysproto.h#6 integrate .. //depot/projects/avr32/src/sys/sys/systm.h#7 integrate .. //depot/projects/avr32/src/sys/sys/tty.h#5 integrate .. //depot/projects/avr32/src/sys/sys/ttycom.h#2 integrate .. //depot/projects/avr32/src/sys/sys/ttydisc.h#2 integrate .. //depot/projects/avr32/src/sys/sys/types.h#3 integrate .. //depot/projects/avr32/src/sys/sys/vnode.h#8 integrate .. //depot/projects/avr32/src/sys/teken/Makefile#1 branch .. //depot/projects/avr32/src/sys/teken/gensequences#1 branch .. //depot/projects/avr32/src/sys/teken/sequences#1 branch .. //depot/projects/avr32/src/sys/teken/teken.c#1 branch .. //depot/projects/avr32/src/sys/teken/teken.h#1 branch .. //depot/projects/avr32/src/sys/teken/teken_demo.c#1 branch .. //depot/projects/avr32/src/sys/teken/teken_scs.h#1 branch .. //depot/projects/avr32/src/sys/teken/teken_stress.c#1 branch .. //depot/projects/avr32/src/sys/teken/teken_subr.h#1 branch .. //depot/projects/avr32/src/sys/teken/teken_subr_compat.h#1 branch .. //depot/projects/avr32/src/sys/teken/teken_wcwidth.h#1 branch .. //depot/projects/avr32/src/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/avr32/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/avr32/src/sys/ufs/ufs/ufs_acl.c#3 integrate .. //depot/projects/avr32/src/sys/ufs/ufs/ufs_gjournal.c#2 integrate .. //depot/projects/avr32/src/sys/ufs/ufs/ufs_vnops.c#7 integrate .. //depot/projects/avr32/src/sys/vm/device_pager.c#5 integrate .. //depot/projects/avr32/src/sys/vm/sg_pager.c#2 integrate .. //depot/projects/avr32/src/sys/vm/vm.h#4 integrate .. //depot/projects/avr32/src/sys/vm/vm_extern.h#6 integrate .. //depot/projects/avr32/src/sys/vm/vm_glue.c#3 integrate .. //depot/projects/avr32/src/sys/vm/vm_mmap.c#7 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Dependencies#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-cam#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-crypto#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-dev_pci#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-dev_sound#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-dev_usb#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-geom#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-kern#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-libkern#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-linux#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-net80211#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-netgraph#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-netinet#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-netinet6#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-netipsec#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-opencrypto#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Doxyfile-vm#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/Makefile#2 integrate .. //depot/projects/avr32/src/tools/kerneldoc/subsys/common-Doxyfile#2 integrate .. //depot/projects/avr32/src/tools/regression/acltools/00.t#2 integrate .. //depot/projects/avr32/src/tools/regression/acltools/01.t#1 branch .. //depot/projects/avr32/src/tools/regression/acltools/03.t#1 branch .. //depot/projects/avr32/src/tools/regression/acltools/aclfuzzer.sh#1 branch .. //depot/projects/avr32/src/tools/regression/acltools/tools-crossfs.test#1 branch .. //depot/projects/avr32/src/tools/regression/acltools/tools-nfs4.test#1 branch .. //depot/projects/avr32/src/tools/regression/acltools/tools-posix.test#4 integrate .. //depot/projects/avr32/src/tools/regression/bin/sh/builtins/eval3.0#1 branch .. //depot/projects/avr32/src/tools/regression/bin/sh/execution/func1.0#1 branch .. //depot/projects/avr32/src/tools/regression/bin/sh/execution/func2.0#1 branch .. //depot/projects/avr32/src/tools/regression/fstest/Makefile#2 integrate .. //depot/projects/avr32/src/tools/regression/fstest/fstest.c#4 integrate .. //depot/projects/avr32/src/tools/regression/fstest/tests/chmod/12.t#1 branch .. //depot/projects/avr32/src/tools/regression/fstest/tests/granular/00.t#1 branch .. //depot/projects/avr32/src/tools/regression/fstest/tests/granular/01.t#1 branch .. //depot/projects/avr32/src/tools/regression/fstest/tests/granular/02.t#1 branch .. //depot/projects/avr32/src/tools/regression/fstest/tests/granular/03.t#1 branch .. //depot/projects/avr32/src/tools/regression/fstest/tests/granular/04.t#1 branch .. //depot/projects/avr32/src/tools/regression/fstest/tests/granular/05.t#1 branch .. //depot/projects/avr32/src/tools/regression/poll/Makefile#2 integrate .. //depot/projects/avr32/src/tools/regression/poll/sockpoll.c#1 branch .. //depot/projects/avr32/src/tools/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/multitest.t#3 integrate .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.1#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.10#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.11#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.12#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.13#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.14#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.15#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.16#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.17#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.18#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.2#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.3#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.4#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.4.1#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.5#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.6#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.7#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.8#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1.9#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/100_9.10#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/101_9.11#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/102_9.12#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/103_9.13#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/104_9.14#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/105_9.15#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/106_9.16#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/107_9.17#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/108_9.18#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/109_9.19#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/10_1.9#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/110_9.20#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/111_9.21#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/112_9.22#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/113_9.23#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/114_9.24#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/115_9.25#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/116_9.26#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/117_9.27#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/118_9.28#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/119_9.29#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/11_1.10#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/120_9.30#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/121_9.31#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/12_1.11#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/13_1.12#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/14_1.13#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/15_1.14#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/16_1.15#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/17_1.16#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/18_1.17#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/19_1.18#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/1_1.1#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.1#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.10#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.11#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.12#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.13#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.14#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.15#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.16#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.17#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.18#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.19#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.2#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.20#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.21#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.22#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.3#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.4#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.5#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.6#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.7#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.8#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2.9#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/20_2.1#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/21_2.2#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/22_2.3#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/23_2.4#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/24_2.5#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/25_2.6#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/26_2.7#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/27_2.8#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/28_2.9#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/29_2.10#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/2_1.2#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/3.1#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/3.2#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/3.3#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/3.4#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/30_2.11#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/31_2.12#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/32_2.13#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/33_2.14#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/34_2.15#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/35_2.16#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/36_2.17#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/37_2.18#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/38_2.19#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/39_2.20#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/3_1.3#2 delete .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/4.1#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/4.2#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/4.3#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/4.4#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/4.5#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/4.6#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/4.7#1 branch .. //depot/projects/avr32/src/tools/regression/usr.bin/sed/regress.multitest.out/4.8#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Sep 27 22:17:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 885FB1065676; Sun, 27 Sep 2009 22:17:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CFCC106566C for ; Sun, 27 Sep 2009 22:17:22 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 222238FC23 for ; Sun, 27 Sep 2009 22:17:22 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8RMHLLV067680 for ; Sun, 27 Sep 2009 22:17:21 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8RMHLXE067678 for perforce@freebsd.org; Sun, 27 Sep 2009 22:17:21 GMT (envelope-from lulf@FreeBSD.org) Date: Sun, 27 Sep 2009 22:17:21 GMT Message-Id: <200909272217.n8RMHLXE067678@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 168948 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2009 22:17:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=168948 Change 168948 by lulf@lulf_nobby on 2009/09/27 22:16:58 - Fix build. Affected files ... .. //depot/projects/avr32/src/sys/avr32/include/_align.h#1 add .. //depot/projects/avr32/src/sys/avr32/include/param.h#5 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/include/param.h#5 (text+ko) ==== @@ -96,6 +96,7 @@ #define KSTACK_GUARD_PAGES 1 #define KSTACK_SIZE KSTACK_PAGES * PAGE_SIZE +#define MAXPAGESIZES 1 /* maximum number of supported page sizes */ /* * Mach derived conversion macros From owner-p4-projects@FreeBSD.ORG Sun Sep 27 23:01:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75A711065693; Sun, 27 Sep 2009 23:01:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3939E106568B for ; Sun, 27 Sep 2009 23:01:10 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 258E18FC12 for ; Sun, 27 Sep 2009 23:01:10 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8RN19x9070763 for ; Sun, 27 Sep 2009 23:01:09 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8RN193b070759 for perforce@freebsd.org; Sun, 27 Sep 2009 23:01:09 GMT (envelope-from mav@freebsd.org) Date: Sun, 27 Sep 2009 23:01:09 GMT Message-Id: <200909272301.n8RN193b070759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 168950 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2009 23:01:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=168950 Change 168950 by mav@mav_mavbook on 2009/09/27 23:01:03 IFC Affected files ... .. //depot/projects/scottl-camlock/src/UPDATING#18 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/scottl-camlock/src/etc/mtree/BSD.usr.dist#5 integrate .. //depot/projects/scottl-camlock/src/etc/network.subr#8 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/defaultroute#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ip6addrctl#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/netif#7 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/routing#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/rtadvd#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/Makefile.inc#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_spec.c#3 integrate .. //depot/projects/scottl-camlock/src/libexec/rpc.rquotad/rquotad.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#24 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#8 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#12 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/lindev.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#21 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/apm_bios.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/identcpu.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/md_var.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#21 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios_alloc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#24 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#24 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_ibm.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbd.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/de/if_de.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/de/if_devar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpms/dpms.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lindev/full.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/lindev/lindev.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/lindev/lindev.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/syscons/scmouse.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/scterm-teken.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#25 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/apm_bios.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#37 integrate .. //depot/projects/scottl-camlock/src/sys/modules/lindev/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/nfslockd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_serv.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/NOTES#16 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#24 integrate .. //depot/projects/scottl-camlock/src/sys/sys/ata.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/teken/sequences#2 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken_demo.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken_scs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken_stress.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken_subr.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken_subr_compat.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_mmap.c#18 integrate .. //depot/projects/scottl-camlock/src/tools/regression/mmap/Makefile#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/mmap/mmap.c#1 branch .. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/nanobsd.sh#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/apm/Makefile#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/UPDATING#18 (text+ko) ==== @@ -22,10 +22,61 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090926: + The rc.d/network_ipv6, IPv6 configuration script has been integrated + into rc.d/netif. The changes are the following: + + 1. To use IPv6, simply define $ifconfig_IF_ipv6 like $ifconfig_IF + for IPv4. For aliases, $ifconfig_IF_aliasN should be used. + Note that both variables need the "inet6" keyword at the head. + + Do not set $ipv6_network_interfaces manually if you do not + understand what you are doing. It is not needed in most cases. + + $ipv6_ifconfig_IF and $ipv6_ifconfig_IF_aliasN still work, but + they are obsolete. + + 2. $ipv6_enable is obsolete. Use $ipv6_prefer and + "inet6 accept_rtadv" keyword in ifconfig(8) instead. + + If you define $ipv6_enable=YES, it means $ipv6_prefer=YES and + all configured interfaces have "inet6 accept_rtadv" in the + $ifconfig_IF_ipv6. These are for backward compatibility. + + 3. A new variable $ipv6_prefer has been added. If NO, IPv6 + functionality of interfaces with no corresponding + $ifconfig_IF_ipv6 is disabled by using "inet6 ifdisabled" flag, + and the default address selection policy of ip6addrctl(8) + is the IPv4-preferred one (see rc.d/ip6addrctl for more details). + Note that if you want to configure IPv6 functionality on the + disabled interfaces after boot, first you need to clear the flag by + using ifconfig(8) like: + + ifconfig em0 inet6 -ifdisabled + + If YES, the default address selection policy is set as + IPv6-preferred. + + The default value of $ipv6_prefer is NO. + + 4. If your system need to receive Router Advertisement messages, + define "inet6 accept_rtadv" in $ifconfig_IF_ipv6. The rc(8) + scripts automatically invoke rtsol(8) when the interface becomes + UP. The Router Advertisement messages are used for SLAAC + (State-Less Address AutoConfiguration). + 20090922: 802.11s D3.03 support was committed. This is incompatible with the previous code, which was based on D3.0. +20090912: + A sysctl variable net.inet6.ip6.accept_rtadv now sets the default value + of a per-interface flag ND6_IFF_ACCEPT_RTADV, not a global knob to + control whether accepting Router Advertisement messages or not. + Also, a per-interface flag ND6_IFF_AUTO_LINKLOCAL has been added and + a sysctl variable net.inet6.ip6.auto_linklocal is its default value. + The ifconfig(8) utility now supports these flags. + 20090910: ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for mount(8) and -a option for df(1) to see them. @@ -979,4 +1030,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.640 2009/09/22 18:19:18 rpaulo Exp $ +$FreeBSD: src/UPDATING,v 1.641 2009/09/26 18:59:00 hrs Exp $ ==== //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 (text+ko) ==== @@ -535,7 +535,7 @@ .ad .sp .6 .RS 4n -Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher2\fR, but this may change in future releases). The value "off" disables integrity +Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher4\fR, but this may change in future releases). The value "off" disables integrity checking on user data. Disabling checksums is NOT a recommended practice. .RE ==== //depot/projects/scottl-camlock/src/etc/mtree/BSD.usr.dist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.338 2009/09/03 16:25:25 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.339 2009/09/27 21:27:11 gabor Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -1031,6 +1031,8 @@ .. fr_FR.UTF-8 .. + gl_ES.ISO8859-1 + .. he_IL.UTF-8 .. hi_IN.ISCII-DEV ==== //depot/projects/scottl-camlock/src/etc/network.subr#8 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.201 2009/09/12 23:01:36 hrs Exp $ +# $FreeBSD: src/etc/network.subr,v 1.202 2009/09/26 18:59:00 hrs Exp $ # # @@ -97,15 +97,26 @@ if afexists inet6; then if ipv6if $1; then if checkyesno ipv6_gateway_enable; then - _ipv6_opts="-accept_rtadv auto_linklocal" + _ipv6_opts="-accept_rtadv" + fi + else + if checkyesno ipv6_prefer; then + _ipv6_opts="-ifdisabled" else - _ipv6_opts="auto_linklocal" + _ipv6_opts="ifdisabled" fi - else - _ipv6_opts="-auto_linklocal ifdisabled" + + # backward compatibility: $ipv6_enable + case $ipv6_enable in + [Yy][Ee][Ss]) + _ipv6_opts="${_ipv6_opts} accept_rtadv" + ;; + esac fi - ifconfig $1 inet6 ${_ipv6_opts} + if [ -n "${_ipv6_opts}" ]; then + ifconfig $1 inet6 ${_ipv6_opts} + fi # ifconfig_IF_ipv6 ifconfig_args=`ifconfig_getargs $1 ipv6` @@ -382,7 +393,7 @@ # 1 otherwise. ipv6if() { - local _if i + local _if _tmpargs i _if=$1 if ! afexists inet6; then @@ -396,6 +407,18 @@ ;; esac + # True if $ifconfig_IF_ipv6 is defined. + _tmpargs=`_ifconfig_getargs $_if ipv6` + if [ -n "${_tmpargs}" ]; then + return 0 + fi + + # backward compatibility: True if $ipv6_ifconfig_IF is defined. + _tmpargs=`get_if_var $_if ipv6_ifconfig_IF` + if [ -n "${_tmpargs}" ]; then + return 0 + fi + case "${ipv6_network_interfaces}" in [Aa][Uu][Tt][Oo]) return 0 @@ -431,17 +454,30 @@ if checkyesno ipv6_gateway_enable; then return 1 fi + _tmpargs=`get_if_var $_if ipv6_prefix_IF` + if [ -n "${_tmpargs}" ]; then + return 1 + fi case $_if in lo0|\ stf[0-9]*|\ faith[0-9]*|\ lp[0-9]*|\ - sl[0-9]*) + sl[0-9]*|\ + pflog[0-9]*|\ + pfsync[0-9]*) return 1 ;; esac + # backward compatibility: $ipv6_enable + case $ipv6_enable in + [Yy][Ee][Ss]) + return 0 + ;; + esac + _tmpargs=`_ifconfig_getargs $_if ipv6` for _arg in $_tmpargs; do case $_arg in @@ -451,6 +487,16 @@ esac done + # backward compatibility: $ipv6_ifconfig_IF + _tmpargs=`get_if_var $_if ipv6_ifconfig_IF` + for _arg in $_tmpargs; do + case $_arg in + accept_rtadv) + return 0 + ;; + esac + done + return 1 } @@ -691,7 +737,7 @@ ;; *) ifconfig $1 inet6 ${ifconfig_args} alias && _ret=0 - warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete." + warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete." \ " Use ifconfig_$1_aliasN instead." ;; esac @@ -773,6 +819,7 @@ done # backward compatibility: ipv6_ifconfig_IF_aliasN. + alias=0 while : ; do ifconfig_args=`get_if_var $1 ipv6_ifconfig_IF_alias${alias}` case "${ifconfig_args}" in @@ -780,13 +827,12 @@ break ;; *) - ifconfig $1 inet6 ${ifconfig_args} -alias - alias=$((${alias} + 1)) - warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete." + ifconfig $1 inet6 ${ifconfig_args} -alias && _ret=0 + warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete." \ " Use ifconfig_$1_aliasN instead." - _ret=0 ;; esac + alias=$((${alias} + 1)) done return $_ret ==== //depot/projects/scottl-camlock/src/etc/rc.d/defaultroute#3 (text+ko) ==== @@ -2,11 +2,11 @@ # # Wait for the default route to be up # -# $FreeBSD: src/etc/rc.d/defaultroute,v 1.7 2009/09/12 22:13:41 hrs Exp $ +# $FreeBSD: src/etc/rc.d/defaultroute,v 1.8 2009/09/26 19:00:20 hrs Exp $ # # PROVIDE: defaultroute -# REQUIRE: devd netif +# REQUIRE: devd faith netif stf # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/scottl-camlock/src/etc/rc.d/ip6addrctl#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.6 2009/09/12 22:13:41 hrs Exp $ +# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.7 2009/09/26 18:59:00 hrs Exp $ # # PROVIDE: ip6addrctl @@ -19,6 +19,8 @@ prefer_ipv6_cmd="ip6addrctl_prefer_ipv6" prefer_ipv4_cmd="ip6addrctl_prefer_ipv4" +set_rcvar_obsolete ipv6_enable ipv6_prefer + ip6addrctl_prefer_ipv6() { ip6addrctl flush >/dev/null 2>&1 ==== //depot/projects/scottl-camlock/src/etc/rc.d/netif#7 (text+ko) ==== @@ -22,7 +22,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/etc/rc.d/netif,v 1.33 2009/09/12 22:13:41 hrs Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.34 2009/09/26 18:59:00 hrs Exp $ # # PROVIDE: netif @@ -41,7 +41,7 @@ extra_commands="cloneup clonedown" cmdifn= -set_rcvar_obsolete ipv6_enable +set_rcvar_obsolete ipv6_enable ipv6_prefer network_start() { ==== //depot/projects/scottl-camlock/src/etc/rc.d/routing#4 (text+ko) ==== @@ -2,11 +2,11 @@ # # Configure routing and miscellaneous network tunables # -# $FreeBSD: src/etc/rc.d/routing,v 1.148 2009/09/13 20:19:02 bz Exp $ +# $FreeBSD: src/etc/rc.d/routing,v 1.149 2009/09/26 19:00:20 hrs Exp $ # # PROVIDE: routing -# REQUIRE: netif ppp +# REQUIRE: faith netif ppp stf # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/scottl-camlock/src/etc/rc.d/rtadvd#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/rtadvd,v 1.14 2009/09/12 23:00:01 hrs Exp $ +# $FreeBSD: src/etc/rc.d/rtadvd,v 1.15 2009/09/26 19:00:47 hrs Exp $ # # PROVIDE: rtadvd @@ -43,7 +43,10 @@ case ${rtadvd_interfaces} in [Aa][Uu][Tt][Oo]|'') for i in `ifconfig -l` ; do - if is_wired_interface $1; then + case $i in + lo0) continue ;; + esac + if ipv6if $i; then rtadvd_interfaces="${rtadvd_interfaces} ${i}" fi done ==== //depot/projects/scottl-camlock/src/lib/libc/nls/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $ -# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.17 2009/03/24 23:31:41 gabor Exp $ +# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.18 2009/09/27 13:16:38 gabor Exp $ .PATH: ${.CURDIR}/nls @@ -20,6 +20,7 @@ NLS+= es_ES.ISO8859-1 NLS+= fi_FI.ISO8859-1 NLS+= fr_FR.ISO8859-1 +NLS+= gl_ES.ISO8859-1 NLS+= hu_HU.ISO8859-2 NLS+= it_IT.ISO8859-15 NLS+= ko_KR.UTF-8 ==== //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.3#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)malloc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.80 2008/11/03 21:17:18 jasone Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.81 2009/09/26 18:20:40 alc Exp $ .\" -.Dd August 26, 2008 +.Dd September 26, 2009 .Dt MALLOC 3 .Os .Sh NAME @@ -245,7 +245,8 @@ This is intended for debugging and will impact performance negatively. .It K Double/halve the virtual memory chunk size. -The default chunk size is 1 MB. +The default chunk size is the maximum of 1 MB and the largest +page size that is less than or equal to 4 MB. .It M Use .Xr mmap 2 @@ -561,6 +562,7 @@ .Xr alloca 3 , .Xr atexit 3 , .Xr getpagesize 3 , +.Xr getpagesizes 3 , .Xr memory 3 , .Xr posix_memalign 3 .Sh STANDARDS ==== //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#5 (text+ko) ==== @@ -156,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.184 2009/09/05 13:32:05 kib Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.185 2009/09/26 18:20:40 alc Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -4795,6 +4795,21 @@ } } + /* + * Increase the chunk size to the largest page size that is greater + * than the default chunk size and less than or equal to 4MB. + */ + { + size_t pagesizes[MAXPAGESIZES]; + int k, nsizes; + + nsizes = getpagesizes(pagesizes, MAXPAGESIZES); + for (k = 0; k < nsizes; k++) + if (pagesizes[k] <= (1LU << 22)) + while ((1LU << opt_chunk_2pow) < pagesizes[k]) + opt_chunk_2pow++; + } + for (i = 0; i < 3; i++) { unsigned j; ==== //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_spec.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_spec.c,v 1.7 2007/11/06 21:50:43 marius Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_spec.c,v 1.8 2009/09/25 00:15:30 davidxu Exp $ */ #include "namespace.h" @@ -131,9 +131,19 @@ curthread->specific[key].data = NULL; curthread->specific_data_count--; } + else if (curthread->specific[key].data != NULL) { + /* + * This can happen if the key is deleted via + * pthread_key_delete without first setting the value + * to NULL in all threads. POSIX says that the + * destructor is not invoked in this case. + */ + curthread->specific[key].data = NULL; + curthread->specific_data_count--; + } /* - * If there is a destructore, call it + * If there is a destructor, call it * with the key table entry unlocked: */ if (destructor != NULL) { ==== //depot/projects/scottl-camlock/src/libexec/rpc.rquotad/rquotad.c#3 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/libexec/rpc.rquotad/rquotad.c,v 1.10 2008/11/04 14:17:49 des Exp $"); +__FBSDID("$FreeBSD: src/libexec/rpc.rquotad/rquotad.c,v 1.13 2009/09/26 23:05:01 des Exp $"); #include #include @@ -31,12 +31,11 @@ #include #include -void rquota_service(struct svc_req *request, SVCXPRT *transp); -void sendquota(struct svc_req *request, SVCXPRT *transp); -void printerr_reply(SVCXPRT *transp); -void initfs(void); -int getfsquota(long id, char *path, struct dqblk *dqblk); -int hasquota(struct fstab *fs, char **qfnamep); +static void rquota_service(struct svc_req *request, SVCXPRT *transp); +static void sendquota(struct svc_req *request, SVCXPRT *transp); +static void initfs(void); +static int getfsquota(long id, char *path, struct dqblk *dqblk); +static int hasquota(struct fstab *fs, char **qfnamep); /* * structure containing informations about ufs filesystems @@ -48,16 +47,16 @@ char *qfpathname; /* pathname of the quota file */ dev_t st_dev; /* device of the filesystem */ } fs_stat; -struct fs_stat *fs_begin = NULL; +static struct fs_stat *fs_begin = NULL; -int from_inetd = 1; +static int from_inetd = 1; static void cleanup(int sig) { - (void) sig; - (void) rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL); + (void)sig; + (void)rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL); exit(0); } @@ -70,18 +69,17 @@ socklen_t fromlen; fromlen = sizeof(from); - if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0) { + if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0) from_inetd = 0; - } if (!from_inetd) { daemon(0, 0); - (void) rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL); + (void)rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL); - (void) signal(SIGINT, cleanup); - (void) signal(SIGTERM, cleanup); - (void) signal(SIGHUP, cleanup); + (void)signal(SIGINT, cleanup); + (void)signal(SIGTERM, cleanup); + (void)signal(SIGHUP, cleanup); } openlog("rpc.rquotad", LOG_CONS|LOG_PID, LOG_DAEMON); @@ -94,10 +92,11 @@ exit(1); } ok = svc_reg(transp, RQUOTAPROG, RQUOTAVERS, - rquota_service, NULL); - } else + rquota_service, NULL); + } else { ok = svc_create(rquota_service, - RQUOTAPROG, RQUOTAVERS, "udp"); + RQUOTAPROG, RQUOTAVERS, "udp"); + } if (!ok) { syslog(LOG_ERR, "unable to register (RQUOTAPROG, RQUOTAVERS, %s)", @@ -111,7 +110,7 @@ exit(1); } -void +static void rquota_service(struct svc_req *request, SVCXPRT *transp) { @@ -134,7 +133,7 @@ } /* read quota for the specified id, and send it */ -void +static void sendquota(struct svc_req *request, SVCXPRT *transp) { struct getquota_args getq_args; @@ -142,7 +141,7 @@ struct dqblk dqblk; struct timeval timev; - bzero((char *)&getq_args, sizeof(getq_args)); + bzero(&getq_args, sizeof(getq_args)); if (!svc_getargs(transp, (xdrproc_t)xdr_getquota_args, &getq_args)) { svcerr_decode(transp); return; @@ -175,36 +174,16 @@ getq_rslt.getquota_rslt_u.gqr_rquota.rq_ftimeleft = dqblk.dqb_itime - timev.tv_sec; } - if (!svc_sendreply(transp, (xdrproc_t)xdr_getquota_rslt, &getq_rslt)) { + if (!svc_sendreply(transp, (xdrproc_t)xdr_getquota_rslt, &getq_rslt)) svcerr_systemerr(transp); - } if (!svc_freeargs(transp, (xdrproc_t)xdr_getquota_args, &getq_args)) { syslog(LOG_ERR, "unable to free arguments"); exit(1); } } -void -printerr_reply(SVCXPRT *transp) /* when a reply to a request failed */ -{ - char name[INET6_ADDRSTRLEN]; - struct sockaddr *caller; - int save_errno; - - save_errno = errno; - - caller = (struct sockaddr *)svc_getrpccaller(transp)->buf; - getnameinfo(caller, caller->sa_len, name, sizeof (name), - NULL, 0, NI_NUMERICHOST); - errno = save_errno; - if (errno == 0) - syslog(LOG_ERR, "couldn't send reply to %s", name); - else - syslog(LOG_ERR, "couldn't send reply to %s: %m", name); -} - /* initialise the fs_tab list from entries in /etc/fstab */ -void +static void initfs(void) { struct fs_stat *fs_current = NULL; @@ -220,15 +199,13 @@ if (!hasquota(fs, &qfpathname)) continue; - fs_current = (struct fs_stat *) malloc(sizeof(struct fs_stat)); + fs_current = malloc(sizeof(struct fs_stat)); fs_current->fs_next = fs_next; /* next element */ - fs_current->fs_file = - malloc(sizeof(char) * (strlen(fs->fs_file) + 1)); + fs_current->fs_file = malloc(strlen(fs->fs_file) + 1); strcpy(fs_current->fs_file, fs->fs_file); - fs_current->qfpathname = - malloc(sizeof(char) * (strlen(qfpathname) + 1)); + fs_current->qfpathname = malloc(strlen(qfpathname) + 1); strcpy(fs_current->qfpathname, qfpathname); stat(fs_current->fs_file, &st); @@ -244,7 +221,7 @@ * gets the quotas for id, filesystem path. * Return 0 if fail, 1 otherwise */ -int +static int getfsquota(long id, char *path, struct dqblk *dqblk) { struct stat st_path; @@ -257,7 +234,7 @@ qcmd = QCMD(Q_GETQUOTA, USRQUOTA); for (fs = fs_begin; fs != NULL; fs = fs->fs_next) { - /* where the devise is the same as path */ + /* where the device is the same as path */ if (fs->st_dev != st_path.st_dev) continue; @@ -299,7 +276,7 @@ * Check to see if a particular quota is to be enabled. * Comes from quota.c, NetBSD 0.9 */ -int +static int hasquota(struct fstab *fs, char **qfnamep) { static char initname, usrname[100]; ==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#24 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.64 2009/09/22 22:17:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.65 2009/09/27 22:00:26 mav Exp $"); #include #include @@ -1019,18 +1019,28 @@ printf("protocol "); printf("ATA/ATAPI-%d", ata_version(parm->version_major)); if (parm->satacapabilities && parm->satacapabilities != 0xffff) { - if (parm->satacapabilities & ATA_SATA_GEN2) + if (parm->satacapabilities & ATA_SATA_GEN3) + printf(" SATA 3.x\n"); + else if (parm->satacapabilities & ATA_SATA_GEN2) printf(" SATA 2.x\n"); else if (parm->satacapabilities & ATA_SATA_GEN1) printf(" SATA 1.x\n"); else - printf(" SATA x.x\n"); + printf(" SATA\n"); } else printf("\n"); printf("device model %.40s\n", parm->model); + printf("firmware revision %.8s\n", parm->revision); printf("serial number %.20s\n", parm->serial); - printf("firmware revision %.8s\n", parm->revision); + if (parm->enabled.extension & ATA_SUPPORT_64BITWWN) { + printf("WWN %02x%02x%02x%02x\n", + parm->wwn[0], parm->wwn[1], parm->wwn[2], parm->wwn[3]); + } + if (parm->enabled.extension & ATA_SUPPORT_MEDIASN) { + printf("media serial number %.30s\n", + parm->media_serial); + } printf("cylinders %d\n", parm->cylinders); printf("heads %d\n", parm->heads); @@ -1071,6 +1081,8 @@ default: printf("0"); } + if ((parm->capabilities1 & ATA_SUPPORT_IORDY) == 0) + printf(" w/o IORDY"); printf("\n"); printf("DMA%ssupported ", @@ -1110,18 +1122,25 @@ printf("overlap%ssupported\n", parm->capabilities1 & ATA_SUPPORT_OVERLAP ? " " : " not "); + if (parm->media_rotation_rate == 1) { + printf("media RPM non-rotating\n"); + } else if (parm->media_rotation_rate >= 0x0401 && + parm->media_rotation_rate <= 0xFFFE) { + printf("media RPM %d\n", + parm->media_rotation_rate); + } printf("\nFeature " "Support Enable Value Vendor\n"); - + printf("read ahead %s %s\n", + parm->support.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no", + parm->enabled.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no"); printf("write cache %s %s\n", parm->support.command1 & ATA_SUPPORT_WRITECACHE ? "yes" : "no", parm->enabled.command1 & ATA_SUPPORT_WRITECACHE ? "yes" : "no"); - - printf("read ahead %s %s\n", - parm->support.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no", - parm->enabled.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no"); - + printf("flush cache %s %s\n", + parm->support.command2 & ATA_SUPPORT_FLUSHCACHE ? "yes" : "no", + parm->enabled.command2 & ATA_SUPPORT_FLUSHCACHE ? "yes" : "no"); if (parm->satacapabilities && parm->satacapabilities != 0xffff) { printf("Native Command Queuing (NCQ) %s " " %d/0x%02X\n", @@ -1136,28 +1155,22 @@ parm->support.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no", parm->enabled.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no", ATA_QUEUE_LEN(parm->queue), ATA_QUEUE_LEN(parm->queue)); - printf("SMART %s %s\n", parm->support.command1 & ATA_SUPPORT_SMART ? "yes" : "no", parm->enabled.command1 & ATA_SUPPORT_SMART ? "yes" : "no"); - printf("microcode download %s %s\n", parm->support.command2 & ATA_SUPPORT_MICROCODE ? "yes" : "no", parm->enabled.command2 & ATA_SUPPORT_MICROCODE ? "yes" : "no"); - printf("security %s %s\n", parm->support.command1 & ATA_SUPPORT_SECURITY ? "yes" : "no", parm->enabled.command1 & ATA_SUPPORT_SECURITY ? "yes" : "no"); - printf("power management %s %s\n", parm->support.command1 & ATA_SUPPORT_POWERMGT ? "yes" : "no", parm->enabled.command1 & ATA_SUPPORT_POWERMGT ? "yes" : "no"); - printf("advanced power management %s %s %d/0x%02X\n", parm->support.command2 & ATA_SUPPORT_APM ? "yes" : "no", parm->enabled.command2 & ATA_SUPPORT_APM ? "yes" : "no", parm->apm_value, parm->apm_value); - printf("automatic acoustic management %s %s " "%d/0x%02X %d/0x%02X\n", parm->support.command2 & ATA_SUPPORT_AUTOACOUSTIC ? "yes" :"no", @@ -1166,6 +1179,22 @@ ATA_ACOUSTIC_CURRENT(parm->acoustic), ATA_ACOUSTIC_VENDOR(parm->acoustic), ATA_ACOUSTIC_VENDOR(parm->acoustic)); + printf("media status notification %s %s\n", + parm->support.command2 & ATA_SUPPORT_NOTIFY ? "yes" : "no", + parm->enabled.command2 & ATA_SUPPORT_NOTIFY ? "yes" : "no"); + printf("power-up in Standby %s %s\n", + parm->support.command2 & ATA_SUPPORT_STANDBY ? "yes" : "no", + parm->enabled.command2 & ATA_SUPPORT_STANDBY ? "yes" : "no"); + printf("write-read-verify %s %s %d/0x%x\n", + parm->support2 & ATA_SUPPORT_WRITEREADVERIFY ? "yes" : "no", + parm->enabled2 & ATA_SUPPORT_WRITEREADVERIFY ? "yes" : "no", + parm->wrv_mode, parm->wrv_mode); + printf("unload %s %s\n", + parm->support.extension & ATA_SUPPORT_UNLOAD ? "yes" : "no", + parm->enabled.extension & ATA_SUPPORT_UNLOAD ? "yes" : "no"); + printf("free-fall %s %s\n", + parm->support2 & ATA_SUPPORT_FREEFALL ? "yes" : "no", + parm->enabled2 & ATA_SUPPORT_FREEFALL ? "yes" : "no"); } @@ -1261,6 +1290,7 @@ ata_bswap(ident_buf->model, sizeof(ident_buf->model)); ata_bswap(ident_buf->revision, sizeof(ident_buf->revision)); ata_bswap(ident_buf->serial, sizeof(ident_buf->serial)); + ata_bswap(ident_buf->media_serial, sizeof(ident_buf->media_serial)); } ata_btrim(ident_buf->model, sizeof(ident_buf->model)); ata_bpack(ident_buf->model, ident_buf->model, sizeof(ident_buf->model)); @@ -1268,6 +1298,9 @@ ata_bpack(ident_buf->revision, ident_buf->revision, sizeof(ident_buf->revision)); ata_btrim(ident_buf->serial, sizeof(ident_buf->serial)); ata_bpack(ident_buf->serial, ident_buf->serial, sizeof(ident_buf->serial)); + ata_btrim(ident_buf->media_serial, sizeof(ident_buf->media_serial)); + ata_bpack(ident_buf->media_serial, ident_buf->media_serial, + sizeof(ident_buf->media_serial)); fprintf(stdout, "%s%d: ", device->device_name, device->dev_unit_num); ==== //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#8 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.161 2009/09/12 22:17:13 hrs Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.162 2009/09/26 18:59:00 hrs Exp $ .\" -.Dd September 2, 2009 +.Dd September 23, 2009 .Dt IFCONFIG 8 .Os .Sh NAME @@ -598,7 +598,10 @@ the hardware will be re-initialized. .El .Pp -The following parameters are for ICMPv6 Neightbor Discovery Protocol: +The following parameters are for ICMPv6 Neightbor Discovery Protocol. +Note that the address family keyword +.Dq Li inet6 +is needed for them: .Bl -tag -width indent .It Cm accept_rtadv Set a flag to enable accepting ICMPv6 Router Advertisement messages. @@ -619,7 +622,10 @@ .Cm defaultif . .It Cm ifdisabled Set a flag to disable all of IPv6 network communications on the -specified interface. +specified interface. Note that if there are already configured IPv6 +addresses on that interface, all of them are marked as +.Dq tentative +and DAD will be performed when this flag is cleared. .It Cm -ifdisabled Clear a flag .Cm ifdisabled . ==== //depot/projects/scottl-camlock/src/share/man/man4/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.461 2009/09/09 09:50:31 delphij Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.462 2009/09/26 12:45:28 bz Exp $ MAN= aac.4 \ acpi.4 \ @@ -173,6 +173,7 @@ le.4 \ led.4 \ lge.4 \ + ${_lindev.4} \ ${_linux.4} \ lmc.4 \ lo.4 \ @@ -625,6 +626,7 @@ _if_wpi.4= if_wpi.4 _ipmi.4= ipmi.4 _io.4= io.4 +_lindev.4= lindev.4 _linux.4= linux.4 _ndis.4= ndis.4 _nfe.4= nfe.4 @@ -636,6 +638,8 @@ _spkr.4= spkr.4 _urtw.4= urtw.4 _wpi.4= wpi.4 + +MLINKS+=lindev.4 full.4 .endif .if exists(${.CURDIR}/man4.${MACHINE_ARCH}) ==== //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#8 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.363 2009/09/17 19:05:47 dougb Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.364 2009/09/26 18:59:00 hrs Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 28 06:25:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 549261065679; Mon, 28 Sep 2009 06:25:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 158691065670 for ; Mon, 28 Sep 2009 06:25:24 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0290A8FC1E for ; Mon, 28 Sep 2009 06:25:24 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8S6PNoB030850 for ; Mon, 28 Sep 2009 06:25:23 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8S6PNK6030848 for perforce@freebsd.org; Mon, 28 Sep 2009 06:25:23 GMT (envelope-from anchie@FreeBSD.org) Date: Mon, 28 Sep 2009 06:25:23 GMT Message-Id: <200909280625.n8S6PNK6030848@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 168953 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Sep 2009 06:25:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=168953 Change 168953 by anchie@p4imunes on 2009/09/28 06:25:10 Redefinition of ip_dummynet variables due to virtualisation. Affected files ... .. //depot/projects/vimage/src/sys/netinet/ipfw/ip_dummynet.c#5 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ipfw/ip_dummynet.c#5 (text+ko) ==== @@ -73,6 +73,7 @@ #include #include /* IFNAMSIZ, struct ifaddr, ifq head, lock.h mutex.h */ #include +#include #include #include /* ip_len, ip_off */ #include @@ -88,35 +89,60 @@ * We keep a private variable for the simulation time, but we could * probably use an existing one ("softticks" in sys/kern/kern_timeout.c) */ -static dn_key curr_time = 0 ; /* current simulation time */ +static VNET_DEFINE(dn_key, curr_time) = 0 ; /* current simulation time */ +#define V_curr_time VNET(curr_time) -static int dn_hash_size = 64 ; /* default hash size */ +static VNET_DEFINE(int, dn_hash_size) = 64 ; /* default hash size */ +#define V_dn_hash_size VNET(dn_hash_size) /* statistics on number of queue searches and search steps */ -static long searches, search_steps ; -static int pipe_expire = 1 ; /* expire queue if empty */ -static int dn_max_ratio = 16 ; /* max queues/buckets ratio */ +static VNET_DEFINE(long, searches); +static VNET_DEFINE(long, search_steps); +static VNET_DEFINE(int, pipe_expire) = 1 ; /* expire queue if empty */ +static VNET_DEFINE(int, dn_max_ratio) = 16 ; /* max queues/buckets ratio */ +#define V_searches VNET(searches) +#define V_search_steps VNET(search_steps) +#define V_pipe_expire VNET(pipe_expire) +#define V_dn_max_ratio VNET(dn_max_ratio) -static long pipe_slot_limit = 100; /* Foot shooting limit for pipe queues. */ -static long pipe_byte_limit = 1024 * 1024; +static VNET_DEFINE(long, pipe_slot_limit) = 100; /* Foot shooting limit for pipe queues. */ +static VNET_DEFINE(long, pipe_byte_limit) = 1024 * 1024; +#define V_pipe_slot_limit VNET(pipe_slot_limit) +#define V_pipe_byte_limit VNET(pipe_byte_limit) -static int red_lookup_depth = 256; /* RED - default lookup table depth */ -static int red_avg_pkt_size = 512; /* RED - default medium packet size */ -static int red_max_pkt_size = 1500; /* RED - default max packet size */ +static VNET_DEFINE(int, red_lookup_depth) = 256; /* RED - default lookup table depth */ +static VNET_DEFINE(int, red_avg_pkt_size) = 512; /* RED - default medium packet size */ +static VNET_DEFINE(int, red_max_pkt_size) = 1500; /* RED - default max packet size */ +#define V_red_lookup_depth VNET(red_lookup_depth) +#define V_red_avg_pkt_size VNET(red_avg_pkt_size) +#define V_red_max_pkt_size VNET(red_max_pkt_size) -static struct timeval prev_t, t; -static long tick_last; /* Last tick duration (usec). */ -static long tick_delta; /* Last vs standard tick diff (usec). */ -static long tick_delta_sum; /* Accumulated tick difference (usec).*/ -static long tick_adjustment; /* Tick adjustments done. */ -static long tick_lost; /* Lost(coalesced) ticks number. */ +static VNET_DEFINE(struct timeval, prev_t); +static VNET_DEFINE(struct timeval, t); +static VNET_DEFINE(long, tick_last); /* Last tick duration (usec). */ +static VNET_DEFINE(long, tick_delta); /* Last vs standard tick diff (usec). */ +static VNET_DEFINE(long, tick_delta_sum); /* Accumulated tick difference (usec).*/ +static VNET_DEFINE(long, tick_adjustment); /* Tick adjustments done. */ +static VNET_DEFINE(long, tick_lost); /* Lost(coalesced) ticks number. */ /* Adjusted vs non-adjusted curr_time difference (ticks). */ -static long tick_diff; +static VNET_DEFINE(long, tick_diff); +#define V_prev_t VNET(prev_t) +#define V_t VNET(t) +#define V_tick_last VNET(tick_last) +#define V_tick_delta VNET(tick_delta) +#define V_tick_delta_sum VNET(tick_delta_sum) +#define V_tick_adjustment VNET(tick_adjustment) +#define V_tick_lost VNET(tick_lost) +#define V_tick_diff VNET(tick_diff) -static int io_fast; -static unsigned long io_pkt; -static unsigned long io_pkt_fast; -static unsigned long io_pkt_drop; +static VNET_DEFINE(int, io_fast); +static VNET_DEFINE(unsigned long, io_pkt); +static VNET_DEFINE(unsigned long, io_pkt_fast); +static VNET_DEFINE(long, io_pkt_drop); +#define V_io_fast VNET(io_fast) +#define V_io_pkt VNET(io_pkt) +#define V_io_pkt_fast VNET(io_pkt_fast) +#define V_io_pkt_drop VNET(io_pkt_drop) /* * Three heaps contain queues and pipes that the scheduler handles: @@ -131,7 +157,9 @@ MALLOC_DEFINE(M_DUMMYNET, "dummynet", "dummynet heap"); -static struct dn_heap ready_heap, extract_heap, wfq_ready_heap ; +static VNET_DEFINE(struct dn_heap, ready_heap); +static VNET_DEFINE(struct dn_heap, extract_heap); +static VNET_DEFINE(struct dn_heap, wfq_ready_heap); static int heap_init(struct dn_heap *h, int size); static int heap_insert (struct dn_heap *h, dn_key key1, void *p); @@ -145,10 +173,10 @@ #define HASHSIZE 16 #define HASH(num) ((((num) >> 8) ^ ((num) >> 4) ^ (num)) & 0x0f) -static struct dn_pipe_head pipehash[HASHSIZE]; /* all pipes */ -static struct dn_flow_set_head flowsethash[HASHSIZE]; /* all flowsets */ +static VNET_DEFINE(struct dn_pipe_head, pipehash[HASHSIZE]); /* all pipes */ +static VNET_DEFINE(struct dn_flow_set_head, flowsethash[HASHSIZE]); /* all flowsets */ -static struct callout dn_timeout; +static VNET_DEFINE(struct callout, dn_timeout); extern void (*bridge_dn_p)(struct mbuf *, struct ifnet *); @@ -157,73 +185,73 @@ SYSCTL_DECL(_net_inet_ip); SYSCTL_NODE(_net_inet_ip, OID_AUTO, dummynet, CTLFLAG_RW, 0, "Dummynet"); -SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, hash_size, - CTLFLAG_RW, &dn_hash_size, 0, "Default hash table size"); +SYSCTL_VNET_INT(_net_inet_ip_dummynet, OID_AUTO, hash_size, + CTLFLAG_RW, &VNET_NAME(dn_hash_size), 0, "Default hash table size"); #if 0 /* curr_time is 64 bit */ -SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, curr_time, - CTLFLAG_RD, &curr_time, 0, "Current tick"); +SYSCTL_VNET_LONG(_net_inet_ip_dummynet, OID_AUTO, curr_time, + CTLFLAG_RD, &VNET_NAME(curr_time), 0, "Current tick"); #endif -SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, ready_heap, - CTLFLAG_RD, &ready_heap.size, 0, "Size of ready heap"); -SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, extract_heap, - CTLFLAG_RD, &extract_heap.size, 0, "Size of extract heap"); -SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, searches, - CTLFLAG_RD, &searches, 0, "Number of queue searches"); -SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, search_steps, - CTLFLAG_RD, &search_steps, 0, "Number of queue search steps"); -SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, expire, - CTLFLAG_RW, &pipe_expire, 0, "Expire queue if empty"); -SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, max_chain_len, - CTLFLAG_RW, &dn_max_ratio, 0, +SYSCTL_VNET_INT(_net_inet_ip_dummynet, OID_AUTO, ready_heap, + CTLFLAG_RD, &VNET_NAME(ready_heap).size, 0, "Size of ready heap"); +SYSCTL_VNET_INT(_net_inet_ip_dummynet, OID_AUTO, extract_heap, + CTLFLAG_RD, &VNET_NAME(extract_heap).size, 0, "Size of extract heap"); +SYSCTL_VNET_LONG(_net_inet_ip_dummynet, OID_AUTO, searches, + CTLFLAG_RD, &VNET_NAME(searches), 0, "Number of queue searches"); +SYSCTL_VNET_LONG(_net_inet_ip_dummynet, OID_AUTO, search_steps, + CTLFLAG_RD, &VNET_NAME(search_steps), 0, "Number of queue search steps"); +SYSCTL_VNET_INT(_net_inet_ip_dummynet, OID_AUTO, expire, + CTLFLAG_RW, &VNET_NAME(pipe_expire), 0, "Expire queue if empty"); +SYSCTL_VNET_INT(_net_inet_ip_dummynet, OID_AUTO, max_chain_len, + CTLFLAG_RW, &VNET_NAME(dn_max_ratio), 0, "Max ratio between dynamic queues and buckets"); -SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, red_lookup_depth, - CTLFLAG_RD, &red_lookup_depth, 0, "Depth of RED lookup table"); -SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, red_avg_pkt_size, - CTLFLAG_RD, &red_avg_pkt_size, 0, "RED Medium packet size"); -SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, red_max_pkt_size, - CTLFLAG_RD, &red_max_pkt_size, 0, "RED Max packet size"); -SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, tick_delta, - CTLFLAG_RD, &tick_delta, 0, "Last vs standard tick difference (usec)."); -SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, tick_delta_sum, - CTLFLAG_RD, &tick_delta_sum, 0, "Accumulated tick difference (usec)."); -SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, tick_adjustment, - CTLFLAG_RD, &tick_adjustment, 0, "Tick adjustments done."); -SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, tick_diff, - CTLFLAG_RD, &tick_diff, 0, +SYSCTL_VNET_INT(_net_inet_ip_dummynet, OID_AUTO, red_lookup_depth, + CTLFLAG_RD, &VNET_NAME(red_lookup_depth), 0, "Depth of RED lookup table"); +SYSCTL_VNET_INT(_net_inet_ip_dummynet, OID_AUTO, red_avg_pkt_size, + CTLFLAG_RD, &VNET_NAME(red_avg_pkt_size), 0, "RED Medium packet size"); +SYSCTL_VNET_INT(_net_inet_ip_dummynet, OID_AUTO, red_max_pkt_size, + CTLFLAG_RD, &VNET_NAME(red_max_pkt_size), 0, "RED Max packet size"); +SYSCTL_VNET_LONG(_net_inet_ip_dummynet, OID_AUTO, tick_delta, + CTLFLAG_RD, &VNET_NAME(tick_delta), 0, "Last vs standard tick difference (usec)."); +SYSCTL_VNET_LONG(_net_inet_ip_dummynet, OID_AUTO, tick_delta_sum, + CTLFLAG_RD, &VNET_NAME(tick_delta_sum), 0, "Accumulated tick difference (usec)."); +SYSCTL_VNET_LONG(_net_inet_ip_dummynet, OID_AUTO, tick_adjustment, + CTLFLAG_RD, &VNET_NAME(tick_adjustment), 0, "Tick adjustments done."); +SYSCTL_VNET_LONG(_net_inet_ip_dummynet, OID_AUTO, tick_diff, + CTLFLAG_RD, &VNET_NAME(tick_diff), 0, "Adjusted vs non-adjusted curr_time difference (ticks)."); -SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, tick_lost, - CTLFLAG_RD, &tick_lost, 0, +SYSCTL_VNET_LONG(_net_inet_ip_dummynet, OID_AUTO, tick_lost, + CTLFLAG_RD, &VNET_NAME(tick_lost), 0, "Number of ticks coalesced by dummynet taskqueue."); -SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, io_fast, - CTLFLAG_RW, &io_fast, 0, "Enable fast dummynet io."); -SYSCTL_ULONG(_net_inet_ip_dummynet, OID_AUTO, io_pkt, - CTLFLAG_RD, &io_pkt, 0, +SYSCTL_VNET_INT(_net_inet_ip_dummynet, OID_AUTO, io_fast, + CTLFLAG_RW, &VNET_NAME(io_fast), 0, "Enable fast dummynet io."); +SYSCTL_VNET_ULONG(_net_inet_ip_dummynet, OID_AUTO, io_pkt, + CTLFLAG_RD, &VNET_NAME(io_pkt), 0, "Number of packets passed to dummynet."); -SYSCTL_ULONG(_net_inet_ip_dummynet, OID_AUTO, io_pkt_fast, - CTLFLAG_RD, &io_pkt_fast, 0, +SYSCTL_VNET_ULONG(_net_inet_ip_dummynet, OID_AUTO, io_pkt_fast, + CTLFLAG_RD, &VNET_NAME(io_pkt_fast), 0, "Number of packets bypassed dummynet scheduler."); -SYSCTL_ULONG(_net_inet_ip_dummynet, OID_AUTO, io_pkt_drop, - CTLFLAG_RD, &io_pkt_drop, 0, +SYSCTL_VNET_ULONG(_net_inet_ip_dummynet, OID_AUTO, io_pkt_drop, + CTLFLAG_RD, &VNET_NAME(io_pkt_drop), 0, "Number of packets dropped by dummynet."); -SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, pipe_slot_limit, - CTLFLAG_RW, &pipe_slot_limit, 0, "Upper limit in slots for pipe queue."); -SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, pipe_byte_limit, - CTLFLAG_RW, &pipe_byte_limit, 0, "Upper limit in bytes for pipe queue."); +SYSCTL_VNET_LONG(_net_inet_ip_dummynet, OID_AUTO, pipe_slot_limit, + CTLFLAG_RW, &VNET_NAME(pipe_slot_limit), 0, "Upper limit in slots for pipe queue."); +SYSCTL_VNET_LONG(_net_inet_ip_dummynet, OID_AUTO, pipe_byte_limit, + CTLFLAG_RW, &VNET_NAME(pipe_byte_limit), 0, "Upper limit in bytes for pipe queue."); #endif #ifdef DUMMYNET_DEBUG -int dummynet_debug = 0; +VNET_DEFINE(int, dummynet_debug) = 0; #ifdef SYSCTL_NODE -SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, debug, CTLFLAG_RW, &dummynet_debug, +SYSCTL_VNET_INT(_net_inet_ip_dummynet, OID_AUTO, debug, CTLFLAG_RW, &VNET_NAME(dummynet_debug), 0, "control debugging printfs"); #endif -#define DPRINTF(X) if (dummynet_debug) printf X +#define DPRINTF(X) if (V_dummynet_debug) printf X #else #define DPRINTF(X) #endif -static struct task dn_task; -static struct taskqueue *dn_tq = NULL; +static VNET_DEFINE(struct task, dn_task); +static VNET_DEFINE(struct taskqueue *, dn_tq) = NULL; static void dummynet_task(void *, int); static struct mtx dummynet_mtx; @@ -493,7 +521,7 @@ while ((m = pipe->head) != NULL) { pkt = dn_tag_get(m); - if (!DN_KEY_LEQ(pkt->output_time, curr_time)) + if (!DN_KEY_LEQ(pkt->output_time, V_curr_time)) break; pipe->head = m->m_nextpkt; @@ -513,7 +541,7 @@ * XXX Should check errors on heap_insert, by draining the * whole pipe p and hoping in the future we are more successful. */ - heap_insert(&extract_heap, pkt->output_time, pipe); + heap_insert(&V_extract_heap, pkt->output_time, pipe); } } @@ -590,7 +618,7 @@ q->len-- ; q->len_bytes -= len ; - dt->output_time = curr_time + p->delay ; + dt->output_time = V_curr_time + p->delay ; if (p->head == NULL) p->head = pkt; @@ -630,7 +658,7 @@ * bandwidth==0 (no limit) means we can drain the whole queue, * setting len_scaled = 0 does the job. */ - q->numbytes += (curr_time - q->sched_time) * p->bandwidth; + q->numbytes += (V_curr_time - q->sched_time) * p->bandwidth; while ((pkt = q->head) != NULL) { int len = pkt->m_pkthdr.len; dn_key len_scaled = p->bandwidth ? len*8*hz @@ -654,14 +682,14 @@ if ((pkt = q->head) != NULL) { /* this implies bandwidth != 0 */ dn_key t = set_ticks(pkt, q, p); /* ticks i have to wait */ - q->sched_time = curr_time; - heap_insert(&ready_heap, curr_time + t, (void *)q); + q->sched_time = V_curr_time; + heap_insert(&V_ready_heap, V_curr_time + t, (void *)q); /* * XXX Should check errors on heap_insert, and drain the whole * queue on error hoping next time we are luckier. */ } else /* RED needs to know when the queue becomes empty. */ - q->idle_time = curr_time; + q->idle_time = V_curr_time; /* * If the delay line was empty call transmit_event() now. @@ -689,7 +717,7 @@ DUMMYNET_LOCK_ASSERT(); if (p->if_name[0] == 0) /* tx clock is simulated */ - p->numbytes += (curr_time - p->sched_time) * p->bandwidth; + p->numbytes += (V_curr_time - p->sched_time) * p->bandwidth; else { /* * tx clock is for real, * the ifq must be empty or this is a NOP. @@ -762,7 +790,7 @@ } } if (sch->elements == 0 && neh->elements == 0 && p->numbytes >= 0) { - p->idle_time = curr_time; + p->idle_time = V_curr_time; /* * No traffic and no events scheduled. * We can get rid of idle-heap. @@ -793,8 +821,8 @@ if (p->bandwidth > 0) t = (p->bandwidth - 1 - p->numbytes) / p->bandwidth; dn_tag_get(p->tail)->output_time += t; - p->sched_time = curr_time; - heap_insert(&wfq_ready_heap, curr_time + t, (void *)p); + p->sched_time = V_curr_time; + heap_insert(&V_wfq_ready_heap, V_curr_time + t, (void *)p); /* * XXX Should check errors on heap_insert, and drain the whole * queue on error hoping next time we are luckier. @@ -817,7 +845,7 @@ dummynet(void * __unused unused) { - taskqueue_enqueue(dn_tq, &dn_task); + taskqueue_enqueue(V_dn_tq, &V_dn_task); } /* @@ -835,23 +863,23 @@ DUMMYNET_LOCK(); - heaps[0] = &ready_heap; /* fixed-rate queues */ - heaps[1] = &wfq_ready_heap; /* wfq queues */ - heaps[2] = &extract_heap; /* delay line */ + heaps[0] = &V_ready_heap; /* fixed-rate queues */ + heaps[1] = &V_wfq_ready_heap; /* wfq queues */ + heaps[2] = &V_extract_heap; /* delay line */ /* Update number of lost(coalesced) ticks. */ - tick_lost += pending - 1; + V_tick_lost += pending - 1; getmicrouptime(&t); /* Last tick duration (usec). */ - tick_last = (t.tv_sec - prev_t.tv_sec) * 1000000 + - (t.tv_usec - prev_t.tv_usec); + V_tick_last = (V_t.tv_sec - V_prev_t.tv_sec) * 1000000 + + (V_t.tv_usec - V_prev_t.tv_usec); /* Last tick vs standard tick difference (usec). */ - tick_delta = (tick_last * hz - 1000000) / hz; + V_tick_delta = (V_tick_last * hz - 1000000) / hz; /* Accumulated tick difference (usec). */ - tick_delta_sum += tick_delta; + V_tick_delta_sum += V_tick_delta; - prev_t = t; + V_prev_t = V_t; /* * Adjust curr_time if accumulated tick difference greater than @@ -859,28 +887,28 @@ * we do positive adjustment as required and throttle curr_time in * case of negative adjustment. */ - curr_time++; - if (tick_delta_sum - tick >= 0) { - int diff = tick_delta_sum / tick; + V_curr_time++; + if (V_tick_delta_sum - tick >= 0) { + int diff = V_tick_delta_sum / tick; - curr_time += diff; - tick_diff += diff; - tick_delta_sum %= tick; - tick_adjustment++; - } else if (tick_delta_sum + tick <= 0) { - curr_time--; - tick_diff--; - tick_delta_sum += tick; - tick_adjustment++; + V_curr_time += diff; + V_tick_diff += diff; + V_tick_delta_sum %= tick; + V_tick_adjustment++; + } else if (V_tick_delta_sum + tick <= 0) { + V_curr_time--; + V_tick_diff--; + V_tick_delta_sum += tick; + V_tick_adjustment++; } for (i = 0; i < 3; i++) { h = heaps[i]; - while (h->elements > 0 && DN_KEY_LEQ(h->p[0].key, curr_time)) { - if (h->p[0].key > curr_time) + while (h->elements > 0 && DN_KEY_LEQ(h->p[0].key, V_curr_time)) { + if (h->p[0].key > V_curr_time) printf("dummynet: warning, " "heap %d is %d ticks late\n", - i, (int)(curr_time - h->p[0].key)); + i, (int)(V_curr_time - h->p[0].key)); /* store a copy before heap_extract */ p = h->p[0].object; /* need to extract before processing */ @@ -901,7 +929,7 @@ /* Sweep pipes trying to expire idle flow_queues. */ for (i = 0; i < HASHSIZE; i++) - SLIST_FOREACH(pipe, &pipehash[i], next) + SLIST_FOREACH(pipe, &V_pipehash[i], next) if (pipe->idle_heap.elements > 0 && DN_KEY_LT(pipe->idle_heap.p[0].key, pipe->V)) { struct dn_flow_queue *q = @@ -918,7 +946,7 @@ if (head != NULL) dummynet_send(head); - callout_reset(&dn_timeout, 1, dummynet, NULL); + callout_reset(&V_dn_timeout, 1, dummynet, NULL); } static void @@ -1029,7 +1057,7 @@ { struct dn_flow_queue *q; - if (fs->rq_elements > fs->rq_size * dn_max_ratio && + if (fs->rq_elements > fs->rq_size * V_dn_max_ratio && expire_queues(fs) == 0) { /* No way to get room, use or create overflow queue. */ i = fs->rq_size; @@ -1045,7 +1073,7 @@ q->hash_slot = i; q->next = fs->rq[i]; q->S = q->F + 1; /* hack - mark timestamp as invalid. */ - q->numbytes = fs->pipe->burst + (io_fast ? fs->pipe->bandwidth : 0); + q->numbytes = fs->pipe->burst + (V_io_fast ? fs->pipe->bandwidth : 0); fs->rq[i] = q; fs->rq_elements++; return (q); @@ -1112,9 +1140,9 @@ } i = i % fs->rq_size ; /* finally, scan the current list for a match */ - searches++ ; + V_searches++ ; for (prev=NULL, q = fs->rq[i] ; q ; ) { - search_steps++; + V_search_steps++; if (is_v6 && IN6_ARE_ADDR_EQUAL(&id->dst_ip6,&q->id.dst_ip6) && IN6_ARE_ADDR_EQUAL(&id->src_ip6,&q->id.src_ip6) && @@ -1134,7 +1162,7 @@ break ; /* found */ /* No match. Check if we can expire the entry */ - if (pipe_expire && q->head == NULL && q->S == q->F+1 ) { + if (V_pipe_expire && q->head == NULL && q->S == q->F+1 ) { /* entry is idle and not in any heap, expire it */ struct dn_flow_queue *old_q = q ; @@ -1189,7 +1217,7 @@ u_int q_size = (fs->flags_fs & DN_QSIZE_IS_BYTES) ? q->len_bytes : q->len; - DPRINTF(("\ndummynet: %d q: %2u ", (int)curr_time, q_size)); + DPRINTF(("\ndummynet: %d q: %2u ", (int)V_curr_time, q_size)); /* Average queue size estimation. */ if (q_size != 0) { @@ -1207,7 +1235,7 @@ * XXX check wraps... */ if (q->avg) { - u_int t = (curr_time - q->idle_time) / fs->lookup_step; + u_int t = (V_curr_time - q->idle_time) / fs->lookup_step; q->avg = (t < fs->lookup_depth) ? SCALE_MUL(q->avg, fs->w_q_lookup[t]) : 0; @@ -1273,7 +1301,7 @@ { struct dn_flow_set *fs; - SLIST_FOREACH(fs, &flowsethash[HASH(fs_nr)], next) + SLIST_FOREACH(fs, &V_flowsethash[HASH(fs_nr)], next) if (fs->fs_nr == fs_nr) return (fs); @@ -1285,7 +1313,7 @@ { struct dn_pipe *pipe; - SLIST_FOREACH(pipe, &pipehash[HASH(pipe_nr)], next) + SLIST_FOREACH(pipe, &V_pipehash[HASH(pipe_nr)], next) if (pipe->pipe_nr == pipe_nr) return (pipe); @@ -1328,7 +1356,7 @@ is_pipe = (cmd->opcode == O_PIPE); DUMMYNET_LOCK(); - io_pkt++; + V_io_pkt++; /* * This is a dummynet rule, so we expect an O_PIPE or O_QUEUE rule. * @@ -1405,29 +1433,29 @@ goto done; if (is_pipe) { /* Fixed rate queues. */ - if (q->idle_time < curr_time) { + if (q->idle_time < V_curr_time) { /* Calculate available burst size. */ q->numbytes += - (curr_time - q->idle_time) * pipe->bandwidth; + (V_curr_time - q->idle_time) * pipe->bandwidth; if (q->numbytes > pipe->burst) q->numbytes = pipe->burst; - if (io_fast) + if (V_io_fast) q->numbytes += pipe->bandwidth; } } else { /* WF2Q. */ - if (pipe->idle_time < curr_time) { + if (pipe->idle_time < V_curr_time) { /* Calculate available burst size. */ pipe->numbytes += - (curr_time - pipe->idle_time) * pipe->bandwidth; + (V_curr_time - pipe->idle_time) * pipe->bandwidth; if (pipe->numbytes > pipe->burst) pipe->numbytes = pipe->burst; - if (io_fast) + if (V_io_fast) pipe->numbytes += pipe->bandwidth; } - pipe->idle_time = curr_time; + pipe->idle_time = V_curr_time; } /* Necessary for both: fixed rate & WF2Q queues. */ - q->idle_time = curr_time; + q->idle_time = V_curr_time; /* * If we reach this point the flow was previously idle, so we need @@ -1442,11 +1470,11 @@ q->extra_bits = compute_extra_bits(m, pipe); t = set_ticks(m, q, pipe); } - q->sched_time = curr_time; + q->sched_time = V_curr_time; if (t == 0) /* Must process it now. */ ready_event(q, &head, &tail); else - heap_insert(&ready_heap, curr_time + t , q); + heap_insert(&V_ready_heap, V_curr_time + t , q); } else { /* * WF2Q. First, compute start time S: if the flow was @@ -1494,7 +1522,7 @@ printf("dummynet: OUCH! pipe should have been idle!\n"); DPRINTF(("dummynet: waking up pipe %d at %d\n", pipe->pipe_nr, (int)(q->F >> MY_M))); - pipe->sched_time = curr_time; + pipe->sched_time = V_curr_time; ready_event_wfq(pipe, &head, &tail); } } @@ -1502,7 +1530,7 @@ done: if (head == m && dir != DN_TO_IFB_FWD && dir != DN_TO_ETH_DEMUX && dir != DN_TO_ETH_OUT) { /* Fast io. */ - io_pkt_fast++; + V_io_pkt_fast++; if (m->m_nextpkt != NULL) printf("dummynet: fast io: pkt chain detected!\n"); head = m->m_nextpkt = NULL; @@ -1515,7 +1543,7 @@ return (0); dropit: - io_pkt_drop++; + V_io_pkt_drop++; if (q) q->drops++; DUMMYNET_UNLOCK(); @@ -1610,9 +1638,9 @@ DUMMYNET_LOCK(); /* Free heaps so we don't have unwanted events. */ - heap_free(&ready_heap); - heap_free(&wfq_ready_heap); - heap_free(&extract_heap); + heap_free(&V_ready_heap); + heap_free(&V_wfq_ready_heap); + heap_free(&V_extract_heap); /* * Now purge all queued pkts and delete all pipes. @@ -1620,13 +1648,13 @@ * XXXGL: can we merge the for(;;) cycles into one or not? */ for (i = 0; i < HASHSIZE; i++) - SLIST_FOREACH_SAFE(fs, &flowsethash[i], next, fs1) { - SLIST_REMOVE(&flowsethash[i], fs, dn_flow_set, next); + SLIST_FOREACH_SAFE(fs, &V_flowsethash[i], next, fs1) { + SLIST_REMOVE(&V_flowsethash[i], fs, dn_flow_set, next); purge_flow_set(fs, 1); } for (i = 0; i < HASHSIZE; i++) - SLIST_FOREACH_SAFE(pipe, &pipehash[i], next, pipe1) { - SLIST_REMOVE(&pipehash[i], pipe, dn_pipe, next); + SLIST_FOREACH_SAFE(pipe, &V_pipehash[i], next, pipe1) { + SLIST_REMOVE(&V_pipehash[i], pipe, dn_pipe, next); purge_pipe(pipe); free_pipe(pipe); } @@ -1659,13 +1687,13 @@ free(x->w_q_lookup, M_DUMMYNET); x->w_q_lookup = NULL; } - if (red_lookup_depth == 0) { + if (V_red_lookup_depth == 0) { printf("\ndummynet: net.inet.ip.dummynet.red_lookup_depth" "must be > 0\n"); free(x, M_DUMMYNET); return (EINVAL); } - x->lookup_depth = red_lookup_depth; + x->lookup_depth = V_red_lookup_depth; x->w_q_lookup = (u_int *)malloc(x->lookup_depth * sizeof(int), M_DUMMYNET, M_NOWAIT); if (x->w_q_lookup == NULL) { @@ -1683,12 +1711,12 @@ x->w_q_lookup[i] = SCALE_MUL(x->w_q_lookup[i - 1], x->lookup_weight); - if (red_avg_pkt_size < 1) - red_avg_pkt_size = 512; - x->avg_pkt_size = red_avg_pkt_size; - if (red_max_pkt_size < 1) - red_max_pkt_size = 1500; - x->max_pkt_size = red_max_pkt_size; + if (V_red_avg_pkt_size < 1) + V_red_avg_pkt_size = 512; + x->avg_pkt_size = V_red_avg_pkt_size; + if (V_red_max_pkt_size < 1) + V_red_max_pkt_size = 1500; + x->max_pkt_size = V_red_max_pkt_size; return (0); } @@ -1699,7 +1727,7 @@ int l = pfs->rq_size; if (l == 0) - l = dn_hash_size; + l = V_dn_hash_size; if (l < 4) l = 4; else if (l > DN_MAX_HASH_SIZE) @@ -1725,12 +1753,12 @@ x->plr = src->plr; x->flow_mask = src->flow_mask; if (x->flags_fs & DN_QSIZE_IS_BYTES) { - if (x->qsize > pipe_byte_limit) + if (x->qsize > V_pipe_byte_limit) x->qsize = 1024 * 1024; } else { if (x->qsize == 0) x->qsize = 50; - if (x->qsize > pipe_slot_limit) + if (x->qsize > V_pipe_slot_limit) x->qsize = 50; } /* Configuring RED. */ @@ -1790,12 +1818,12 @@ for (i = 0; i <= pipe->fs.rq_size; i++) for (q = pipe->fs.rq[i]; q; q = q->next) { q->numbytes = p->burst + - (io_fast ? p->bandwidth : 0); + (V_io_fast ? p->bandwidth : 0); } pipe->bandwidth = p->bandwidth; pipe->burst = p->burst; - pipe->numbytes = pipe->burst + (io_fast ? pipe->bandwidth : 0); + pipe->numbytes = pipe->burst + (V_io_fast ? pipe->bandwidth : 0); bcopy(p->if_name, pipe->if_name, sizeof(p->if_name)); pipe->ifp = NULL; /* reset interface ptr */ pipe->delay = p->delay; @@ -1835,7 +1863,7 @@ free_pipe(pipe); return (error); } - SLIST_INSERT_HEAD(&pipehash[HASH(pipe->pipe_nr)], + SLIST_INSERT_HEAD(&V_pipehash[HASH(pipe->pipe_nr)], pipe, next); } DUMMYNET_UNLOCK(); @@ -1886,7 +1914,7 @@ free(fs, M_DUMMYNET); return (error); } - SLIST_INSERT_HEAD(&flowsethash[HASH(fs->fs_nr)], + SLIST_INSERT_HEAD(&V_flowsethash[HASH(fs->fs_nr)], fs, next); } DUMMYNET_UNLOCK(); @@ -1945,16 +1973,16 @@ DUMMYNET_LOCK_ASSERT(); - heap_free(&ready_heap); - heap_free(&wfq_ready_heap); - heap_free(&extract_heap); + heap_free(&V_ready_heap); + heap_free(&V_wfq_ready_heap); + heap_free(&V_extract_heap); /* remove all references to this pipe from flow_sets */ for (i = 0; i < HASHSIZE; i++) - SLIST_FOREACH(fs, &flowsethash[i], next) + SLIST_FOREACH(fs, &V_flowsethash[i], next) purge_flow_set(fs, 0); for (i = 0; i < HASHSIZE; i++) { - SLIST_FOREACH(pipe, &pipehash[i], next) { + SLIST_FOREACH(pipe, &V_pipehash[i], next) { purge_flow_set(&(pipe->fs), 0); mnext = pipe->head; @@ -1992,22 +2020,22 @@ } /* Unlink from list of pipes. */ - SLIST_REMOVE(&pipehash[HASH(pipe->pipe_nr)], pipe, dn_pipe, next); + SLIST_REMOVE(&V_pipehash[HASH(pipe->pipe_nr)], pipe, dn_pipe, next); /* Remove all references to this pipe from flow_sets. */ for (i = 0; i < HASHSIZE; i++) - SLIST_FOREACH(fs, &flowsethash[i], next) + SLIST_FOREACH(fs, &V_flowsethash[i], next) if (fs->pipe == pipe) { printf("dummynet: ++ ref to pipe %d from fs %d\n", p->pipe_nr, fs->fs_nr); fs->pipe = NULL ; purge_flow_set(fs, 0); } - fs_remove_from_heap(&ready_heap, &(pipe->fs)); + fs_remove_from_heap(&V_ready_heap, &(pipe->fs)); purge_pipe(pipe); /* remove all data associated to this pipe */ /* remove reference to here from extract_heap and wfq_ready_heap */ - pipe_remove_from_heap(&extract_heap, pipe); - pipe_remove_from_heap(&wfq_ready_heap, pipe); + pipe_remove_from_heap(&V_extract_heap, pipe); + pipe_remove_from_heap(&V_wfq_ready_heap, pipe); DUMMYNET_UNLOCK(); free_pipe(pipe); @@ -2023,7 +2051,7 @@ } /* Unlink from list of flowsets. */ - SLIST_REMOVE( &flowsethash[HASH(fs->fs_nr)], fs, dn_flow_set, next); + SLIST_REMOVE( &V_flowsethash[HASH(fs->fs_nr)], fs, dn_flow_set, next); if (fs->pipe != NULL) { /* Update total weight on parent pipe and cleanup parent heaps. */ @@ -2085,10 +2113,10 @@ * Compute size of data structures: list of pipes and flow_sets. */ for (i = 0; i < HASHSIZE; i++) { - SLIST_FOREACH(pipe, &pipehash[i], next) + SLIST_FOREACH(pipe, &V_pipehash[i], next) size += sizeof(*pipe) + pipe->fs.rq_elements * sizeof(struct dn_flow_queue); - SLIST_FOREACH(fs, &flowsethash[i], next) + SLIST_FOREACH(fs, &V_flowsethash[i], next) size += sizeof (*fs) + fs->rq_elements * sizeof(struct dn_flow_queue); } @@ -2126,7 +2154,7 @@ } bp = buf; for (i = 0; i < HASHSIZE; i++) - SLIST_FOREACH(pipe, &pipehash[i], next) { + SLIST_FOREACH(pipe, &V_pipehash[i], next) { struct dn_pipe *pipe_bp = (struct dn_pipe *)bp; /* @@ -2156,7 +2184,7 @@ } for (i = 0; i < HASHSIZE; i++) - SLIST_FOREACH(fs, &flowsethash[i], next) { + SLIST_FOREACH(fs, &V_flowsethash[i], next) { struct dn_flow_set *fs_bp = (struct dn_flow_set *)bp; bcopy(fs, bp, sizeof(*fs)); @@ -2250,31 +2278,31 @@ DUMMYNET_LOCK_INIT(); for (i = 0; i < HASHSIZE; i++) { - SLIST_INIT(&pipehash[i]); - SLIST_INIT(&flowsethash[i]); + SLIST_INIT(&V_pipehash[i]); + SLIST_INIT(&V_flowsethash[i]); } - ready_heap.size = ready_heap.elements = 0; - ready_heap.offset = 0; + V_ready_heap.size = ready_heap.elements = 0; + V_ready_heap.offset = 0; - wfq_ready_heap.size = wfq_ready_heap.elements = 0; - wfq_ready_heap.offset = 0; + V_wfq_ready_heap.size = wfq_ready_heap.elements = 0; + V_wfq_ready_heap.offset = 0; - extract_heap.size = extract_heap.elements = 0; - extract_heap.offset = 0; + V_extract_heap.size = extract_heap.elements = 0; + V_extract_heap.offset = 0; ip_dn_ctl_ptr = ip_dn_ctl; ip_dn_io_ptr = dummynet_io; - TASK_INIT(&dn_task, 0, dummynet_task, NULL); - dn_tq = taskqueue_create_fast("dummynet", M_NOWAIT, - taskqueue_thread_enqueue, &dn_tq); - taskqueue_start_threads(&dn_tq, 1, PI_NET, "dummynet"); + TASK_INIT(&V_dn_task, 0, dummynet_task, NULL); + V_dn_tq = taskqueue_create_fast("dummynet", M_NOWAIT, + taskqueue_thread_enqueue, &V_dn_tq); + taskqueue_start_threads(&V_dn_tq, 1, PI_NET, "dummynet"); - callout_init(&dn_timeout, CALLOUT_MPSAFE); - callout_reset(&dn_timeout, 1, dummynet, NULL); + callout_init(&V_dn_timeout, CALLOUT_MPSAFE); + callout_reset(&V_dn_timeout, 1, dummynet, NULL); /* Initialize curr_time adjustment mechanics. */ - getmicrouptime(&prev_t); + getmicrouptime(&V_prev_t); } #ifdef KLD_MODULE @@ -2285,10 +2313,10 @@ ip_dn_io_ptr = NULL; DUMMYNET_LOCK(); - callout_stop(&dn_timeout); + callout_stop(&V_dn_timeout); DUMMYNET_UNLOCK(); - taskqueue_drain(dn_tq, &dn_task); - taskqueue_free(dn_tq); + taskqueue_drain(V_dn_tq, &V_dn_task); + taskqueue_free(V_dn_tq); dummynet_flush(); From owner-p4-projects@FreeBSD.ORG Mon Sep 28 08:23:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19D451065679; Mon, 28 Sep 2009 08:23:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D28BD1065672 for ; Mon, 28 Sep 2009 08:23:34 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A8CE28FC1A for ; Mon, 28 Sep 2009 08:23:34 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8S8NYhA041826 for ; Mon, 28 Sep 2009 08:23:34 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8S8NY7f041824 for perforce@freebsd.org; Mon, 28 Sep 2009 08:23:34 GMT (envelope-from thompsa@freebsd.org) Date: Mon, 28 Sep 2009 08:23:34 GMT Message-Id: <200909280823.n8S8NY7f041824@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 168967 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Sep 2009 08:23:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=168967 Change 168967 by thompsa@thompsa_pea on 2009/09/28 08:22:40 Nuke header that was never used. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_pci.h#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_pci.h#4 (text+ko) ==== @@ -33,7 +33,6 @@ */ #include #include -#include #include From owner-p4-projects@FreeBSD.ORG Mon Sep 28 10:37:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 992F5106568F; Mon, 28 Sep 2009 10:37:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5DC07106568B for ; Mon, 28 Sep 2009 10:37:00 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4C35B8FC08 for ; Mon, 28 Sep 2009 10:37:00 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8SAb0lU063447 for ; Mon, 28 Sep 2009 10:37:00 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8SAb0Vi063445 for perforce@freebsd.org; Mon, 28 Sep 2009 10:37:00 GMT (envelope-from gk@FreeBSD.org) Date: Mon, 28 Sep 2009 10:37:00 GMT Message-Id: <200909281037.n8SAb0Vi063445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 168971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Sep 2009 10:37:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=168971 Change 168971 by gk@gk_h1 on 2009/09/28 10:36:28 correctly check readdir buffer size Affected files ... .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#16 edit Differences ... ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#16 (text+ko) ==== @@ -69,6 +69,7 @@ #include #define DIRENT_MINSIZE (sizeof(struct dirent) - (MAXNAMLEN + 1)) +#define DIRENT_MAXSIZE (sizeof(struct dirent)) static int pefs_bug_bypass = 0; /* for debugging: enables bypass printf'ing */ SYSCTL_INT(_debug, OID_AUTO, pefs_bug_bypass, CTLFLAG_RW, @@ -1249,7 +1250,6 @@ puio = pefs_chunk_uio(&pc, uio->uio_offset, uio->uio_rw); error = VOP_READDIR(PEFS_LOWERVP(vp), puio, cred, eofflag, a_ncookies, a_cookies); - if (error) break; @@ -1264,7 +1264,7 @@ uio->uio_offset = puio->uio_offset; /* Finish if there is no need to merge cookies */ - if ((*eofflag || uio->uio_resid <= DIRENT_MINSIZE) && + if ((*eofflag || uio->uio_resid < DIRENT_MAXSIZE) && (a_cookies == NULL || r_cookies == NULL)) break; @@ -1290,7 +1290,7 @@ cookies = NULL; } - if (*eofflag || uio->uio_resid <= DIRENT_MINSIZE) + if (*eofflag || uio->uio_resid < DIRENT_MAXSIZE) break; pefs_chunk_restore(&pc); From owner-p4-projects@FreeBSD.ORG Mon Sep 28 14:04:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9721B106568D; Mon, 28 Sep 2009 14:04:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B390106568B for ; Mon, 28 Sep 2009 14:04:47 +0000 (UTC) (envelope-from yohanes@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 485E58FC27 for ; Mon, 28 Sep 2009 14:04:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8SE4lKF092029 for ; Mon, 28 Sep 2009 14:04:47 GMT (envelope-from yohanes@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8SE4l4f092027 for perforce@freebsd.org; Mon, 28 Sep 2009 14:04:47 GMT (envelope-from yohanes@FreeBSD.org) Date: Mon, 28 Sep 2009 14:04:47 GMT Message-Id: <200909281404.n8SE4l4f092027@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to yohanes@FreeBSD.org using -f From: Yohanes Nugroho To: Perforce Change Reviews Cc: Subject: PERFORCE change 168972 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Sep 2009 14:04:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=168972 Change 168972 by yohanes@econa on 2009/09/28 14:04:34 network speed improvement Affected files ... .. //depot/projects/str91xx/src/sys/arm/conf/CNS11XXNAS#3 edit .. //depot/projects/str91xx/src/sys/arm/econa/econa_machdep.c#2 edit .. //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#4 edit .. //depot/projects/str91xx/src/sys/arm/econa/timer.c#3 edit Differences ... ==== //depot/projects/str91xx/src/sys/arm/conf/CNS11XXNAS#3 (text+ko) ==== @@ -33,7 +33,6 @@ makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -makeoptions CONF_CFLAGS= -march=armv4 options HZ=100 options DEVICE_POLLING ==== //depot/projects/str91xx/src/sys/arm/econa/econa_machdep.c#2 (text+ko) ==== ==== //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#4 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -61,9 +62,11 @@ #include #include #include +#include #include "miibus_if.h" + #define ECE_MAX_TX_BUFFERS 256 #define ECE_MAX_RX_BUFFERS 256 @@ -77,6 +80,8 @@ struct mtx sc_mtx_tx; /* tx mutex */ struct mtx sc_mtx_rx; /* rx mutex */ + bus_dma_tag_t sc_parent_tag; /* parent bus DMA tag */ + device_t dev; /* Myself */ device_t miibus; /* My child miibus */ void *intrhand; /* Interrupt handle */ @@ -91,37 +96,43 @@ struct callout tick_ch; /* Tick callout */ + bus_dmamap_t dmamap_tx; + bus_dmamap_t dmamap_rx; + - bus_dmamap_t desc_dmap_tx; - bus_dmamap_t desc_dmap_rx; + bus_dmamap_t sparemap_rx; + eth_tx_desc_t* desc_tx; eth_rx_desc_t* desc_rx; - bus_addr_t ece_desc_paddr_tx; //desc_start_tx - bus_addr_t ece_desc_paddr_rx; //desc_start_rx - bus_dmamap_t dmap_tx; - bus_dmamap_t dmap_rx; + bus_dma_tag_t dmatag_ring_tx; + bus_dma_tag_t dmatag_ring_rx; + + bus_addr_t ring_paddr_tx; + bus_addr_t ring_paddr_rx; + bus_dmamap_t dmap_tx[ECE_MAX_TX_BUFFERS]; + bus_dmamap_t dmap_rx[ECE_MAX_TX_BUFFERS]; struct mbuf* buffer_tx[ECE_MAX_TX_BUFFERS]; struct mbuf* buffer_rx[ECE_MAX_RX_BUFFERS]; - bus_dma_tag_t ece_desc_dtag_tx; - bus_dma_tag_t ece_desc_dtag_rx; - bus_dma_tag_t ece_dtag_tx; - bus_dma_tag_t ece_dtag_rx; + bus_dma_tag_t dmatag_tx; + bus_dma_tag_t dmatag_rx; - bus_addr_t desc_start_tx; - bus_addr_t desc_start_rx; uint32_t desc_curr_tx; uint32_t desc_curr_rx; uint32_t curr_tx_mbuf; - + int sent_position[ECE_MAX_RX_BUFFERS]; int use_rmii; + struct taskqueue *sc_tq; + struct task sc_intr_task; + struct task sc_tx_task; + }; @@ -201,21 +212,20 @@ mtx_init(&_sc->sc_mtx_tx, device_get_nameunit(_sc->dev), \ "ECE TX Lock", MTX_DEF) - #define ECE_RXLOCK(_sc) mtx_lock(&(_sc)->sc_mtx_rx) #define ECE_RXUNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx_rx) #define ECE_RXLOCK_INIT(_sc) \ mtx_init(&_sc->sc_mtx_rx, device_get_nameunit(_sc->dev), \ "ECE RX Lock", MTX_DEF) +#define ECE_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); +#define ECE_TXLOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx_tx); +#define ECE_RXLOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx_rx); -#define ECE_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); #define ECE_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); #define ECE_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); - - static devclass_t ece_devclass; /* ifnet entry points */ @@ -253,14 +263,63 @@ static void set_vlan_vid(struct ece_softc *sc, int vlan, int vid); static void set_vlan_member(struct ece_softc *sc, int vlan, int group); static void set_vlan_tag(struct ece_softc *sc, int vlan, int tag); -static int phy_read(struct ece_softc *sc, int phy, int reg); -static void phy_write(struct ece_softc *sc, int phy, int reg, int data); static int gsw_hardware_init(struct ece_softc *sc); static void ece_intr_rx_locked(struct ece_softc *sc, int count); static void ece_free_desc_dma_tx(struct ece_softc *sc); static void ece_free_desc_dma_rx(struct ece_softc *sc); +static void ece_intr_task(void *arg, int pending __unused); +static void ece_tx_task(void *arg, int pending __unused); + +static int ece_allocate_dma(struct ece_softc *sc); + +static inline int +phy_read(struct ece_softc *sc, int phy, int reg) +{ + int val; + int ii; + int status; + + + WR4(sc, PHY_CONTROL, 1 << 15); + + WR4(sc, PHY_CONTROL, ((phy & 0x1) | + ((reg & 0x1F) << 8) | (0x1 << 14))); + + for (ii = 0; ii < 0x1000; ii++) { + status = RD4(sc, PHY_CONTROL); + if (status & (0x1 << 15)) { + /* clear the rw_ok status, and clear other bits value */ + WR4(sc, PHY_CONTROL, (0x1 << 15)); + val = ((status >> 16) & 0xFFFF); + return val; + } + } + return 0; +} + + +static inline void +phy_write(struct ece_softc *sc, int phy, int reg, int data) +{ + int ii; + + WR4(sc, PHY_CONTROL, 1 << 15); + + WR4(sc, PHY_CONTROL, + ((phy & 0x1) | ((reg & 0x1F) << 8) | + (0x1 << 13) | ((data & 0xFFFF) << 16))); + + for (ii = 0; ii < 0x1000; ii++) { + if (RD4(sc, PHY_CONTROL) & (0x1 << 15)) { + /* clear the rw_ok status, and clear other bits value */ + WR4(sc, PHY_CONTROL, (0x1 << 15)); + return; + } + } +} + static int ece_probe(device_t dev) @@ -297,6 +356,7 @@ } + static int ece_attach(device_t dev) { @@ -313,7 +373,7 @@ poweron(); - //DEBUG_TRACE; + // sc->dev = dev; @@ -326,7 +386,7 @@ goto out; - //DEBUG_TRACE; + // rid = 2; /*FSRC: Fm-Switch-Rx-Complete*/ sc->irq_res_rec = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); @@ -339,7 +399,7 @@ if (sc->irq_res_status == NULL) goto out; - //DEBUG_TRACE; + // rid = 4; /*FSQF: Fm-Switch-Queue-Full*/ sc->irq_res_qf = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); @@ -347,7 +407,10 @@ goto out; - //DEBUG_TRACE; + + // + + err = ece_activate(dev); if (err) @@ -394,20 +457,22 @@ } } + DEBUG_TRACE; ece_set_mac(sc, eaddr); - + DEBUG_TRACE; sc->ifp = ifp = if_alloc(IFT_ETHER); if (mii_phy_probe(dev, &sc->miibus, ece_ifmedia_upd, ece_ifmedia_sts)) { device_printf(dev, "Cannot find my PHY.\n"); err = ENXIO; goto out; } - + DEBUG_TRACE; ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_mtu = ETHERMTU; ifp->if_capabilities = IFCAP_HWCSUM; + ifp->if_hwassist = (CSUM_IP | CSUM_TCP | CSUM_UDP); ifp->if_capenable = ifp->if_capabilities; /* */ ifp->if_start = ecestart; ifp->if_ioctl = eceioctl; @@ -417,14 +482,28 @@ IFQ_SET_MAXLEN(&ifp->if_snd, ECE_MAX_TX_BUFFERS-1); IFQ_SET_READY(&ifp->if_snd); ifp->if_timer = 0; + DEBUG_TRACE; + + /* Create local taskq. */ + + TASK_INIT(&sc->sc_intr_task, 0, ece_intr_task, sc); + TASK_INIT(&sc->sc_tx_task, 1, ece_tx_task, ifp); + sc->sc_tq = taskqueue_create_fast("ece_taskq", M_WAITOK, + taskqueue_thread_enqueue, &sc->sc_tq); + if (sc->sc_tq == NULL) { + printf("could not create taskqueue\n"); + goto out; + } + DEBUG_TRACE; ether_ifattach(ifp, eaddr); + /* * Activate the interrupt */ err = bus_setup_intr(dev, sc->irq_res_rec, INTR_TYPE_NET | INTR_MPSAFE, - NULL, ece_intr, sc, &sc->intrhand); + NULL, ece_intr, sc, &sc->intrhand); if (err) { ether_ifdetach(ifp); ECE_LOCK_DESTROY(sc); @@ -432,14 +511,14 @@ } err = bus_setup_intr(dev, sc->irq_res_status, INTR_TYPE_NET | INTR_MPSAFE, - NULL, ece_intr_status, sc, &sc->intrhand_status); + NULL, ece_intr_status, sc, &sc->intrhand_status); if (err) { ether_ifdetach(ifp); ECE_LOCK_DESTROY(sc); goto out; } err = bus_setup_intr(dev, sc->irq_res_qf, INTR_TYPE_NET | INTR_MPSAFE, - NULL, ece_intr_qf, sc, &sc->intrhand_qf); + NULL,ece_intr_qf, sc, &sc->intrhand_qf); if (err) { ether_ifdetach(ifp); @@ -449,14 +528,17 @@ ECE_TXLOCK_INIT(sc); ECE_RXLOCK_INIT(sc); + DEBUG_TRACE; + //enable all interrupt sources WR4(sc, INTERRUPT_MASK, 0x00000000); - + DEBUG_TRACE; /*enable port 0*/ WR4(sc, PORT_0_CONFIG, RD4(sc, PORT_0_CONFIG) & ~((0x1 << 18))); - /* enable dma */ - WR4(sc, FS_DMA_CONTROL, 1); + taskqueue_start_threads(&sc->sc_tq, 1, PI_NET, "%s taskq", + device_get_nameunit(sc->dev)); + DEBUG_TRACE; out:; if (err) @@ -469,7 +551,7 @@ static int ece_detach(device_t dev) { - //DEBUG_TRACE; + // return EBUSY; /* XXX TODO(1) */ } @@ -488,16 +570,16 @@ ece_alloc_desc_dma_tx(struct ece_softc *sc) { bus_addr_t desc_paddr; - //int i; + int i; int error; - DEBUG_TRACE; + desc_paddr = 0; /* Allocate a busdma tag and DMA safe memory for TX/RX descriptors. */ - error = bus_dma_tag_create(NULL, /* parent */ + error = bus_dma_tag_create(sc->sc_parent_tag, /* parent */ 16, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -505,36 +587,36 @@ sizeof(eth_tx_desc_t)*ECE_MAX_TX_BUFFERS, 1, /* maxsize, nsegments */ sizeof(eth_tx_desc_t)*ECE_MAX_TX_BUFFERS, 0, /* maxsegsz, flags */ NULL, NULL, /* lockfunc, lockfuncarg */ - &sc->ece_desc_dtag_tx); /* dmat */ + &sc->dmatag_tx); /* dmat */ - error = bus_dmamem_alloc(sc->ece_desc_dtag_tx, + error = bus_dmamem_alloc(sc->dmatag_tx, (void**)&(sc->desc_tx), BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_COHERENT, - &(sc->desc_dmap_tx)); + &(sc->dmamap_tx)); if (error) { if_printf(sc->ifp, "failed to allocate DMA memory\n"); return (ENXIO); } - error = bus_dmamap_load(sc->ece_desc_dtag_tx, sc->desc_dmap_tx, + error = bus_dmamap_load(sc->dmatag_tx, sc->dmamap_tx, sc->desc_tx, sizeof(eth_tx_desc_t)*ECE_MAX_TX_BUFFERS, ece_getaddr, - &(sc->ece_desc_paddr_tx), BUS_DMA_NOWAIT); + &(sc->ring_paddr_tx), BUS_DMA_NOWAIT); if (error) { if_printf(sc->ifp, "can't load descriptor\n"); - bus_dmamem_free(sc->ece_desc_dtag_tx, sc->desc_tx, - sc->desc_dmap_tx); + bus_dmamem_free(sc->dmatag_tx, sc->desc_tx, + sc->dmamap_tx); sc->desc_tx = NULL; return (ENXIO); } - desc_paddr = sc->ece_desc_paddr_tx; + desc_paddr = sc->ring_paddr_tx; /* Allocate a busdma tag for mbufs. */ - error = bus_dma_tag_create(NULL, /* parent */ + error = bus_dma_tag_create(sc->sc_parent_tag, /* parent */ 16, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -542,7 +624,7 @@ MCLBYTES*MAX_FRAGMENT, MAX_FRAGMENT, /* maxsize, nsegments */ MCLBYTES, 0, /* maxsegsz, flags */ NULL, NULL, /* lockfunc, lockfuncarg */ - &sc->ece_dtag_tx); /* dmat */ + &sc->dmatag_ring_tx); /* dmat */ if (error) { @@ -550,12 +632,15 @@ return (ENXIO); } - error = bus_dmamap_create(sc->ece_dtag_tx, 0, &sc->dmap_tx); - if (error) { - if_printf(sc->ifp, "failed to create map for mbuf\n"); - return (ENXIO); + + + for (i=0; idmatag_ring_tx, 0, &sc->dmap_tx[i]); + if (error) { + if_printf(sc->ifp, "failed to create map for mbuf\n"); + return (ENXIO); + } } - return 0; } @@ -571,37 +656,33 @@ if (sc->buffer_tx[i]) { m_freem(sc->buffer_tx[i]); sc->buffer_tx[i]= 0; - } + } } - if (sc->desc_dmap_tx) { - DEBUG_TRACE; - bus_dmamap_unload(sc->ece_desc_dtag_tx, sc->desc_dmap_tx); + if (sc->dmamap_tx) { + bus_dmamap_unload(sc->dmatag_tx, sc->dmamap_tx); if (sc->desc_tx) { - bus_dmamem_free(sc->ece_desc_dtag_tx, sc->desc_tx, sc->desc_dmap_tx); + bus_dmamem_free(sc->dmatag_tx, sc->desc_tx, sc->dmamap_tx); } - sc->desc_dmap_tx = 0; + sc->dmamap_tx = 0; } - if (sc->ece_desc_dtag_tx) { - DEBUG_TRACE; - bus_dma_tag_destroy(sc->ece_desc_dtag_tx); - sc->ece_desc_dtag_tx = 0; + if (sc->dmatag_tx) { + bus_dma_tag_destroy(sc->dmatag_tx); + sc->dmatag_tx = 0; } - if (sc->dmap_tx) { - DEBUG_TRACE; - bus_dmamap_destroy(sc->ece_dtag_tx, sc->dmap_tx); - bus_dma_tag_destroy(sc->ece_dtag_tx); - sc->dmap_tx = 0; - sc->ece_dtag_tx = 0; + if (sc->dmatag_ring_tx) { + for (i = 0; idmatag_ring_tx, sc->dmap_tx[i]); + sc->dmap_tx[i] = 0; + } + bus_dma_tag_destroy(sc->dmatag_ring_tx); + sc->dmatag_ring_tx = 0; } - } - - static int ece_alloc_desc_dma_rx(struct ece_softc *sc) { @@ -610,12 +691,12 @@ int error; - DEBUG_TRACE; + desc_paddr = 0; /* Allocate a busdma tag and DMA safe memory for RX/RX descriptors. */ - error = bus_dma_tag_create(NULL, /* parent */ + error = bus_dma_tag_create(sc->sc_parent_tag, /* parent */ 16, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ @@ -623,58 +704,61 @@ sizeof(eth_rx_desc_t)*ECE_MAX_RX_BUFFERS, 1, /* maxsize, nsegments */ sizeof(eth_rx_desc_t)*ECE_MAX_RX_BUFFERS, 0, /* maxsegsz, flags */ NULL, NULL, /* lockfunc, lockfuncarg */ - &sc->ece_desc_dtag_rx); /* dmat */ + &sc->dmatag_rx); /* dmat */ - error = bus_dmamem_alloc(sc->ece_desc_dtag_rx, + error = bus_dmamem_alloc(sc->dmatag_rx, (void**)&(sc->desc_rx), BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_COHERENT, - &(sc->desc_dmap_rx)); + &(sc->dmamap_rx)); if (error) { if_printf(sc->ifp, "failed to allocate DMA memory\n"); return (ENXIO); } - error = bus_dmamap_load(sc->ece_desc_dtag_rx, sc->desc_dmap_rx, + error = bus_dmamap_load(sc->dmatag_rx, sc->dmamap_rx, sc->desc_rx, sizeof(eth_rx_desc_t)*ECE_MAX_RX_BUFFERS, ece_getaddr, - &(sc->ece_desc_paddr_rx), BUS_DMA_NOWAIT); + &(sc->ring_paddr_rx), BUS_DMA_NOWAIT); if (error) { if_printf(sc->ifp, "can't load descriptor\n"); - bus_dmamem_free(sc->ece_desc_dtag_rx, sc->desc_rx, - sc->desc_dmap_rx); + bus_dmamem_free(sc->dmatag_rx, sc->desc_rx, + sc->dmamap_rx); sc->desc_rx = NULL; return (ENXIO); } - desc_paddr = sc->ece_desc_paddr_rx; + desc_paddr = sc->ring_paddr_rx; + - DEBUG_TRACE; /* Allocate a busdma tag for mbufs. */ - error = bus_dma_tag_create(NULL, /* parent */ - 8, 0, /* alignment, boundary */ + error = bus_dma_tag_create(sc->sc_parent_tag, /* parent */ + 16, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filtfunc, filtfuncarg */ MCLBYTES, 1, /* maxsize, nsegments */ MCLBYTES, 0, /* maxsegsz, flags */ NULL, NULL, /* lockfunc, lockfuncarg */ - &sc->ece_dtag_rx); /* dmat */ + &sc->dmatag_ring_rx); /* dmat */ if (error) { if_printf(sc->ifp, "failed to create busdma tag for mbufs\n"); return (ENXIO); } - DEBUG_TRACE; + + error = bus_dmamap_create(sc->dmatag_ring_rx, 0, &sc->sparemap_rx); - error = bus_dmamap_create(sc->ece_dtag_rx, 0, &sc->dmap_rx); - if (error) { - if_printf(sc->ifp, "failed to create map for mbuf\n"); - return (ENXIO); + for (int i =0; idmatag_ring_rx, 0, &sc->dmap_rx[i]); + if (error) { + if_printf(sc->ifp, "failed to create map for mbuf\n"); + return (ENXIO); + } } @@ -686,7 +770,7 @@ ece_free_desc_dma_rx(struct ece_softc *sc) { int i; - //bus_dmamap_sync(sc->ece_dtag_rx, sc->dmap_rx, BUS_DMASYNC_POSTWRITE); + //bus_dmamap_sync(sc->dmatag_ring_rx, sc->dmap_rx, BUS_DMASYNC_POSTWRITE); for (i = 0; i < ECE_MAX_RX_BUFFERS; i++) { @@ -696,21 +780,22 @@ } } - if (sc->ece_desc_dtag_rx) { - bus_dmamap_unload(sc->ece_desc_dtag_rx, sc->desc_dmap_rx); - bus_dmamem_free(sc->ece_desc_dtag_rx, sc->desc_rx, - sc->desc_dmap_rx); - bus_dma_tag_destroy(sc->ece_desc_dtag_rx); - sc->ece_desc_dtag_rx = 0; - sc->desc_dmap_rx = 0; + if (sc->dmatag_rx) { + bus_dmamap_unload(sc->dmatag_rx, sc->dmamap_rx); + bus_dmamem_free(sc->dmatag_rx, sc->desc_rx, + sc->dmamap_rx); + bus_dma_tag_destroy(sc->dmatag_rx); + sc->dmatag_rx = 0; + sc->dmamap_rx = 0; sc->desc_rx = 0; } - if (sc->ece_dtag_rx) { - bus_dmamap_destroy(sc->ece_dtag_rx, sc->dmap_rx); - bus_dma_tag_destroy(sc->ece_dtag_rx); - sc->ece_dtag_rx = 0; - sc->dmap_rx = 0; + if (sc->dmatag_ring_rx) { + for (i = 0; idmatag_ring_rx, sc->dmap_rx[i]); + } + bus_dma_tag_destroy(sc->dmatag_ring_rx); + sc->dmatag_ring_rx = 0; } } @@ -718,7 +803,7 @@ static int -ece_new_rxbuf(bus_dma_tag_t tag, bus_dmamap_t map, struct mbuf **mbufp, +ece_new_rxbuf(bus_dma_tag_t tag, bus_dmamap_t *sparemap, struct mbuf **mbufp, bus_addr_t *paddr) { struct mbuf *new_mbuf; @@ -726,7 +811,7 @@ int error; int nsegs; - //DEBUG_TRACE; + // KASSERT(mbufp != NULL, ("NULL mbuf pointer!")); @@ -736,18 +821,18 @@ new_mbuf->m_len = new_mbuf->m_pkthdr.len = new_mbuf->m_ext.ext_size; if (*mbufp) { - bus_dmamap_sync(tag, map, BUS_DMASYNC_POSTREAD); - bus_dmamap_unload(tag, map); + bus_dmamap_sync(tag, *sparemap, BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(tag, *sparemap); //cpu_dcache_wbinv_all(); } - error = bus_dmamap_load_mbuf_sg(tag, map, new_mbuf, seg, &nsegs, + error = bus_dmamap_load_mbuf_sg(tag, *sparemap, new_mbuf, seg, &nsegs, BUS_DMA_NOWAIT); KASSERT(nsegs == 1, ("Too many segments returned!")); if (nsegs != 1 || error) panic("mge_new_rxbuf(): nsegs(%d), error(%d)", nsegs, error); - bus_dmamap_sync(tag, map, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(tag, *sparemap, BUS_DMASYNC_PREREAD); //cpu_dcache_wbinv_all(); (*mbufp) = new_mbuf; @@ -764,11 +849,26 @@ eth_tx_desc_t *desctx; eth_rx_desc_t *descrx; int i; + int error; - DEBUG_TRACE; + + error = bus_dma_tag_create( + bus_get_dma_tag(sc->dev), /* parent */ + 1, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + BUS_SPACE_MAXSIZE_32BIT, 0, /* maxsize, nsegments */ + BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */ + 0, /* flags */ + NULL, NULL, /* lockfunc, lockarg */ + &sc->sc_parent_tag); + + + ece_alloc_desc_dma_tx(sc); - DEBUG_TRACE; + printf("size of rx = %d tx = %d\n", sizeof(eth_rx_desc_t), sizeof(eth_tx_desc_t)); @@ -776,6 +876,7 @@ desctx = (eth_tx_desc_t *)(&sc->desc_tx[i]); memset(desctx, 0, sizeof(eth_tx_desc_t)); desctx->length = MAX_PACKET_LEN; + sc->sent_position[i] = -1; desctx->cown = 1; if (i==ECE_MAX_TX_BUFFERS-1) { desctx->eor = 1; @@ -783,13 +884,12 @@ } ece_alloc_desc_dma_rx(sc); - - DEBUG_TRACE; - + for (i = 0; i < ECE_MAX_RX_BUFFERS; i++) { descrx = (eth_rx_desc_t *)&(sc->desc_rx[i]); memset(descrx, 0, sizeof(eth_rx_desc_t)); - ece_new_rxbuf(sc->ece_dtag_rx, sc->dmap_rx, &(sc->buffer_rx[i]), + ece_new_rxbuf(sc->dmatag_ring_rx, &sc->sparemap_rx, + &(sc->buffer_rx[i]), (bus_addr_t *)&(descrx->data_ptr)); descrx->length = sc->buffer_rx[i]->m_len; if (i==ECE_MAX_RX_BUFFERS-1) { @@ -798,8 +898,6 @@ } sc->desc_curr_tx = 0; sc->desc_curr_rx = 0; - sc->curr_tx_mbuf = 0; - return (0); } @@ -815,9 +913,10 @@ uint32_t mac_port_config; uint32_t cpu_port_config; uint32_t cfg_reg; - + struct ifnet *ifp; sc = device_get_softc(dev); + ifp = sc->ifp; while (1) { @@ -843,13 +942,13 @@ mac_port_config |= ((0x1 << 18)); WR4(sc, MAC_PORT_1_CONFIG, mac_port_config); - DEBUG_TRACE; + vlan_init(); gsw_hardware_init(sc); - DEBUG_TRACE; + mac_port_config = RD4(sc, MAC_PORT_0_CONFIG); mac_port_config &= (~(0x1 << 18)); /* Enable Port 0 */ WR4(sc, MAC_PORT_0_CONFIG, mac_port_config); @@ -860,29 +959,26 @@ cpu_port_config &= ~(0x1 << 18); WR4(sc, CPU_PORT_CONFIG, cpu_port_config); - - DEBUG_TRACE; err = ece_allocate_dma(sc); if (err) { if_printf(sc->ifp, "failed allocating dma\n"); - goto errout; + goto out; } - WR4(sc, TS_DESCRIPTOR_POINTER, sc->ece_desc_paddr_tx); - WR4(sc, TS_DESCRIPTOR_BASE_ADDR, sc->ece_desc_paddr_tx); + + WR4(sc, TS_DESCRIPTOR_POINTER, sc->ring_paddr_tx); + WR4(sc, TS_DESCRIPTOR_BASE_ADDR, sc->ring_paddr_tx); - WR4(sc, FS_DESCRIPTOR_POINTER, sc->ece_desc_paddr_rx); - WR4(sc, FS_DESCRIPTOR_BASE_ADDR, sc->ece_desc_paddr_rx); + WR4(sc, FS_DESCRIPTOR_POINTER, sc->ring_paddr_rx); + WR4(sc, FS_DESCRIPTOR_BASE_ADDR, sc->ring_paddr_rx); WR4(sc, FS_DMA_CONTROL, 1); + + return (0); +out: + return (ENXIO); - - DEBUG_TRACE; - return (0); -errout: - ece_deactivate(dev); - return (ENOMEM); } static void @@ -890,6 +986,8 @@ { struct ece_softc *sc; + printf("deactivating\n"); + sc = device_get_softc(dev); if (sc->intrhand) @@ -924,6 +1022,8 @@ sc->irq_res_rec = 0; sc->irq_res_qf = 0; sc->irq_res_status = 0; + ECE_TXLOCK_DESTROY(sc); + ECE_RXLOCK_DESTROY(sc); return; } @@ -1362,7 +1462,7 @@ { struct gsw_arl_table_entry_t arl_table_entry; - DEBUG_TRACE; + /* erase old mac */ arl_table_entry.filter = 0; @@ -1396,9 +1496,7 @@ ece_set_mac(struct ece_softc *sc, u_char *eaddr) { int i; - for (i = 0; i<6; i++) { - my_vlan0_mac[i] = eaddr[i]; } gsw_set_mac_address(sc, 0, eaddr, 6); @@ -1411,7 +1509,6 @@ } - static void ece_intr_rx_locked(struct ece_softc *sc, int count) { @@ -1425,12 +1522,9 @@ struct mbuf *mb; eth_rx_desc_t *desc; - //ECE_ASSERT_LOCKED(sc); - - fssd_curr = RD4(sc, FS_DESCRIPTOR_POINTER); - fssd = (fssd_curr - (uint32_t)sc->ece_desc_paddr_rx)>>4; + fssd = (fssd_curr - (uint32_t)sc->ring_paddr_rx)>>4; desc = (eth_rx_desc_t *)&(sc->desc_rx[sc->desc_curr_rx]); @@ -1440,71 +1534,30 @@ rxcount = (ECE_MAX_RX_BUFFERS - sc->desc_curr_rx) + fssd; } else { if (desc->cown == 0) { - if_printf(sc->ifp, "str9104 failed, line %d\n", __LINE__); - rxcount = 0; + return; } else { rxcount = ECE_MAX_RX_BUFFERS; } } - bus_dmamap_sync(sc->ece_desc_dtag_rx, sc->desc_dmap_rx, - BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); - for (i= 0; icown; bufsize = desc->length; - //printf("status = %d length = %d\n", status, bufsize); if (status) { int idx = sc->desc_curr_rx; - //bus_dmamap_sync(sc->ece_desc_dtag_rx, sc->dmap_rx,BUS_DMASYNC_POSTREAD); - //cpu_dcache_wbinv_all(); - + bus_dmamap_sync(sc->dmatag_rx, sc->dmap_rx[idx], + BUS_DMASYNC_PREREAD); + mb = m_devget((void *)sc->buffer_rx[idx]->m_data, - //sc->buffer_rx[idx]->m_len, desc->length+16, 0, ifp, NULL); - //cpu_dcache_wbinv_all(); - /*printf("sc->buffer_rx[idx]->m_data = %p\n", sc->buffer_rx[idx]->m_data); - printf("desc->length = %d\n", desc->length); - printf("desc->fs = %d\n", desc->fs); - printf("desc->prot = %d\n", desc->prot); - printf("desc->ip_fail = %d\n", desc->ipf); - printf("desc->l4_fail = %d\n", desc->l4f); - printf("packet header length = %d\n", mb->m_pkthdr.len); - int j; - for (j=0; jlength+2; j++) { - printf("%02x ", (unsigned char)(sc->buffer_rx[idx]->m_data[j])); - } - printf("\n"); - */ - if (mb) { mb->m_data += 2; - -/* if (mb->m_pkthdr.len-desc->length!=2) { - printf("delta > 2 %d\n", mb->m_pkthdr.len-desc->length); - printf("sc->buffer_rx[idx]->m_data = %p\n", sc->buffer_rx[idx]->m_data); - printf("desc->length = %d\n", desc->length); - printf("desc->fs = %d\n", desc->fs); - printf("desc->prot = %d\n", desc->prot); - printf("desc->ip_fail = %d\n", desc->ipf); - printf("desc->l4_fail = %d\n", desc->l4f); - printf("packet header length = %d\n", mb->m_pkthdr.len); - int j; - for (j=0; jlength+2; j++) { - printf("%02x ", (unsigned char)(sc->buffer_rx[idx]->m_data[j])); - } - printf("\n"); - }*/ - if (desc->prot!=3) { mb->m_pkthdr.csum_flags |= CSUM_IP_CHECKED; mb->m_pkthdr.csum_flags |= CSUM_IP_VALID; @@ -1512,44 +1565,40 @@ } mb->m_len = mb->m_pkthdr.len; - //printf("process packet\n"); ECE_RXUNLOCK(sc); (*ifp->if_input)(ifp, mb); ECE_RXLOCK(sc); - - //bus_dmamap_sync(sc->ece_desc_dtag_rx, sc->dmap_rx,BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } else { if_printf(sc->ifp, "no mbuf length = %d\n", desc->length); /* Give up if no mbufs */ } } else { - printf("error cown not valid\n"); + /*not ready, process later*/ + return; } desc->cown = 0; desc->length = sc->buffer_rx[sc->desc_curr_rx]->m_len; - //cpu_dcache_wbinv_all(); if (sc->desc_curr_rx==ECE_MAX_RX_BUFFERS-1) { - desc = (eth_rx_desc_t *)&(sc->desc_rx[0]); + desc = (eth_rx_desc_t *)&(sc->desc_rx[0]); sc->desc_curr_rx = 0; } else { sc->desc_curr_rx++; - desc = (eth_rx_desc_t *)&(sc->desc_rx[sc->desc_curr_rx]); + desc++; } - bus_dmamap_sync(sc->ece_desc_dtag_rx, sc->desc_dmap_rx,BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } - return; } + static void -ece_intr(void *xsc) +ece_intr_task(void *arg, int pending __unused) { - struct ece_softc *sc = xsc; - - //printf("INTERRUPT --->receive packet\n"); +// printf("ECE INTR TASK"); + struct ece_softc *sc = arg; + //struct ifnet *ifp = sc->ifp; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 28 14:19:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 714261065697; Mon, 28 Sep 2009 14:19:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C4D61065695 for ; Mon, 28 Sep 2009 14:19:03 +0000 (UTC) (envelope-from yohanes@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0903B8FC2B for ; Mon, 28 Sep 2009 14:19:03 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8SEJ3kA093101 for ; Mon, 28 Sep 2009 14:19:03 GMT (envelope-from yohanes@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8SEJ218093099 for perforce@freebsd.org; Mon, 28 Sep 2009 14:19:02 GMT (envelope-from yohanes@FreeBSD.org) Date: Mon, 28 Sep 2009 14:19:02 GMT Message-Id: <200909281419.n8SEJ218093099@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to yohanes@FreeBSD.org using -f From: Yohanes Nugroho To: Perforce Change Reviews Cc: Subject: PERFORCE change 168973 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Sep 2009 14:19:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=168973 Change 168973 by yohanes@econa on 2009/09/28 14:18:59 sync Affected files ... .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/Makefile#2 integrate .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/disks/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/str91xx/ports/MOVED#7 integrate .. //depot/projects/str91xx/ports/Mk/bsd.gcc.mk#5 integrate .. //depot/projects/str91xx/ports/UPDATING#7 integrate .. //depot/projects/str91xx/src/UPDATING#7 integrate .. //depot/projects/str91xx/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/str91xx/src/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/str91xx/src/etc/network.subr#5 integrate .. //depot/projects/str91xx/src/etc/periodic/daily/400.status-disks#2 integrate .. //depot/projects/str91xx/src/etc/periodic/security/200.chkmounts#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/defaultroute#3 integrate .. //depot/projects/str91xx/src/etc/rc.d/ip6addrctl#3 integrate .. //depot/projects/str91xx/src/etc/rc.d/netif#4 integrate .. //depot/projects/str91xx/src/etc/rc.d/routing#3 integrate .. //depot/projects/str91xx/src/etc/rc.d/rtadvd#3 integrate .. //depot/projects/str91xx/src/lib/libc/nls/Makefile.inc#2 integrate .. //depot/projects/str91xx/src/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch .. //depot/projects/str91xx/src/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/str91xx/src/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/str91xx/src/libexec/rpc.rquotad/rquotad.c#2 integrate .. //depot/projects/str91xx/src/sbin/camcontrol/camcontrol.c#5 integrate .. //depot/projects/str91xx/src/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/str91xx/src/sbin/shutdown/shutdown.c#2 integrate .. //depot/projects/str91xx/src/share/man/man4/Makefile#5 integrate .. //depot/projects/str91xx/src/share/man/man4/lindev.4#1 branch .. //depot/projects/str91xx/src/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/str91xx/src/sys/amd64/acpica/acpi_machdep.c#4 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/str91xx/src/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/str91xx/src/sys/amd64/include/apm_bios.h#1 branch .. //depot/projects/str91xx/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/str91xx/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/str91xx/src/sys/arm/include/md_var.h#2 integrate .. //depot/projects/str91xx/src/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/str91xx/src/sys/cam/ata/ata_all.c#3 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/str91xx/src/sys/compat/x86bios/x86bios.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/x86bios/x86bios.h#2 integrate .. //depot/projects/str91xx/src/sys/compat/x86bios/x86bios_alloc.c#2 integrate .. //depot/projects/str91xx/src/sys/conf/files#7 integrate .. //depot/projects/str91xx/src/sys/conf/files.amd64#5 integrate .. //depot/projects/str91xx/src/sys/conf/files.i386#6 integrate .. //depot/projects/str91xx/src/sys/conf/files.pc98#2 integrate .. //depot/projects/str91xx/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/de/if_de.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/dpms/dpms.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/fb/vesa.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/lindev/full.c#1 branch .. //depot/projects/str91xx/src/sys/dev/lindev/lindev.c#1 branch .. //depot/projects/str91xx/src/sys/dev/lindev/lindev.h#1 branch .. //depot/projects/str91xx/src/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/scterm-teken.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/atmegadci.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci_pci.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/usb_controller.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_cdce.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_cdcereg.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/quirk/usb_quirk.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uark.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/ubsa.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/ubser.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uch341.c#1 branch .. //depot/projects/str91xx/src/sys/dev/usb/serial/uchcom.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/ucycom.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/ufoma.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uftdi.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/ugensa.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uipaq.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/umct.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/umodem.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/umoscom.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uplcom.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/usb_serial.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/usb_serial.h#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uslcom.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uvscom.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/storage/umass.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb.h#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_bus.h#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_cdc.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_device.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_device.h#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_hub.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_transfer.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/str91xx/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/str91xx/src/sys/i386/conf/NOTES#6 integrate .. //depot/projects/str91xx/src/sys/i386/include/apm_bios.h#2 integrate .. //depot/projects/str91xx/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_event.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/subr_bus.c#5 integrate .. //depot/projects/str91xx/src/sys/modules/Makefile#7 integrate .. //depot/projects/str91xx/src/sys/modules/lindev/Makefile#1 branch .. //depot/projects/str91xx/src/sys/modules/nfslockd/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/modules/usb/Makefile#4 integrate .. //depot/projects/str91xx/src/sys/modules/usb/uch341/Makefile#1 branch .. //depot/projects/str91xx/src/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/str91xx/src/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/str91xx/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/str91xx/src/sys/sys/ata.h#3 integrate .. //depot/projects/str91xx/src/sys/teken/sequences#2 integrate .. //depot/projects/str91xx/src/sys/teken/teken.c#2 integrate .. //depot/projects/str91xx/src/sys/teken/teken.h#2 integrate .. //depot/projects/str91xx/src/sys/teken/teken_demo.c#2 integrate .. //depot/projects/str91xx/src/sys/teken/teken_scs.h#2 integrate .. //depot/projects/str91xx/src/sys/teken/teken_stress.c#2 integrate .. //depot/projects/str91xx/src/sys/teken/teken_subr.h#2 integrate .. //depot/projects/str91xx/src/sys/teken/teken_subr_compat.h#2 integrate .. //depot/projects/str91xx/src/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/str91xx/src/tools/regression/mmap/Makefile#1 branch .. //depot/projects/str91xx/src/tools/regression/mmap/mmap.c#1 branch .. //depot/projects/str91xx/src/tools/tools/mwl/mwlstats/mwlstats.c#2 integrate .. //depot/projects/str91xx/src/tools/tools/nanobsd/nanobsd.sh#3 integrate .. //depot/projects/str91xx/src/usr.sbin/Makefile#5 integrate .. //depot/projects/str91xx/src/usr.sbin/apm/Makefile#2 integrate .. //depot/projects/str91xx/www/nl/where.sgml#2 integrate Differences ... ==== //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -151,7 +151,8 @@ adding - Lets say we want to add a new SCSI disk to a machine that + The following section will describe how to add a new + SCSI disk to a machine that currently only has a single drive. First turn off the computer and install the drive in the computer following the instructions of the computer, controller, and drive manufacturer. Due to the ==== //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -612,10 +612,9 @@ the option, which enables debugging information when passed to &man.gcc.1;. - options SCHED_4BSD # 4BSD scheduler + options SCHED_ULE # ULE scheduler - The traditional and default system scheduler for &os;. - Keep this. + The default system scheduler for &os;. Keep this. options PREEMPTION # Enable kernel thread preemption ==== //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/es_ES.ISO8859-1/articles/Makefile,v 1.12 2008/04/24 19:11:13 carvay Exp $ +# $FreeBSD: doc/es_ES.ISO8859-1/articles/Makefile,v 1.13 2009/09/27 13:06:31 gabor Exp $ # $FreeBSDes: doc/es_ES.ISO8859-1/articles/Makefile,v 1.3 2004/10/09 02:01:17 jesusr Exp $ SUBDIR = @@ -17,6 +17,7 @@ SUBDIR+= nanobsd SUBDIR+= p4-primer SUBDIR+= problem-reports +SUBDIR+= pxe SUBDIR+= releng SUBDIR+= version-guide SUBDIR+= zip-drive ==== //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#3 (text+ko) ==== @@ -1,13 +1,13 @@ @@ -190,19 +190,19 @@ hozzáadás - Tegyük fel, hogy a jelenleg egyetlen meghajtót - tartalmazó rendszerünket szeretnénk - bõvíteni egy új SCSI-lemez - hozzáadásával. Ehhez elsõként - kapcsoljuk ki a számítógépünket - és szereljük be a helyére az új - meghajtót a számítógép, a - lemezvezérlõ és a meghajtó - gyártójának utasításai - alapján. Mivel ezt a mûveletet rengeteg módon - lehet elvégezni, ezért ennek pontos - részleteivel ez a leírás most nem - foglalkozik. + Ebben a szakaszban arról lesz szó, hogy a + jelenleg egyetlen meghajtót tartalmazó + rendszerünket hogyan tudjuk bõvíteni egy + új SCSI-lemez hozzáadásával. Ehhez + elsõként kapcsoljuk ki a + számítógépünket és + szereljük be a helyére az új meghajtót a + számítógép, a lemezvezérlõ + és a meghajtó gyártójának + utasításai alapján. Mivel ezt a + mûveletet rengeteg módon lehet elvégezni, + ezért ennek pontos részleteivel ez a + leírás most nem foglalkozik. Jelentkezzünk be root felhasználóként. Miután ==== //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#3 (text+ko) ==== @@ -1,12 +1,12 @@ @@ -856,10 +856,10 @@ információkat tudunk átadni a &man.gcc.1; fordítónak. - options SCHED_4BSD # 4BSD ütemezõ + options SCHED_ULE # ULE ütemezõ - A &os; tradicionális és alapértelmezett - rendszerütemezõje. Ne változtassuk meg! + A &os; alapértelmezett rendszerütemezõje. Ne + változtassuk meg! options PREEMPTION # a rendszerszálak megszakíthatóságának engedélyezése ==== //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/disks/chapter.sgml#3 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -159,8 +159,8 @@ нÑмÑÑ… нь - Бид ÑˆÐ¸Ð½Ñ SCSI диÑкийг одоогоор зөвхөн нÑг хөтөчтÑй байгаа машин дÑÑÑ€ - нÑмÑхийг Ñ…Ò¯ÑÑж байна гÑж бодъё. ЭхлÑÑд компьютераа унтраагаад хөтчийг + Дараах Ñ…ÑÑÑг зөвхөн нÑг хөтөчтÑй машинд ÑˆÐ¸Ð½Ñ SCSI диÑк Ñ…ÑрхÑн + нÑмÑÑ… талаар тайлбарлах болно. ЭхлÑÑд компьютераа унтраагаад хөтчийг компьютер, Ñ…Ñнагч болон хөтчийн үйлдвÑрлÑгчийн заавруудын дагуу Ñуулгана. Үүнийг хийх маш олон төрлийн Ð¿Ñ€Ð¾Ñ†ÐµÐ´ÑƒÑ€ÑƒÑƒÐ´Ð°Ð°Ñ Ð±Ð¾Ð»Ð¾Ð¾Ð´ ÑÐ½Ñ Ñ‚ÑƒÑ…Ð°Ð¹ дÑлгÑÑ€Ñнгүй мÑдÑÑлÑл нь ÑÐ½Ñ Ð±Ð°Ñ€Ð¸Ð¼Ñ‚Ñ‹Ð½ хамрах хүрÑÑнÑÑÑ Ð³Ð°Ð´Ð½Ð° юм. ==== //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml#2 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -591,9 +591,9 @@ бөгөөд цөмийг бүтÑÑÑ… үед тохируулгыг &man.gcc.1; уруу өгÑнөөр дибаг (debug) хийх мÑдÑÑлÑл идÑвхждÑг. - options SCHED_4BSD # 4BSD scheduler + options SCHED_ULE # ULE scheduler - &os; -ийн уламжлалт, анхдагч ÑиÑтемийн төлөвлөгч/хуваарилагч. Үүнийг үлдÑÑ. + &os; -ийн анхдагч ÑиÑтемийн төлөвлөгч/хуваарилагч. Үүнийг үлдÑÑ. options PREEMPTION # Enable kernel thread preemption ==== //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#3 (text+ko) ==== @@ -1,10 +1,10 @@ @@ -207,9 +207,9 @@ toevoegen - Stel dat het gewenst is om een nieuwe SCSI-schijf aan een - machine toe te voegen die slechts een enkele drive heeft. Ten - eerste dient de computer uitgeschakeld te worden en dient de + De volgende sectie beschrijft hoe een nieuwe SCSI + schijf aan een machine toe te voegen die slechts een enkele drive heeft. + Ten eerste dient de computer uitgeschakeld te worden en dient de schijf volgens de instructies van de computer, controller en schijffabrikant geïnstalleerd te worden. Wegens de grote variéteiten om dit soort procedures uit te voeren, vallen ==== //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 (text+ko) ==== @@ -1,11 +1,10 @@ @@ -677,10 +676,9 @@ wanneer de kernel met de optie gebouwd wordt, wat debuginformatie doorgeeft aan &man.gcc.1;. - options SCHED_4BSD # 4BSD taakplanner + options SCHED_ULE # ULE taakplanner - De traditionele en standaard taakplanner voor &os;. Laat dit - staan. + De standaard taakplanner voor &os;. Laat dit staan. options PREEMPTION # Zet kernelthreadpreëmptie aan ==== //depot/projects/str91xx/ports/MOVED#7 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1990 2009/09/23 19:44:02 glarkin Exp $ +# $FreeBSD: ports/MOVED,v 1.1991 2009/09/24 20:56:23 miwi Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -4171,3 +4171,11 @@ systutils/uptimec||2009-09-23|Project is gone since 2007 www/cakephp||2009-09-23|Repomoved to www/cakephp11 www/cakephp-devel||2009-09-23|Repomoved to www/cakephp12 +audio/gmpccaa||2009-09-24|Unmaintained upstream +audio/gmpc-osd||2009-09-24|Unmaintained upstream +audio/gmpc-qosd||2009-09-24|Unmaintained upstream +audio/gmpc-random-playlist||2009-09-24|Unmaintained upstream +audio/gmpc-serverstats||2009-09-24|Unmaintained upstream +audio/gmpc-favorites||2009-09-24|Unmaintained upstream +audio/gmpc-autoplaylist||2009-09-24|Unmaintained upstream +audio/gmpc-stopbutton||2009-09-24|Unmaintained upstream ==== //depot/projects/str91xx/ports/Mk/bsd.gcc.mk#5 (text+ko) ==== @@ -30,7 +30,7 @@ # If you are wondering what your port exactly does, use "make test-gcc" # to see some debugging. # -# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.33 2009/09/23 21:13:07 gerald Exp $ +# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.34 2009/09/26 01:02:01 gerald Exp $ # GCC_Include_MAINTAINER= gerald@FreeBSD.org @@ -72,6 +72,8 @@ F77:= gfortran44 CC:= gcc44 CXX:= g++44 +CFLAGS+= -Wl,-rpath=${PREFIX}/lib/gcc44 +LDFLAGS+= -Wl,-rpath=${PREFIX}/lib/gcc44 # Intel Fortran compiler from lang/ifc. . elif ${USE_FORTRAN} == ifort ==== //depot/projects/str91xx/ports/UPDATING#7 (text+ko) ==== @@ -5,6 +5,23 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20090921 + AFFECTS: users of archivers/lzmautils, archivers/lzmautils-devel + AUTHOR: Christian Weisgerber + + The XZ Utils distribution has superseded LZMA Utils, so the xz + port has been added and the lzmautils ports have been removed. + To perform the move, run one of the following commands: + + If using portupgrade: + # portupgrade -o archivers/xz lzmautils\* + + If using portmaster: + # portmaster -o archivers/xz archivers/lzmautils + or + # portmaster -o archivers/xz archivers/lzmautils-devel + as applicable. + 20090919: AFFECTS: users of mail/postfix-postfwd AUTHOR: Sahil Tandon @@ -8522,4 +8539,4 @@ 2) Update all p5-* modules: portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.863 2009/09/19 17:00:07 miwi Exp $ +$FreeBSD: ports/UPDATING,v 1.864 2009/09/25 14:24:49 naddy Exp $ ==== //depot/projects/str91xx/src/UPDATING#7 (text+ko) ==== @@ -22,10 +22,61 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090926: + The rc.d/network_ipv6, IPv6 configuration script has been integrated + into rc.d/netif. The changes are the following: + + 1. To use IPv6, simply define $ifconfig_IF_ipv6 like $ifconfig_IF + for IPv4. For aliases, $ifconfig_IF_aliasN should be used. + Note that both variables need the "inet6" keyword at the head. + + Do not set $ipv6_network_interfaces manually if you do not + understand what you are doing. It is not needed in most cases. + + $ipv6_ifconfig_IF and $ipv6_ifconfig_IF_aliasN still work, but + they are obsolete. + + 2. $ipv6_enable is obsolete. Use $ipv6_prefer and + "inet6 accept_rtadv" keyword in ifconfig(8) instead. + + If you define $ipv6_enable=YES, it means $ipv6_prefer=YES and + all configured interfaces have "inet6 accept_rtadv" in the + $ifconfig_IF_ipv6. These are for backward compatibility. + + 3. A new variable $ipv6_prefer has been added. If NO, IPv6 + functionality of interfaces with no corresponding + $ifconfig_IF_ipv6 is disabled by using "inet6 ifdisabled" flag, + and the default address selection policy of ip6addrctl(8) + is the IPv4-preferred one (see rc.d/ip6addrctl for more details). + Note that if you want to configure IPv6 functionality on the + disabled interfaces after boot, first you need to clear the flag by + using ifconfig(8) like: + + ifconfig em0 inet6 -ifdisabled + + If YES, the default address selection policy is set as + IPv6-preferred. + + The default value of $ipv6_prefer is NO. + + 4. If your system need to receive Router Advertisement messages, + define "inet6 accept_rtadv" in $ifconfig_IF_ipv6. The rc(8) + scripts automatically invoke rtsol(8) when the interface becomes + UP. The Router Advertisement messages are used for SLAAC + (State-Less Address AutoConfiguration). + 20090922: 802.11s D3.03 support was committed. This is incompatible with the previous code, which was based on D3.0. +20090912: + A sysctl variable net.inet6.ip6.accept_rtadv now sets the default value + of a per-interface flag ND6_IFF_ACCEPT_RTADV, not a global knob to + control whether accepting Router Advertisement messages or not. + Also, a per-interface flag ND6_IFF_AUTO_LINKLOCAL has been added and + a sysctl variable net.inet6.ip6.auto_linklocal is its default value. + The ifconfig(8) utility now supports these flags. + 20090910: ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for mount(8) and -a option for df(1) to see them. @@ -979,4 +1030,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.640 2009/09/22 18:19:18 rpaulo Exp $ +$FreeBSD: src/UPDATING,v 1.641 2009/09/26 18:59:00 hrs Exp $ ==== //depot/projects/str91xx/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 (text+ko) ==== @@ -535,7 +535,7 @@ .ad .sp .6 .RS 4n -Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher2\fR, but this may change in future releases). The value "off" disables integrity +Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher4\fR, but this may change in future releases). The value "off" disables integrity checking on user data. Disabling checksums is NOT a recommended practice. .RE ==== //depot/projects/str91xx/src/etc/mtree/BSD.usr.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.338 2009/09/03 16:25:25 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.339 2009/09/27 21:27:11 gabor Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -1031,6 +1031,8 @@ .. fr_FR.UTF-8 .. + gl_ES.ISO8859-1 + .. he_IL.UTF-8 .. hi_IN.ISCII-DEV ==== //depot/projects/str91xx/src/etc/network.subr#5 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.201 2009/09/12 23:01:36 hrs Exp $ +# $FreeBSD: src/etc/network.subr,v 1.202 2009/09/26 18:59:00 hrs Exp $ # # @@ -97,15 +97,26 @@ if afexists inet6; then if ipv6if $1; then if checkyesno ipv6_gateway_enable; then - _ipv6_opts="-accept_rtadv auto_linklocal" + _ipv6_opts="-accept_rtadv" + fi + else + if checkyesno ipv6_prefer; then + _ipv6_opts="-ifdisabled" else - _ipv6_opts="auto_linklocal" + _ipv6_opts="ifdisabled" fi - else - _ipv6_opts="-auto_linklocal ifdisabled" + + # backward compatibility: $ipv6_enable + case $ipv6_enable in + [Yy][Ee][Ss]) + _ipv6_opts="${_ipv6_opts} accept_rtadv" + ;; + esac fi - ifconfig $1 inet6 ${_ipv6_opts} + if [ -n "${_ipv6_opts}" ]; then + ifconfig $1 inet6 ${_ipv6_opts} + fi # ifconfig_IF_ipv6 ifconfig_args=`ifconfig_getargs $1 ipv6` @@ -382,7 +393,7 @@ # 1 otherwise. ipv6if() { - local _if i + local _if _tmpargs i _if=$1 if ! afexists inet6; then @@ -396,6 +407,18 @@ ;; esac + # True if $ifconfig_IF_ipv6 is defined. + _tmpargs=`_ifconfig_getargs $_if ipv6` + if [ -n "${_tmpargs}" ]; then + return 0 + fi + + # backward compatibility: True if $ipv6_ifconfig_IF is defined. + _tmpargs=`get_if_var $_if ipv6_ifconfig_IF` + if [ -n "${_tmpargs}" ]; then + return 0 + fi + case "${ipv6_network_interfaces}" in [Aa][Uu][Tt][Oo]) return 0 @@ -431,17 +454,30 @@ if checkyesno ipv6_gateway_enable; then return 1 fi + _tmpargs=`get_if_var $_if ipv6_prefix_IF` + if [ -n "${_tmpargs}" ]; then + return 1 + fi case $_if in lo0|\ stf[0-9]*|\ faith[0-9]*|\ lp[0-9]*|\ - sl[0-9]*) + sl[0-9]*|\ + pflog[0-9]*|\ + pfsync[0-9]*) return 1 ;; esac + # backward compatibility: $ipv6_enable + case $ipv6_enable in + [Yy][Ee][Ss]) + return 0 + ;; + esac + _tmpargs=`_ifconfig_getargs $_if ipv6` for _arg in $_tmpargs; do case $_arg in @@ -451,6 +487,16 @@ esac done + # backward compatibility: $ipv6_ifconfig_IF + _tmpargs=`get_if_var $_if ipv6_ifconfig_IF` + for _arg in $_tmpargs; do + case $_arg in + accept_rtadv) + return 0 + ;; + esac + done + return 1 } @@ -691,7 +737,7 @@ ;; *) ifconfig $1 inet6 ${ifconfig_args} alias && _ret=0 - warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete." + warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete." \ " Use ifconfig_$1_aliasN instead." ;; esac @@ -773,6 +819,7 @@ done # backward compatibility: ipv6_ifconfig_IF_aliasN. + alias=0 while : ; do ifconfig_args=`get_if_var $1 ipv6_ifconfig_IF_alias${alias}` case "${ifconfig_args}" in @@ -780,13 +827,12 @@ break ;; *) - ifconfig $1 inet6 ${ifconfig_args} -alias - alias=$((${alias} + 1)) - warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete." + ifconfig $1 inet6 ${ifconfig_args} -alias && _ret=0 + warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete." \ " Use ifconfig_$1_aliasN instead." - _ret=0 ;; esac + alias=$((${alias} + 1)) done return $_ret ==== //depot/projects/str91xx/src/etc/periodic/daily/400.status-disks#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/periodic/daily/400.status-disks,v 1.6 2002/02/13 19:10:07 brian Exp $ +# $FreeBSD: src/etc/periodic/daily/400.status-disks,v 1.7 2009/09/28 03:32:35 cperciva Exp $ # # If there is a global system configuration file, suck it in. @@ -19,6 +19,9 @@ df $daily_status_disks_df_flags && rc=1 || rc=3 # display which filesystems need backing up + if ! [ -f /etc/fstab ]; then + export PATH_FSTAB=/dev/null + fi echo "" dump W || rc=3;; ==== //depot/projects/str91xx/src/etc/periodic/security/200.chkmounts#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.6 2008/10/25 18:45:40 ed Exp $ +# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.7 2009/09/28 03:32:35 cperciva Exp $ # # Show changes in the way filesystems are mounted @@ -50,6 +50,9 @@ ignore="${ignore}|^amd:" esac [ -n "$ignore" ] && cmd="egrep -v ${ignore#|}" || cmd=cat + if ! [ -f /etc/fstab ]; then + export PATH_FSTAB=/dev/null + fi mount -p | sort | ${cmd} | check_diff mount - "${host} changes in mounted filesystems:" rc=$?;; ==== //depot/projects/str91xx/src/etc/rc.d/defaultroute#3 (text+ko) ==== @@ -2,11 +2,11 @@ # # Wait for the default route to be up # -# $FreeBSD: src/etc/rc.d/defaultroute,v 1.7 2009/09/12 22:13:41 hrs Exp $ +# $FreeBSD: src/etc/rc.d/defaultroute,v 1.8 2009/09/26 19:00:20 hrs Exp $ # # PROVIDE: defaultroute -# REQUIRE: devd netif +# REQUIRE: devd faith netif stf # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/str91xx/src/etc/rc.d/ip6addrctl#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.6 2009/09/12 22:13:41 hrs Exp $ +# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.7 2009/09/26 18:59:00 hrs Exp $ # # PROVIDE: ip6addrctl @@ -19,6 +19,8 @@ prefer_ipv6_cmd="ip6addrctl_prefer_ipv6" prefer_ipv4_cmd="ip6addrctl_prefer_ipv4" +set_rcvar_obsolete ipv6_enable ipv6_prefer + ip6addrctl_prefer_ipv6() { ip6addrctl flush >/dev/null 2>&1 ==== //depot/projects/str91xx/src/etc/rc.d/netif#4 (text+ko) ==== @@ -22,7 +22,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/etc/rc.d/netif,v 1.33 2009/09/12 22:13:41 hrs Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.34 2009/09/26 18:59:00 hrs Exp $ # # PROVIDE: netif @@ -41,7 +41,7 @@ extra_commands="cloneup clonedown" cmdifn= -set_rcvar_obsolete ipv6_enable +set_rcvar_obsolete ipv6_enable ipv6_prefer network_start() { ==== //depot/projects/str91xx/src/etc/rc.d/routing#3 (text+ko) ==== @@ -2,11 +2,11 @@ # # Configure routing and miscellaneous network tunables # -# $FreeBSD: src/etc/rc.d/routing,v 1.148 2009/09/13 20:19:02 bz Exp $ +# $FreeBSD: src/etc/rc.d/routing,v 1.149 2009/09/26 19:00:20 hrs Exp $ # # PROVIDE: routing -# REQUIRE: netif ppp +# REQUIRE: faith netif ppp stf # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/str91xx/src/etc/rc.d/rtadvd#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/rtadvd,v 1.14 2009/09/12 23:00:01 hrs Exp $ +# $FreeBSD: src/etc/rc.d/rtadvd,v 1.15 2009/09/26 19:00:47 hrs Exp $ # # PROVIDE: rtadvd @@ -43,7 +43,10 @@ case ${rtadvd_interfaces} in [Aa][Uu][Tt][Oo]|'') for i in `ifconfig -l` ; do - if is_wired_interface $1; then + case $i in + lo0) continue ;; + esac + if ipv6if $i; then rtadvd_interfaces="${rtadvd_interfaces} ${i}" fi done ==== //depot/projects/str91xx/src/lib/libc/nls/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $ -# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.17 2009/03/24 23:31:41 gabor Exp $ +# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.18 2009/09/27 13:16:38 gabor Exp $ .PATH: ${.CURDIR}/nls @@ -20,6 +20,7 @@ NLS+= es_ES.ISO8859-1 NLS+= fi_FI.ISO8859-1 NLS+= fr_FR.ISO8859-1 +NLS+= gl_ES.ISO8859-1 NLS+= hu_HU.ISO8859-2 NLS+= it_IT.ISO8859-15 NLS+= ko_KR.UTF-8 ==== //depot/projects/str91xx/src/lib/libc/stdlib/malloc.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)malloc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.80 2008/11/03 21:17:18 jasone Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.81 2009/09/26 18:20:40 alc Exp $ .\" -.Dd August 26, 2008 +.Dd September 26, 2009 .Dt MALLOC 3 .Os .Sh NAME @@ -245,7 +245,8 @@ This is intended for debugging and will impact performance negatively. .It K Double/halve the virtual memory chunk size. -The default chunk size is 1 MB. +The default chunk size is the maximum of 1 MB and the largest +page size that is less than or equal to 4 MB. .It M Use .Xr mmap 2 @@ -561,6 +562,7 @@ .Xr alloca 3 , .Xr atexit 3 , .Xr getpagesize 3 , +.Xr getpagesizes 3 , .Xr memory 3 , .Xr posix_memalign 3 .Sh STANDARDS ==== //depot/projects/str91xx/src/lib/libc/stdlib/malloc.c#3 (text+ko) ==== @@ -156,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.184 2009/09/05 13:32:05 kib Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.185 2009/09/26 18:20:40 alc Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -4795,6 +4795,21 @@ } } + /* + * Increase the chunk size to the largest page size that is greater + * than the default chunk size and less than or equal to 4MB. + */ + { + size_t pagesizes[MAXPAGESIZES]; + int k, nsizes; + + nsizes = getpagesizes(pagesizes, MAXPAGESIZES); + for (k = 0; k < nsizes; k++) + if (pagesizes[k] <= (1LU << 22)) + while ((1LU << opt_chunk_2pow) < pagesizes[k]) + opt_chunk_2pow++; + } + for (i = 0; i < 3; i++) { unsigned j; ==== //depot/projects/str91xx/src/lib/libthr/thread/thr_spec.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_spec.c,v 1.7 2007/11/06 21:50:43 marius Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_spec.c,v 1.8 2009/09/25 00:15:30 davidxu Exp $ */ #include "namespace.h" @@ -131,9 +131,19 @@ curthread->specific[key].data = NULL; curthread->specific_data_count--; } + else if (curthread->specific[key].data != NULL) { + /* + * This can happen if the key is deleted via + * pthread_key_delete without first setting the value + * to NULL in all threads. POSIX says that the + * destructor is not invoked in this case. + */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 28 19:14:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D84D61065672; Mon, 28 Sep 2009 19:14:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9BF3C106566B for ; Mon, 28 Sep 2009 19:14:26 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A3988FC2A for ; Mon, 28 Sep 2009 19:14:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8SJEQY7029885 for ; Mon, 28 Sep 2009 19:14:26 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8SJEQBx029883 for perforce@freebsd.org; Mon, 28 Sep 2009 19:14:26 GMT (envelope-from gk@FreeBSD.org) Date: Mon, 28 Sep 2009 19:14:26 GMT Message-Id: <200909281914.n8SJEQBx029883@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 168984 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Sep 2009 19:14:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=168984 Change 168984 by gk@gk_h1 on 2009/09/28 19:13:43 change keyid generation authenticate keys in db (with hmac) use key as IV for encrypting keys in db (CFB mode is used) support chains with single key add invalid algorithm constant getopt and usage fixes wrap long lines. license cleanup Affected files ... .. //depot/projects/soc2009/gk_pefs/sbin/pefs/Makefile#4 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#8 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.h#8 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_key.c#7 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_keychain.c#5 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_mount.c#4 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pkcs5v2-x.c#1 add .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pkcs5v2-x.h#1 add .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#12 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#12 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_hmac.c#2 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#12 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vfsops.c#11 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#17 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_xbase64.c#5 edit Differences ... ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/Makefile#4 (text+ko) ==== @@ -7,7 +7,8 @@ PROG= pefs SRCS= pefs_ctl.c pefs_key.c pefs_keychain.c pefs_mount.c SRCS+= getmntopts.c -SRCS+= g_eli_crypto.c pkcs5v2.c sha2.c +SRCS+= g_eli_crypto.c sha2.c +SRCS+= pkcs5v2-x.c # Should patch original pkcs5v2.c instead LINKS= ${BINDIR}/pefs ${BINDIR}/mount_pefs NO_MAN= ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#8 (text+ko) ==== @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include @@ -65,7 +66,8 @@ static int pefs_showchain(int argc, char *argv[]); typedef int (*command_func_t)(int argc, char **argv); -typedef int (*keyop_func_t)(struct pefs_keychain_head *kch, int fd); +typedef int (*keyop_func_t)(struct pefs_keychain_head *kch, int fd, + int verbose); struct command { const char *name; @@ -162,7 +164,8 @@ static inline void pefs_key_show(struct pefs_xkey *xk, int ind) { - printf("\t%-4d %016jx %s\n", ind, pefs_keyid_as_int(xk->pxk_keyid), pefs_alg_name(xk)); + printf("\t%-4d %016jx %s\n", ind, pefs_keyid_as_int(xk->pxk_keyid), + pefs_alg_name(xk)); } static int @@ -173,9 +176,10 @@ struct pefs_keyparam kp; int error, fd, i; int chain = PEFS_KEYCHAIN_IGNORE_MISSING; + int verbose = 0; pefs_keyparam_init(&kp); - while ((i = getopt(argc, argv, "pcCa:i:k:")) != -1) + while ((i = getopt(argc, argv, "cCpva:i:k:")) != -1) switch(i) { case 'a': kp.kp_alg = optarg; @@ -192,13 +196,17 @@ case 'i': kp.kp_iterations = atoi(optarg); if (kp.kp_iterations <= 0) { - warnx("invalid iterations argument: %s", optarg); + warnx("invalid iterations argument: %s", + optarg); pefs_usage(); } break; case 'k': kp.kp_keyfile = optarg; break; + case 'v': + verbose = 1; + break; default: pefs_usage(); } @@ -209,6 +217,8 @@ bzero(&k, sizeof(k)); pefs_usage(); } + if (pefs_getfsroot(argv[0], NULL, 0) != 0) + return (EX_DATAERR); error = pefs_key_get(&k, NULL, 0, &kp); if (error != 0) @@ -222,7 +232,7 @@ if (fd == -1) return (EX_IOERR); - error = func(&kch, fd); + error = func(&kch, fd, verbose); pefs_keychain_free(&kch); @@ -232,7 +242,7 @@ } static int -pefs_addkey_op(struct pefs_keychain_head *kch, int fd) +pefs_addkey_op(struct pefs_keychain_head *kch, int fd, int verbose) { struct pefs_keychain *kc; @@ -240,6 +250,9 @@ if (ioctl(fd, PEFS_ADDKEY, &kc->kc_key) == -1) { warn("cannot add key"); return (-1); + } else if (verbose) { + printf("Key added: %016jx\n", + pefs_keyid_as_int(kc->kc_key.pxk_keyid)); } } @@ -247,13 +260,16 @@ } static int -pefs_delkey_op(struct pefs_keychain_head *kch, int fd) +pefs_delkey_op(struct pefs_keychain_head *kch, int fd, int verbose) { struct pefs_keychain *kc; TAILQ_FOREACH(kc, kch, kc_entry) { if (ioctl(fd, PEFS_DELKEY, &kc->kc_key) == -1) { warn("cannot delete key"); + } else if (verbose) { + printf("Key deleted: %016jx\n", + pefs_keyid_as_int(kc->kc_key.pxk_keyid)); } } @@ -284,7 +300,7 @@ int chain = PEFS_KEYCHAIN_IGNORE_MISSING; pefs_keyparam_init(&kp); - while ((i = getopt(argc, argv, "vxpcCa:i:k:")) != -1) + while ((i = getopt(argc, argv, "cCpvxa:i:k:")) != -1) switch(i) { case 'v': verbose = 1; @@ -307,7 +323,8 @@ case 'i': kp.kp_iterations = atoi(optarg); if (kp.kp_iterations <= 0) { - warnx("invalid iterations argument: %s", optarg); + warnx("invalid iterations argument: %s", + optarg); pefs_usage(); } break; @@ -333,7 +350,8 @@ } /* only check filesystem type */ - pefs_getfsroot(argv[0], NULL, 0); + if (pefs_getfsroot(argv[0], NULL, 0) != 0) + return (EX_DATAERR); error = pefs_key_get(&k, NULL, 0, &kp); if (error != 0) @@ -475,32 +493,46 @@ } p[2]; struct pefs_xkey *k1 = &p[0].k, *k2 = &p[1].k; int verbose = 0; - int error, i; + int zerochainedkey = 0, optchainedkey = 0; + int error, i, fd; pefs_keyparam_init(&p[0].kp); pefs_keyparam_init(&p[1].kp); - while ((i = getopt(argc, argv, "vpPa:A:i:I:k:K:")) != -1) + while ((i = getopt(argc, argv, "pPvZa:A:i:I:k:K:")) != -1) switch(i) { case 'v': verbose = 1; break; + case 'Z': + zerochainedkey = 1; + break; case 'a': case 'A': + if (isupper(i)) + optchainedkey = i; p[isupper(i) ? 1 : 0].kp.kp_alg = optarg; break; case 'p': case 'P': + if (isupper(i)) + optchainedkey = i; p[isupper(i) ? 1 : 0].kp.kp_nopassphrase = 1; break; case 'i': case 'I': - if ((p[isupper(i) ? 1 : 0].kp.kp_iterations = atoi(optarg)) <= 0) { - warnx("invalid iterations argument: %s", optarg); + if (isupper(i)) + optchainedkey = i; + if ((p[isupper(i) ? 1 : 0].kp.kp_iterations = + atoi(optarg)) <= 0) { + warnx("invalid iterations argument: %s", + optarg); pefs_usage(); } break; case 'k': case 'K': + if (isupper(i)) + optchainedkey = i; p[isupper(i) ? 1 : 0].kp.kp_keyfile = optarg; break; default: @@ -509,6 +541,9 @@ argc -= optind; argv += optind; + if (optchainedkey && zerochainedkey) + errx(EX_USAGE, "invalid argument combination: -Z -%c", + optchainedkey); if (!checkargs_fs(argc, argv)) { bzero(p, sizeof(p)); @@ -520,6 +555,23 @@ bzero(p, sizeof(p)); return (error); } + + if (zerochainedkey) { + fd = open(PATH_DEVRANDOM, O_RDONLY); + if (fd == -1) + err(EX_IOERR, "%s", PATH_DEVRANDOM); + read(fd, k2, sizeof(struct pefs_keychain)); + close(fd); + k2->pxk_alg = PEFS_ALG_INVALID; + error = pefs_keychain_set(argv[0], k1, k2); + if (error) + return (EX_DATAERR); + if (verbose) { + } + + return (0); + } + error = pefs_key_get(k2, "chained key passphrase", 1, &p[1].kp); if (error != 0) { bzero(p, sizeof(p)); @@ -528,7 +580,8 @@ pefs_keychain_get(&kch, argv[0], PEFS_KEYCHAIN_IGNORE_MISSING, k1); TAILQ_FOREACH(kc, &kch, kc_entry) { - if (memcmp(k2->pxk_keyid, kc->kc_key.pxk_keyid, PEFS_KEYID_SIZE) == 0) { + if (memcmp(k2->pxk_keyid, kc->kc_key.pxk_keyid, + PEFS_KEYID_SIZE) == 0) { pefs_keychain_free(&kch); bzero(k1->pxk_key, PEFS_KEY_SIZE); bzero(k2->pxk_key, PEFS_KEY_SIZE); @@ -543,7 +596,8 @@ bzero(k2->pxk_key, PEFS_KEY_SIZE); warnx("key chain for parent key is already set: %016jx -> %016jx", pefs_keyid_as_int(kc->kc_key.pxk_keyid), - pefs_keyid_as_int(TAILQ_NEXT(kc, kc_entry)->kc_key.pxk_keyid)); + pefs_keyid_as_int( + TAILQ_NEXT(kc, kc_entry)->kc_key.pxk_keyid)); pefs_keychain_free(&kch); exit(EX_DATAERR); } @@ -552,9 +606,13 @@ if (error) return (EX_DATAERR); if (verbose) { - printf("Key chain set: %016jx -> %016jx\n", - pefs_keyid_as_int(k1->pxk_keyid), - pefs_keyid_as_int(k2->pxk_keyid)); + if (zerochainedkey) + printf("Key chain set: %016jx\n", + pefs_keyid_as_int(k1->pxk_keyid)); + else + printf("Key chain set: %016jx -> %016jx\n", + pefs_keyid_as_int(k1->pxk_keyid), + pefs_keyid_as_int(k2->pxk_keyid)); } return (0); @@ -571,7 +629,7 @@ int error, i; pefs_keyparam_init(&kp); - while ((i = getopt(argc, argv, "fvpa:i:k:")) != -1) + while ((i = getopt(argc, argv, "fvpi:k:")) != -1) switch(i) { case 'f': force = 1; @@ -579,16 +637,14 @@ case 'v': verbose = 1; break; - case 'a': - kp.kp_alg = optarg; - break; case 'p': kp.kp_nopassphrase = 1; break; case 'i': kp.kp_iterations = atoi(optarg); if (kp.kp_iterations <= 0) { - warnx("invalid iterations argument: %s", optarg); + warnx("invalid iterations argument: %s", + optarg); pefs_usage(); } break; @@ -622,7 +678,8 @@ if (verbose) { printf("Key chain deleted: %016jx -> %016jx\n", pefs_keyid_as_int(kc->kc_key.pxk_keyid), - pefs_keyid_as_int(TAILQ_NEXT(kc, kc_entry)->kc_key.pxk_keyid)); + pefs_keyid_as_int( + TAILQ_NEXT(kc, kc_entry)->kc_key.pxk_keyid)); } if (!force) break; @@ -642,18 +699,16 @@ int error, i; pefs_keyparam_init(&kp); - while ((i = getopt(argc, argv, "pa:i:k:")) != -1) + while ((i = getopt(argc, argv, "pi:k:")) != -1) switch(i) { - case 'a': - kp.kp_alg = optarg; - break; case 'p': kp.kp_nopassphrase = 1; break; case 'i': kp.kp_iterations = atoi(optarg); if (kp.kp_iterations <= 0) { - warnx("invalid iterations argument: %s", optarg); + warnx("invalid iterations argument: %s", + optarg); pefs_usage(); } break; @@ -699,25 +754,22 @@ int i, n, fd; k[0].pxk_index = k[1].pxk_index = -1; - while ((i = getopt(argc, argv, "va:n:N:")) != -1) + while ((i = getopt(argc, argv, "vn:N:")) != -1) switch(i) { case 'v': verbose = 1; break; - case 'a': - if (pefs_alg_lookup(&k[0], optarg) < 0) - errx(EX_USAGE, "invalid algorithm %s", optarg); - k[1] = k[0]; - break; case 'n': if ((nmin = atoi(optarg)) <= 0) { - warnx("invalid lower bound argument: %s", optarg); + warnx("invalid lower bound argument: %s", + optarg); pefs_usage(); } break; case 'N': if ((nmax = atoi(optarg)) <= 0) { - warnx("invalid lower bound argument: %s", optarg); + warnx("invalid lower bound argument: %s", + optarg); pefs_usage(); } break; @@ -728,7 +780,9 @@ argv += optind; if (nmin >= nmax) { - errx(EX_USAGE, "invalid arguments: lower bound (%d) >= upper bound (%d)", nmin, nmax); + errx(EX_USAGE, + "invalid arguments: lower bound (%d) >= upper bound (%d)", + nmin, nmax); } if (!checkargs_fs(argc, argv)) { @@ -736,6 +790,7 @@ } n = arc4random_uniform(nmax - nmin) + nmin; + n /= 2; fd = open(PATH_DEVRANDOM, O_RDONLY); if (fd == -1) @@ -743,13 +798,13 @@ for (i = 1; i <= n; i++) { read(fd, k, 2 * sizeof(struct pefs_keychain)); - if (i % 2 == 0) { - pefs_keychain_set(argv[0], &k[0], &k[1]); - if (verbose) { - printf("Key chain set: %016jx -> %016jx\n", - pefs_keyid_as_int(k[0].pxk_keyid), - pefs_keyid_as_int(k[1].pxk_keyid)); - } + k[0].pxk_alg = PEFS_ALG_INVALID; + k[1].pxk_alg = PEFS_ALG_INVALID; + pefs_keychain_set(argv[0], &k[0], &k[1]); + if (verbose) { + printf("Key chain set: %016jx -> %016jx\n", + pefs_keyid_as_int(k[0].pxk_keyid), + pefs_keyid_as_int(k[1].pxk_keyid)); } } @@ -762,19 +817,19 @@ void pefs_usage(void) { - fprintf(stderr, "usage: pefs mount [-o options] target filesystem\n" - " pefs unmount [-fv] filesystem\n" - " pefs addkey [-cCp] [-a alg] [-i iterations] [-k keyfile] filesystem\n" - " pefs setkey [-cCpvx] [-a alg] [-i iterations] [-k keyfile] directory\n" - " pefs delkey [-cCp] [-a alg] [-i iterations] [-k keyfile] filesystem\n" - " pefs flushkeys filesystem\n" - " pefs setchain [-pPv] [-a alg] [-i iterations] [-k keyfile]\n" - " [-A alg] [-I iterations] [-K keyfile] filesystem\n" - " pefs delchain [-pPv] [-a alg] [-i iterations] [-k keyfile]\n" - " [-A alg] [-I iterations] [-K keyfile] filesystem\n" - " pefs showchain [-a alg] [-n min] [-N max] filesystem\n" - " pefs randomchain [-v] [-a alg] [-n min] [-N max] filesystem\n" - " pefs showkeys filesystem\n"); + fprintf(stderr, +"usage: pefs mount [-o options] from filesystem\n" +" pefs unmount [-fv] filesystem\n" +" pefs addkey [-cCpv] [-a alg] [-i iterations] [-k keyfile] filesystem\n" +" pefs setkey [-cCpvx] [-a alg] [-i iterations] [-k keyfile] directory\n" +" pefs delkey [-cCpv] [-i iterations] [-k keyfile] filesystem\n" +" pefs flushkeys filesystem\n" +" pefs setchain [-pPvZ] [-a alg] [-i iterations] [-k keyfile]\n" +" [-A alg] [-I iterations] [-K keyfile] filesystem\n" +" pefs delchain [-pv] [-i iterations] [-k keyfile] filesystem\n" +" pefs showchain [-p] [-i iterations] [-k keyfile] filesystem\n" +" pefs randomchain [-v] [-a alg] [-n min] [-N max] filesystem\n" +" pefs showkeys filesystem\n"); exit(EX_USAGE); } @@ -783,7 +838,8 @@ { if (modfind(PEFS_KLD) < 0) if (kld_load(PEFS_KLD) < 0 || modfind(PEFS_KLD) < 0) - errx(EX_OSERR, "cannot find or load \"%s\" kernel module", + errx(EX_OSERR, + "cannot find or load \"%s\" kernel module", PEFS_KLD); } ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.h#8 (text+ko) ==== @@ -37,7 +37,14 @@ #define PEFS_RANDOMCHAIN_MIN 16 #define PEFS_RANDOMCHAIN_MAX 64 -struct pefs_xkey; +#define PEFS_KEYENC_MAC_SIZE (PEFS_KEY_SIZE / 2) + +struct pefs_xkeyenc { + struct pefs_xkey chained; + uint32_t alg; + uint32_t keybits; + u_char mac[PEFS_KEYENC_MAC_SIZE]; +}; struct pefs_keyparam { int kp_nopassphrase; @@ -59,9 +66,12 @@ int pefs_mount(int argc, char *argv[]); int pefs_mount_prog(int argc, char *argv[]); int pefs_getfsroot(const char *path, char *fsroot, size_t size); -int pefs_key_get(struct pefs_xkey *xk, const char *prompt, int verify, struct pefs_keyparam *kp); -int pefs_key_encrypt(struct pefs_xkey *xk, const struct pefs_xkey *xk_parent); -int pefs_key_decrypt(struct pefs_xkey *xk, const struct pefs_xkey *xk_parent); +int pefs_key_get(struct pefs_xkey *xk, const char *prompt, int verify, + struct pefs_keyparam *kp); +int pefs_key_encrypt(struct pefs_xkeyenc *xe, + const struct pefs_xkey *xk_parent); +int pefs_key_decrypt(struct pefs_xkeyenc *xe, + const struct pefs_xkey *xk_parent); uintmax_t pefs_keyid_as_int(char *keyid); const char * pefs_alg_name(struct pefs_xkey *xk); int pefs_alg_lookup(struct pefs_xkey *xk, const char *algname); ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_key.c#7 (text+ko) ==== @@ -40,16 +40,16 @@ #include #include -#include #include #include #include "pefs_ctl.h" +#include "pkcs5v2-x.h" #define PEFS_KEY_PROMPT_DEFAULT "passphrase" -#define PEFS_CIPHERKEY_ITERATIONS 1000 +#define PEFS_KEYENC_ITERATIONS 1000 struct algorithm { const char *name; @@ -104,7 +104,8 @@ } int -pefs_key_get(struct pefs_xkey *xk, const char *prompt, int verify, struct pefs_keyparam *kp) +pefs_key_get(struct pefs_xkey *xk, const char *prompt, int verify, + struct pefs_keyparam *kp) { struct hmac_ctx ctx; char promptbuf[64], buf[BUFSIZ], buf2[BUFSIZ], *p; @@ -134,7 +135,8 @@ else { fd = open(kp->kp_keyfile, O_RDONLY); if (fd == -1) - err(EX_IOERR, "cannot open keyfile %s", kp->kp_keyfile); + err(EX_IOERR, "cannot open keyfile %s", + kp->kp_keyfile); } while ((done = read(fd, buf, sizeof(buf))) > 0) g_eli_crypto_hmac_update(&ctx, buf, done); @@ -170,40 +172,52 @@ if (kp->kp_iterations == 0) { g_eli_crypto_hmac_update(&ctx, buf, strlen(buf)); } else { - pkcs5v2_genkey(xk->pxk_key, PEFS_KEY_SIZE, buf, 0, buf, kp->kp_iterations); - g_eli_crypto_hmac_update(&ctx, xk->pxk_key, PEFS_KEY_SIZE); + pkcs5v2_genkey(xk->pxk_key, PEFS_KEY_SIZE, buf, 0, buf, + strlen(buf), kp->kp_iterations); + g_eli_crypto_hmac_update(&ctx, xk->pxk_key, + PEFS_KEY_SIZE); } bzero(buf, sizeof(buf)); } g_eli_crypto_hmac_final(&ctx, xk->pxk_key, PEFS_KEY_SIZE); - g_eli_crypto_hmac_init(&ctx, NULL, 0); - g_eli_crypto_hmac_update(&ctx, xk->pxk_key, PEFS_KEY_SIZE); + g_eli_crypto_hmac_init(&ctx, xk->pxk_key, PEFS_KEY_SIZE); + g_eli_crypto_hmac_update(&ctx, "", 8); g_eli_crypto_hmac_final(&ctx, xk->pxk_keyid, PEFS_KEYID_SIZE); return (0); } static int -pefs_key_cipher(struct pefs_xkey *xk, int enc, const struct pefs_xkey *xk_parent) +pefs_key_cipher(struct pefs_xkeyenc *xe, int enc, + const struct pefs_xkey *xk_parent) { const int keysize = 128 / 8; - const int datasize = sizeof(struct pefs_xkey); - u_char *data = (u_char *) xk; + const int datasize = sizeof(struct pefs_xkeyenc) - PEFS_KEYENC_MAC_SIZE; + struct hmac_ctx hmac_ctx; + u_char *data = (u_char *) xe; EVP_CIPHER_CTX ctx; - u_char iv[keysize]; u_char key[keysize]; + u_char mac[PEFS_KEYENC_MAC_SIZE]; int outsize; - pkcs5v2_genkey(key, keysize, NULL, 0, xk_parent->pxk_key, PEFS_CIPHERKEY_ITERATIONS); + pkcs5v2_genkey(key, keysize, xk_parent->pxk_keyid, PEFS_KEYID_SIZE, + xk_parent->pxk_key, PEFS_KEY_SIZE, PEFS_KEYENC_ITERATIONS); + + g_eli_crypto_hmac_init(&hmac_ctx, key, keysize); + if (!enc) { + g_eli_crypto_hmac_update(&hmac_ctx, data, datasize); + g_eli_crypto_hmac_final(&hmac_ctx, mac, PEFS_KEYENC_MAC_SIZE); + bzero(&hmac_ctx, sizeof(hmac_ctx)); + if (memcmp(mac, xe->mac, PEFS_KEYENC_MAC_SIZE) != 0) + return (-1); + } EVP_CIPHER_CTX_init(&ctx); - EVP_CipherInit_ex(&ctx, EVP_aes_128_cfb(), NULL, NULL, NULL, enc); EVP_CIPHER_CTX_set_key_length(&ctx, keysize); EVP_CIPHER_CTX_set_padding(&ctx, 0); - bzero(iv, sizeof(iv)); - EVP_CipherInit_ex(&ctx, NULL, NULL, key, iv, enc); + EVP_CipherInit_ex(&ctx, NULL, NULL, key, key, enc); bzero(key, sizeof(key)); if (EVP_CipherUpdate(&ctx, data, &outsize, data, datasize) == 0) { @@ -219,18 +233,26 @@ assert(outsize == 0); EVP_CIPHER_CTX_cleanup(&ctx); + + if (enc) { + g_eli_crypto_hmac_update(&hmac_ctx, data, datasize); + g_eli_crypto_hmac_final(&hmac_ctx, xe->mac, + PEFS_KEYENC_MAC_SIZE); + bzero(&hmac_ctx, sizeof(hmac_ctx)); + } + return (0); } int -pefs_key_encrypt(struct pefs_xkey *xk, const struct pefs_xkey *xk_parent) +pefs_key_encrypt(struct pefs_xkeyenc *xe, const struct pefs_xkey *xk_parent) { - return (pefs_key_cipher(xk, 1, xk_parent)); + return (pefs_key_cipher(xe, 1, xk_parent)); } int -pefs_key_decrypt(struct pefs_xkey *xk, const struct pefs_xkey *xk_parent) +pefs_key_decrypt(struct pefs_xkeyenc *xe, const struct pefs_xkey *xk_parent) { - return (pefs_key_cipher(xk, 0, xk_parent)); + return (pefs_key_cipher(xe, 0, xk_parent)); } ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_keychain.c#5 (text+ko) ==== @@ -22,13 +22,12 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include __FBSDID("$FreeBSD$"); -#include +#include #include #include #include @@ -84,16 +83,20 @@ pefs_keychain_get_db(DB *db, struct pefs_keychain_head *kch) { struct pefs_keychain *kc_parent = NULL, *kc; + struct pefs_xkeyenc ke; DBT db_key, db_data; int error; while (1) { kc_parent = TAILQ_LAST(kch, pefs_keychain_head); TAILQ_FOREACH(kc, kch, kc_entry) { - if (kc != kc_parent && memcmp(kc->kc_key.pxk_keyid, - kc_parent->kc_key.pxk_keyid, PEFS_KEYID_SIZE) == 0) { + if (kc != kc_parent && + memcmp(kc->kc_key.pxk_keyid, + kc_parent->kc_key.pxk_keyid, + PEFS_KEYID_SIZE) == 0) { pefs_keychain_free(kch); - errx(EX_DATAERR, "keychain: loop detected: %016jx", + errx(EX_DATAERR, + "keychain: loop detected: %016jx", pefs_keyid_as_int(kc->kc_key.pxk_keyid)); } } @@ -107,25 +110,36 @@ error = 0; break; } - if (db_data.size != sizeof(struct pefs_xkey)) + if (db_data.size != sizeof(struct pefs_xkeyenc)) errx(EX_DATAERR, "keychain: db damaged"); kc = calloc(1, sizeof(struct pefs_keychain)); if (kc == NULL) err(EX_OSERR, "calloc"); - memcpy(&kc->kc_key, db_data.data, sizeof(struct pefs_xkey)); - error = pefs_key_decrypt(&kc->kc_key, &kc_parent->kc_key); + memcpy(&ke, db_data.data, sizeof(struct pefs_xkeyenc)); + error = pefs_key_decrypt(&ke, &kc_parent->kc_key); if (error) break; + kc->kc_key = ke.chained; + kc_parent->kc_key.pxk_alg = le32toh(ke.alg); + kc_parent->kc_key.pxk_keybits = le32toh(ke.keybits); + if (pefs_alg_name(&kc_parent->kc_key) == NULL) + errx(EX_DATAERR, "keychain: db damaged"); kc->kc_key.pxk_index = -1; kc->kc_key.pxk_alg = le32toh(kc->kc_key.pxk_alg); kc->kc_key.pxk_keybits = le32toh(kc->kc_key.pxk_keybits); - if (pefs_alg_name(&kc->kc_key) == NULL) { + + if (kc->kc_key.pxk_alg == PEFS_ALG_INVALID || + pefs_alg_name(&kc->kc_key) == NULL) { bzero(&kc->kc_key, sizeof(struct pefs_xkey)); - warn("keychain %016jx -> %016jx: invalid algorithm (decyption failed)", - pefs_keyid_as_int(kc_parent->kc_key.pxk_keyid), - pefs_keyid_as_int(kc->kc_key.pxk_keyid)); + if (kc->kc_key.pxk_alg != PEFS_ALG_INVALID) + warn("keychain %016jx -> %016jx: invalid algorithm (decyption failed)", + pefs_keyid_as_int( + kc_parent->kc_key.pxk_keyid), + pefs_keyid_as_int(kc->kc_key.pxk_keyid)); + free(kc); + break; } TAILQ_INSERT_TAIL(kch, kc, kc_entry); } @@ -167,42 +181,47 @@ if (error) { if (flags & PEFS_KEYCHAIN_USE) - errx(EX_DATAERR, "keychain: Key not found %016jx", pefs_keyid_as_int(xk->pxk_keyid)); + errx(EX_DATAERR, "keychain: Key not found %016jx", + pefs_keyid_as_int(xk->pxk_keyid)); } return (0); } int -pefs_keychain_set(const char *filesystem, struct pefs_xkey *xk, struct pefs_xkey *xknext) +pefs_keychain_set(const char *filesystem, struct pefs_xkey *xk, + struct pefs_xkey *xknext) { - struct pefs_xkey k; + struct pefs_xkeyenc ke; DBT db_key, db_data; DB *db; int error; - k = *xknext; - k.pxk_index = (uint32_t)random(); - k.pxk_alg = htole32(k.pxk_alg); - k.pxk_keybits = htole32(k.pxk_keybits); - if (pefs_key_encrypt(&k, xk) != 0) + ke.chained = *xknext; + ke.chained.pxk_index = (uint32_t)random(); + ke.chained.pxk_alg = htole32(ke.chained.pxk_alg); + ke.chained.pxk_keybits = htole32(ke.chained.pxk_keybits); + ke.alg = htole32(xk->pxk_alg); + ke.keybits = htole32(xk->pxk_keybits); + if (pefs_key_encrypt(&ke, xk) != 0) return (-1); db = keychain_dbopen(filesystem, PEFS_KEYCHAIN_USE, O_RDWR | O_CREAT); if (db == NULL) return (-1); - db_data.data = &k; - db_data.size = sizeof(struct pefs_xkey); + db_data.data = &ke; + db_data.size = sizeof(struct pefs_xkeyenc); db_key.data = xk->pxk_keyid; db_key.size = PEFS_KEYID_SIZE; error = db->put(db, &db_key, &db_data, R_NOOVERWRITE); - bzero(&k, sizeof(struct pefs_xkey)); + bzero(&ke, sizeof(struct pefs_xkeyenc)); if (error != 0) { if (error == -1) warn("keychain"); else - warnx("keychain: cannot set key chain %016jx", pefs_keyid_as_int(xk->pxk_keyid)); + warnx("keychain: cannot set key chain %016jx", + pefs_keyid_as_int(xk->pxk_keyid)); } db->close(db); @@ -226,7 +245,8 @@ if (error == -1) warn("keychain"); else - warnx("keychain: cannot delete key chain %016jx", pefs_keyid_as_int(xk->pxk_keyid)); + warnx("keychain: cannot delete key chain %016jx", + pefs_keyid_as_int(xk->pxk_keyid)); } db->close(db); ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_mount.c#4 (text+ko) ==== @@ -30,10 +30,6 @@ * SUCH DAMAGE. */ -/* - * Ancestors: - * FreeBSD: head/sbin/mount_nullfs/mount_nullfs.c 152670 2005-11-21 22:51:16Z rodrigc - */ #include __FBSDID("$FreeBSD$"); @@ -49,6 +45,8 @@ #include #include +#include + #include "mntopts.h" #include "pefs_ctl.h" ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#12 (text+ko) ==== @@ -1,10 +1,7 @@ /*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. + * Copyright (c) 2009 Gleb Kurtsou + * All rights reserved. * - * This code is derived from software donated to Berkeley by - * Jan-Simon Pendry. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -13,14 +10,11 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -29,21 +23,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)null.h 8.3 (Berkeley) 8/20/94 - * - * Ancestors: - * FreeBSD: head/sys/fs/nullfs/null.h 143642 2005-03-15 13:49:33Z jeff - * * $FreeBSD$ */ -#include -#include -#include -#include -#include -#include - +#define PEFS_ALG_INVALID 0 #define PEFS_ALG_SALSA20 1 #define PEFS_ALG_AES_CTR 2 #define PEFS_ALG_CAMELLIA_CTR 3 @@ -62,11 +45,13 @@ char pxk_key[PEFS_KEY_SIZE]; }; +#ifdef _IO #define PEFS_GETKEY _IOWR('p', 0, struct pefs_xkey) #define PEFS_ADDKEY _IOWR('p', 1, struct pefs_xkey) #define PEFS_SETKEY _IOWR('p', 2, struct pefs_xkey) #define PEFS_DELKEY _IOWR('p', 3, struct pefs_xkey) #define PEFS_FLUSHKEYS _IO('p', 4) +#endif #ifdef _KERNEL @@ -275,3 +260,4 @@ #endif /* PEFS_DEBUG */ #endif /* _KERNEL */ + ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#12 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include @@ -33,6 +34,7 @@ #include #include #include +#include #include #include @@ -54,9 +56,12 @@ CTASSERT(PEFS_TWEAK_SIZE == 64/8); CTASSERT(CAMELLIA_BLOCK_SIZE == PEFS_CTR_BLOCK_SIZE); -typedef void algop_keysetup_t(struct pefs_ctx *ctx, const uint8_t *key, uint32_t keybits); -typedef void algop_ivsetup_t(struct pefs_ctx *ctx, const uint8_t *iv, uint64_t offset); -typedef void algop_crypt_t(struct pefs_ctx *ctx, const uint8_t *plaintext, uint8_t *ciphertext, uint32_t len); +typedef void algop_keysetup_t(struct pefs_ctx *ctx, const uint8_t *key, + uint32_t keybits); +typedef void algop_ivsetup_t(struct pefs_ctx *ctx, const uint8_t *iv, + uint64_t offset); +typedef void algop_crypt_t(struct pefs_ctx *ctx, const uint8_t *plaintext, + uint8_t *ciphertext, uint32_t len); typedef void algop_cryptblock_t(struct pefs_ctx *ctx, uint8_t *data); struct pefs_alg { @@ -139,11 +144,9 @@ pefs_crypto_init(void) { pefs_ctx_zone = uma_zcreate("pefs_ctx", sizeof(struct pefs_ctx), - NULL, NULL, NULL, (uma_fini)bzero, - UMA_ALIGN_PTR, 0); + NULL, NULL, NULL, (uma_fini)bzero, UMA_ALIGN_PTR, 0); pefs_key_zone = uma_zcreate("pefs_key", sizeof(struct pefs_key), - NULL, NULL, NULL, (uma_fini)bzero, - UMA_ALIGN_PTR, 0); + NULL, NULL, NULL, (uma_fini)bzero, UMA_ALIGN_PTR, 0); } void @@ -194,7 +197,8 @@ bzero(key, PEFS_KEY_SIZE); pefs_hmac_init(&ctx->o.pctx_hmac, masterkey, PEFS_KEY_SIZE); pefs_hmac_update(&ctx->o.pctx_hmac, key, PEFS_KEY_SIZE); - pefs_hmac_update(&ctx->o.pctx_hmac, magic_ctxinfo_data_key, PEFS_TWEAK_SIZE); + pefs_hmac_update(&ctx->o.pctx_hmac, magic_ctxinfo_data_key, + PEFS_TWEAK_SIZE); pefs_hmac_update(&ctx->o.pctx_hmac, &idx, sizeof(idx)); pefs_hmac_final(&ctx->o.pctx_hmac, key, PEFS_KEY_SIZE); pk->pk_alg->pa_keysetup(pk->pk_data_ctx, key, pk->pk_keybits); @@ -202,7 +206,8 @@ idx = 2; pefs_hmac_init(&ctx->o.pctx_hmac, masterkey, PEFS_KEY_SIZE); pefs_hmac_update(&ctx->o.pctx_hmac, key, PEFS_KEY_SIZE); - pefs_hmac_update(&ctx->o.pctx_hmac, magic_ctxinfo_name_key, PEFS_TWEAK_SIZE); + pefs_hmac_update(&ctx->o.pctx_hmac, magic_ctxinfo_name_key, + PEFS_TWEAK_SIZE); pefs_hmac_update(&ctx->o.pctx_hmac, &idx, sizeof(idx)); pefs_hmac_final(&ctx->o.pctx_hmac, key, PEFS_KEY_SIZE); pefs_aes_keysetup(pk->pk_name_ctx, key, 128); @@ -210,7 +215,8 @@ idx = 3; pefs_hmac_init(&ctx->o.pctx_hmac, masterkey, PEFS_KEY_SIZE); pefs_hmac_update(&ctx->o.pctx_hmac, key, PEFS_KEY_SIZE); - pefs_hmac_update(&ctx->o.pctx_hmac, magic_ctxinfo_name_key, PEFS_TWEAK_SIZE); + pefs_hmac_update(&ctx->o.pctx_hmac, magic_ctxinfo_name_key, + PEFS_TWEAK_SIZE); pefs_hmac_update(&ctx->o.pctx_hmac, &idx, sizeof(idx)); pefs_hmac_final(&ctx->o.pctx_hmac, key, PEFS_KEY_SIZE); vmac_set_key(key, &pk->pk_name_csum_ctx->o.pctx_vmac); @@ -249,7 +255,8 @@ } if (pk->pk_keybits == 0) { uma_zfree(pefs_key_zone, pk); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 28 19:22:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7F9C1065670; Mon, 28 Sep 2009 19:22:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ACA7F106566B for ; Mon, 28 Sep 2009 19:22:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 822BE8FC15 for ; Mon, 28 Sep 2009 19:22:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8SJMZRt030490 for ; Mon, 28 Sep 2009 19:22:35 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8SJMZDU030488 for perforce@freebsd.org; Mon, 28 Sep 2009 19:22:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 28 Sep 2009 19:22:35 GMT Message-Id: <200909281922.n8SJMZDU030488@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 168985 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Sep 2009 19:22:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=168985 Change 168985 by hselasky@hselasky_laptop001 on 2009/09/28 19:22:03 USB serial: - fix panic with uchcom at attach. - add new USB ID (Not working yet - use uch341 driver until further) Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#13 (text+ko) ==== @@ -206,6 +206,7 @@ static const struct usb_device_id uchcom_devs[] = { {USB_VPI(USB_VENDOR_WCH, USB_PRODUCT_WCH_CH341SER, 0)}, + {USB_VPI(0x1a86, 0x7523, 0)}, }; /* protypes */ @@ -213,6 +214,7 @@ static int uchcom_pre_param(struct ucom_softc *, struct termios *); static void uchcom_cfg_get_status(struct ucom_softc *, uint8_t *, uint8_t *); +static void uchcom_cfg_open(struct ucom_softc *ucom); static void uchcom_cfg_param(struct ucom_softc *, struct termios *); static void uchcom_cfg_set_break(struct ucom_softc *, uint8_t); static void uchcom_cfg_set_dtr(struct ucom_softc *, uint8_t); @@ -275,6 +277,7 @@ .ucom_cfg_set_dtr = &uchcom_cfg_set_dtr, .ucom_cfg_set_rts = &uchcom_cfg_set_rts, .ucom_cfg_set_break = &uchcom_cfg_set_break, + .ucom_cfg_open = &uchcom_cfg_open, .ucom_cfg_param = &uchcom_cfg_param, .ucom_pre_param = &uchcom_pre_param, .ucom_start_read = &uchcom_start_read, @@ -341,14 +344,6 @@ "error=%s\n", usbd_errstr(error)); goto detach; } - /* - * Do the initialization during attach so that the system does not - * sleep during open: - */ - uchcom_update_version(sc); - uchcom_clear_chip(sc); - uchcom_reset_chip(sc); - uchcom_update_status(sc); sc->sc_dtr = 1; sc->sc_rts = 1; @@ -713,18 +708,29 @@ uchcom_set_dtrrts(sc); } +static void +uchcom_cfg_open(struct ucom_softc *ucom) +{ + struct uchcom_softc *sc = ucom->sc_parent; + + DPRINTF("\n"); + + uchcom_update_version(sc); + uchcom_clear_chip(sc); + uchcom_reset_chip(sc); + uchcom_update_status(sc); +} + static int uchcom_pre_param(struct ucom_softc *ucom, struct termios *t) { struct uchcom_divider dv; switch (t->c_cflag & CSIZE) { - case CS5: - case CS6: - case CS7: + case CS8: + break; + default: return (EIO); - default: - break; } if (uchcom_calc_divider_settings(&dv, t->c_ospeed)) { From owner-p4-projects@FreeBSD.ORG Mon Sep 28 21:09:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41AB51065676; Mon, 28 Sep 2009 21:09:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05760106566C for ; Mon, 28 Sep 2009 21:09:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E6EB58FC08 for ; Mon, 28 Sep 2009 21:09:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8SL9W35050655 for ; Mon, 28 Sep 2009 21:09:32 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8SL9WtK050653 for perforce@freebsd.org; Mon, 28 Sep 2009 21:09:32 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 28 Sep 2009 21:09:32 GMT Message-Id: <200909282109.n8SL9WtK050653@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 168992 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Sep 2009 21:09:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=168992 Change 168992 by hselasky@hselasky_laptop001 on 2009/09/28 21:09:06 USB serial: - merge the two uchxxx drivers together - some register programming had to be removed because it was making the newer version of the chip not working. Hopefully no essential features are missed out. Affected files ... .. //depot/projects/usb/src/sys/conf/files#81 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uch341.c#3 delete .. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#80 edit .. //depot/projects/usb/src/sys/modules/usb/Makefile#21 edit .. //depot/projects/usb/src/sys/modules/usb/uch341/Makefile#2 delete Differences ... ==== //depot/projects/usb/src/sys/conf/files#81 (text+ko) ==== @@ -1643,7 +1643,6 @@ dev/usb/serial/uark.c optional uark dev/usb/serial/ubsa.c optional ubsa dev/usb/serial/ubser.c optional ubser -dev/usb/serial/uch341.c optional uch341 dev/usb/serial/uchcom.c optional uchcom dev/usb/serial/ucycom.c optional ucycom dev/usb/serial/ufoma.c optional ufoma ==== //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#14 (text+ko) ==== @@ -66,7 +66,8 @@ __FBSDID("$FreeBSD: src/sys/dev/usb/serial/uchcom.c,v 1.11 2009/06/23 02:19:59 thompsa Exp $"); /* - * driver for WinChipHead CH341/340, the worst USB-serial chip in the world. + * Driver for WinChipHead CH341/340, the worst USB-serial chip in the + * world. */ #include @@ -206,7 +207,7 @@ static const struct usb_device_id uchcom_devs[] = { {USB_VPI(USB_VENDOR_WCH, USB_PRODUCT_WCH_CH341SER, 0)}, - {USB_VPI(0x1a86, 0x7523, 0)}, + {USB_VPI(USB_VENDOR_WCH2, USB_PRODUCT_WCH2_CH341SER, 0)}, }; /* protypes */ @@ -226,12 +227,9 @@ static void uchcom_update_version(struct uchcom_softc *); static void uchcom_convert_status(struct uchcom_softc *, uint8_t); static void uchcom_update_status(struct uchcom_softc *); -static void uchcom_set_dtrrts(struct uchcom_softc *); +static void uchcom_set_dtr_rts(struct uchcom_softc *); static int uchcom_calc_divider_settings(struct uchcom_divider *, uint32_t); -static void uchcom_set_dte_rate(struct uchcom_softc *, uint32_t); -static void uchcom_set_line_control(struct uchcom_softc *, tcflag_t); -static void uchcom_clear_chip(struct uchcom_softc *); -static void uchcom_reset_chip(struct uchcom_softc *); +static void uchcom_set_baudrate(struct uchcom_softc *, uint32_t); static void uchcom_poll(struct ucom_softc *ucom); static device_probe_t uchcom_probe; @@ -345,9 +343,6 @@ goto detach; } - sc->sc_dtr = 1; - sc->sc_rts = 1; - /* clear stall at first run */ mtx_lock(&sc->sc_mtx); usbd_xfer_set_stall(sc->sc_xfer[UCHCOM_BULK_DT_WR]); @@ -453,8 +448,7 @@ { uint8_t buf[UCHCOM_INPUT_BUF_SIZE]; - uchcom_ctrl_read( - sc, UCHCOM_REQ_GET_VERSION, 0, 0, buf, sizeof(buf)); + uchcom_ctrl_read(sc, UCHCOM_REQ_GET_VERSION, 0, 0, buf, sizeof(buf)); if (rver) *rver = buf[0]; @@ -467,13 +461,13 @@ } static void -uchcom_set_dtrrts_10(struct uchcom_softc *sc, uint8_t val) +uchcom_set_dtr_rts_10(struct uchcom_softc *sc, uint8_t val) { uchcom_write_reg(sc, UCHCOM_REG_STAT1, val, UCHCOM_REG_STAT1, val); } static void -uchcom_set_dtrrts_20(struct uchcom_softc *sc, uint8_t val) +uchcom_set_dtr_rts_20(struct uchcom_softc *sc, uint8_t val) { uchcom_ctrl_write(sc, UCHCOM_REQ_SET_DTRRTS, val, 0); } @@ -510,7 +504,7 @@ static void -uchcom_set_dtrrts(struct uchcom_softc *sc) +uchcom_set_dtr_rts(struct uchcom_softc *sc) { uint8_t val = 0; @@ -520,9 +514,9 @@ val |= UCHCOM_RTS_MASK; if (sc->sc_version < UCHCOM_VER_20) - uchcom_set_dtrrts_10(sc, ~val); + uchcom_set_dtr_rts_10(sc, ~val); else - uchcom_set_dtrrts_20(sc, ~val); + uchcom_set_dtr_rts_20(sc, ~val); } static void @@ -578,16 +572,16 @@ dp->dv_div = (uint8_t)-div; } - mod = UCHCOM_BPS_MOD_BASE / rate + UCHCOM_BPS_MOD_BASE_OFS; - mod = mod + mod / 2; + mod = (UCHCOM_BPS_MOD_BASE / rate) + UCHCOM_BPS_MOD_BASE_OFS; + mod = mod + (mod / 2); - dp->dv_mod = mod / 0x100; + dp->dv_mod = (mod + 0xFF) / 0x100; return (0); } static void -uchcom_set_dte_rate(struct uchcom_softc *sc, uint32_t rate) +uchcom_set_baudrate(struct uchcom_softc *sc, uint32_t rate) { struct uchcom_divider dv; @@ -602,76 +596,6 @@ UCHCOM_REG_BPS_PAD, 0); } -static void -uchcom_set_line_control(struct uchcom_softc *sc, tcflag_t cflag) -{ - uint8_t lcr1 = 0; - uint8_t lcr2 = 0; - - uchcom_read_reg(sc, UCHCOM_REG_LCR1, &lcr1, UCHCOM_REG_LCR2, &lcr2); - - lcr1 &= ~UCHCOM_LCR1_MASK; - lcr2 &= ~UCHCOM_LCR2_MASK; - - /* - * XXX: it is difficult to handle the line control appropriately: - * - CS8, !CSTOPB and any parity mode seems ok, but - * - the chip doesn't have the function to calculate parity - * in !CS8 mode. - * - it is unclear that the chip supports CS5,6 mode. - * - it is unclear how to handle stop bits. - */ - - if (cflag & PARENB) { - lcr1 |= UCHCOM_LCR1_PARENB; - if (cflag & PARODD) - lcr2 |= UCHCOM_LCR2_PARODD; - else - lcr2 |= UCHCOM_LCR2_PAREVEN; - } - uchcom_write_reg(sc, UCHCOM_REG_LCR1, lcr1, UCHCOM_REG_LCR2, lcr2); -} - -static void -uchcom_clear_chip(struct uchcom_softc *sc) -{ - DPRINTF("\n"); - uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, 0, 0); -} - -static void -uchcom_reset_chip(struct uchcom_softc *sc) -{ - uint16_t val; - uint16_t idx; - uint8_t lcr1; - uint8_t lcr2; - uint8_t pre; - uint8_t div; - uint8_t mod; - - uchcom_read_reg(sc, UCHCOM_REG_LCR1, &lcr1, UCHCOM_REG_LCR2, &lcr2); - uchcom_read_reg(sc, UCHCOM_REG_BPS_PRE, &pre, UCHCOM_REG_BPS_DIV, &div); - uchcom_read_reg(sc, UCHCOM_REG_BPS_MOD, &mod, UCHCOM_REG_BPS_PAD, NULL); - - val = 0; - idx = 0; - val |= (uint16_t)(lcr1 & 0xF0) << 8; - val |= 0x01; - val |= (uint16_t)(lcr2 & 0x0F) << 8; - val |= 0x02; - idx |= pre & 0x07; - val |= 0x04; - idx |= (uint16_t)div << 8; - val |= 0x08; - idx |= mod & 0xF8; - val |= 0x10; - - DPRINTF("reset v=0x%04X, i=0x%04X\n", val, idx); - - uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, val, idx); -} - /* ---------------------------------------------------------------------- * methods for ucom */ @@ -694,7 +618,7 @@ DPRINTF("onoff = %d\n", onoff); sc->sc_dtr = onoff; - uchcom_set_dtrrts(sc); + uchcom_set_dtr_rts(sc); } static void @@ -705,7 +629,7 @@ DPRINTF("onoff = %d\n", onoff); sc->sc_rts = onoff; - uchcom_set_dtrrts(sc); + uchcom_set_dtr_rts(sc); } static void @@ -716,8 +640,6 @@ DPRINTF("\n"); uchcom_update_version(sc); - uchcom_clear_chip(sc); - uchcom_reset_chip(sc); uchcom_update_status(sc); } @@ -744,8 +666,16 @@ { struct uchcom_softc *sc = ucom->sc_parent; - uchcom_set_line_control(sc, t->c_cflag); - uchcom_set_dte_rate(sc, t->c_ospeed); + uchcom_get_version(sc, 0); + uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, 0, 0); + uchcom_set_baudrate(sc, t->c_ospeed); + uchcom_read_reg(sc, 0x18, 0, 0x25, 0); + uchcom_write_reg(sc, 0x18, 0x50, 0x25, 0x00); + uchcom_update_status(sc); + uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, 0x501f, 0xd90a); + uchcom_set_baudrate(sc, t->c_ospeed); + uchcom_set_dtr_rts(sc); + uchcom_update_status(sc); } static void @@ -846,14 +776,14 @@ tr_setup: pc = usbd_xfer_get_frame(xfer, 0); if (ucom_get_data(&sc->sc_ucom, pc, 0, - UCHCOM_BULK_BUF_SIZE, &actlen)) { + usbd_xfer_max_len(xfer), &actlen)) { DPRINTF("actlen = %d\n", actlen); usbd_xfer_set_frame_len(xfer, 0, actlen); usbd_transfer_submit(xfer); } - return; + break; default: /* Error */ if (error != USB_ERR_CANCELLED) { @@ -861,8 +791,7 @@ usbd_xfer_set_stall(xfer); goto tr_setup; } - return; - + break; } } @@ -877,14 +806,17 @@ switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - pc = usbd_xfer_get_frame(xfer, 0); - ucom_put_data(&sc->sc_ucom, pc, 0, actlen); + + if (actlen > 0) { + pc = usbd_xfer_get_frame(xfer, 0); + ucom_put_data(&sc->sc_ucom, pc, 0, actlen); + } case USB_ST_SETUP: tr_setup: usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer)); usbd_transfer_submit(xfer); - return; + break; default: /* Error */ if (error != USB_ERR_CANCELLED) { @@ -892,7 +824,7 @@ usbd_xfer_set_stall(xfer); goto tr_setup; } - return; + break; } } ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#80 (text+ko) ==== @@ -626,6 +626,7 @@ vendor QCOM 0x18e8 Qcom vendor LINKSYS3 0x1915 Linksys vendor QUALCOMMINC 0x19d2 Qualcomm, Incorporated +vendor WCH2 0x1a86 QinHeng Electronics vendor STELERA 0x1a8d Stelera Wireless vendor MPMAN 0x1cae MpMan vendor DRESDENELEKTRONIK 0x1cf1 dresden elektronik @@ -2506,8 +2507,10 @@ product WACOM GRAPHIRE3_4X5 0x0013 Graphire 3 4x5 product WACOM INTUOSA5 0x0021 Intuos A5 product WACOM GD0912U 0x0022 Intuos 9x12 Graphics Tablet -/* WCH products*/ +/* WCH products */ product WCH CH341SER 0x5523 CH341/CH340 USB-Serial Bridge +/* WCH products */ +product WCH2 CH341SER 0x7523 CH341/CH340 USB-Serial Bridge /* Western Digital products */ product WESTERN COMBO 0x0200 Firewire USB Combo product WESTERN EXTHDD 0x0400 External HDD ==== //depot/projects/usb/src/sys/modules/usb/Makefile#21 (text+ko) ==== @@ -29,7 +29,7 @@ SUBDIR += ehci musb ohci uhci uss820dci ${_at91dci} ${_atmegadci} SUBDIR += rum uath upgt ural zyd ${_urtw} SUBDIR += uhid ukbd ums udbp ufm -SUBDIR += ucom u3g uark ubsa ubser uch341 uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ +SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ umct umodem umoscom uplcom uslcom uvisor uvscom SUBDIR += uether aue axe cdce cue kue rue udav SUBDIR += usfs umass urio From owner-p4-projects@FreeBSD.ORG Tue Sep 29 14:02:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61F25106568F; Tue, 29 Sep 2009 14:02:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 268AF106566B for ; Tue, 29 Sep 2009 14:02:00 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 13E2F8FC20 for ; Tue, 29 Sep 2009 14:02:00 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TE1xPC079691 for ; Tue, 29 Sep 2009 14:01:59 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8TE1xuZ079689 for perforce@freebsd.org; Tue, 29 Sep 2009 14:01:59 GMT (envelope-from jhb@freebsd.org) Date: Tue, 29 Sep 2009 14:01:59 GMT Message-Id: <200909291401.n8TE1xuZ079689@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 Cc: Subject: PERFORCE change 169007 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Sep 2009 14:02:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=169007 Change 169007 by jhb@jhb_jhbbsd on 2009/09/29 14:01:34 Remove bogus uses of RF_ALLOCATED. Affected files ... .. //depot/projects/multipass/sys/dev/ctau/if_ct.c#4 edit .. //depot/projects/multipass/sys/dev/cx/if_cx.c#4 edit .. //depot/projects/multipass/sys/dev/digi/digi_isa.c#2 edit Differences ... ==== //depot/projects/multipass/sys/dev/ctau/if_ct.c#4 (text+ko) ==== @@ -337,8 +337,7 @@ { struct resource *res; - if (!(res = bus_alloc_resource (dev, type, &rid, start, end, count, - RF_ALLOCATED))) + if (!(res = bus_alloc_resource (dev, type, &rid, start, end, count, 0))) return 0; bus_release_resource (dev, type, rid, res); ==== //depot/projects/multipass/sys/dev/cx/if_cx.c#4 (text+ko) ==== @@ -424,8 +424,7 @@ { struct resource *res; - if (!(res = bus_alloc_resource (dev, type, &rid, start, end, count, - RF_ALLOCATED))) + if (!(res = bus_alloc_resource (dev, type, &rid, start, end, count, 0))) return 0; bus_release_resource (dev, type, rid, res); ==== //depot/projects/multipass/sys/dev/digi/digi_isa.c#2 (text+ko) ==== @@ -292,7 +292,7 @@ /* Temporarily map our memory */ sc->res.mrid = 0; sc->res.mem = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->res.mrid, - 0ul, ~0ul, sc->win_size, RF_ALLOCATED); + 0ul, ~0ul, sc->win_size, 0); if (sc->res.mem == NULL) { device_printf(dev, "0x%lx: Memory range is in use\n", sc->pmem); bus_release_resource(dev, SYS_RES_IOPORT, sc->res.iorid, From owner-p4-projects@FreeBSD.ORG Tue Sep 29 14:31:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4643106568D; Tue, 29 Sep 2009 14:31:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E5CD1065679 for ; Tue, 29 Sep 2009 14:31:32 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 59C0E8FC0A for ; Tue, 29 Sep 2009 14:31:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TEVWAr082867 for ; Tue, 29 Sep 2009 14:31:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8TEVWKU082865 for perforce@freebsd.org; Tue, 29 Sep 2009 14:31:32 GMT (envelope-from jhb@freebsd.org) Date: Tue, 29 Sep 2009 14:31:32 GMT Message-Id: <200909291431.n8TEVWKU082865@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 Cc: Subject: PERFORCE change 169010 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Sep 2009 14:31:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=169010 Change 169010 by jhb@jhb_jhbbsd on 2009/09/29 14:31:10 Branch section 9 manpages. Affected files ... .. //depot/projects/multipass/share/man/man9/BUF_ISLOCKED.9#1 branch .. //depot/projects/multipass/share/man/man9/BUF_LOCK.9#1 branch .. //depot/projects/multipass/share/man/man9/BUF_LOCKFREE.9#1 branch .. //depot/projects/multipass/share/man/man9/BUF_LOCKINIT.9#1 branch .. //depot/projects/multipass/share/man/man9/BUF_RECURSED.9#1 branch .. //depot/projects/multipass/share/man/man9/BUF_TIMELOCK.9#1 branch .. //depot/projects/multipass/share/man/man9/BUF_UNLOCK.9#1 branch .. //depot/projects/multipass/share/man/man9/BUS_ADD_CHILD.9#1 branch .. //depot/projects/multipass/share/man/man9/BUS_CONFIG_INTR.9#1 branch .. //depot/projects/multipass/share/man/man9/BUS_NEW_PASS.9#1 branch .. //depot/projects/multipass/share/man/man9/BUS_PRINT_CHILD.9#1 branch .. //depot/projects/multipass/share/man/man9/BUS_READ_IVAR.9#1 branch .. //depot/projects/multipass/share/man/man9/BUS_SETUP_INTR.9#1 branch .. //depot/projects/multipass/share/man/man9/CTASSERT.9#1 branch .. //depot/projects/multipass/share/man/man9/DB_COMMAND.9#1 branch .. //depot/projects/multipass/share/man/man9/DECLARE_GEOM_CLASS.9#1 branch .. //depot/projects/multipass/share/man/man9/DECLARE_MODULE.9#1 branch .. //depot/projects/multipass/share/man/man9/DELAY.9#1 branch .. //depot/projects/multipass/share/man/man9/DEVICE_ATTACH.9#1 branch .. //depot/projects/multipass/share/man/man9/DEVICE_DETACH.9#1 branch .. //depot/projects/multipass/share/man/man9/DEVICE_IDENTIFY.9#1 branch .. //depot/projects/multipass/share/man/man9/DEVICE_PROBE.9#1 branch .. //depot/projects/multipass/share/man/man9/DEVICE_SHUTDOWN.9#1 branch .. //depot/projects/multipass/share/man/man9/DEV_MODULE.9#1 branch .. //depot/projects/multipass/share/man/man9/DRIVER_MODULE.9#1 branch .. //depot/projects/multipass/share/man/man9/EVENTHANDLER.9#1 branch .. //depot/projects/multipass/share/man/man9/KASSERT.9#1 branch .. //depot/projects/multipass/share/man/man9/LOCK_PROFILING.9#1 branch .. //depot/projects/multipass/share/man/man9/MD5.9#1 branch .. //depot/projects/multipass/share/man/man9/MODULE_DEPEND.9#1 branch .. //depot/projects/multipass/share/man/man9/MODULE_VERSION.9#1 branch .. //depot/projects/multipass/share/man/man9/Makefile#1 branch .. //depot/projects/multipass/share/man/man9/SYSCALL_MODULE.9#1 branch .. //depot/projects/multipass/share/man/man9/VFS.9#1 branch .. //depot/projects/multipass/share/man/man9/VFS_CHECKEXP.9#1 branch .. //depot/projects/multipass/share/man/man9/VFS_FHTOVP.9#1 branch .. //depot/projects/multipass/share/man/man9/VFS_LOCK_GIANT.9#1 branch .. //depot/projects/multipass/share/man/man9/VFS_MOUNT.9#1 branch .. //depot/projects/multipass/share/man/man9/VFS_QUOTACTL.9#1 branch .. //depot/projects/multipass/share/man/man9/VFS_ROOT.9#1 branch .. //depot/projects/multipass/share/man/man9/VFS_SET.9#1 branch .. //depot/projects/multipass/share/man/man9/VFS_STATFS.9#1 branch .. //depot/projects/multipass/share/man/man9/VFS_SYNC.9#1 branch .. //depot/projects/multipass/share/man/man9/VFS_UNMOUNT.9#1 branch .. //depot/projects/multipass/share/man/man9/VFS_VGET.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_ACCESS.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_ACLCHECK.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_ADVLOCK.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_ATTRIB.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_BWRITE.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_CREATE.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_FSYNC.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_GETACL.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_GETEXTATTR.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_GETPAGES.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_GETVOBJECT.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_INACTIVE.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_IOCTL.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_LINK.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_LISTEXTATTR.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_LOCK.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_LOOKUP.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_OPENCLOSE.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_PATHCONF.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_PRINT.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_RDWR.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_READDIR.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_READLINK.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_REALLOCBLKS.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_REMOVE.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_RENAME.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_REVOKE.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_SETACL.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_SETEXTATTR.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_STRATEGY.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_VPTOCNP.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_VPTOFH.9#1 branch .. //depot/projects/multipass/share/man/man9/accept_filter.9#1 branch .. //depot/projects/multipass/share/man/man9/accf_data.9#1 branch .. //depot/projects/multipass/share/man/man9/accf_dns.9#1 branch .. //depot/projects/multipass/share/man/man9/accf_http.9#1 branch .. //depot/projects/multipass/share/man/man9/acl.9#1 branch .. //depot/projects/multipass/share/man/man9/alloc_unr.9#1 branch .. //depot/projects/multipass/share/man/man9/alq.9#1 branch .. //depot/projects/multipass/share/man/man9/altq.9#1 branch .. //depot/projects/multipass/share/man/man9/atomic.9#1 branch .. //depot/projects/multipass/share/man/man9/bios.9#1 branch .. //depot/projects/multipass/share/man/man9/boot.9#1 branch .. //depot/projects/multipass/share/man/man9/bpf.9#1 branch .. //depot/projects/multipass/share/man/man9/buf.9#1 branch .. //depot/projects/multipass/share/man/man9/bus_activate_resource.9#1 branch .. //depot/projects/multipass/share/man/man9/bus_alloc_resource.9#1 branch .. //depot/projects/multipass/share/man/man9/bus_child_present.9#1 branch .. //depot/projects/multipass/share/man/man9/bus_dma.9#1 branch .. //depot/projects/multipass/share/man/man9/bus_generic_attach.9#1 branch .. //depot/projects/multipass/share/man/man9/bus_generic_detach.9#1 branch .. //depot/projects/multipass/share/man/man9/bus_generic_new_pass.9#1 branch .. //depot/projects/multipass/share/man/man9/bus_generic_print_child.9#1 branch .. //depot/projects/multipass/share/man/man9/bus_generic_read_ivar.9#1 branch .. //depot/projects/multipass/share/man/man9/bus_generic_shutdown.9#1 branch .. //depot/projects/multipass/share/man/man9/bus_release_resource.9#1 branch .. //depot/projects/multipass/share/man/man9/bus_set_pass.9#1 branch .. //depot/projects/multipass/share/man/man9/bus_set_resource.9#1 branch .. //depot/projects/multipass/share/man/man9/bus_space.9#1 branch .. //depot/projects/multipass/share/man/man9/byteorder.9#1 branch .. //depot/projects/multipass/share/man/man9/cd.9#1 branch .. //depot/projects/multipass/share/man/man9/condvar.9#1 branch .. //depot/projects/multipass/share/man/man9/config_intrhook.9#1 branch .. //depot/projects/multipass/share/man/man9/contigmalloc.9#1 branch .. //depot/projects/multipass/share/man/man9/copy.9#1 branch .. //depot/projects/multipass/share/man/man9/cr_cansee.9#1 branch .. //depot/projects/multipass/share/man/man9/cr_seeothergids.9#1 branch .. //depot/projects/multipass/share/man/man9/cr_seeotheruids.9#1 branch .. //depot/projects/multipass/share/man/man9/critical_enter.9#1 branch .. //depot/projects/multipass/share/man/man9/crypto.9#1 branch .. //depot/projects/multipass/share/man/man9/dev_clone.9#1 branch .. //depot/projects/multipass/share/man/man9/devclass.9#1 branch .. //depot/projects/multipass/share/man/man9/devclass_find.9#1 branch .. //depot/projects/multipass/share/man/man9/devclass_get_count.9#1 branch .. //depot/projects/multipass/share/man/man9/devclass_get_device.9#1 branch .. //depot/projects/multipass/share/man/man9/devclass_get_devices.9#1 branch .. //depot/projects/multipass/share/man/man9/devclass_get_drivers.9#1 branch .. //depot/projects/multipass/share/man/man9/devclass_get_maxunit.9#1 branch .. //depot/projects/multipass/share/man/man9/devclass_get_name.9#1 branch .. //depot/projects/multipass/share/man/man9/devclass_get_softc.9#1 branch .. //depot/projects/multipass/share/man/man9/devfs_set_cdevpriv.9#1 branch .. //depot/projects/multipass/share/man/man9/device.9#1 branch .. //depot/projects/multipass/share/man/man9/device_add_child.9#1 branch .. //depot/projects/multipass/share/man/man9/device_delete_child.9#1 branch .. //depot/projects/multipass/share/man/man9/device_enable.9#1 branch .. //depot/projects/multipass/share/man/man9/device_find_child.9#1 branch .. //depot/projects/multipass/share/man/man9/device_get_children.9#1 branch .. //depot/projects/multipass/share/man/man9/device_get_devclass.9#1 branch .. //depot/projects/multipass/share/man/man9/device_get_driver.9#1 branch .. //depot/projects/multipass/share/man/man9/device_get_ivars.9#1 branch .. //depot/projects/multipass/share/man/man9/device_get_name.9#1 branch .. //depot/projects/multipass/share/man/man9/device_get_parent.9#1 branch .. //depot/projects/multipass/share/man/man9/device_get_softc.9#1 branch .. //depot/projects/multipass/share/man/man9/device_get_state.9#1 branch .. //depot/projects/multipass/share/man/man9/device_get_sysctl.9#1 branch .. //depot/projects/multipass/share/man/man9/device_get_unit.9#1 branch .. //depot/projects/multipass/share/man/man9/device_printf.9#1 branch .. //depot/projects/multipass/share/man/man9/device_probe_and_attach.9#1 branch .. //depot/projects/multipass/share/man/man9/device_quiet.9#1 branch .. //depot/projects/multipass/share/man/man9/device_set_desc.9#1 branch .. //depot/projects/multipass/share/man/man9/device_set_driver.9#1 branch .. //depot/projects/multipass/share/man/man9/device_set_flags.9#1 branch .. //depot/projects/multipass/share/man/man9/devstat.9#1 branch .. //depot/projects/multipass/share/man/man9/devtoname.9#1 branch .. //depot/projects/multipass/share/man/man9/disk.9#1 branch .. //depot/projects/multipass/share/man/man9/domain.9#1 branch .. //depot/projects/multipass/share/man/man9/driver.9#1 branch .. //depot/projects/multipass/share/man/man9/extattr.9#1 branch .. //depot/projects/multipass/share/man/man9/fail.9#1 branch .. //depot/projects/multipass/share/man/man9/fetch.9#1 branch .. //depot/projects/multipass/share/man/man9/firmware.9#1 branch .. //depot/projects/multipass/share/man/man9/g_access.9#1 branch .. //depot/projects/multipass/share/man/man9/g_attach.9#1 branch .. //depot/projects/multipass/share/man/man9/g_bio.9#1 branch .. //depot/projects/multipass/share/man/man9/g_consumer.9#1 branch .. //depot/projects/multipass/share/man/man9/g_data.9#1 branch .. //depot/projects/multipass/share/man/man9/g_event.9#1 branch .. //depot/projects/multipass/share/man/man9/g_geom.9#1 branch .. //depot/projects/multipass/share/man/man9/g_provider.9#1 branch .. //depot/projects/multipass/share/man/man9/g_provider_by_name.9#1 branch .. //depot/projects/multipass/share/man/man9/g_wither_geom.9#1 branch .. //depot/projects/multipass/share/man/man9/get_cyclecount.9#1 branch .. //depot/projects/multipass/share/man/man9/getnewvnode.9#1 branch .. //depot/projects/multipass/share/man/man9/groupmember.9#1 branch .. //depot/projects/multipass/share/man/man9/hash.9#1 branch .. //depot/projects/multipass/share/man/man9/hashinit.9#1 branch .. //depot/projects/multipass/share/man/man9/hexdump.9#1 branch .. //depot/projects/multipass/share/man/man9/ieee80211.9#1 branch .. //depot/projects/multipass/share/man/man9/ieee80211_amrr.9#1 branch .. //depot/projects/multipass/share/man/man9/ieee80211_beacon.9#1 branch .. //depot/projects/multipass/share/man/man9/ieee80211_bmiss.9#1 branch .. //depot/projects/multipass/share/man/man9/ieee80211_crypto.9#1 branch .. //depot/projects/multipass/share/man/man9/ieee80211_ddb.9#1 branch .. //depot/projects/multipass/share/man/man9/ieee80211_input.9#1 branch .. //depot/projects/multipass/share/man/man9/ieee80211_node.9#1 branch .. //depot/projects/multipass/share/man/man9/ieee80211_output.9#1 branch .. //depot/projects/multipass/share/man/man9/ieee80211_proto.9#1 branch .. //depot/projects/multipass/share/man/man9/ieee80211_radiotap.9#1 branch .. //depot/projects/multipass/share/man/man9/ieee80211_regdomain.9#1 branch .. //depot/projects/multipass/share/man/man9/ieee80211_scan.9#1 branch .. //depot/projects/multipass/share/man/man9/ieee80211_vap.9#1 branch .. //depot/projects/multipass/share/man/man9/ifnet.9#1 branch .. //depot/projects/multipass/share/man/man9/inittodr.9#1 branch .. //depot/projects/multipass/share/man/man9/insmntque.9#1 branch .. //depot/projects/multipass/share/man/man9/intro.9#1 branch .. //depot/projects/multipass/share/man/man9/ithread.9#1 branch .. //depot/projects/multipass/share/man/man9/kernacc.9#1 branch .. //depot/projects/multipass/share/man/man9/kernel_mount.9#1 branch .. //depot/projects/multipass/share/man/man9/kobj.9#1 branch .. //depot/projects/multipass/share/man/man9/kproc.9#1 branch .. //depot/projects/multipass/share/man/man9/kqueue.9#1 branch .. //depot/projects/multipass/share/man/man9/kthread.9#1 branch .. //depot/projects/multipass/share/man/man9/ktr.9#1 branch .. //depot/projects/multipass/share/man/man9/lock.9#1 branch .. //depot/projects/multipass/share/man/man9/locking.9#1 branch .. //depot/projects/multipass/share/man/man9/mac.9#1 branch .. //depot/projects/multipass/share/man/man9/make_dev.9#1 branch .. //depot/projects/multipass/share/man/man9/malloc.9#1 branch .. //depot/projects/multipass/share/man/man9/mbchain.9#1 branch .. //depot/projects/multipass/share/man/man9/mbpool.9#1 branch .. //depot/projects/multipass/share/man/man9/mbuf.9#1 branch .. //depot/projects/multipass/share/man/man9/mbuf_tags.9#1 branch .. //depot/projects/multipass/share/man/man9/mdchain.9#1 branch .. //depot/projects/multipass/share/man/man9/memguard.9#1 branch .. //depot/projects/multipass/share/man/man9/mi_switch.9#1 branch .. //depot/projects/multipass/share/man/man9/microseq.9#1 branch .. //depot/projects/multipass/share/man/man9/microtime.9#1 branch .. //depot/projects/multipass/share/man/man9/microuptime.9#1 branch .. //depot/projects/multipass/share/man/man9/module.9#1 branch .. //depot/projects/multipass/share/man/man9/mtx_pool.9#1 branch .. //depot/projects/multipass/share/man/man9/mutex.9#1 branch .. //depot/projects/multipass/share/man/man9/namei.9#1 branch .. //depot/projects/multipass/share/man/man9/netisr.9#1 branch .. //depot/projects/multipass/share/man/man9/p_candebug.9#1 branch .. //depot/projects/multipass/share/man/man9/p_cansee.9#1 branch .. //depot/projects/multipass/share/man/man9/panic.9#1 branch .. //depot/projects/multipass/share/man/man9/pbuf.9#1 branch .. //depot/projects/multipass/share/man/man9/pci.9#1 branch .. //depot/projects/multipass/share/man/man9/pfil.9#1 branch .. //depot/projects/multipass/share/man/man9/pfind.9#1 branch .. //depot/projects/multipass/share/man/man9/pgfind.9#1 branch .. //depot/projects/multipass/share/man/man9/physio.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_activate.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_change_wiring.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_clear_modify.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_copy.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_enter.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_extract.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_growkernel.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_init.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_is_modified.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_is_prefaultable.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_map.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_mincore.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_object_init_pt.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_page_exists_quick.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_page_init.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_page_protect.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_pinit.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_qenter.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_release.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_remove.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_resident_count.9#1 branch .. //depot/projects/multipass/share/man/man9/pmap_zero_page.9#1 branch .. //depot/projects/multipass/share/man/man9/printf.9#1 branch .. //depot/projects/multipass/share/man/man9/prison_check.9#1 branch .. //depot/projects/multipass/share/man/man9/priv.9#1 branch .. //depot/projects/multipass/share/man/man9/pseudofs.9#1 branch .. //depot/projects/multipass/share/man/man9/psignal.9#1 branch .. //depot/projects/multipass/share/man/man9/random.9#1 branch .. //depot/projects/multipass/share/man/man9/random_harvest.9#1 branch .. //depot/projects/multipass/share/man/man9/redzone.9#1 branch .. //depot/projects/multipass/share/man/man9/refcount.9#1 branch .. //depot/projects/multipass/share/man/man9/resettodr.9#1 branch .. //depot/projects/multipass/share/man/man9/resource_int_value.9#1 branch .. //depot/projects/multipass/share/man/man9/rijndael.9#1 branch .. //depot/projects/multipass/share/man/man9/rman.9#1 branch .. //depot/projects/multipass/share/man/man9/rmlock.9#1 branch .. //depot/projects/multipass/share/man/man9/rtalloc.9#1 branch .. //depot/projects/multipass/share/man/man9/rtentry.9#1 branch .. //depot/projects/multipass/share/man/man9/runqueue.9#1 branch .. //depot/projects/multipass/share/man/man9/rwlock.9#1 branch .. //depot/projects/multipass/share/man/man9/sbuf.9#1 branch .. //depot/projects/multipass/share/man/man9/scheduler.9#1 branch .. //depot/projects/multipass/share/man/man9/securelevel_gt.9#1 branch .. //depot/projects/multipass/share/man/man9/selrecord.9#1 branch .. //depot/projects/multipass/share/man/man9/sema.9#1 branch .. //depot/projects/multipass/share/man/man9/sf_buf.9#1 branch .. //depot/projects/multipass/share/man/man9/sglist.9#1 branch .. //depot/projects/multipass/share/man/man9/signal.9#1 branch .. //depot/projects/multipass/share/man/man9/sleep.9#1 branch .. //depot/projects/multipass/share/man/man9/sleepqueue.9#1 branch .. //depot/projects/multipass/share/man/man9/socket.9#1 branch .. //depot/projects/multipass/share/man/man9/spl.9#1 branch .. //depot/projects/multipass/share/man/man9/stack.9#1 branch .. //depot/projects/multipass/share/man/man9/store.9#1 branch .. //depot/projects/multipass/share/man/man9/style.9#1 branch .. //depot/projects/multipass/share/man/man9/swi.9#1 branch .. //depot/projects/multipass/share/man/man9/sx.9#1 branch .. //depot/projects/multipass/share/man/man9/sysctl.9#1 branch .. //depot/projects/multipass/share/man/man9/sysctl_add_oid.9#1 branch .. //depot/projects/multipass/share/man/man9/sysctl_ctx_init.9#1 branch .. //depot/projects/multipass/share/man/man9/taskqueue.9#1 branch .. //depot/projects/multipass/share/man/man9/thread_exit.9#1 branch .. //depot/projects/multipass/share/man/man9/time.9#1 branch .. //depot/projects/multipass/share/man/man9/timeout.9#1 branch .. //depot/projects/multipass/share/man/man9/tvtohz.9#1 branch .. //depot/projects/multipass/share/man/man9/ucred.9#1 branch .. //depot/projects/multipass/share/man/man9/uidinfo.9#1 branch .. //depot/projects/multipass/share/man/man9/uio.9#1 branch .. //depot/projects/multipass/share/man/man9/usbdi.9#1 branch .. //depot/projects/multipass/share/man/man9/utopia.9#1 branch .. //depot/projects/multipass/share/man/man9/vaccess.9#1 branch .. //depot/projects/multipass/share/man/man9/vaccess_acl_nfs4.9#1 branch .. //depot/projects/multipass/share/man/man9/vaccess_acl_posix1e.9#1 branch .. //depot/projects/multipass/share/man/man9/vcount.9#1 branch .. //depot/projects/multipass/share/man/man9/vflush.9#1 branch .. //depot/projects/multipass/share/man/man9/vfs_busy.9#1 branch .. //depot/projects/multipass/share/man/man9/vfs_getnewfsid.9#1 branch .. //depot/projects/multipass/share/man/man9/vfs_getopt.9#1 branch .. //depot/projects/multipass/share/man/man9/vfs_getvfs.9#1 branch .. //depot/projects/multipass/share/man/man9/vfs_mount.9#1 branch .. //depot/projects/multipass/share/man/man9/vfs_mountedfrom.9#1 branch .. //depot/projects/multipass/share/man/man9/vfs_rootmountalloc.9#1 branch .. //depot/projects/multipass/share/man/man9/vfs_suser.9#1 branch .. //depot/projects/multipass/share/man/man9/vfs_timestamp.9#1 branch .. //depot/projects/multipass/share/man/man9/vfs_unbusy.9#1 branch .. //depot/projects/multipass/share/man/man9/vfs_unmountall.9#1 branch .. //depot/projects/multipass/share/man/man9/vfsconf.9#1 branch .. //depot/projects/multipass/share/man/man9/vget.9#1 branch .. //depot/projects/multipass/share/man/man9/vgone.9#1 branch .. //depot/projects/multipass/share/man/man9/vhold.9#1 branch .. //depot/projects/multipass/share/man/man9/vinvalbuf.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_fault_prefault.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_check_protection.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_clean.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_create.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_delete.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_entry_resize_free.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_find.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_findspace.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_inherit.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_init.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_insert.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_lock.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_lookup.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_madvise.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_max.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_protect.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_remove.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_simplify_entry.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_stack.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_submap.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_map_wire.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_alloc.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_bits.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_cache.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_copy.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_deactivate.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_dontneed.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_flag.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_free.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_grab.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_hold.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_insert.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_io.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_lookup.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_protect.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_rename.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_sleep_busy.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_wakeup.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_wire.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_zero_fill.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_set_page_size.9#1 branch .. //depot/projects/multipass/share/man/man9/vn_fullpath.9#1 branch .. //depot/projects/multipass/share/man/man9/vn_isdisk.9#1 branch .. //depot/projects/multipass/share/man/man9/vnode.9#1 branch .. //depot/projects/multipass/share/man/man9/vput.9#1 branch .. //depot/projects/multipass/share/man/man9/vref.9#1 branch .. //depot/projects/multipass/share/man/man9/vrefcnt.9#1 branch .. //depot/projects/multipass/share/man/man9/vrele.9#1 branch .. //depot/projects/multipass/share/man/man9/vslock.9#1 branch .. //depot/projects/multipass/share/man/man9/watchdog.9#1 branch .. //depot/projects/multipass/share/man/man9/zero_copy.9#1 branch .. //depot/projects/multipass/share/man/man9/zone.9#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Sep 29 15:01:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 628DD106568B; Tue, 29 Sep 2009 15:01:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 26782106566C for ; Tue, 29 Sep 2009 15:01:05 +0000 (UTC) (envelope-from yohanes@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 10F258FC0A for ; Tue, 29 Sep 2009 15:01:05 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TF14Ww085080 for ; Tue, 29 Sep 2009 15:01:04 GMT (envelope-from yohanes@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8TF14vv085078 for perforce@freebsd.org; Tue, 29 Sep 2009 15:01:04 GMT (envelope-from yohanes@FreeBSD.org) Date: Tue, 29 Sep 2009 15:01:04 GMT Message-Id: <200909291501.n8TF14vv085078@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to yohanes@FreeBSD.org using -f From: Yohanes Nugroho To: Perforce Change Reviews Cc: Subject: PERFORCE change 169011 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Sep 2009 15:01:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=169011 Change 169011 by yohanes@econa on 2009/09/29 15:00:27 sync latest source Affected files ... .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/str91xx/ports/MOVED#8 integrate .. //depot/projects/str91xx/src/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/str91xx/src/share/man/man4/msk.4#3 integrate .. //depot/projects/str91xx/src/share/man/man7/tuning.7#3 integrate .. //depot/projects/str91xx/src/share/zoneinfo/asia#5 integrate .. //depot/projects/str91xx/src/share/zoneinfo/southamerica#2 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/str91xx/src/sys/arm/econa/econa_machdep.c#3 edit .. //depot/projects/str91xx/src/sys/dev/alc/if_alc.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/drm/r600_blit.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/drm/radeon_cs.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/drm/radeon_drv.h#4 integrate .. //depot/projects/str91xx/src/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/mii/e1000phy.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/mii/e1000phyreg.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/str91xx/src/sys/geom/part/g_part_ebr.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_export.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/str91xx/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#3 integrate .. //depot/projects/str91xx/src/sys/sys/fcntl.h#3 integrate Differences ... ==== //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.sgml#2 (text+ko) ==== @@ -4,10 +4,10 @@ The FreeBSD Greek Documentation Project - $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.sgml,v 1.7 2009/05/15 15:49:44 manolis Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.sgml,v 1.8 2009/09/28 17:25:46 manolis Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml - %SRCID% 1.192 + %SRCID% 1.193 --> @@ -654,10 +654,10 @@ ôçí åðéëïãÞ , åðéôñÝðïíôáò Ýôóé ôçí ÷ñÞóç ôïõò üôáí äïèïýí óôï &man.gcc.1;. - options SCHED_4BSD # 4BSD scheduler + options SCHED_ULE # ULE scheduler - Ï ðáñáäïóéáêüò êáé ðñïåðéëåãìÝíïò scheduler ôïõ &os;. ÊñáôÞóôå ôçí - åðéëïãÞ áõôÞ. + Ï ðñïåðéëåãìÝíïò scheduler ôïõ &os;. ÊñáôÞóôå ôçí åðéëïãÞ + áõôÞ. options PREEMPTION # Enable kernel thread preemption ==== //depot/projects/str91xx/ports/MOVED#8 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1991 2009/09/24 20:56:23 miwi Exp $ +# $FreeBSD: ports/MOVED,v 1.1992 2009/09/28 15:40:04 nobutaka Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -4179,3 +4179,4 @@ audio/gmpc-favorites||2009-09-24|Unmaintained upstream audio/gmpc-autoplaylist||2009-09-24|Unmaintained upstream audio/gmpc-stopbutton||2009-09-24|Unmaintained upstream +mail/wanderlust-devel||2009-09-28|Port addition canceled ==== //depot/projects/str91xx/src/lib/libc/sys/fcntl.2#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)fcntl.2 8.2 (Berkeley) 1/12/94 -.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.47 2008/03/26 15:23:07 dfr Exp $ +.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.48 2009/09/28 16:59:47 delphij Exp $ .\" -.Dd March 8, 2008 +.Dd September 28, 2009 .Dt FCNTL 2 .Os .Sh NAME @@ -241,6 +241,22 @@ .Dv SA_RESTART (see .Xr sigaction 2 ) . +.It Dv F_READAHEAD +Set or clear the read ahead amount for sequential access to the third +argument, +.Fa arg , +which is rounded up to the nearest block size. +A zero value in +.Fa arg +turns off read ahead. +.It Dv F_RDAHEAD +Equivalent to Darwin counterpart which sets read ahead amount of 128KB +when the third argument, +.Fa arg +is non-zero. +A zero value in +.Fa arg +turns off read ahead. .El .Pp When a shared lock has been set on a segment of a file, ==== //depot/projects/str91xx/src/share/man/man4/msk.4#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/msk.4,v 1.9 2009/06/02 05:13:02 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/msk.4,v 1.10 2009/09/28 21:15:57 yongari Exp $ .\" -.Dd June 2, 2009 +.Dd September 28, 2009 .Dt MSK 4 .Os .Sh NAME @@ -158,6 +158,8 @@ .It D-Link 550SX Gigabit Ethernet .It +D-Link 560SX Gigabit Ethernet +.It D-Link 560T Gigabit Ethernet .It Marvell Yukon 88E8021CU Gigabit Ethernet ==== //depot/projects/str91xx/src/share/man/man7/tuning.7#3 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.81 2009/06/23 20:57:27 kib Exp $ +.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.82 2009/09/29 10:50:02 ru Exp $ .\" .Dd January 23, 2009 .Dt TUNING 7 @@ -407,22 +407,27 @@ .Va vm.overcommit sysctl defines the overcommit behaviour of the vm subsystem. The virtual memory system always does accounting of the swap space -reservation, both total for system and per-user. Corresponding values +reservation, both total for system and per-user. +Corresponding values are available through sysctl -.Va vm.swap_total, +.Va vm.swap_total , that gives the total bytes available for swapping, and -.Va vm.swap_reserved, +.Va vm.swap_reserved , that gives number of bytes that may be needed to back all currently allocated anonymous memory. .Pp Setting bit 0 of the .Va vm.overcommit sysctl causes the virtual memory system to return failure -to the process when allocation of memory causes vm.swap_reserved -to exceed vm.swap_total. -Bit 1 of the sysctl enforces RLIMIT_SWAP limit +to the process when allocation of memory causes +.Va vm.swap_reserved +to exceed +.Va vm.swap_total . +Bit 1 of the sysctl enforces +.Dv RLIMIT_SWAP +limit (see -.Xr getrlimit 2 ). +.Xr getrlimit 2 ) . Root is exempt from this limit. Bit 2 allows to count most of the physical memory as allocatable, except wired and free reserved pages ==== //depot/projects/str91xx/src/share/zoneinfo/asia#5 (text+ko) ==== @@ -1,5 +1,5 @@ # 
-# @(#)asia	8.40
+# @(#)asia	8.41
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -1674,8 +1674,15 @@
 # advance clocks in the country by one hour from April 15 to
 # conserve energy"
 
-# From Arthur David Olson (2009-04-10):
-# Assume for now that Pakistan will end DST in 2009 as it did in 2008.
+# From Steffen Thorsen (2009-09-17):
+# "The News International," Pakistan reports that: "The Federal
+# Government has decided to restore the previous time by moving the
+# clocks backward by one hour from October 1. A formal announcement to
+# this effect will be made after the Prime Minister grants approval in
+# this regard." 
+# 
+# http://www.thenews.com.pk/updates.asp?id=87168
+# 
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
@@ -1683,7 +1690,7 @@
 Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
 Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
 Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
-Rule Pakistan	2009	only	-	Nov	1	0:00	0	-
+Rule Pakistan	2009	only	-	Oct	1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:30	-	IST	1942 Sep

==== //depot/projects/str91xx/src/share/zoneinfo/southamerica#2 (text+ko) ====

@@ -1,5 +1,5 @@
 # 
-# @(#)southamerica	8.36
+# @(#)southamerica	8.37
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -397,7 +397,37 @@
 # is that "The province will most likely follow the next daylight saving schedule,
 # which is planned for the second Sunday in October."
 
+# From Alexander Krivenyshev (2009-09-19):
+# Some  Argentinian Provinces (Buenos Aires, Entre Ríos) are opposing to the
+# Daylight Saving Time for the 2009-2010 season.
+#
+# (Spanish)
+# "El cambio de huso horario en Entre Ríos deberá ser aprobado por la
+# Legislatura":
+# 
+# http://www.analisisdigital.com.ar/noticias.php?ed=1&di=0&no=110168
+# 
+# English translation - "The time zone change in Entre Rios must be approved by
+# the Legislature."
+#
+# (Spanish)
+# "Mar del Plata no quiere cambiar la hora."
+# 
+# http://www.mensajeroweb.com.ar/index.php?x=nota/33861/1/mar-del-plata-no-quiere-cambiar-la-hora
+# 
+# English translation - "Mar del Plata is not to change the time"
 #
+# or
+# (some English translation)
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_argentina07.html
+# 
+
+# From Arthur David Olson (2009-09-22):
+# "Mar del Plata no quiere cambiar la hora" translates to
+# "Mar del Plata doesn't want to change the time"
+# (less definitive than "is not to").
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
 # Buenos Aires (BA), Capital Federal (CF),

==== //depot/projects/str91xx/src/sys/amd64/amd64/pmap.c#6 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.673 2009/09/18 17:09:33 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.674 2009/09/28 17:10:27 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -442,7 +442,7 @@
 	if (ndmpdp < 4)		/* Minimum 4GB of dirmap */
 		ndmpdp = 4;
 	DMPDPphys = allocpages(firstaddr, NDMPML4E);
-	if ((amd_feature & AMDID_PAGE1GB) == 0)
+	if (TRUE || (amd_feature & AMDID_PAGE1GB) == 0)
 		DMPDphys = allocpages(firstaddr, ndmpdp);
 	dmaplimit = (vm_paddr_t)ndmpdp << PDPSHIFT;
 
@@ -476,7 +476,7 @@
 
 	/* Now set up the direct map space using either 2MB or 1GB pages */
 	/* Preset PG_M and PG_A because demotion expects it */
-	if ((amd_feature & AMDID_PAGE1GB) == 0) {
+	if (TRUE || (amd_feature & AMDID_PAGE1GB) == 0) {
 		for (i = 0; i < NPDEPG * ndmpdp; i++) {
 			((pd_entry_t *)DMPDphys)[i] = (vm_paddr_t)i << PDRSHIFT;
 			((pd_entry_t *)DMPDphys)[i] |= PG_RW | PG_V | PG_PS |

==== //depot/projects/str91xx/src/sys/arm/econa/econa_machdep.c#3 (text+ko) ====

@@ -201,7 +201,7 @@
 	boot_arg1 = arg;
 	boot_arg2 = arg2;
 	boothowto = RB_VERBOSE;
-	boothowto |=  RB_SINGLE;
+	//boothowto |=  RB_SINGLE;
 
 	set_cpufuncs();
 	lastaddr = fake_preload_metadata();

==== //depot/projects/str91xx/src/sys/dev/alc/if_alc.c#3 (text+ko) ====

@@ -28,7 +28,7 @@
 /* Driver for Atheros AR8131/AR8132 PCIe Ethernet. */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/alc/if_alc.c,v 1.4 2009/08/24 20:37:15 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/alc/if_alc.c,v 1.5 2009/09/28 22:18:38 yongari Exp $");
 
 #include 
 #include 
@@ -234,6 +234,16 @@
 	if (phy != sc->alc_phyaddr)
 		return (0);
 
+	/*
+	 * For AR8132 fast ethernet controller, do not report 1000baseT
+	 * capability to mii(4). Even though AR8132 uses the same
+	 * model/revision number of F1 gigabit PHY, the PHY has no
+	 * ability to establish 1000baseT link.
+	 */
+	if ((sc->alc_flags & ALC_FLAG_FASTETHER) != 0 &&
+	    reg == MII_EXTSR)
+		return (0);
+
 	CSR_WRITE_4(sc, ALC_MDIO, MDIO_OP_EXECUTE | MDIO_OP_READ |
 	    MDIO_SUP_PREAMBLE | MDIO_CLK_25_4 | MDIO_REG_ADDR(reg));
 	for (i = ALC_PHY_TIMEOUT; i > 0; i--) {

==== //depot/projects/str91xx/src/sys/dev/drm/r600_blit.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/drm/r600_blit.c,v 1.2 2009/09/13 11:10:38 rnoland Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/drm/r600_blit.c,v 1.3 2009/09/28 22:38:44 rnoland Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
@@ -1876,7 +1876,7 @@
 
 			/* dst */
 			set_render_target(dev_priv, COLOR_8_8_8_8,
-					  dst_x + cur_size, h,
+					  (dst_x + cur_size) / 4, h,
 					  dst_gpu_addr);
 
 			/* scissors */

==== //depot/projects/str91xx/src/sys/dev/drm/radeon_cs.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_cs.c,v 1.1 2009/08/23 14:55:57 rnoland Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_cs.c,v 1.2 2009/09/28 22:41:28 rnoland Exp $");
 #include "dev/drm/drmP.h"
 #include "dev/drm/radeon_drm.h"
 #include "dev/drm/radeon_drv.h"
@@ -403,8 +403,8 @@
 			DRM_ERROR("bad DRAW_INDEX\n");
 			break;
 		}
-		ib_chunk->kdata[offset_dw + 1] = (offset & 0xffffffff);
-		ib_chunk->kdata[offset_dw + 2] = (upper_32_bits(offset) & 0xff);
+		ib_chunk->kdata[offset_dw + 1] += (offset & 0xffffffff);
+		ib_chunk->kdata[offset_dw + 2] += (upper_32_bits(offset) & 0xff);
 		break;
 	case R600_IT_DRAW_INDEX_AUTO:
 		//DRM_INFO("R600_IT_DRAW_INDEX_AUTO\n");
@@ -433,8 +433,8 @@
 				DRM_ERROR("bad WAIT_REG_MEM\n");
 				break;
 			}
-			ib_chunk->kdata[offset_dw + 2] = (offset & 0xffffffff);
-			ib_chunk->kdata[offset_dw + 3] = (upper_32_bits(offset) & 0xff);
+			ib_chunk->kdata[offset_dw + 2] += (offset & 0xffffffff);
+			ib_chunk->kdata[offset_dw + 3] += (upper_32_bits(offset) & 0xff);
 		}
 		if (ret)
 			DRM_ERROR("bad WAIT_REG_MEM\n");
@@ -469,7 +469,7 @@
 				break;
 			}
 			ib_chunk->kdata[offset_dw + 2] += (offset & 0xffffffff);
-			ib_chunk->kdata[offset_dw + 3] |= (upper_32_bits(offset) & 0xff);
+			ib_chunk->kdata[offset_dw + 3] += (upper_32_bits(offset) & 0xff);
 		}
 		if (ret)
 			DRM_ERROR("bad EVENT_WRITE\n");
@@ -488,7 +488,7 @@
 			break;
 		}
 		ib_chunk->kdata[offset_dw + 2] += (offset & 0xffffffff);
-		ib_chunk->kdata[offset_dw + 3] |= (upper_32_bits(offset) & 0xff);
+		ib_chunk->kdata[offset_dw + 3] += (upper_32_bits(offset) & 0xff);
 		break;
 	case R600_IT_SET_CONFIG_REG:
 		//DRM_INFO("R600_IT_SET_CONFIG_REG\n");
@@ -628,7 +628,7 @@
 					if (ret)
 						break;
 					ib_chunk->kdata[offset_dw + (i * 7) + 0 + 2] += (offset & 0xffffffff);
-					ib_chunk->kdata[offset_dw + (i * 7) + 2 + 2] |= (upper_32_bits(offset) & 0xff);
+					ib_chunk->kdata[offset_dw + (i * 7) + 2 + 2] += (upper_32_bits(offset) & 0xff);
 					break;
 				}
 				if (ret)

==== //depot/projects/str91xx/src/sys/dev/drm/radeon_drv.h#4 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_drv.h,v 1.26 2009/08/23 15:02:58 rnoland Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_drv.h,v 1.27 2009/09/28 22:40:29 rnoland Exp $");
 
 #ifndef __RADEON_DRV_H__
 #define __RADEON_DRV_H__
@@ -143,15 +143,15 @@
 	CHIP_R600,
 	CHIP_RV610,
 	CHIP_RV630,
+	CHIP_RV670,
 	CHIP_RV620,
 	CHIP_RV635,
-	CHIP_RV670,
 	CHIP_RS780,
 	CHIP_RS880,
 	CHIP_RV770,
-	CHIP_RV740,
 	CHIP_RV730,
 	CHIP_RV710,
+	CHIP_RV740,
 	CHIP_LAST,
 };
 

==== //depot/projects/str91xx/src/sys/dev/drm/radeon_irq.c#3 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_irq.c,v 1.15 2009/06/25 16:17:07 rnoland Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_irq.c,v 1.16 2009/09/28 22:37:07 rnoland Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
@@ -194,6 +194,9 @@
 	u32 r500_disp_int;
 	u32 tmp;
 
+	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+		return IRQ_NONE;
+
 	/* Only consider the bits we're interested in - others could be used
 	 * outside the DRM
 	 */
@@ -323,6 +326,9 @@
 	drm_radeon_irq_emit_t *emit = data;
 	int result;
 
+	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+		return -EINVAL;
+
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
 	if (!dev_priv) {
@@ -363,6 +369,9 @@
 	    (drm_radeon_private_t *) dev->dev_private;
 	u32 dummy;
 
+	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+		return;
+
 	/* Disable *all* interrupts */
 	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600)
 		RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
@@ -380,6 +389,9 @@
 	atomic_set(&dev_priv->swi_emitted, 0);
 	DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
 
+	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+		return 0;
+
 	radeon_irq_set_state(dev, RADEON_SW_INT_ENABLE, 1);
 
 	return 0;
@@ -394,6 +406,9 @@
 
 	dev_priv->irq_enabled = 0;
 
+	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+		return;
+
 	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600)
 		RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
 	/* Disable *all* interrupts */

==== //depot/projects/str91xx/src/sys/dev/drm/radeon_state.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_state.c,v 1.26 2009/08/23 15:02:58 rnoland Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_state.c,v 1.27 2009/09/28 22:37:07 rnoland Exp $");
 
 #include "dev/drm/drmP.h"
 #include "dev/drm/drm.h"
@@ -3024,7 +3024,10 @@
 		value = GET_SCRATCH(dev_priv, 2);
 		break;
 	case RADEON_PARAM_IRQ_NR:
-		value = dev->irq;
+		if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+			value = 0;
+		else
+			value = dev->irq;
 		break;
 	case RADEON_PARAM_GART_BASE:
 		value = dev_priv->gart_vm_start;

==== //depot/projects/str91xx/src/sys/dev/fxp/if_fxp.c#5 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.297 2009/09/08 13:19:05 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.298 2009/09/28 19:40:16 yongari Exp $");
 
 /*
  * Intel EtherExpress Pro/100B PCI Fast Ethernet driver
@@ -631,8 +631,11 @@
 	}
 
 	/* For 82559 or later chips, Rx checksum offload is supported. */
-	if (sc->revision >= FXP_REV_82559_A0)
-		sc->flags |= FXP_FLAG_82559_RXCSUM;
+	if (sc->revision >= FXP_REV_82559_A0) {
+		/* 82559ER does not support Rx checksum offloading. */
+		if (sc->ident->devid != 0x1209)
+			sc->flags |= FXP_FLAG_82559_RXCSUM;
+	}
 	/*
 	 * Enable use of extended RFDs and TCBs for 82550
 	 * and later chips. Note: we need extended TXCB support

==== //depot/projects/str91xx/src/sys/dev/jme/if_jme.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/jme/if_jme.c,v 1.11 2009/06/26 11:45:06 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/jme/if_jme.c,v 1.12 2009/09/28 19:33:52 yongari Exp $");
 
 #include 
 #include 
@@ -306,6 +306,10 @@
 
 	sc = ifp->if_softc;
 	JME_LOCK(sc);
+	if ((ifp->if_flags & IFF_UP) == 0) {
+		JME_UNLOCK(sc);
+		return;
+	}
 	mii = device_get_softc(sc->jme_miibus);
 
 	mii_pollstat(mii);
@@ -1585,8 +1589,10 @@
 		    pmc + PCIR_POWER_STATUS, pmstat, 2);
 	}
 	ifp = sc->jme_ifp;
-	if ((ifp->if_flags & IFF_UP) != 0)
+	if ((ifp->if_flags & IFF_UP) != 0) {
+		ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 		jme_init_locked(sc);
+	}
 
 	JME_UNLOCK(sc);
 
@@ -1861,6 +1867,7 @@
 	if ((sc->jme_flags & JME_FLAG_LINK) == 0) {
 		if_printf(sc->jme_ifp, "watchdog timeout (missed link)\n");
 		ifp->if_oerrors++;
+		ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 		jme_init_locked(sc);
 		return;
 	}
@@ -1875,6 +1882,7 @@
 
 	if_printf(sc->jme_ifp, "watchdog timeout\n");
 	ifp->if_oerrors++;
+	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	jme_init_locked(sc);
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 		taskqueue_enqueue(sc->jme_tq, &sc->jme_tx_task);
@@ -1917,8 +1925,10 @@
 				VLAN_CAPABILITIES(ifp);
 			}
 			ifp->if_mtu = ifr->ifr_mtu;
-			if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
+			if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) {
+				ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 				jme_init_locked(sc);
+			}
 			JME_UNLOCK(sc);
 		}
 		break;
@@ -2642,6 +2652,8 @@
 	ifp = sc->jme_ifp;
 	mii = device_get_softc(sc->jme_miibus);
 
+	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
+		return;
 	/*
 	 * Cancel any pending I/O.
 	 */

==== //depot/projects/str91xx/src/sys/dev/mii/e1000phy.c#4 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/mii/e1000phy.c,v 1.31 2009/08/18 20:20:15 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/e1000phy.c,v 1.34 2009/09/28 21:03:28 yongari Exp $");
 
 /*
  * driver for the Marvell 88E1000 series external 1000/100/10-BT PHY.
@@ -59,6 +59,9 @@
 #include "miidevs.h"
 
 #include 
+/* XXX */
+#include 
+#include 
 
 #include "miibus_if.h"
 
@@ -68,6 +71,7 @@
 struct e1000phy_softc {
 	struct mii_softc mii_sc;
 	int mii_model;
+	struct msk_mii_data *mmd;
 };
 
 static device_method_t e1000phy_methods[] = {
@@ -130,6 +134,7 @@
 	struct mii_softc *sc;
 	struct mii_attach_args *ma;
 	struct mii_data *mii;
+	struct ifnet *ifp;
 
 	esc = device_get_softc(dev);
 	sc = &esc->mii_sc;
@@ -145,6 +150,16 @@
 	mii->mii_instance++;
 
 	esc->mii_model = MII_MODEL(ma->mii_id2);
+	ifp = sc->mii_pdata->mii_ifp;
+	if (strcmp(ifp->if_dname, "msk") == 0) {
+		/* XXX */
+		esc->mmd = device_get_ivars(
+		    device_get_parent(device_get_parent(dev)));
+		if (esc->mmd != NULL &&
+		    (esc->mmd->mii_flags & MIIF_HAVEFIBER) != 0)
+			sc->mii_flags |= MIIF_HAVEFIBER;
+	}
+
 	switch (esc->mii_model) {
 	case MII_MODEL_MARVELL_E1011:
 	case MII_MODEL_MARVELL_E1112:
@@ -199,6 +214,13 @@
 			reg &= ~E1000_SCR_MODE_MASK;
 			reg |= E1000_SCR_MODE_1000BX;
 			PHY_WRITE(sc, E1000_SCR, reg);
+			if (esc->mmd != NULL && esc->mmd->pmd == 'P') {
+				/* Set SIGDET polarity low for SFP module. */
+				PHY_WRITE(sc, E1000_EADR, 1);
+				reg = PHY_READ(sc, E1000_SCR);
+				reg |= E1000_SCR_FIB_SIGDET_POLARITY;
+				PHY_WRITE(sc, E1000_SCR, reg);
+			}
 			PHY_WRITE(sc, E1000_EADR, page);
 		}
 	} else {
@@ -248,7 +270,7 @@
 		}
 	}
 
-	switch (MII_MODEL(esc->mii_model)) {
+	switch (esc->mii_model) {
 	case MII_MODEL_MARVELL_E3082:
 	case MII_MODEL_MARVELL_E1112:
 	case MII_MODEL_MARVELL_E1118:
@@ -485,8 +507,11 @@
 			return;
 		}
 	} else {
-		if (ssr & E1000_SSR_1000MBS)
-			mii->mii_media_active |= IFM_1000_SX;
+		/*
+		 * Some fiber PHY(88E1112) does not seem to set resolved
+		 * speed so always assume we've got IFM_1000_SX.
+		 */
+		mii->mii_media_active |= IFM_1000_SX;
 	}
 
 	if (ssr & E1000_SSR_DUPLEX)

==== //depot/projects/str91xx/src/sys/dev/mii/e1000phyreg.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/mii/e1000phyreg.h,v 1.7 2009/06/02 00:30:30 yongari Exp $ */
+/* $FreeBSD: src/sys/dev/mii/e1000phyreg.h,v 1.8 2009/09/28 21:03:28 yongari Exp $ */
 /*-
  * Principal Author: Parag Patel
  * Copyright (c) 2001
@@ -248,6 +248,11 @@
 
 #define E1000_SCR_EN_DETECT_MASK	0x0300
 
+/* 88E1112 page 1 fiber specific control */
+#define E1000_SCR_FIB_TX_DIS		0x0008
+#define E1000_SCR_FIB_SIGDET_POLARITY	0x0200
+#define E1000_SCR_FIB_FORCE_LINK	0x0400
+
 /* 88E1112 page 2 */
 #define E1000_SCR_MODE_MASK		0x0380
 #define E1000_SCR_MODE_AUTO		0x0180

==== //depot/projects/str91xx/src/sys/dev/msk/if_msk.c#4 (text+ko) ====

@@ -99,7 +99,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/msk/if_msk.c,v 1.66 2009/09/08 13:19:05 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/msk/if_msk.c,v 1.70 2009/09/28 21:11:31 yongari Exp $");
 
 #include 
 #include 
@@ -223,6 +223,8 @@
 	    "Marvell Yukon 88E8072 Gigabit Ethernet" },
 	{ VENDORID_DLINK, DEVICEID_DLINK_DGE550SX,
 	    "D-Link 550SX Gigabit Ethernet" },
+	{ VENDORID_DLINK, DEVICEID_DLINK_DGE560SX,
+	    "D-Link 560SX Gigabit Ethernet" },
 	{ VENDORID_DLINK, DEVICEID_DLINK_DGE560T,
 	    "D-Link 560T Gigabit Ethernet" }
 };
@@ -1445,6 +1447,7 @@
 	struct msk_softc *sc;
 	struct msk_if_softc *sc_if;
 	struct ifnet *ifp;
+	struct msk_mii_data *mmd;
 	int i, port, error;
 	uint8_t eaddr[6];
 
@@ -1454,7 +1457,8 @@
 	error = 0;
 	sc_if = device_get_softc(dev);
 	sc = device_get_softc(device_get_parent(dev));
-	port = *(int *)device_get_ivars(dev);
+	mmd = device_get_ivars(dev);
+	port = mmd->port;
 
 	sc_if->msk_if_dev = dev;
 	sc_if->msk_port = port;
@@ -1600,7 +1604,8 @@
 mskc_attach(device_t dev)
 {
 	struct msk_softc *sc;
-	int error, msic, msir, *port, reg;
+	struct msk_mii_data *mmd;
+	int error, msic, msir, reg;
 
 	sc = device_get_softc(dev);
 	sc->msk_dev = dev;
@@ -1669,10 +1674,6 @@
 	CSR_WRITE_2(sc, B0_CTST, CS_RST_SET);
 	CSR_WRITE_2(sc, B0_CTST, CS_RST_CLR);
 	sc->msk_pmd = CSR_READ_1(sc, B2_PMD_TYP);
-	 if (sc->msk_pmd == 'L' || sc->msk_pmd == 'S')
-		 sc->msk_coppertype = 0;
-	 else
-		 sc->msk_coppertype = 1;
 	/* Check number of MACs. */
 	sc->msk_num_port = 1;
 	if ((CSR_READ_1(sc, B2_Y2_HW_RES) & CFG_DUAL_MAC_MSK) ==
@@ -1812,15 +1813,18 @@
 		error = ENXIO;
 		goto fail;
 	}
-	port = malloc(sizeof(int), M_DEVBUF, M_WAITOK);
-	if (port == NULL) {
+	mmd = malloc(sizeof(struct msk_mii_data), M_DEVBUF, M_WAITOK | M_ZERO);
+	if (mmd == NULL) {
 		device_printf(dev, "failed to allocate memory for "
 		    "ivars of PORT_A\n");
 		error = ENXIO;
 		goto fail;
 	}
-	*port = MSK_PORT_A;
-	device_set_ivars(sc->msk_devs[MSK_PORT_A], port);
+	mmd->port = MSK_PORT_A;
+	mmd->pmd = sc->msk_pmd;
+	 if (sc->msk_pmd == 'L' || sc->msk_pmd == 'S' || sc->msk_pmd == 'P')
+		mmd->mii_flags |= MIIF_HAVEFIBER;
+	device_set_ivars(sc->msk_devs[MSK_PORT_A], mmd);
 
 	if (sc->msk_num_port > 1) {
 		sc->msk_devs[MSK_PORT_B] = device_add_child(dev, "msk", -1);
@@ -1829,15 +1833,18 @@
 			error = ENXIO;
 			goto fail;
 		}
-		port = malloc(sizeof(int), M_DEVBUF, M_WAITOK);
-		if (port == NULL) {
+		mmd = malloc(sizeof(struct msk_mii_data), M_DEVBUF, M_WAITOK | M_ZERO);
+		if (mmd == NULL) {
 			device_printf(dev, "failed to allocate memory for "
 			    "ivars of PORT_B\n");
 			error = ENXIO;
 			goto fail;
 		}
-		*port = MSK_PORT_B;
-		device_set_ivars(sc->msk_devs[MSK_PORT_B], port);
+		mmd->port = MSK_PORT_B;
+		mmd->pmd = sc->msk_pmd;
+	 	if (sc->msk_pmd == 'L' || sc->msk_pmd == 'S' || sc->msk_pmd == 'P')
+			mmd->mii_flags |= MIIF_HAVEFIBER;
+		device_set_ivars(sc->msk_devs[MSK_PORT_B], mmd);
 	}
 
 	error = bus_generic_attach(dev);
@@ -3794,9 +3801,14 @@
 	/* Set receive filter. */
 	msk_rxfilter(sc_if);
 
-	/* Flush Rx MAC FIFO on any flow control or error. */
-	CSR_WRITE_4(sc, MR_ADDR(sc_if->msk_port, RX_GMF_FL_MSK),
-	    GMR_FS_ANY_ERR);
+	if (sc->msk_hw_id == CHIP_ID_YUKON_XL) {
+		/* Clear flush mask - HW bug. */
+		CSR_WRITE_4(sc, MR_ADDR(sc_if->msk_port, RX_GMF_FL_MSK), 0);
+	} else {
+		/* Flush Rx MAC FIFO on any flow control or error. */
+		CSR_WRITE_4(sc, MR_ADDR(sc_if->msk_port, RX_GMF_FL_MSK),
+		    GMR_FS_ANY_ERR);
+	}
 
 	/*
 	 * Set Rx FIFO flush threshold to 64 bytes + 1 FIFO word
@@ -4188,7 +4200,7 @@
 	gmac = GMAC_READ_2(sc, sc_if->msk_port, GM_PHY_ADDR);
 	GMAC_WRITE_2(sc, sc_if->msk_port, GM_PHY_ADDR, gmac | GM_PAR_MIB_CLR);
 	/* Read all MIB Counters with Clear Mode set. */
-	for (i = GM_RXF_UC_OK; i <= GM_TXE_FIFO_UR; i++)
+	for (i = GM_RXF_UC_OK; i <= GM_TXE_FIFO_UR; i += sizeof(uint32_t))
 		reg = MSK_READ_MIB32(sc_if->msk_port, i);
 	/* Clear MIB Clear Counter Mode. */
 	gmac &= ~GM_PAR_MIB_CLR;

==== //depot/projects/str91xx/src/sys/dev/msk/if_mskreg.h#3 (text+ko) ====

@@ -93,7 +93,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*$FreeBSD: src/sys/dev/msk/if_mskreg.h,v 1.27 2009/06/02 05:08:57 yongari Exp $*/
+/*$FreeBSD: src/sys/dev/msk/if_mskreg.h,v 1.29 2009/09/28 21:11:31 yongari Exp $*/
 
 /*
  * SysKonnect PCI vendor ID
@@ -148,6 +148,7 @@
  * D-Link gigabit ethernet device ID
  */
 #define DEVICEID_DLINK_DGE550SX	0x4001
+#define DEVICEID_DLINK_DGE560SX	0x4002
 #define DEVICEID_DLINK_DGE560T	0x4b00
 
 #define BIT_31		(1 << 31)
@@ -2403,6 +2404,12 @@
 #define	MSK_TX_TIMEOUT		5
 #define	MSK_PUT_WM	10
 
+struct msk_mii_data {
+	int		port;
+	uint32_t	pmd;
+	int		mii_flags;
+};
+
 /* Forward decl. */
 struct msk_if_softc;
 
@@ -2466,7 +2473,6 @@
 	uint8_t			msk_num_port;
 	int			msk_ramsize;	/* amount of SRAM on NIC */
 	uint32_t		msk_pmd;	/* physical media type */
-	uint32_t		msk_coppertype;
 	uint32_t		msk_intrmask;
 	uint32_t		msk_intrhwemask;
 	uint32_t		msk_pflags;

==== //depot/projects/str91xx/src/sys/dev/sound/pci/hda/hda_reg.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/sound/pci/hda/hda_reg.h,v 1.3 2008/09/13 16:56:03 mav Exp $
+ * $FreeBSD: src/sys/dev/sound/pci/hda/hda_reg.h,v 1.4 2009/09/29 09:36:38 mav Exp $
  */
 
 #ifndef _HDA_REG_H_
@@ -660,13 +660,49 @@
 #define HDA_CMD_VERB_GET_STRIPE_CONTROL			0xf24
 #define HDA_CMD_VERB_SET_STRIPE_CONTROL			0x724
 
-#define HDA_CMD_SET_STRIPE_CONTROL(cad, nid)				\
+#define HDA_CMD_GET_STRIPE_CONTROL(cad, nid)				\
     (HDA_CMD_12BIT((cad), (nid),					\
     HDA_CMD_VERB_GET_STRIPE_CONTROL, 0x0))
-#define HDA_CMD_GET_STRIPE_CONTROL(cad, nid, payload)			\
+#define HDA_CMD_SET_STRIPE_CONTROL(cad, nid, payload)			\
     (HDA_CMD_12BIT((cad), (nid),					\
     HDA_CMD_VERB_SET_STRIPE_CONTROL, (payload)))
 
+/* Channel Count Control */
+#define HDA_CMD_VERB_GET_CONV_CHAN_COUNT			0xf2d
+#define HDA_CMD_VERB_SET_CONV_CHAN_COUNT			0x72d 
+
+#define HDA_CMD_GET_CONV_CHAN_COUNT(cad, nid)				\
+    (HDA_CMD_12BIT((cad), (nid),					\
+    HDA_CMD_VERB_GET_CONV_CHAN_COUNT, 0x0))
+#define HDA_CMD_SET_CONV_CHAN_COUNT(cad, nid, payload)			\
+    (HDA_CMD_12BIT((cad), (nid),					\
+    HDA_CMD_VERB_SET_CONV_CHAN_COUNT, (payload)))
+
+#define HDA_CMD_VERB_GET_HDMI_DIP_SIZE			0xf2e 
+#define HDA_CMD_VERB_GET_HDMI_ELDD			0xf2f 
+
+#define HDA_CMD_VERB_GET_HDMI_DIP_INDEX			0xf30 
+#define HDA_CMD_VERB_SET_HDMI_DIP_INDEX			0x730 
+
+#define HDA_CMD_VERB_GET_HDMI_DIP_DATA			0xf31 
+#define HDA_CMD_VERB_SET_HDMI_DIP_DATA			0x731 
+
+#define HDA_CMD_VERB_GET_HDMI_DIP_XMIT			0xf32 
+#define HDA_CMD_VERB_SET_HDMI_DIP_XMIT			0x732 
+
+#define HDA_CMD_VERB_GET_HDMI_CP_CTRL			0xf33 
+#define HDA_CMD_VERB_SET_HDMI_CP_CTRL			0x733 
+
+#define HDA_CMD_VERB_GET_HDMI_CHAN_SLOT			0xf34 
+#define HDA_CMD_VERB_SET_HDMI_CHAN_SLOT			0x734 
+
+#define HDA_CMD_GET_HDMI_CHAN_SLOT(cad, nid)				\
+    (HDA_CMD_12BIT((cad), (nid),					\
+    HDA_CMD_VERB_GET_HDMI_CHAN_SLOT, 0x0))
+#define HDA_CMD_SET_HDMI_CHAN_SLOT(cad, nid, payload)			\
+    (HDA_CMD_12BIT((cad), (nid),					\
+    HDA_CMD_VERB_SET_HDMI_CHAN_SLOT, (payload)))
+
 /* Function Reset */
 #define HDA_CMD_VERB_FUNCTION_RESET			0x7ff
 
@@ -779,6 +815,10 @@
 #define HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_SHIFT		20
 #define HDA_PARAM_AUDIO_WIDGET_CAP_DELAY_MASK		0x000f0000
 #define HDA_PARAM_AUDIO_WIDGET_CAP_DELAY_SHIFT		16

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Sep 29 15:22:28 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C0F031065679; Tue, 29 Sep 2009 15:22:28 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 843E31065670
	for ; Tue, 29 Sep 2009 15:22:28 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 70E398FC1A
	for ; Tue, 29 Sep 2009 15:22:28 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TFMSUl087701
	for ; Tue, 29 Sep 2009 15:22:28 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8TFMSMD087699
	for perforce@freebsd.org; Tue, 29 Sep 2009 15:22:28 GMT
	(envelope-from stas@freebsd.org)
Date: Tue, 29 Sep 2009 15:22:28 GMT
Message-Id: <200909291522.n8TFMSMD087699@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169013 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 29 Sep 2009 15:22:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=169013

Change 169013 by stas@stas_yandex on 2009/09/29 15:22:00

	- Fix 32 bit on amd64 operation.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_ume/elf.c#4 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_ume/elf.c#4 (text+ko) ====

@@ -400,6 +400,15 @@
          VG_(pread)(fd, buf, ph->p_filesz, ph->p_offset);
          buf[ph->p_filesz] = '\0';
 
+#if defined(VGP_x86_freebsd)
+         sres._isError = True;
+         /* Hack.  FreeBSD's kernel overloads the interpreter name. */
+         if (VG_(strcmp)(buf, "/libexec/ld-elf.so.1") == 0 ||
+             VG_(strcmp)(buf, "/usr/libexec/ld-elf.so.1") == 0) {
+            sres = VG_(open)("/libexec/ld-elf32.so.1", VKI_O_RDONLY, 0);
+         }
+         if (sr_isError(sres))
+#endif
          sres = VG_(open)(buf, VKI_O_RDONLY, 0);
          if (sr_isError(sres)) {
             VG_(printf)("valgrind: m_ume.c: can't open interpreter\n");

From owner-p4-projects@FreeBSD.ORG  Tue Sep 29 16:38:52 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B2129106568D; Tue, 29 Sep 2009 16:38:52 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 74AE01065670
	for ; Tue, 29 Sep 2009 16:38:52 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 623618FC2F
	for ; Tue, 29 Sep 2009 16:38:52 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TGcquU094179
	for ; Tue, 29 Sep 2009 16:38:52 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8TGcqb4094177
	for perforce@freebsd.org; Tue, 29 Sep 2009 16:38:52 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 29 Sep 2009 16:38:52 GMT
Message-Id: <200909291638.n8TGcqb4094177@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 
Cc: 
Subject: PERFORCE change 169016 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 29 Sep 2009 16:38:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=169016

Change 169016 by jhb@jhb_jhbbsd on 2009/09/29 16:38:28

	Add a new concept for "reserved" resources to resource lists.
	Reserved resources are used by bus drivers to always allocate the
	resources associated with a device when the device is added and
	later handoff that resource to the driver if it requests it.  This
	is needed for devices that have resources that a driver may not
	use, or resources that are active even if a driver hasn't allocated
	them such as PCI BARs or the resources assigned to ACPI or PnPBIOS
	devices.
	
	To use this, the bus should reserve the resources when adding the
	child using resource_list_reserve().  This allocates the I/O
	resources from the parent bus and leaves the resource in the
	resource list entry.  resource_list_alloc() and
	resource_list_release() still work for bus_alloc_resource() and
	bus_release_resource().  However, for reserved resources they
	simply let the driver use the reserved resource rather than
	allocating a new one.  If a bus wants to release a reserved
	resource, it uses resource_list_unreserve() (could possibly
	use a better name).
	
	Change the pci(4) bus to use the new reserved resources support
	instead of the old tricks with rman_set_device().

Affected files ...

.. //depot/projects/multipass/sys/dev/pci/pci.c#7 edit
.. //depot/projects/multipass/sys/kern/subr_bus.c#8 edit
.. //depot/projects/multipass/sys/sys/bus.h#5 edit

Differences ...

==== //depot/projects/multipass/sys/dev/pci/pci.c#7 (text+ko) ====

@@ -2461,7 +2461,7 @@
 	 * driver for this device will later inherit this resource in
 	 * pci_alloc_resource().
 	 */
-	res = resource_list_alloc(rl, bus, dev, type, ®, start, end, count,
+	res = resource_list_reserve(rl, bus, dev, type, ®, start, end, count,
 	    prefetch ? RF_PREFETCHABLE : 0);
 	if (res == NULL) {
 		/*
@@ -2472,10 +2472,8 @@
 		 */
 		resource_list_delete(rl, type, reg);
 		start = 0;
-	} else {
+	} else
 		start = rman_get_start(res);
-		rman_set_device(res, bus);
-	}
 	pci_write_bar(dev, reg, start);
 	return (barlen);
 }
@@ -2514,14 +2512,12 @@
 	} else {
 		rid = PCIR_BAR(0);
 		resource_list_add(rl, type, rid, 0x1f0, 0x1f7, 8);
-		r = resource_list_alloc(rl, bus, dev, type, &rid, 0x1f0, 0x1f7,
-		    8, 0);
-		rman_set_device(r, bus);
+		r = resource_list_reserve(rl, bus, dev, type, &rid, 0x1f0,
+		    0x1f7, 8, 0);
 		rid = PCIR_BAR(1);
 		resource_list_add(rl, type, rid, 0x3f6, 0x3f6, 1);
-		r = resource_list_alloc(rl, bus, dev, type, &rid, 0x3f6, 0x3f6,
-		    1, 0);
-		rman_set_device(r, bus);
+		r = resource_list_reserve(rl, bus, dev, type, &rid, 0x3f6,
+		    0x3f6, 1, 0);
 	}
 	if (progif & PCIP_STORAGE_IDE_MODESEC) {
 		pci_add_map(bus, dev, PCIR_BAR(2), rl, force,
@@ -2531,14 +2527,12 @@
 	} else {
 		rid = PCIR_BAR(2);
 		resource_list_add(rl, type, rid, 0x170, 0x177, 8);
-		r = resource_list_alloc(rl, bus, dev, type, &rid, 0x170, 0x177,
-		    8, 0);
-		rman_set_device(r, bus);
+		r = resource_list_reserve(rl, bus, dev, type, &rid, 0x170,
+		    0x177, 8, 0);
 		rid = PCIR_BAR(3);
 		resource_list_add(rl, type, rid, 0x376, 0x376, 1);
-		r = resource_list_alloc(rl, bus, dev, type, &rid, 0x376, 0x376,
-		    1, 0);
-		rman_set_device(r, bus);
+		r = resource_list_reserve(rl, bus, dev, type, &rid, 0x376,
+		    0x376, 1, 0);
 	}
 	pci_add_map(bus, dev, PCIR_BAR(4), rl, force,
 	    prefetchmask & (1 << 4));
@@ -3447,7 +3441,7 @@
 #endif /* DDB */
 
 static struct resource *
-pci_alloc_map(device_t dev, device_t child, int type, int *rid,
+pci_reserve_map(device_t dev, device_t child, int type, int *rid,
     u_long start, u_long end, u_long count, u_int flags)
 {
 	struct pci_devinfo *dinfo = device_get_ivars(child);
@@ -3517,15 +3511,15 @@
 		    count, *rid, type, start, end);
 		goto out;
 	}
-	rman_set_device(res, dev);
 	resource_list_add(rl, type, *rid, start, end, count);
 	rle = resource_list_find(rl, type, *rid);
 	if (rle == NULL)
-		panic("pci_alloc_map: unexpectedly can't find resource.");
+		panic("pci_reserve_map: unexpectedly can't find resource.");
 	rle->res = res;
 	rle->start = rman_get_start(res);
 	rle->end = rman_get_end(res);
 	rle->count = count;
+	rle->flags = RLE_RESERVED;
 	if (bootverbose)
 		device_printf(child,
 		    "Lazy allocation of %#lx bytes rid %#x type %d at %#lx\n",
@@ -3575,35 +3569,14 @@
 		break;
 	case SYS_RES_IOPORT:
 	case SYS_RES_MEMORY:
-		/* Allocate resources for this BAR if needed. */
+		/* Reserve resources for this BAR if needed. */
 		rle = resource_list_find(rl, type, *rid);
 		if (rle == NULL) {
-			res = pci_alloc_map(dev, child, type, rid, start, end,
+			res = pci_reserve_map(dev, child, type, rid, start, end,
 			    count, flags);
 			if (res == NULL)
 				return (NULL);
-			rle = resource_list_find(rl, type, *rid);
 		}
-
-		/*
-		 * If the resource belongs to the bus, then give it to
-		 * the child.  We need to activate it if requested
-		 * since the bus always allocates inactive resources.
-		 */
-		if (rle != NULL && rle->res != NULL &&
-		    rman_get_device(rle->res) == dev) {
-			if (bootverbose)
-				device_printf(child,
-			    "Reserved %#lx bytes for rid %#x type %d at %#lx\n",
-				    rman_get_size(rle->res), *rid, type,
-				    rman_get_start(rle->res));
-			rman_set_device(rle->res, child);
-			if ((flags & RF_ACTIVE) &&
-			    bus_activate_resource(child, type, *rid,
-			    rle->res) != 0)
-				return (NULL);
-			return (rle->res);
-		}
 	}
 	return (resource_list_alloc(rl, dev, child, type, rid,
 	    start, end, count, flags));
@@ -3613,7 +3586,6 @@
 pci_release_resource(device_t dev, device_t child, int type, int rid,
     struct resource *r)
 {
-	int error;
 
 	if (device_get_parent(child) != dev)
 		return (BUS_RELEASE_RESOURCE(device_get_parent(dev), child,
@@ -3622,21 +3594,10 @@
 	/*
 	 * For BARs we don't actually want to release the resource.
 	 * Instead, we deactivate the resource if needed and then give
-	 * ownership of the BAR back to the bus.
+	 * ownership of the BAR back to the bus.  This is handled for us
+	 * in resource_list_release() since we use resource_list_reserve()
+	 * for BARs.
 	 */
-	switch (type) {
-	case SYS_RES_IOPORT:
-	case SYS_RES_MEMORY:
-		if (rman_get_device(r) != child)
-			return (EINVAL);
-		if (rman_get_flags(r) & RF_ACTIVE) {
-			error = bus_deactivate_resource(child, type, rid, r);
-			if (error)
-				return (error);
-		}
-		rman_set_device(r, dev);
-		return (0);
-	}
 	return (bus_generic_rl_release_resource(dev, child, type, rid, r));
 }
 
@@ -3679,8 +3640,8 @@
 		return;
 
 	if (rle->res) {
-		if (rman_get_device(rle->res) != dev ||
-		    rman_get_flags(rle->res) & RF_ACTIVE) {
+		if (rman_get_flags(rle->res) & RF_ACTIVE ||
+		    rle->flags & RLE_ALLOCATED) {
 			device_printf(dev, "delete_resource: "
 			    "Resource still owned by child, oops. "
 			    "(type=%d, rid=%d, addr=%lx)\n",
@@ -3701,7 +3662,7 @@
 			break;
 		}
 #endif
-		bus_release_resource(dev, type, rid, rle->res);
+		resource_list_unreserve(rl, dev, child, type, rid, rle->res);
 	}
 	resource_list_delete(rl, type, rid);
 }

==== //depot/projects/multipass/sys/kern/subr_bus.c#8 (text+ko) ====

@@ -2807,6 +2807,7 @@
 		rle->type = type;
 		rle->rid = rid;
 		rle->res = NULL;
+		rle->flags = 0;
 	}
 
 	if (rle->res)
@@ -2861,6 +2862,63 @@
 }
 
 /**
+ * @brief Allocate a reserved resource
+ *
+ * This can be used by busses to force the allocation of resources
+ * that are always active in the system even if they are not allocated
+ * by a driver (e.g. PCI BARs).  This function is usually called when
+ * adding a new child to the bus.  The resource is allocated from the
+ * parent bus when it is reserved.  The resource list entry is marked
+ * with RLE_RESERVED to note that it is a reserved resource.
+ *
+ * Subsequent attempts to allocate the resource with
+ * resource_list_alloc() will succeed the first time and will set
+ * RLE_ALLOCATED to note that it has been allocated.  When a reserved
+ * resource that has been allocated is released with
+ * resource_list_release() the resource RLE_ALLOCATED is cleared, but
+ * the actual resource remains allocated.  The resource can be released to
+ * the parent bus by calling resource_list_unreserve().
+ *
+ * @param rl		the resource list to allocate from
+ * @param bus		the parent device of @p child
+ * @param child		the device for which the resource is being reserved
+ * @param type		the type of resource to allocate
+ * @param rid		a pointer to the resource identifier
+ * @param start		hint at the start of the resource range - pass
+ *			@c 0UL for any start address
+ * @param end		hint at the end of the resource range - pass
+ *			@c ~0UL for any end address
+ * @param count		hint at the size of range required - pass @c 1
+ *			for any size
+ * @param flags		any extra flags to control the resource
+ *			allocation - see @c RF_XXX flags in
+ *			 for details
+ * 
+ * @returns		the resource which was allocated or @c NULL if no
+ *			resource could be allocated
+ */
+struct resource *
+resource_list_reserve(struct resource_list *rl, device_t bus, device_t child,
+    int type, int *rid, u_long start, u_long end, u_long count, u_int flags)
+{
+	struct resource_list_entry *rle = NULL;
+	int passthrough = (device_get_parent(child) != bus);
+	struct resource *r;
+
+	if (passthrough)
+		panic(
+    "resource_list_reserve() should only be called for direct children");
+
+	r = resource_list_alloc(rl, bus, child, type, rid, start, end, count,
+	    flags);
+	if (r != NULL) {
+		rle = resource_list_find(rl, type, *rid);
+		rle->flags |= RLE_RESERVED;
+	}
+	return (r);
+}
+
+/**
  * @brief Helper function for implementing BUS_ALLOC_RESOURCE()
  *
  * Implement BUS_ALLOC_RESOURCE() by looking up a resource from the list
@@ -2911,8 +2969,15 @@
 	if (!rle)
 		return (NULL);		/* no resource of that type/rid */
 
-	if (rle->res)
+	if (rle->res) {
+		if (rle->flags & RLE_RESERVED) {
+			if (rle->flags & RLE_ALLOCATED)
+				return (NULL);
+			else
+				return (rle->res);
+		}
 		panic("resource_list_alloc: resource entry is busy");
+	}
 
 	if (isdefault) {
 		start = rle->start;
@@ -2944,7 +3009,7 @@
  * @param rl		the resource list which was allocated from
  * @param bus		the parent device of @p child
  * @param child		the device which is requesting a release
- * @param type		the type of resource to allocate
+ * @param type		the type of resource to release
  * @param rid		the resource identifier
  * @param res		the resource to release
  * 
@@ -2971,6 +3036,19 @@
 		panic("resource_list_release: can't find resource");
 	if (!rle->res)
 		panic("resource_list_release: resource entry is not busy");
+	if (rle->flags & RLE_RESERVED) {
+		if (rle->flags & RLE_ALLOCATED) {
+			if (rman_get_flags(res) & RF_ACTIVE) {
+				error = bus_deactivate_resource(child, type,
+				    rid, res);
+				if (error)
+					return (error);
+			}
+			rle->flags &= ~RLE_ALLOCATED;
+			return (0);
+		}
+		return (EINVAL);
+	}
 
 	error = BUS_RELEASE_RESOURCE(device_get_parent(bus), child,
 	    type, rid, res);
@@ -2982,6 +3060,45 @@
 }
 
 /**
+ * @brief Fully release a reserved resource
+ *
+ * Fully releases a resouce reserved via resource_list_reserve().
+ *
+ * @param rl		the resource list which was allocated from
+ * @param bus		the parent device of @p child
+ * @param child		the device whose reserved resource is being released
+ * @param type		the type of resource to release
+ * @param rid		the resource identifier
+ * @param res		the resource to release
+ * 
+ * @retval 0		success
+ * @retval non-zero	a standard unix error code indicating what
+ *			error condition prevented the operation
+ */
+int
+resource_list_unreserve(struct resource_list *rl, device_t bus, device_t child,
+    int type, int rid, struct resource *res)
+{
+	struct resource_list_entry *rle = NULL;
+	int passthrough = (device_get_parent(child) != bus);
+
+	if (passthrough)
+		panic(
+    "resource_list_unreserve() should only be called for direct children");
+
+	rle = resource_list_find(rl, type, rid);
+
+	if (!rle)
+		panic("resource_list_unreserve: can't find resource");
+	if (!(rle->flags & RLE_RESERVED))
+		return (EINVAL);
+	if (rle->flags & RLE_ALLOCATED)
+		return (EBUSY);
+	rle->flags &= ~RLE_RESERVED;
+	return (resource_list_release(rl, bus, child, type, rid, res));
+}
+
+/**
  * @brief Print a description of resources in a resource list
  *
  * Print all resources of a specified type, for use in BUS_PRINT_CHILD().

==== //depot/projects/multipass/sys/sys/bus.h#5 (text+ko) ====

@@ -231,6 +231,7 @@
 	STAILQ_ENTRY(resource_list_entry) link;
 	int	type;			/**< @brief type argument to alloc_resource */
 	int	rid;			/**< @brief resource identifier */
+	int	flags;			/**< @brief resource flags */
 	struct	resource *res;		/**< @brief the real resource when allocated */
 	u_long	start;			/**< @brief start of resource range */
 	u_long	end;			/**< @brief end of resource range */
@@ -238,6 +239,9 @@
 };
 STAILQ_HEAD(resource_list, resource_list_entry);
 
+#define	RLE_RESERVED		0x0001	/* Reserved by the parent bus. */
+#define	RLE_ALLOCATED		0x0002	/* Reserved resource is allocated. */
+
 void	resource_list_init(struct resource_list *rl);
 void	resource_list_free(struct resource_list *rl);
 struct resource_list_entry *
@@ -261,6 +265,15 @@
 int	resource_list_release(struct resource_list *rl,
 			      device_t bus, device_t child,
 			      int type, int rid, struct resource *res);
+struct resource *
+	resource_list_reserve(struct resource_list *rl,
+			      device_t bus, device_t child,
+			      int type, int *rid,
+			      u_long start, u_long end,
+			      u_long count, u_int flags);
+int	resource_list_unreserve(struct resource_list *rl,
+				device_t bus, device_t child,
+				int type, int rid, struct resource *res);
 void	resource_list_purge(struct resource_list *rl);
 int	resource_list_print_type(struct resource_list *rl,
 				 const char *name, int type,

From owner-p4-projects@FreeBSD.ORG  Tue Sep 29 16:50:05 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D664B1065696; Tue, 29 Sep 2009 16:50:04 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9AEC1106568D
	for ; Tue, 29 Sep 2009 16:50:04 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 861188FC2D
	for ; Tue, 29 Sep 2009 16:50:04 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TGo4hJ005295
	for ; Tue, 29 Sep 2009 16:50:04 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8TGo42d005293
	for perforce@freebsd.org; Tue, 29 Sep 2009 16:50:04 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 29 Sep 2009 16:50:04 GMT
Message-Id: <200909291650.n8TGo42d005293@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169017 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 29 Sep 2009 16:50:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=169017

Change 169017 by hselasky@hselasky_laptop001 on 2009/09/29 16:49:42

	
	USB ethernet:
	 - correct some bugs in the NCM implementation.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#22 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#22 (text+ko) ====

@@ -1088,7 +1088,7 @@
 	sc->sc_ncm.hdr.dwSignature[2] = 'M';
 	sc->sc_ncm.hdr.dwSignature[3] = 'H';
 	USETW(sc->sc_ncm.hdr.wHeaderLength, sizeof(sc->sc_ncm.hdr));
-	USETW(sc->sc_ncm.hdr.wBlockLength, offset);
+	USETW(sc->sc_ncm.hdr.wBlockLength, last_offset);
 	USETW(sc->sc_ncm.hdr.wSequence, sc->sc_ncm.tx_seq);
 	USETW(sc->sc_ncm.hdr.wDptIndex, sizeof(sc->sc_ncm.hdr));
 
@@ -1243,25 +1243,24 @@
 
 			offset = UGETW(sc->sc_ncm.dp[x].wFrameIndex);
 			temp = UGETW(sc->sc_ncm.dp[x].wFrameLength);
-			if ((offset + temp) > actlen) {
-				DPRINTFN(1, "invalid frame detected (ignored)\n");
+
+			if ((offset == 0) ||
+			    (temp < sizeof(struct ether_header)) ||
+			    (temp > (MCLBYTES - ETHER_ALIGN))) {
+				DPRINTFN(1, "NULL frame detected at %d\n", x);
+				m = NULL;
+				/* silently ignore this frame */
+				continue;
+			} else if ((offset + temp) > actlen) {
+				DPRINTFN(1, "invalid frame "
+				    "detected at %d\n", x);
 				m = NULL;
-
-			} else if (temp >= sizeof(struct ether_header)) {
-				/*
-				 * allocate a suitable memory buffer, if
-				 * possible
-				 */
-				if (temp > (MCLBYTES - ETHER_ALIGN)) {
-					m = NULL;
-					continue;
-				} if (temp > (MHLEN - ETHER_ALIGN)) {
-					m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
-				} else {
-					m = m_gethdr(M_DONTWAIT, MT_DATA);
-				}
+				/* silently ignore this frame */
+				continue;
+			} else if (temp > (MHLEN - ETHER_ALIGN)) {
+				m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
 			} else {
-				m = NULL;	/* dump it */
+				m = m_gethdr(M_DONTWAIT, MT_DATA);
 			}
 
 			DPRINTFN(16, "frame %u, offset = %u, length = %u \n",

From owner-p4-projects@FreeBSD.ORG  Tue Sep 29 17:13:30 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A91F81065670; Tue, 29 Sep 2009 17:13:30 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6DD361065694
	for ; Tue, 29 Sep 2009 17:13:30 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5CDE38FC1B
	for ; Tue, 29 Sep 2009 17:13:30 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8THDUcP007939
	for ; Tue, 29 Sep 2009 17:13:30 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8THDULj007937
	for perforce@freebsd.org; Tue, 29 Sep 2009 17:13:30 GMT
	(envelope-from stas@freebsd.org)
Date: Tue, 29 Sep 2009 17:13:30 GMT
Message-Id: <200909291713.n8THDULj007937@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169019 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 29 Sep 2009 17:13:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=169019

Change 169019 by stas@stas_yandex on 2009/09/29 17:12:38

	- Correctly initialize valgrind stack parameters.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-freebsd.c#13 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-freebsd.c#13 (text+ko) ====

@@ -181,6 +181,8 @@
    ctst->tmp_sig_mask = ptst->sig_mask;
 
    /* Linux has to guess, we don't */
+   ctst->client_stack_highest_word = (Addr)tp.stack_base + tp.stack_size;
+   ctst->client_stack_szB = tp.stack_size;
    VG_(register_stack)((Addr)tp.stack_base, (Addr)tp.stack_base + tp.stack_size);
 
    /* Assume the thr_new will succeed, and tell any tool that wants to

From owner-p4-projects@FreeBSD.ORG  Tue Sep 29 17:30:49 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C5AA51065676; Tue, 29 Sep 2009 17:30:49 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A6AE1065670
	for ; Tue, 29 Sep 2009 17:30:49 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5FA168FC22
	for ; Tue, 29 Sep 2009 17:30:49 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8THUnHZ009145
	for ; Tue, 29 Sep 2009 17:30:49 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8THUnHQ009143
	for perforce@freebsd.org; Tue, 29 Sep 2009 17:30:49 GMT
	(envelope-from stas@freebsd.org)
Date: Tue, 29 Sep 2009 17:30:49 GMT
Message-Id: <200909291730.n8THUnHQ009143@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169020 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 29 Sep 2009 17:30:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=169020

Change 169020 by stas@stas_yandex on 2009/09/29 17:29:59

	- Fix OS detection.

Affected files ...

.. //depot/projects/valgrind/tests/os_test.c#3 edit

Differences ...

==== //depot/projects/valgrind/tests/os_test.c#3 (text+ko) ====

@@ -39,7 +39,7 @@
    if ( 0 == strcmp( OS, "darwin" ) ) return True;
 
 #elif defined(VGO_freebsd)
-   if ( 0 == strcmp( OS, "darwin" ) ) return True;
+   if ( 0 == strcmp( OS, "freebsd" ) ) return True;
 
 #else
 #  error Unknown OS

From owner-p4-projects@FreeBSD.ORG  Tue Sep 29 18:17:41 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5C1AA1065679; Tue, 29 Sep 2009 18:17:41 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 20AA6106566C
	for ; Tue, 29 Sep 2009 18:17:41 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0F85C8FC13
	for ; Tue, 29 Sep 2009 18:17:41 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TIHeel013505
	for ; Tue, 29 Sep 2009 18:17:40 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8TIHe7X013503
	for perforce@freebsd.org; Tue, 29 Sep 2009 18:17:40 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 29 Sep 2009 18:17:40 GMT
Message-Id: <200909291817.n8TIHe7X013503@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 
Cc: 
Subject: PERFORCE change 169022 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 29 Sep 2009 18:17:41 -0000

http://perforce.freebsd.org/chv.cgi?CH=169022

Change 169022 by jhb@jhb_jhbbsd on 2009/09/29 18:17:38

	- Simplify resource_list_unreserve() to just read the resource out
	  of the resource list entry.
	- Add a resource_list_busy() that returns true if a given resource
	  entry is "busy".  A resource entry is not busy if it has no
	  associated resource, or if the resource is a "reserved" resource
	  that is not allocated by the child device.  Otherwise the resource
	  entry is busy.

Affected files ...

.. //depot/projects/multipass/sys/dev/pci/pci.c#8 edit
.. //depot/projects/multipass/sys/kern/subr_bus.c#9 edit
.. //depot/projects/multipass/sys/sys/bus.h#6 edit

Differences ...

==== //depot/projects/multipass/sys/dev/pci/pci.c#8 (text+ko) ====

@@ -3641,12 +3641,11 @@
 
 	if (rle->res) {
 		if (rman_get_flags(rle->res) & RF_ACTIVE ||
-		    rle->flags & RLE_ALLOCATED) {
+		    resource_list_busy(rl, type, rid)) {
 			device_printf(dev, "delete_resource: "
 			    "Resource still owned by child, oops. "
 			    "(type=%d, rid=%d, addr=%lx)\n",
-			    rle->type, rle->rid,
-			    rman_get_start(rle->res));
+			    type, rid, rman_get_start(rle->res));
 			return;
 		}
 
@@ -3662,7 +3661,7 @@
 			break;
 		}
 #endif
-		resource_list_unreserve(rl, dev, child, type, rid, rle->res);
+		resource_list_unreserve(rl, dev, child, type, rid);
 	}
 	resource_list_delete(rl, type, rid);
 }

==== //depot/projects/multipass/sys/kern/subr_bus.c#9 (text+ko) ====

@@ -2820,6 +2820,31 @@
 }
 
 /**
+ * @brief Determine if a resource entry is busy.
+ *
+ * Returns true if a resource entry is busy meaning that it has an
+ * associated resource that is not an unallocated "reserved" resource.
+ *
+ * @param rl		the resource list to search
+ * @param type		the resource entry type (e.g. SYS_RES_MEMORY)
+ * @param rid		the resource identifier
+ *
+ * @returns Non-zero if the entry is busy, zero otherwise.
+ */
+int
+resource_list_busy(struct resource_list *rl, int type, int rid)
+{
+	struct resource_list_entry *rle;
+
+	rle = resource_list_find(rl, type, rid);
+	if (rle == NULL || rle->res == NULL)
+		return (0);
+	if ((rle->flags & (RLE_RESERVED | RLE_ALLOCATED)) == RLE_RESERVED)
+		return (0);
+	return (1);
+}
+
+/**
  * @brief Find a resource entry by type and rid.
  *
  * @param rl		the resource list to search
@@ -3077,7 +3102,7 @@
  */
 int
 resource_list_unreserve(struct resource_list *rl, device_t bus, device_t child,
-    int type, int rid, struct resource *res)
+    int type, int rid)
 {
 	struct resource_list_entry *rle = NULL;
 	int passthrough = (device_get_parent(child) != bus);
@@ -3095,7 +3120,7 @@
 	if (rle->flags & RLE_ALLOCATED)
 		return (EBUSY);
 	rle->flags &= ~RLE_RESERVED;
-	return (resource_list_release(rl, bus, child, type, rid, res));
+	return (resource_list_release(rl, bus, child, type, rid, rle->res));
 }
 
 /**

==== //depot/projects/multipass/sys/sys/bus.h#6 (text+ko) ====

@@ -251,6 +251,8 @@
 int	resource_list_add_next(struct resource_list *rl,
 			  int type,
 			  u_long start, u_long end, u_long count);
+int	resource_list_busy(struct resource_list *rl,
+			   int type, int rid);
 struct resource_list_entry*
 	resource_list_find(struct resource_list *rl,
 			   int type, int rid);
@@ -273,7 +275,7 @@
 			      u_long count, u_int flags);
 int	resource_list_unreserve(struct resource_list *rl,
 				device_t bus, device_t child,
-				int type, int rid, struct resource *res);
+				int type, int rid);
 void	resource_list_purge(struct resource_list *rl);
 int	resource_list_print_type(struct resource_list *rl,
 				 const char *name, int type,

From owner-p4-projects@FreeBSD.ORG  Tue Sep 29 18:19:43 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C78FB106568B; Tue, 29 Sep 2009 18:19:43 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8BF67106568F
	for ; Tue, 29 Sep 2009 18:19:43 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B6EF8FC15
	for ; Tue, 29 Sep 2009 18:19:43 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TIJhwo013617
	for ; Tue, 29 Sep 2009 18:19:43 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8TIJhm9013615
	for perforce@freebsd.org; Tue, 29 Sep 2009 18:19:43 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 29 Sep 2009 18:19:43 GMT
Message-Id: <200909291819.n8TIJhm9013615@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 
Cc: 
Subject: PERFORCE change 169023 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 29 Sep 2009 18:19:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=169023

Change 169023 by jhb@jhb_jhbbsd on 2009/09/29 18:19:07

	Teach the acpi(4) bus to mark all resources as reserved aside from
	a few cases:
	
	1) We ignore IRQ resources for PCI link devices completely.  These
	   are not real resources, at least not in the way that we want
	   to manage with rman.
	2) Do not reserve resources for system resource devices since they
	   are handled specially.

Affected files ...

.. //depot/projects/multipass/sys/dev/acpica/acpi.c#6 edit

Differences ...

==== //depot/projects/multipass/sys/dev/acpica/acpi.c#6 (text+ko) ====

@@ -118,6 +118,8 @@
 			uintptr_t value);
 static struct resource_list *acpi_get_rlist(device_t dev, device_t child);
 static int	acpi_sysres_alloc(device_t dev);
+static int	acpi_set_resource(device_t dev, device_t child, int type,
+			int rid, u_long start, u_long count);
 static struct resource *acpi_alloc_resource(device_t bus, device_t child,
 			int type, int *rid, u_long start, u_long end,
 			u_long count, u_int flags);
@@ -190,7 +192,7 @@
     DEVMETHOD(bus_read_ivar,		acpi_read_ivar),
     DEVMETHOD(bus_write_ivar,		acpi_write_ivar),
     DEVMETHOD(bus_get_resource_list,	acpi_get_rlist),
-    DEVMETHOD(bus_set_resource,		bus_generic_rl_set_resource),
+    DEVMETHOD(bus_set_resource,		acpi_set_resource),
     DEVMETHOD(bus_get_resource,		bus_generic_rl_get_resource),
     DEVMETHOD(bus_alloc_resource,	acpi_alloc_resource),
     DEVMETHOD(bus_release_resource,	acpi_release_resource),
@@ -1114,6 +1116,38 @@
     return (0);
 }
 
+static int
+acpi_set_resource(device_t dev, device_t child, int type, int rid,
+    u_long start, u_long count)
+{
+    struct acpi_device *ad = device_get_ivars(child);
+    struct resource_list *rl = &ad->ad_rl;
+    char *pcilink_ids[] = { "PNP0C0F", NULL };
+    char *sysres_ids[] = { "PNP0C01", "PNP0C02", NULL };
+    u_long end;
+    
+    /* Ignore IRQ resources for PCI link devices. */
+    if (type == SYS_RES_IRQ && ACPI_ID_PROBE(dev, child, pcilink_ids) != NULL)
+	return (0);
+
+    /* Add the resource. */
+    end = (start + count - 1);
+    resource_list_add(rl, type, rid, start, end, count);
+
+    /* Don't reserve system resources. */
+    if (ACPI_ID_PROBE(dev, child, sysres_ids) != NULL)
+	return (0);
+
+    /*
+     * Reserve the resource.
+     *
+     * XXX: Ignores failure for now.  Failure here is probably a
+     * BIOS/firmware bug?
+     */
+    resource_list_reserve(rl, dev, child, type, &rid, start, end, count, 0);
+    return (0);
+}
+
 static struct resource *
 acpi_alloc_resource(device_t bus, device_t child, int type, int *rid,
     u_long start, u_long end, u_long count, u_int flags)
@@ -1246,6 +1280,12 @@
     struct resource_list *rl;
 
     rl = acpi_get_rlist(bus, child);
+    if (resource_list_busy(rl, type, rid)) {
+	device_printf(bus, "delete_resource: Resource still owned by child"
+	    " (type=%d, rid=%d)\n", type, rid);
+	return;
+    }
+    resource_list_unreserve(rl, bus, child, type, rid);
     resource_list_delete(rl, type, rid);
 }
 

From owner-p4-projects@FreeBSD.ORG  Tue Sep 29 20:09:44 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5A11B1065698; Tue, 29 Sep 2009 20:09:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1E7281065692
	for ; Tue, 29 Sep 2009 20:09:44 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E94798FC29
	for ; Tue, 29 Sep 2009 20:09:43 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TK9hbJ023373
	for ; Tue, 29 Sep 2009 20:09:43 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8TK9hhu023371
	for perforce@freebsd.org; Tue, 29 Sep 2009 20:09:43 GMT
	(envelope-from stas@freebsd.org)
Date: Tue, 29 Sep 2009 20:09:43 GMT
Message-Id: <200909292009.n8TK9hhu023371@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169029 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 29 Sep 2009 20:09:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=169029

Change 169029 by stas@stas_yandex on 2009/09/29 20:09:20

	- Add suppressions for DRD

Affected files ...

.. //depot/projects/valgrind/freebsd.supp#4 edit

Differences ...

==== //depot/projects/valgrind/freebsd.supp#4 (text+ko) ====

@@ -19,3 +19,17 @@
    fun:puts
    fun:main
 }
+{
+   DRD-1
+   drd:ConflictingAccess
+   obj:/lib/libthr.so.3
+   fun:pthread_create
+   fun:pthread_create
+   fun:main
+}
+{
+   DRD-2
+   drd:ConflictingAccess
+   fun:pthread_exit
+}
+

From owner-p4-projects@FreeBSD.ORG  Tue Sep 29 20:10:45 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8FCAE1065676; Tue, 29 Sep 2009 20:10:45 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 535811065670
	for ; Tue, 29 Sep 2009 20:10:45 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 29E5A8FC13
	for ; Tue, 29 Sep 2009 20:10:45 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TKAjEB023521
	for ; Tue, 29 Sep 2009 20:10:45 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8TKAjJF023519
	for perforce@freebsd.org; Tue, 29 Sep 2009 20:10:45 GMT
	(envelope-from stas@freebsd.org)
Date: Tue, 29 Sep 2009 20:10:45 GMT
Message-Id: <200909292010.n8TKAjJF023519@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169030 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 29 Sep 2009 20:10:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=169030

Change 169030 by stas@stas_yandex on 2009/09/29 20:09:44

	- Do not emit warning message on DRD startup.

Affected files ...

.. //depot/projects/valgrind/drd/drd_main.c#3 edit

Differences ...

==== //depot/projects/valgrind/drd/drd_main.c#3 (text+ko) ====

@@ -547,7 +547,7 @@
 
 static void DRD_(post_clo_init)(void)
 {
-#if defined(VGO_linux) || defined(VGO_darwin)
+#if defined(VGO_linux) || defined(VGO_darwin) || defined(VGO_freebsd)
    /* fine */
 #else
    VG_(printf)("\nWARNING: DRD has not yet been tested on this operating system.\n\n");

From owner-p4-projects@FreeBSD.ORG  Tue Sep 29 21:37:20 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A1C901065679; Tue, 29 Sep 2009 21:37:20 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 662EB106566C
	for ; Tue, 29 Sep 2009 21:37:20 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 557F08FC21
	for ; Tue, 29 Sep 2009 21:37:20 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TLbKJI040861
	for ; Tue, 29 Sep 2009 21:37:20 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8TLbKLh040859
	for perforce@freebsd.org; Tue, 29 Sep 2009 21:37:20 GMT
	(envelope-from rene@FreeBSD.org)
Date: Tue, 29 Sep 2009 21:37:20 GMT
Message-Id: <200909292137.n8TLbKLh040859@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169035 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 29 Sep 2009 21:37:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=169035

Change 169035 by rene@rene_self on 2009/09/29 21:36:24

	IFC	

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#7 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#13 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#13 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/gahr.key#2 integrate
.. //depot/projects/docproj_nl/www/en/cgi/query-pr.cgi#3 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#7 (text+ko) ====

@@ -1,6 +1,6 @@
 
 
 
@@ -700,7 +700,7 @@
 	implement the labeling feature, including the Biba, Lomac,
 	MLS and SEBSD
 	policies.
-
+    
       In many cases, the  may not need
 	to be set at all.  Consider the following situation and
 	security model:
@@ -1547,7 +1547,7 @@
 	to.
 
       The &man.mac.biba.4; security policy module permits an
-	administrator to address which files and programs a user or
+ 	administrator to address which files and programs a user or
 	users may see and invoke while assuring that the programs and
 	files are free from threats and trusted by the system for that
 	user, or group of users.
@@ -1565,7 +1565,7 @@
 	utilities.  While other users would be grouped into other
 	categories such as testers, designers, or just ordinary
 	users and would only be permitted read access.
-
+	
       With its natural security control, a lower integrity subject
 	is unable to write to a higher integrity subject; a higher
 	integrity subject cannot observe or read a lower integrity
@@ -1728,7 +1728,7 @@
 	www users into the insecure class:
 
       &prompt.root; pw usermod nagios -L insecure
-      &prompt.root; pw usermod www -L insecure
+      &prompt.root; pw usermod www -L insecure      
     
 
     
@@ -1885,7 +1885,7 @@
     Begin by adding the following line to
       /boot/loader.conf:
 
-    mac_seeotheruids_enabled="YES"
+    mac_seeotheruids_load="YES"
 
     The &man.mac.bsdextended.4; security policy module may be
       activated through the use of the following rc.conf

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#6 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -1537,7 +1537,7 @@
 	  either /dev/ugen0.2 or
 	  /dev/uscanner0 as device node according
 	  to the &os; version we run.  For this example, a
-	  &epson.perfection; 1650 USB scanner was used.
+	  &epson.perfection; 1650 USB scanner was used.
       
 
       
@@ -1646,7 +1646,7 @@
 device 'epson2:libusb:/dev/usb:/dev/ugen0.2' is a Epson GT-8200 flatbed scanner
 
       This output comes from a &os; 8.X system, the
-	`epson2:libusb:/dev/usb:/dev/ugen0.2' item
+	'epson2:libusb:/dev/usb:/dev/ugen0.2' item
 	gives us the backend name (epson2) and the
 	device node (/dev/ugen0.2) used by our
 	scanner.
@@ -1658,7 +1658,7 @@
 	the backend configuration file and define the scanner device
 	used.  The /usr/local/etc/sane.d/ directory
-	contains all backends configuration files.  This
+	contains all backend configuration files.  This
 	identification problem does appear with certain USB
 	scanners.
 
@@ -1685,7 +1685,7 @@
 
       Since the scanner is not identified, we will need to edit
 	the /usr/local/etc/sane.d/epson2.conf
-	file.  The scanner model used was the &epson.perfection; 1650,
+	file.  The scanner model used was the &epson.perfection; 1650,
 	so we know the scanner will use the epson2
 	backend.  Be sure to read the help comments in the backends
 	configuration files.  Line changes are quite simple: comment
@@ -1746,7 +1746,7 @@
 	/dev/ugen0.2 which is in fact just a
 	symlink to the real device node called
 	/dev/usb/0.2.0 (a quick look at the
-	contain of the /dev
+	contents of the /dev
 	directory will confirm it).  Both, the symlink and the
 	device node, are owned respectively by the
 	wheel and the
@@ -1770,7 +1770,7 @@
       Then we have to make the /dev/ugen0.2
 	symlink and  the /dev/usb/0.2.0 device node accessible to the usb group
 	with the correct write permissions (0660 or
-	0664), cause by default only the owner of
+	0664), because by default only the owner of
 	these files (root) can write to them.
 	All of this is done by adding the following
 	lines to the /etc/devfs.rules file:
@@ -1779,9 +1779,8 @@
 add path ugen0.2 mode 0660 group usb
 add path usb/0.2.0 mode 0666 group usb
 
-      For the &os; 7.X users, the following lines with the
-	correct device node, most of time
-	/dev/uscanner0, are needed:
+      &os; 7.X users will probably need the following lines with the
+	correct device node /dev/uscanner0:
 
       [system=5]
 add path uscanner0 mode 660 group usb

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#13 (text+ko) ====

@@ -1,7 +1,7 @@
 
+
 
@@ -21,30 +21,30 @@
 4eDMA/4najs55j1kz8khhLiAX0SUJj92XpjmpSFLvFB8D4JpeNtWKGx/wt9uwYBr
 GqnFpP7JHUFowTgg4LjgM3r+W+s1TyUZ5cBlgTgp1Qh6y0h98X6Pbppu1GEhTvWP
 9FlvKNK1+bYNKKvUFHc5nLRK+0M7e0IP6yws2O9RN6rkb6UU8rQdUGlldHJvIENl
-cnV0dGkgPGdhaHJAZ2Foci5jaD6IeAQTEQIAOAIbIwYLCQgHAwIEFQIIAwQWAgMB
-Ah4BAheAAhkBFBhodHRwOi8vcGdwLm1pdC5lZHV0BQJFzyOoAAoJEMDCapiVcfeO
-U+oAoIPxcczSTL9IAJnRBUaRvjL8dJNgAJ9wh1Gh1+HpbxqtXsTcEr68ZXKfUYhp
-BBMRAgApAhsjBQkJZgGABgsJCAcDAgQVAggDBBYCAwECHgECF4AFAkUULcYCGQEA
-CgkQwMJqmJVx944wAQCggfm9PIqoj6KZAih/TjByBR7kcAgAnRqnqUHf95IzrsGn
-6d7b+IhfvKh7iH4EExECAD4CGyMFCQlmAYAGCwkIBwMCBBUCCAMEFgIDAQIeAQIX
-gAIZAQUCRc3QKxQYaHR0cDovL3BncC5taXQuZWR1dAAKCRDAwmqYlXH3jswNAJ9K
-qPCEaiTKejBDeI+ZjLemDPYFogCgvC7oKdYHCRU/i9jgcsiycL3wuce0N1BpZXRy
-byBDZXJ1dHRpIChUaGUgRnJlZUJTRCBQcm9qZWN0KSA8Z2FockBGcmVlQlNELm9y
-Zz6IYAQTEQIAIAUCR7xw2AIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEMDC
-apiVcfeOw5AAoMjUQZiqAGONGzJtT3RI1sHhl/p8AJ9ytrTA/gwo66j9K+qNDxQ9
-kUXqubkCDQREauOLEAgAv+OK9YPB4r5+9aZ9/tV6ItolxheP3skoV9ISg4T0ltZM
-8jLtBLqPY5qWlGRrAbh3ZHkOvrrfY/bfGxPg/qlOe+ewqTnAA7IQcBXObENVfrq2
-gm35aluNcHbFutYGrkAThuFst1qJbPowBBmQgR7RH5/lWbn3Qnisthsm6J5Jldjg
-cfXth9usyXsGXCP1zZ10Sj2Q090SuSEEC/PfBpSbgkEMtTEJfirmVKTp0gPfIdUn
-/HhT3ed4kkZXkQJvvI/t3Glyp7RY5nMYPr219vJ+bYP6yxm9gdfLey6A4gEprtnc
-F/7MTUpib3MvgBpmPRq9yV4LHbhiDbXHaoXG1uZVvwADBQf/TkvaVZK55GKm527F
-enxU4hf0fWG3orqKAI/p3AhPj7l/T1nLGWHMku22j61zx9N5xPElMLFdcs4+BX/l
-tzZdhFS67k+Ya/CLy0G3we8KQSqoUTzlP7Mr1aJtXiNXUbadNrkSX1DlRV5RP6ro
-73vvaFXPwHTxSmRRHg/UgE0B5+tJkuNmK2whTDRR6rfpEcdIS1Tms8IUnva0ZI0Q
-SnhzUcxv+YrV8TX11/NC0FlmhxTzncM1pa6w0yGC/E48uG3NuElPenqM1h05xe9B
-ntWbBPjB1TYa80jYNbLA/KdKEZlK1klP2PnNoAX3HoKOm/1rkYEywGfxXuJezX4f
-YLrdxYhPBBgRAgAPBQJEauOLAhsMBQkJZgGAAAoJEMDCapiVcfeOsdgAnAhRFj8Q
-7p39kg5LmO/zsDXCD8wOAKCDV7iQR8Dblj7cX+WKPwwhnrNq0Q==
-=fVQ7
+cnV0dGkgPGdhaHJAZ2Foci5jaD6IYwQTEQIAIwIbIwYLCQgHAwIEFQIIAwQWAgMB
+Ah4BAheAAhkBBQJKwl4hAAoJEMDCapiVcfeOp+oAnR9QXvf5u9vyeU3vnAo7CiyW
+LE6GAJ9Pip8AO5c9BvjTjsRhVH9O+447qohpBBMRAgApAhsjBQkJZgGABgsJCAcD
+AgQVAggDBBYCAwECHgECF4AFAkUULcYCGQEACgkQwMJqmJVx944wAQCggfm9PIqo
+j6KZAih/TjByBR7kcAgAnRqnqUHf95IzrsGn6d7b+IhfvKh7iH4EExECAD4CGyMF
+CQlmAYAGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAIZAQUCRc3QKxQYaHR0cDovL3Bn
+cC5taXQuZWR1dAAKCRDAwmqYlXH3jswNAJ9KqPCEaiTKejBDeI+ZjLemDPYFogCg
+vC7oKdYHCRU/i9jgcsiycL3wuce0N1BpZXRybyBDZXJ1dHRpIChUaGUgRnJlZUJT
+RCBQcm9qZWN0KSA8Z2FockBGcmVlQlNELm9yZz6IYAQTEQIAIAUCR7xw2AIbIwYL
+CQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEMDCapiVcfeOw5AAoMjUQZiqAGONGzJt
+T3RI1sHhl/p8AJ9ytrTA/gwo66j9K+qNDxQ9kUXqubkCDQREauOLEAgAv+OK9YPB
+4r5+9aZ9/tV6ItolxheP3skoV9ISg4T0ltZM8jLtBLqPY5qWlGRrAbh3ZHkOvrrf
+Y/bfGxPg/qlOe+ewqTnAA7IQcBXObENVfrq2gm35aluNcHbFutYGrkAThuFst1qJ
+bPowBBmQgR7RH5/lWbn3Qnisthsm6J5JldjgcfXth9usyXsGXCP1zZ10Sj2Q090S
+uSEEC/PfBpSbgkEMtTEJfirmVKTp0gPfIdUn/HhT3ed4kkZXkQJvvI/t3Glyp7RY
+5nMYPr219vJ+bYP6yxm9gdfLey6A4gEprtncF/7MTUpib3MvgBpmPRq9yV4LHbhi
+DbXHaoXG1uZVvwADBQf/TkvaVZK55GKm527FenxU4hf0fWG3orqKAI/p3AhPj7l/
+T1nLGWHMku22j61zx9N5xPElMLFdcs4+BX/ltzZdhFS67k+Ya/CLy0G3we8KQSqo
+UTzlP7Mr1aJtXiNXUbadNrkSX1DlRV5RP6ro73vvaFXPwHTxSmRRHg/UgE0B5+tJ
+kuNmK2whTDRR6rfpEcdIS1Tms8IUnva0ZI0QSnhzUcxv+YrV8TX11/NC0FlmhxTz
+ncM1pa6w0yGC/E48uG3NuElPenqM1h05xe9BntWbBPjB1TYa80jYNbLA/KdKEZlK
+1klP2PnNoAX3HoKOm/1rkYEywGfxXuJezX4fYLrdxYhPBBgRAgAPBQJEauOLAhsM
+BQkJZgGAAAoJEMDCapiVcfeOsdgAnAhRFj8Q7p39kg5LmO/zsDXCD8wOAKCDV7iQ
+R8Dblj7cX+WKPwwhnrNq0Q==
+=UXRy
 -----END PGP PUBLIC KEY BLOCK-----
 ]]>

==== //depot/projects/docproj_nl/www/en/cgi/query-pr.cgi#3 (text+ko) ====

@@ -26,7 +26,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.65 2008/09/22 19:13:42 wosch Exp $
+# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.66 2009/09/29 19:45:37 simon Exp $
 #
 
 #
@@ -302,6 +302,8 @@
 $PR = int $PR;
 $PR = quotemeta $PR;
 
+# Note: query-pr.web is just a anti DoS wrapper around query-pr which
+# make sure we do not run too many query-pr instances at once.
 if ($category) {
 	$category = quotemeta $category;
 	@query = split /\n/, qx(query-pr.web --full --category=${category} ${PR} 2>&1);

From owner-p4-projects@FreeBSD.ORG  Tue Sep 29 21:50:35 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 78BD1106568D; Tue, 29 Sep 2009 21:50:35 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3D8E01065670
	for ; Tue, 29 Sep 2009 21:50:35 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2D5968FC22
	for ; Tue, 29 Sep 2009 21:50:35 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8TLoZV0041802
	for ; Tue, 29 Sep 2009 21:50:35 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8TLoYAb041800
	for perforce@freebsd.org; Tue, 29 Sep 2009 21:50:34 GMT
	(envelope-from rene@FreeBSD.org)
Date: Tue, 29 Sep 2009 21:50:34 GMT
Message-Id: <200909292150.n8TLoYAb041800@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169037 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 29 Sep 2009 21:50:35 -0000

http://perforce.freebsd.org/chv.cgi?CH=169037

Change 169037 by rene@rene_self on 2009/09/29 21:50:28

	MFen:
	* mac 1.74 -> 1.75
	* multimedia 1.134 -> 1.135

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#13 edit
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#13 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#13 (text+ko) ====

@@ -2,10 +2,9 @@
      The FreeBSD Dutch Documentation Project
 
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.5 2008/11/24 22:43:28 rene Exp $
-     $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.22 2006/01/05 21:13:23 siebrand Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/mac/chapter.sgml
-     %SRCID%	1.74
+     %SRCID%	1.75
 -->
 
 
@@ -1741,7 +1740,7 @@
 
       Merk op dat de hulpgraad hier low is, dit
 	is een mogelijkheid die alleen door het beleid
-        MAC LOMAC wordt geboden.
+	MAC LOMAC wordt geboden.
     
   
 
@@ -1995,7 +1994,7 @@
     Begin door de volgende regel aan
       /boot/loader.conf toe te voegen:
 
-    mac_seeotheruids_enabled="YES"
+    mac_seeotheruids_load="YES"
 
     Het beveiligingsbeleidsmodule &man.mac.bsdextended.4; kan door
       volgende variabele in rc.conf geactiveerd worden:

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#13 (text+ko) ====

@@ -4,7 +4,7 @@
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.17 2009/08/26 06:04:10 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
-     %SRCID%	1.134
+     %SRCID%	1.135
 -->
 
 
@@ -1704,7 +1704,8 @@
 	  /dev/ugen0.2 òf
 	  /dev/uscanner0 als apparaatknooppunt
 	  gebruikt afhankelijk van de versie van &os; die we draaien.  Voor dit
-	  voorbeeld was een &epson.perfection; 1650 USB-scanner gebruikt.
+	  voorbeeld was een &epson.perfection; 1650 USB-scanner
+	  gebruikt.
       
 
       
@@ -1815,7 +1816,7 @@
 device 'epson2:libusb:/dev/usb:/dev/ugen0.2' is a Epson GT-8200 flatbed scanner
 
       Deze uitvoer komt van een &os; 8.X systeem, het item
-	`epson2:libusb:/dev/usb:/dev/ugen0.2' geeft de naam
+	'epson2:libusb:/dev/usb:/dev/ugen0.2' geeft de naam
 	van het backend (epson2) en het apparaatknooppunt
 	(/dev/ugen0.2) dat door onze scanner wordt
 	gebruikt.
@@ -1858,7 +1859,7 @@
 	  geïdentificeerd, dient het bestand
 	  /usr/local/etc/sane.d/epson2.conf
 	  gewijzigd te worden.  De gebruikte scanner is een
-	  &epson.perfection; 1650, dus in dit geval dient voor de scanner
+	  &epson.perfection; 1650, dus in dit geval dient voor de scanner
 	  het backend epson2 gebruikt te worden.  Het
 	  is van belang om het commentaar in de instellingenbestanden van
 	  de backends te lezen.  Het aanpassen van regels is eenvoudig:
@@ -1944,17 +1945,17 @@
 	/dev/usb/0.2.0 met de juiste schrijfpermissies
  	toegankelijk maken voor de groep usb
 	(0660 of 0664), omdat standaard
-	alleen de eigenaar van deze bestanden (root) ernaar
-	kan schrijven.  Dit alles wordt gedaan door de volgende regels aan
-	/etc/devfs.rules toe te voegen:
+	alleen de eigenaar van deze bestanden (root)
+	ernaar kan schrijven.  Dit alles wordt gedaan door de volgende regels
+	aan /etc/devfs.rules toe te voegen:
 
       [system=5]
 add path ugen0.2 mode 0660 group usb
 add path usb/0.2.0 mode 0666 group usb
 
-      Voor gebruikers van &os; 7.X zijn de volgende regels met het
-	juiste apparaatknooppunt, meestal /dev/uscanner0
-	nodig:
+      Gebruikers van &os; 7.X hebben waarschijnlijk de volgende
+	regels met het juiste apparaatknooppunt,
+	/dev/uscanner0, nodig:
 
       [system=5]
 add path uscanner0 mode 0660 group usb

From owner-p4-projects@FreeBSD.ORG  Wed Sep 30 16:50:22 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C3D591065694; Wed, 30 Sep 2009 16:50:22 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 88930106568B
	for ; Wed, 30 Sep 2009 16:50:22 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 77FFF8FC1F
	for ; Wed, 30 Sep 2009 16:50:22 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8UGoMCx054243
	for ; Wed, 30 Sep 2009 16:50:22 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8UGoMso054241
	for perforce@freebsd.org; Wed, 30 Sep 2009 16:50:22 GMT
	(envelope-from jona@FreeBSD.org)
Date: Wed, 30 Sep 2009 16:50:22 GMT
Message-Id: <200909301650.n8UGoMso054241@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169056 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 30 Sep 2009 16:50:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=169056

Change 169056 by jona@jona-trustedbsd-belle-vmware on 2009/09/30 16:50:12

	Removed libuserangel (gone to the non-FreeBSD-specific project http://code.google.com/p/capsicum-core/)

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/Makefile#11 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/libuserangel/Makefile#2 delete
.. //depot/projects/trustedbsd/capabilities/src/lib/libuserangel/libuserangel-powerbox.h#4 delete
.. //depot/projects/trustedbsd/capabilities/src/lib/libuserangel/libuserangel.c#19 delete
.. //depot/projects/trustedbsd/capabilities/src/lib/libuserangel/libuserangel.h#16 delete
.. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_qt/sandbox_qt.cpp#10 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/Makefile#11 (text+ko) ====

@@ -32,7 +32,7 @@
 	ncurses ${_libnetgraph} libradius librpcsvc libsbuf \
 	libtacplus libutil ${_libypclnt} libalias libarchive ${_libatm} \
 	libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \
-	libcalendar libcam libcapability libuserangel libcompat \
+	libcalendar libcam libcapability libcompat \
 	libdevinfo libdevstat \
 	libdisk \
 	libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_qt/sandbox_qt.cpp#10 (text+ko) ====


From owner-p4-projects@FreeBSD.ORG  Wed Sep 30 16:51:23 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C492C1065679; Wed, 30 Sep 2009 16:51:23 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 889A01065670
	for ; Wed, 30 Sep 2009 16:51:23 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 780328FC15
	for ; Wed, 30 Sep 2009 16:51:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8UGpNBi054305
	for ; Wed, 30 Sep 2009 16:51:23 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8UGpNxT054303
	for perforce@freebsd.org; Wed, 30 Sep 2009 16:51:23 GMT
	(envelope-from jona@FreeBSD.org)
Date: Wed, 30 Sep 2009 16:51:23 GMT
Message-Id: <200909301651.n8UGpNxT054303@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169057 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 30 Sep 2009 16:51:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=169057

Change 169057 by jona@jona-trustedbsd-belle-vmware on 2009/09/30 16:50:50

	Removed powerboxes, etc. (gone to the non-FreeBSD-specific project http://code.google.com/p/capsicum-core/)

Affected files ...

.. //depot/projects/trustedbsd/capabilities/cap-support/kpowerboxserver/CMakeLists.txt#6 delete
.. //depot/projects/trustedbsd/capabilities/cap-support/kpowerboxserver/cleanup.sh#3 delete
.. //depot/projects/trustedbsd/capabilities/cap-support/kpowerboxserver/kpowerboxserver.cpp#5 delete
.. //depot/projects/trustedbsd/capabilities/cap-support/kpowerboxserver/kpowerboxserver.h#4 delete
.. //depot/projects/trustedbsd/capabilities/cap-support/kpowerboxserver/main.cpp#3 delete
.. //depot/projects/trustedbsd/capabilities/cap-support/kpowerboxserver/powerbox.h#3 delete
.. //depot/projects/trustedbsd/capabilities/cap-support/powerboxtest/main.cpp#2 delete
.. //depot/projects/trustedbsd/capabilities/cap-support/powerboxtest/powerbox.h#2 delete
.. //depot/projects/trustedbsd/capabilities/cap-support/powerboxtest/powerboxtest.pro#2 delete
.. //depot/projects/trustedbsd/capabilities/cap-support/qpowerboxserver/main.cpp#2 delete
.. //depot/projects/trustedbsd/capabilities/cap-support/qpowerboxserver/powerbox.h#2 delete
.. //depot/projects/trustedbsd/capabilities/cap-support/qpowerboxserver/qpowerboxserver.cpp#2 delete
.. //depot/projects/trustedbsd/capabilities/cap-support/qpowerboxserver/qpowerboxserver.h#2 delete
.. //depot/projects/trustedbsd/capabilities/cap-support/qpowerboxserver/qpowerboxserver.pro#2 delete

Differences ...

From owner-p4-projects@FreeBSD.ORG  Wed Sep 30 16:51:24 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 60F8F106575A; Wed, 30 Sep 2009 16:51:24 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C254D1065672
	for ; Wed, 30 Sep 2009 16:51:23 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 988F68FC28
	for ; Wed, 30 Sep 2009 16:51:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8UGpNSO054310
	for ; Wed, 30 Sep 2009 16:51:23 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8UGpN2l054308
	for perforce@freebsd.org; Wed, 30 Sep 2009 16:51:23 GMT
	(envelope-from jona@FreeBSD.org)
Date: Wed, 30 Sep 2009 16:51:23 GMT
Message-Id: <200909301651.n8UGpN2l054308@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169058 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 30 Sep 2009 16:51:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=169058

Change 169058 by jona@jona-trustedbsd-belle-vmware on 2009/09/30 16:51:10

	Removed Qt patches (gone to the non-FreeBSD-specific project http://code.google.com/p/capsicum-core/)

Affected files ...

.. //depot/projects/trustedbsd/capabilities/qt-patches/devel/qt4-corelib/files/patch-bsd-capabilities.diff#2 delete
.. //depot/projects/trustedbsd/capabilities/qt-patches/x11-fonts/fontconfig/files/patch-bsd-capabilities.diff#3 delete
.. //depot/projects/trustedbsd/capabilities/qt-patches/x11/libxcb/files/patch-bsd-capabilities.diff#3 delete

Differences ...

From owner-p4-projects@FreeBSD.ORG  Wed Sep 30 18:35:17 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 965991065692; Wed, 30 Sep 2009 18:35:17 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5B14E106566B
	for ; Wed, 30 Sep 2009 18:35:17 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4BC4A8FC16
	for ; Wed, 30 Sep 2009 18:35:17 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8UIZHHM063870
	for ; Wed, 30 Sep 2009 18:35:17 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8UIZH6t063868
	for perforce@freebsd.org; Wed, 30 Sep 2009 18:35:17 GMT
	(envelope-from mav@freebsd.org)
Date: Wed, 30 Sep 2009 18:35:17 GMT
Message-Id: <200909301835.n8UIZH6t063868@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169061 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 30 Sep 2009 18:35:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=169061

Change 169061 by mav@mav_mavbook on 2009/09/30 18:34:24

	Rework old devices workaround.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#37 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#37 (text+ko) ====

@@ -668,9 +668,6 @@
 
 			path->device->flags |= CAM_DEV_IDENTIFY_DATA_VALID;
 			ata_device_transport(path);
-			/* Old PIO devices do not need mode setting. */
-			if ((ident_buf->capabilities1 & ATA_SUPPORT_IORDY) == 0)
-				goto modedone;
 			PROBE_SET_ACTION(softc, PROBE_SETMODE);
 			xpt_release_ccb(done_ccb);
 			xpt_schedule(periph, priority);
@@ -725,6 +722,10 @@
 			xpt_release_devq(done_ccb->ccb_h.path, /*count*/1,
 					 /*run_queue*/TRUE);
 		}
+		/* Old PIO2 devices may not support mode setting. */
+		if (ata_max_pmode(ident_buf) <= ATA_PIO2 &&
+		    (ident_buf->capabilities1 & ATA_SUPPORT_IORDY) == 0)
+			goto modedone;
 		goto device_fail;
 	}
 	case PROBE_INQUIRY:

From owner-p4-projects@FreeBSD.ORG  Wed Sep 30 19:58:48 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D6B6E1065693; Wed, 30 Sep 2009 19:58:48 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9B35E1065692
	for ; Wed, 30 Sep 2009 19:58:48 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8B42C8FC2C
	for ; Wed, 30 Sep 2009 19:58:48 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8UJwmSE070761
	for ; Wed, 30 Sep 2009 19:58:48 GMT
	(envelope-from gk@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8UJwmXo070759
	for perforce@freebsd.org; Wed, 30 Sep 2009 19:58:48 GMT
	(envelope-from gk@FreeBSD.org)
Date: Wed, 30 Sep 2009 19:58:48 GMT
Message-Id: <200909301958.n8UJwmXo070759@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gk@FreeBSD.org using -f
From: Gleb Kurtsou 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169063 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 30 Sep 2009 19:58:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=169063

Change 169063 by gk@gk_h1 on 2009/09/30 19:58:05

	fix VOP_LOOKUP(CREATE) and VOP_WRITE() for unencrypted files
	
	do not allocate v_object for files without key (bypass as nullfs)
	allow writing to files without key
	try too lookup unencrypted file on VOP_LOOKUP(CREATE) first
	do "encrypted" lookup on EJUSTRETURN

Affected files ...

.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#18 edit
.. //depot/projects/soc2009/gk_pefs/sys/modules/Makefile#3 edit

Differences ...

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#18 (text+ko) ====

@@ -153,10 +153,10 @@
 	MPASS(pec != NULL && cnp != NULL);
 
 	if (encname_len >= MAXPATHLEN)
-		panic("invalid encrypted name length: %d", encname_len);
+		panic("pefs_enccn_set: invalid encrypted name length: %d", encname_len);
 
 	pefs_enccn_alloc(pec, cnp);
-	if (ptk) {
+	if (ptk != NULL && ptk->ptk_key != NULL) {
 		pec->pec_tkey = *ptk;
 	} else {
 		pec->pec_tkey.ptk_key = NULL;
@@ -270,6 +270,7 @@
 	eofflag = 0;
 	error = 0;
 	de = NULL;
+	ptk.ptk_key = NULL;
 	dpn_key = pefs_node_key(dpn);
 	while (!eofflag) {
 		uio = pefs_chunk_uio(&pc, offset, UIO_READ);
@@ -307,7 +308,7 @@
 	struct pefs_node *pn = VP_TO_PN(vp);
 	int error;
 
-	if (!(pn->pn_flags & PN_HASKEY)) {
+	if ((pn->pn_flags & PN_HASKEY) == 0) {
 		pefs_enccn_set(pec, NULL, cnp->cn_nameptr, cnp->cn_namelen,
 		    cnp);
 		return (0);
@@ -572,10 +573,11 @@
 	nokey_lookup = 0;
 	skip_lookup = (flags & ISDOTDOT) ||
 	    pefs_name_skip(cnp->cn_nameptr, cnp->cn_namelen);
-	if (((dpn->pn_flags & PN_HASKEY) == 0 || skip_lookup) &&
-	    !((flags & ISLASTCN) && cnp->cn_nameiop == CREATE)) {
+	if (((dpn->pn_flags & PN_HASKEY) == 0 || skip_lookup)) {
 		error = VOP_LOOKUP(ldvp, &lvp, cnp);
-		if (skip_lookup || error == 0 || error == EJUSTRETURN ||
+		if (skip_lookup || error == 0 ||
+		    (error == EJUSTRETURN &&
+		    !((flags & ISLASTCN) && cnp->cn_nameiop == CREATE)) ||
 		    pefs_no_keys(dvp))
 			nokey_lookup = 1;
 	}
@@ -670,13 +672,15 @@
 	struct pefs_node *pn = VP_TO_PN(vp);
 	int error;
 
-	if (!(pn->pn_flags & PN_HASKEY) &&
-	    (ap->a_mode & (FWRITE | O_APPEND)))
+	if (pefs_no_keys(vp) && (ap->a_mode & (FWRITE | O_APPEND)))
 		return (EROFS);
 
 	error = pefs_bypass(&ap->a_gen, NULL);
 	if (error == 0) {
-		vnode_create_vobject(vp, 0, ap->a_td);
+		if ((pn->pn_flags & PN_HASKEY) == 0)
+			vp->v_object = PEFS_LOWERVP(vp)->v_object;
+		else
+			vnode_create_vobject(vp, 0, ap->a_td);
 	}
 	return (error);
 }
@@ -696,6 +700,7 @@
 	int error;
 
 	MPASS(vp->v_type == VREG);
+	MPASS(pn->pn_flags & PN_HASKEY);
 
 	error = VOP_GETATTR(lvp, &va, cred);
 	if (error)
@@ -793,6 +798,9 @@
 			if ((vp->v_mount->mnt_flag & MNT_RDONLY) ||
 			    pefs_no_keys(vp))
 				return (EROFS);
+			/* Bypass size change for node without key */
+			if ((VP_TO_PN(vp)->pn_flags & PN_HASKEY) == 0)
+				break;
 			if (vp->v_type == VREG)
 				error = pefs_tryextend(vp, vap->va_size, cred);
 			else
@@ -1034,7 +1042,7 @@
 				ap->a_flags |= LK_EXCLUSIVE;
 				break;
 			default:
-				panic("Unsupported lock request %d\n",
+				panic("pefs_lock: unsupported lock request %d\n",
 				    ap->a_flags);
 			}
 			VOP_UNLOCK(lvp, 0);
@@ -1113,7 +1121,7 @@
 	pefs_node_buf_free(pn);
 	VI_UNLOCK(vp);
 
-	if (vp->v_object != NULL) {
+	if ((pn->pn_flags & PN_HASKEY) && vp->v_object != NULL) {
 		if (vp->v_object->resident_page_count > 0)
 			PEFSDEBUG("pefs_inactive: vobject has dirty pages: vp=%p count=%d\n",
 			    vp, vp->v_object->resident_page_count);
@@ -1140,7 +1148,10 @@
 
 	PEFSDEBUG("pefs_reclaim: vp=%p\n", vp);
 
-	vnode_destroy_vobject(vp);
+	if (pn->pn_flags & PN_HASKEY)
+		vnode_destroy_vobject(vp);
+	else
+		vp->v_object = NULL;
 	cache_purge(vp);
 
 	/*
@@ -1571,7 +1582,7 @@
 	ssize_t target_len;
 	int error;
 
-	if (!(pn->pn_flags & PN_HASKEY))
+	if ((pn->pn_flags & PN_HASKEY) == 0)
 		return (VOP_READLINK(lvp, uio, ap->a_cred));
 
 	pefs_chunk_create(&pc, pn, qmin(uio->uio_resid, MAXPATHLEN));
@@ -1667,7 +1678,7 @@
 
 	if (vp->v_type == VDIR)
 		return (EISDIR);
-	if (!(pn->pn_flags & PN_HASKEY) || vp->v_type == VFIFO)
+	if ((pn->pn_flags & PN_HASKEY) == 0 || vp->v_type == VFIFO)
 		return (VOP_READ(lvp, uio, ioflag, cred));
 	if (vp->v_type != VREG)
 		return (EOPNOTSUPP);
@@ -1783,8 +1794,11 @@
 	if (uio->uio_offset < 0)
 		return (EINVAL);
 
-	if (!(pn->pn_flags & PN_HASKEY))
-		return (EROFS);
+	if ((pn->pn_flags & PN_HASKEY) == 0) {
+		if (pefs_no_keys(vp))
+			return (EROFS);
+		return (VOP_WRITE(lvp, uio, ioflag, cred));
+	}
 
 	error = pefs_getsize(vp, &nsize, cred);
 	if (error != 0)
@@ -1920,7 +1934,7 @@
 	pefs_enccn_init(&tenccn);
 	if ((pn->pn_flags & PN_HASKEY) == 0 || vp->v_type != VDIR ||
 	    pn->pn_tkey.ptk_key == pk) {
-		PEFSDEBUG("pefs_setkey failed: haskkey=%d; type=%d; pk=%d\n",
+		PEFSDEBUG("pefs_setkey failed: haskey=%d; type=%d; pk=%d\n",
 		    (pn->pn_flags & PN_HASKEY) == 0, vp->v_type != VDIR,
 		    pn->pn_tkey.ptk_key == pk);
 		return (EINVAL);

==== //depot/projects/soc2009/gk_pefs/sys/modules/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.620 2009/07/05 15:25:02 trasz Exp $
+# $FreeBSD$
 
 .include 
 
@@ -14,6 +14,7 @@
 	${_agp} \
 	aha \
 	${_ahb} \
+	ahci \
 	${_aic} \
 	aic7xxx \
 	aio \
@@ -39,6 +40,7 @@
 	${_bktr} \
 	${_bm} \
 	bridgestp \
+	bwi \
 	cam \
 	${_canbepm} \
 	${_canbus} \
@@ -108,6 +110,7 @@
 	if_disc \
 	if_edsc \
 	if_ef \
+	if_epair \
 	if_faith \
 	if_gif \
 	if_gre \
@@ -148,6 +151,7 @@
 	libiconv \
 	libmbpool \
 	libmchain \
+	${_lindev} \
 	${_linprocfs} \
 	${_linsysfs} \
 	${_linux} \
@@ -211,6 +215,7 @@
 	${_pccard} \
 	${_pcfclock} \
 	pcn \
+	pefs \
 	${_pf} \
 	${_pflog} \
 	plip \
@@ -223,6 +228,7 @@
 	procfs \
 	pseudofs \
 	${_pst} \
+	pty  \
 	puc \
 	ral \
 	ralfw \
@@ -234,6 +240,7 @@
 	rl \
 	${_s3} \
 	${_safe} \
+	salsa20 \
 	${_sbni} \
 	scc \
 	scd \
@@ -241,6 +248,7 @@
 	sdhci \
 	sem \
 	sf \
+	siis \
 	sis \
 	sk \
 	${_smbfs} \
@@ -293,6 +301,7 @@
 	wlan_xauth \
 	${_wpi} \
 	${_wpifw} \
+	${_x86bios} \
 	${_xe} \
 	xfs \
 	xl \
@@ -367,6 +376,7 @@
 _if_ndis=	if_ndis
 _igb=		igb
 _io=		io
+_lindev=	lindev
 _linprocfs=	linprocfs
 _linsysfs=	linsysfs
 _linux=		linux
@@ -450,6 +460,7 @@
 _s3=		s3
 _twa=		twa
 _vesa=		vesa
+_x86bios=	x86bios
 .elif ${MACHINE} == "pc98"
 _canbepm=	canbepm
 _canbus=	canbus
@@ -476,6 +487,7 @@
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _cyclic=	cyclic
 .endif
+_dpms=		dpms
 _drm=		drm
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _dtrace=	dtrace
@@ -502,6 +514,7 @@
 _iwn=		iwn
 _iwnfw=		iwnfw
 _ixgb=		ixgb
+_lindev=	lindev
 _linprocfs=	linprocfs
 _linsysfs=	linsysfs
 _linux=		linux
@@ -521,14 +534,18 @@
 .endif
 _pccard=	pccard
 _rdma=		rdma	
+_s3=		s3
 _safe=		safe
 _scsi_low=	scsi_low
 _smbfs=		smbfs
 _sound=		sound
 _speaker=	speaker
+_splash=	splash
 _sppp=		sppp
 _tmpfs=		tmpfs
 _twa=		twa
+_vesa=		vesa
+_x86bios=	x86bios
 _wi=		wi
 _wpi=		wpi
 _wpifw=		wpifw

From owner-p4-projects@FreeBSD.ORG  Wed Sep 30 21:34:33 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5B585106568F; Wed, 30 Sep 2009 21:34:33 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1E889106568B
	for ; Wed, 30 Sep 2009 21:34:33 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0DCC28FC14
	for ; Wed, 30 Sep 2009 21:34:33 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8ULYWQK089881
	for ; Wed, 30 Sep 2009 21:34:32 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8ULYW11089879
	for perforce@freebsd.org; Wed, 30 Sep 2009 21:34:32 GMT
	(envelope-from rene@FreeBSD.org)
Date: Wed, 30 Sep 2009 21:34:32 GMT
Message-Id: <200909302134.n8ULYW11089879@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169065 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 30 Sep 2009 21:34:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=169065

Change 169065 by rene@rene_self on 2009/09/30 21:34:23

	Bandaid (i.e. wrong kind of fix) to fix the www/nl build
	Something very fishy is going on here

Affected files ...

.. //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#10 edit

Differences ...

==== //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#10 (text+ko) ====

@@ -42,7 +42,7 @@
     
  • IRC
    • 
     
  • Newsgroepen
    • 
     
  • Gebruikersgroepen
    • 
-    
  • Evenementen
    • 
+    
  • Evenementen
    • 
     
  • Bronnen op het web
    • 
     
  • Sociale netwerken
    • 
   

From owner-p4-projects@FreeBSD.ORG  Thu Oct  1 11:08:27 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A306A106568D; Thu,  1 Oct 2009 11:08:26 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 679561065670
	for ; Thu,  1 Oct 2009 11:08:26 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 56A778FC0C
	for ; Thu,  1 Oct 2009 11:08:26 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n91B8OGP092537
	for ; Thu, 1 Oct 2009 11:08:24 GMT
	(envelope-from gk@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n91B8OCN092535
	for perforce@freebsd.org; Thu, 1 Oct 2009 11:08:24 GMT
	(envelope-from gk@FreeBSD.org)
Date: Thu, 1 Oct 2009 11:08:24 GMT
Message-Id: <200910011108.n91B8OCN092535@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gk@FreeBSD.org using -f
From: Gleb Kurtsou 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169074 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Oct 2009 11:08:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=169074

Change 169074 by gk@gk_h1 on 2009/10/01 11:07:39

	use consistent names for pefs commands
	print supported algorithms

Affected files ...

.. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#9 edit
.. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.h#9 edit
.. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_key.c#8 edit

Differences ...

==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#9 (text+ko) ====

@@ -59,11 +59,12 @@
 static int	pefs_setkey(int argc, char *argv[]);
 static int	pefs_delkey(int argc, char *argv[]);
 static int	pefs_flushkeys(int argc, char *argv[]);
-static int	pefs_setchain(int argc, char *argv[]);
+static int	pefs_addchain(int argc, char *argv[]);
 static int	pefs_delchain(int argc, char *argv[]);
 static int	pefs_randomchain(int argc, char *argv[]);
 static int	pefs_showkeys(int argc, char *argv[]);
-static int	pefs_showchain(int argc, char *argv[]);
+static int	pefs_showchains(int argc, char *argv[]);
+static int	pefs_showalgs(int argc, char *argv[]);
 
 typedef int (*command_func_t)(int argc, char **argv);
 typedef int (*keyop_func_t)(struct pefs_keychain_head *kch, int fd,
@@ -85,9 +86,10 @@
 	{ "showkeys", pefs_showkeys },
 	{ "status", pefs_showkeys },
 	{ "randomchain", pefs_randomchain },
-	{ "setchain", pefs_setchain },
+	{ "addchain", pefs_addchain },
 	{ "delchain", pefs_delchain },
-	{ "showchain", pefs_showchain },
+	{ "showchains", pefs_showchains },
+	{ "showalgs", pefs_showalgs },
 	{ NULL, NULL },
 };
 
@@ -405,9 +407,8 @@
 pefs_showkeys(int argc, char *argv[])
 {
 	struct pefs_xkey k;
-	int chain, fd, i;
+	int fd, i;
 
-	chain = 1;
 	while ((i = getopt(argc, argv, "")) != -1)
 		switch(i) {
 		case '?':
@@ -442,9 +443,6 @@
 	}
 	close(fd);
 
-	if (chain) {
-	}
-
 	return (0);
 }
 
@@ -483,7 +481,7 @@
 }
 
 static int
-pefs_setchain(int argc, char *argv[])
+pefs_addchain(int argc, char *argv[])
 {
 	struct pefs_keychain *kc;
 	struct pefs_keychain_head kch;
@@ -690,7 +688,7 @@
 }
 
 static int
-pefs_showchain(int argc, char *argv[])
+pefs_showchains(int argc, char *argv[])
 {
 	struct pefs_xkey k;
 	struct pefs_keyparam kp;
@@ -813,7 +811,18 @@
 	return (0);
 }
 
+static int
+pefs_showalgs(int argc, char *argv[] __unused)
+{
+	if (argc != 0)
+		pefs_usage();
+
+	pefs_alg_list(stdout);
+
+	return (0);
+}
 
+
 void
 pefs_usage(void)
 {
@@ -824,12 +833,14 @@
 "	pefs setkey [-cCpvx] [-a alg] [-i iterations] [-k keyfile] directory\n"
 "	pefs delkey [-cCpv] [-i iterations] [-k keyfile] filesystem\n"
 "	pefs flushkeys filesystem\n"
-"	pefs setchain [-pPvZ] [-a alg] [-i iterations] [-k keyfile]\n"
+"	pefs showkeys filesystem\n"
+"	pefs addchain [-pPvZ] [-a alg] [-i iterations] [-k keyfile]\n"
 "		[-A alg] [-I iterations] [-K keyfile] filesystem\n"
 "	pefs delchain [-pv] [-i iterations] [-k keyfile] filesystem\n"
-"	pefs showchain [-p] [-i iterations] [-k keyfile] filesystem\n"
 "	pefs randomchain [-v] [-a alg] [-n min] [-N max] filesystem\n"
-"	pefs showkeys filesystem\n");
+"	pefs showchains [-p] [-i iterations] [-k keyfile] filesystem\n"
+"	pefs showalgs\n"
+);
 	exit(EX_USAGE);
 }
 

==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.h#9 (text+ko) ====

@@ -74,5 +74,5 @@
     const struct pefs_xkey *xk_parent);
 uintmax_t	pefs_keyid_as_int(char *keyid);
 const char *	pefs_alg_name(struct pefs_xkey *xk);
-int	pefs_alg_lookup(struct pefs_xkey *xk, const char *algname);
+void	pefs_alg_list(FILE *stream);
 

==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_key.c#8 (text+ko) ====

@@ -58,7 +58,6 @@
 };
 
 static struct algorithm algs[] = {
-	{ "salsa20-256", PEFS_ALG_SALSA20, 256 },
 	{ "aes128-ctr", PEFS_ALG_AES_CTR, 128 },
 	{ "aes128", PEFS_ALG_AES_CTR, 128 },
 	{ "aes192-ctr", PEFS_ALG_AES_CTR, 192 },
@@ -71,6 +70,7 @@
 	{ "camellia192", PEFS_ALG_CAMELLIA_CTR, 192 },
 	{ "camellia256-ctr", PEFS_ALG_CAMELLIA_CTR, 256 },
 	{ "camellia256", PEFS_ALG_CAMELLIA_CTR, 256 },
+	{ "salsa20-256", PEFS_ALG_SALSA20, 256 },
 	{ NULL, 0, 0 },
 };
 
@@ -87,7 +87,26 @@
 	return ("");
 }
 
-int
+void
+pefs_alg_list(FILE *stream)
+{
+	struct algorithm *prev, *alg;
+
+	fprintf(stream, "Supported algorithms:\n");
+	for (prev = NULL, alg = algs; alg->name != NULL; prev = alg++) {
+		if (prev != NULL && alg->id == prev->id &&
+		    alg->keybits == prev->keybits) {
+			fprintf(stream, "\t%s\t(alias for %s)\n", alg->name, prev->name);
+		} else if (alg->id == PEFS_ALG_DEFAULT &&
+		    alg->keybits == PEFS_ALG_DEFAULT_KEYBITS) {
+			fprintf(stream, "\t%s\t(default)\n", alg->name);
+		} else {
+			fprintf(stream, "\t%s\n", alg->name);
+		}
+	}
+}
+
+static int
 pefs_alg_lookup(struct pefs_xkey *xk, const char *algname)
 {
 	struct algorithm *alg;
@@ -117,8 +136,11 @@
 	xk->pxk_keybits = PEFS_ALG_DEFAULT_KEYBITS;
 
 	if (kp->kp_alg != NULL) {
-		if (pefs_alg_lookup(xk, kp->kp_alg) < 0)
-			errx(EX_USAGE, "invalid algorithm %s", kp->kp_alg);
+		if (pefs_alg_lookup(xk, kp->kp_alg) < 0) {
+			warnx("invalid algorithm %s", kp->kp_alg);
+			pefs_alg_list(stderr);
+			exit(EX_USAGE);
+		}
 	}
 
 	g_eli_crypto_hmac_init(&ctx, NULL, 0);

From owner-p4-projects@FreeBSD.ORG  Thu Oct  1 15:30:13 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F376E1065679; Thu,  1 Oct 2009 15:30:12 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B8C581065670
	for ; Thu,  1 Oct 2009 15:30:12 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A767F8FC0A
	for ; Thu,  1 Oct 2009 15:30:12 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n91FUCRO025739
	for ; Thu, 1 Oct 2009 15:30:12 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n91FUCc0025737
	for perforce@freebsd.org; Thu, 1 Oct 2009 15:30:12 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 1 Oct 2009 15:30:12 GMT
Message-Id: <200910011530.n91FUCc0025737@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169085 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Oct 2009 15:30:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=169085

Change 169085 by hselasky@hselasky_laptop001 on 2009/10/01 15:29:25

	
	USB controller: (EHCI Hardware BUG workaround)
	  The EHCI HW can use the qtd_next field instead of
	  qtd_altnext when a short packet is received. This
	  contradicts what is stated in the EHCI datasheet.
	  Also the total-bytes field in the status field of
	  the following TD gets corrupted upon reception
	  of a short packet!
	  We work this around in software by not queueing more
	  than one job/TD at a time of up to 16Kbytes! The bug
	  has been seen on multiple INTEL based EHCI chips.
	  Other vendors have not been tested yet.
	
	- Applications using /dev/usb/X.Y.Z, where Z is non-zero
	are affected, but not applications using LibUSB v0.1, v1.2 and v2.0.
	- Mass Storage is affected.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#34 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#34 (text+ko) ====

@@ -131,6 +131,7 @@
 	uint8_t	auto_data_toggle;
 	uint8_t	setup_alt_next;
 	uint8_t	last_frame;
+	uint8_t can_use_next;
 };
 
 void
@@ -1207,11 +1208,6 @@
 
 	xfer->td_transfer_cache = td;
 
-	/* update data toggle */
-
-	xfer->endpoint->toggle_next =
-	    (status & EHCI_QTD_TOGGLE_MASK) ? 1 : 0;
-
 #if USB_DEBUG
 	if (status & EHCI_QTD_STATERRS) {
 		DPRINTFN(11, "error, addr=%d, endpt=0x%02x, frame=0x%02x"
@@ -1235,6 +1231,9 @@
 static void
 ehci_non_isoc_done(struct usb_xfer *xfer)
 {
+	ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
+	ehci_qh_t *qh;
+	uint32_t status;
 	usb_error_t err = 0;
 
 	DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n",
@@ -1248,6 +1247,17 @@
 	}
 #endif
 
+	/* extract data toggle directly from the QH's overlay area */
+
+	qh = xfer->qh_start[xfer->flags_int.curr_dma_set];
+
+	usb_pc_cpu_invalidate(qh->page_cache);
+
+	status = hc32toh(sc, qh->qh_qtd.qtd_status);
+
+	xfer->endpoint->toggle_next =
+	    (status & EHCI_QTD_TOGGLE_MASK) ? 1 : 0;
+
 	/* reset scanner */
 
 	xfer->td_transfer_cache = xfer->td_transfer_first;
@@ -1348,6 +1358,7 @@
 		}
 	} else {
 		ehci_qtd_t *td;
+		ehci_qh_t *qh;
 
 		/* non-isochronous transfer */
 
@@ -1357,16 +1368,35 @@
 		 */
 		td = xfer->td_transfer_cache;
 
+		qh = xfer->qh_start[xfer->flags_int.curr_dma_set];
+
+		usb_pc_cpu_invalidate(qh->page_cache);
+
+		status = hc32toh(sc, qh->qh_qtd.qtd_status);
+		if (status & EHCI_QTD_ACTIVE) {
+			/* transfer is pending */
+			goto done;
+		}
+
 		while (1) {
 			usb_pc_cpu_invalidate(td->page_cache);
 			status = hc32toh(sc, td->qtd_status);
 
 			/*
-			 * if there is an active TD the transfer isn't done
+			 * Check if there is an active TD which
+			 * indicates that the transfer isn't done.
 			 */
 			if (status & EHCI_QTD_ACTIVE) {
 				/* update cache */
-				xfer->td_transfer_cache = td;
+				if (xfer->td_transfer_cache != td) {
+					xfer->td_transfer_cache = td;
+					if (qh->qh_qtd.qtd_next & 
+					    htohc32(sc, EHCI_LINK_TERMINATE)) {
+						/* XXX - manually advance to next frame */
+						qh->qh_qtd.qtd_next = td->qtd_self;
+						usb_pc_cpu_flush(td->page_cache);
+					}
+				}
 				goto done;
 			}
 			/*
@@ -1545,7 +1575,6 @@
 	ehci_qtd_t *td;
 	ehci_qtd_t *td_next;
 	ehci_qtd_t *td_alt_next;
-	uint32_t qtd_altnext;
 	uint32_t buf_offset;
 	uint32_t average;
 	uint32_t len_old;
@@ -1554,7 +1583,6 @@
 	uint8_t precompute;
 
 	terminate = htohc32(temp->sc, EHCI_LINK_TERMINATE);
-	qtd_altnext = terminate;
 	td_alt_next = NULL;
 	buf_offset = 0;
 	shortpkt_old = temp->shortpkt;
@@ -1612,7 +1640,8 @@
 
 		td->qtd_status =
 		    temp->qtd_status |
-		    htohc32(temp->sc, EHCI_QTD_SET_BYTES(average));
+		    htohc32(temp->sc, EHCI_QTD_IOC |
+			EHCI_QTD_SET_BYTES(average));
 
 		if (average == 0) {
 
@@ -1687,11 +1716,23 @@
 			td->qtd_buffer_hi[x] = 0;
 		}
 
-		if (td_next) {
-			/* link the current TD with the next one */
-			td->qtd_next = td_next->qtd_self;
+		if (temp->can_use_next) {
+			if (td_next) {
+				/* link the current TD with the next one */
+				td->qtd_next = td_next->qtd_self;
+			}
+		} else {
+			/*
+			 * BUG WARNING: The EHCI HW can use the
+			 * qtd_next field instead of qtd_altnext when
+			 * a short packet is received! We work this
+			 * around in software by not queueing more
+			 * than one job/TD at a time!
+			 */
+			td->qtd_next = terminate;
 		}
-		td->qtd_altnext = qtd_altnext;
+
+		td->qtd_altnext = terminate;
 		td->alt_next = td_alt_next;
 
 		usb_pc_cpu_flush(td->page_cache);
@@ -1703,15 +1744,9 @@
 		/* setup alt next pointer, if any */
 		if (temp->last_frame) {
 			td_alt_next = NULL;
-			qtd_altnext = terminate;
 		} else {
 			/* we use this field internally */
 			td_alt_next = td_next;
-			if (temp->setup_alt_next) {
-				qtd_altnext = td_next->qtd_self;
-			} else {
-				qtd_altnext = terminate;
-			}
 		}
 
 		/* restore */
@@ -1756,6 +1791,8 @@
 	temp.qtd_status = 0;
 	temp.last_frame = 0;
 	temp.setup_alt_next = xfer->flags_int.short_frames_ok;
+	temp.can_use_next = (xfer->flags_int.control_xfr ||
+	    (UE_GET_DIR(xfer->endpointno) == UE_DIR_OUT));
 
 	if (xfer->flags_int.control_xfr) {
 		if (xfer->endpoint->toggle_next) {
@@ -1889,7 +1926,6 @@
 	/* the last TD terminates the transfer: */
 	td->qtd_next = htohc32(temp.sc, EHCI_LINK_TERMINATE);
 	td->qtd_altnext = htohc32(temp.sc, EHCI_LINK_TERMINATE);
-	td->qtd_status |= htohc32(temp.sc, EHCI_QTD_IOC);
 
 	usb_pc_cpu_flush(td->page_cache);
 

From owner-p4-projects@FreeBSD.ORG  Thu Oct  1 17:29:26 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 257E9106568F; Thu,  1 Oct 2009 17:29:26 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DE58A106566B
	for ; Thu,  1 Oct 2009 17:29:25 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CCD8E8FC13
	for ; Thu,  1 Oct 2009 17:29:25 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n91HTOsV046677
	for ; Thu, 1 Oct 2009 17:29:24 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n91HTOZ0046675
	for perforce@freebsd.org; Thu, 1 Oct 2009 17:29:24 GMT
	(envelope-from stas@freebsd.org)
Date: Thu, 1 Oct 2009 17:29:24 GMT
Message-Id: <200910011729.n91HTOZ0046675@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169089 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Oct 2009 17:29:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=169089

Change 169089 by stas@stas_yandex on 2009/10/01 17:28:52

	- Remove debug warning, we don't need to deal with any extra fields.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_scheduler/scheduler.c#5 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_scheduler/scheduler.c#5 (text+ko) ====

@@ -405,7 +405,7 @@
 #  if defined(VGO_linux)
    /* no other fields to clear */
 #  elif defined(VGO_freebsd)
-#     warning "Needs love"
+   /* no other fields to clear */
 #  elif defined(VGO_aix5)
    tst->os_state.cancel_async    = False;
    tst->os_state.cancel_disabled = False;

From owner-p4-projects@FreeBSD.ORG  Thu Oct  1 17:33:29 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AEEEE1065676; Thu,  1 Oct 2009 17:33:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 73448106568B
	for ; Thu,  1 Oct 2009 17:33:29 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 485F68FC1E
	for ; Thu,  1 Oct 2009 17:33:29 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n91HXTME047051
	for ; Thu, 1 Oct 2009 17:33:29 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n91HXT7f047049
	for perforce@freebsd.org; Thu, 1 Oct 2009 17:33:29 GMT
	(envelope-from stas@freebsd.org)
Date: Thu, 1 Oct 2009 17:33:29 GMT
Message-Id: <200910011733.n91HXT7f047049@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169091 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Oct 2009 17:33:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=169091

Change 169091 by stas@stas_yandex on 2009/10/01 17:33:04

	- Fix one subtle error with pthread_exit/pthread_join.  Before this
	  change we were not passing the right argument value to thr_exit
	  syscall and thus consumers sleeping on our wait channel were
	  not awakened.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#44 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#44 (text+ko) ====

@@ -171,11 +171,11 @@
 #if defined(VGP_x86_freebsd)	/* FreeBSD has args on the stack */
       asm volatile (
          "movl	%1, %0\n"	/* set tst->status = VgTs_Empty */
-         "movl	%2, %%eax\n"    /* set %eax = __NR_thr_exit */
-         "leal	%3, %%ebx\n"    /* set %ebx = tst->os_state.exitcode */
+         "movl	%2, %%eax\n"    /* set %eax = __NR_hr_exit */
+         "movl	%3, %%ebx\n"    /* set %ebx = tst->os_state.exitcode */
 	 "pushl	%%ebx\n"	/* arg on stack */
 	 "pushl	%%ebx\n"	/* fake return address */
-         "int	$0x80\n"	/* thr_exit(&tst->os_state.exitcode) */
+         "int	$0x80\n"	/* thr_exit(tst->os_state.exitcode) */
 	 "popl	%%ebx\n"	/* fake return address */
 	 "popl	%%ebx\n"	/* arg off stack */
          : "=m" (tst->status)
@@ -184,9 +184,9 @@
       asm volatile (
          "movl	%1, %0\n"	/* set tst->status = VgTs_Empty */
          "movq	%2, %%rax\n"    /* set %rax = __NR_thr_exit */
-         "leaq	%3, %%rdi\n"    /* set %rdi = tst->os_state.exitcode */
+         "movq	%3, %%rdi\n"    /* set %rdi = tst->os_state.exitcode */
 	 "pushq	%%rdi\n"	/* fake return address */
-         "syscall\n"		/* thr_exit(&tst->os_state.exitcode) */
+         "syscall\n"		/* thr_exit(tst->os_state.exitcode) */
 	 "popq	%%rdi\n"	/* fake return address */
          : "=m" (tst->status)
          : "n" (VgTs_Empty), "n" (__NR_thr_exit), "m" (tst->os_state.exitcode));
@@ -1808,8 +1808,8 @@
       PRE_MEM_WRITE( "thr_exit(status)", ARG1, sizeof(long) );
    tst = VG_(get_ThreadState)(tid);
    tst->exitreason = VgSrc_ExitThread;
-   tst->os_state.exitcode = 0;
-   VG_(exit_thread)(tid);
+   tst->os_state.exitcode = ARG1;
+   SET_STATUS_Success(0);
 }
 
 PRE(sys_thr_set_name)

From owner-p4-projects@FreeBSD.ORG  Thu Oct  1 18:42:48 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B79C2106568F; Thu,  1 Oct 2009 18:42:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79116106568D
	for ; Thu,  1 Oct 2009 18:42:48 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 63E5B8FC0A
	for ; Thu,  1 Oct 2009 18:42:48 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n91IgmbF053184
	for ; Thu, 1 Oct 2009 18:42:48 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n91IgjG1053180
	for perforce@freebsd.org; Thu, 1 Oct 2009 18:42:45 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 1 Oct 2009 18:42:45 GMT
Message-Id: <200910011842.n91IgjG1053180@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 
Cc: 
Subject: PERFORCE change 169096 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Oct 2009 18:42:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=169096

Change 169096 by rwatson@rwatson_freebsd_capabilities on 2009/10/01 18:42:11

	Integrate TrustedBSD capabilities branch -- almost no conflicts
	as 8/9 have been fairly static since last integ.  Main exception
	was syscalls.master as system call reservations for capability
	calls have gone upstream, but without implementations.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/Makefile.inc1#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/ObsoleteFiles.inc#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/UPDATING#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/chmod/chmod.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/cp/utils.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/getfacl/getfacl.1#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/getfacl/getfacl.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/ls/print.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/mv/mv.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/mask.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/merge.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/remove.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/setfacl.1#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/setfacl.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/setfacl/setfacl.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/sh/eval.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/sh/exec.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/sh/exec.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/sh/mknodes.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/sh/nodes.c.pat#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/sh/sh.1#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/cddl/compat/opensolaris/include/assert.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/head/assert.h#3 delete
.. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/cddl/lib/libnvpair/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/bzip2/FREEBSD-vendor#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/ee/ee.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/file/magic2mime#3 branch
.. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/gdtoaimp.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/misc.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/netcat/FREEBSD-vendor#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/openpam/FREEBSD-vendor#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/top/display.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/traceroute/as.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/traceroute/as.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/traceroute/traceroute.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/FREEBSD-vendor#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/apps/md4.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/crypto/pqueue/pqueue.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/crypto/pqueue/pqueue.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/ssl/d1_both.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/ssl/d1_pkt.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/bftest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/bntest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/casttest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/destest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/dhtest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/dsatest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/ecdhtest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/ecdsatest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/ectest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/enginetest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/evp_test.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/exptest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_aesavs.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_desmovs.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_dsatest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_dssvs.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_hmactest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_randtest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_rngvs.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_rsagtest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_rsastest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_rsavtest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_shatest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/fips_test_suite.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/hmactest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/ideatest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/jpaketest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/md2test.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/md4test.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/md5test.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/mdc2test.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/randtest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/rc2test.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/rc4test.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/rc5test.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/rmdtest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/rsa_test.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/sha1test.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/sha256t.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/sha512t.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/shatest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssl/test/ssltest.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/etc/Makefile#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/defaults/periodic.conf#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/defaults/rc.conf#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/freebsd-update.conf#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/inetd.conf#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BSD.include.dist#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BSD.local.dist#3 delete
.. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BSD.usr.dist#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BSD.x11-4.dist#2 delete
.. //depot/projects/trustedbsd/capabilities/src/etc/mtree/BSD.x11.dist#2 delete
.. //depot/projects/trustedbsd/capabilities/src/etc/mtree/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/network.subr#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/periodic/daily/400.status-disks#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/periodic/security/200.chkmounts#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/Makefile#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/NETWORKING#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/addswap#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/auto_linklocal#3 delete
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/defaultroute#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/devd#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/faith#1 branch
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/ip6addrctl#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/ipsec#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/mroute6d#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/netif#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/netoptions#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/network_ipv6#3 delete
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/ppp#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/route6d#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/routed#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/routing#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/rtadvd#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/static_arp#1 branch
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/stf#1 branch
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/sysctl#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/wpa_supplicant#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.subr#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/groff/tmac/mdoc.local#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/patch/common.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/patch/pch.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/include/Makefile#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/Makefile#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/archive_read_support_format_iso9660.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_compat_zip.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_isojoliet_bz2.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libarchive/test/test_read_format_isorr_bz2.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/Versions.def#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/db/hash/hash.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Makefile.inc#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/getpagesizes.3#1 branch
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/getpagesizes.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/ctype.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/digittoint.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isalnum.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isalpha.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isascii.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isblank.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/iscntrl.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isdigit.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isgraph.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isideogram.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/islower.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isphonogram.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isprint.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/ispunct.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isrune.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isspace.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isspecial.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isupper.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isxdigit.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/toascii.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/tolower.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/toupper.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/net/getifaddrs.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/Makefile.inc#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/acl_calc_mask.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/acl_support.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/acl_to_text.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/mac.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/mac_free.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/mac_get.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/mac_set.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/mac_text.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/posix1e/posix1e.3#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/regex/engine.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/regex/grot/tests#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdio/fopen.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdlib/malloc.3#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdlib/malloc.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdlib/ptsname.3#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdtime/localtime.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/stdtime/strptime.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/fcntl.2#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/intro.2#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/kqueue.2#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/setfib.2#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/stack_protector.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libdevinfo/devinfo.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libdisk/change.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libjail/jail.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libkvm/kvm_proc.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libkvm/kvm_vnet.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.3#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.atom.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.core.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.core2.3#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.iaf.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.k7.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.k8.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.p4.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.p5.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc.p6.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc_capabilities.3#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc_read.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libradius/libradius.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libradius/radlib.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libradius/radlib.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libradius/radlib_private.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libstand/net.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libstand/nfs.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libstand/rpc.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libthr/thread/thr_spec.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libthr/thread/thr_umtx.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/libexec/Makefile#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/libexec/rpc.rquotad/rquotad.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/Makefile#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/picobsd/bridge/crunch.conf#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/scripts/lib32-make.sh#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/scripts/mm-mtree.sh#1 branch
.. //depot/projects/trustedbsd/capabilities/src/release/scripts/package-split.py#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/svnbranch.awk#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sbin/bsdlabel/bsdlabel.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/camcontrol/camcontrol.8#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/camcontrol/camcontrol.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/label/glabel.8#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/mirror/geom_mirror.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/mirror/gmirror.8#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/nop/gnop.8#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/part/geom_part.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/geom/core/geom.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/Makefile#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/af_inet6.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/af_nd6.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/ifconfig.8#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/ifgif.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/ipfw/ipfw.8#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mksnap_ffs/mksnap_ffs.8#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mount/mount.8#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mount/mount.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mount_nfs/mount_nfs.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/route/route.8#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/route/route.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/savecore/savecore.8#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/savecore/savecore.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/shutdown/shutdown.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/umount/umount.8#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/colldef/Makefile#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/colldef/la_LN.ISO8859-13.src#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/colldef/lt_LT.ISO8859-13.src#2 delete
.. //depot/projects/trustedbsd/capabilities/src/share/examples/cvsup/stable-supfile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/examples/scsi_target/scsi_target.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/examples/scsi_target/scsi_target.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/Makefile#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/acpi_panasonic.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ahci.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/dpms.4#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ed.4#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/inet6.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ip6.4#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ips.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/lindev.4#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/man4.i386/Makefile#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/man4.i386/dpms.4#2 delete
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/mfi.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/mpt.4#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/msk.4#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/polling.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/pts.4#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/pty.4#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/syscons.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/textdump.4#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man5/device.hints.5#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man5/freebsd-update.conf.5#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man5/make.conf.5#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man5/procfs.5#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man5/rc.conf.5#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man5/tmpfs.5#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man7/release.7#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man7/tuning.7#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/Makefile#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/VOP_ACCESS.9#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/acl.9#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/fail.9#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211.9#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_amrr.9#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_beacon.9#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_bmiss.9#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_crypto.9#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_ddb.9#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_input.9#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_ioctl.9#2 delete
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_node.9#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_output.9#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_proto.9#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_radiotap.9#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_regdomain.9#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_scan.9#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/ieee80211_vap.9#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/kproc.9#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/kthread.9#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/sglist.9#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/taskqueue.9#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/vaccess.9#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/vaccess_acl_nfs4.9#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/misc/bsd-family-tree#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/misc/iso3166#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/mklocale/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/mklocale/la_LN.ISO8859-13.src#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/mklocale/lt_LT.ISO8859-13.src#2 delete
.. //depot/projects/trustedbsd/capabilities/src/share/monetdef/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/monetdef/lv_LV.ISO8859-13.src#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/monetdef/zh_CN.GB18030.src#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/monetdef/zh_CN.GB2312.src#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/msgdef/Makefile#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/msgdef/lv_LV.ISO8859-13.src#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/msgdef/lv_LV.UTF-8.src#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/numericdef/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/timedef/Makefile#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/timedef/hi_IN.ISCII-DEV.src#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/timedef/ja_JP.UTF-8.src#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/timedef/lv_LV.ISO8859-13.src#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/timedef/lv_LV.UTF-8.src#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/africa#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/asia#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/australasia#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/europe#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/leapseconds#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/southamerica#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/acpi_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/madt.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/elf_machdep.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/identcpu.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/initcpu.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/local_apic.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/machdep.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/mp_machdep.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/msi.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/pmap.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/trap.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/GENERIC#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/NOTES#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/XENHVM#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/_align.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/acpica_machdep.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/apicvar.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/apm_bios.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/cpufunc.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/param.h#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/pmc_mdep.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/smp.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/specialreg.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_proto.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_sysvec.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/pci/pci_cfgreg.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/identcpu.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/pmap.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/undefined.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/vm_machdep.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/at91/uart_dev_at91usart.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/conf/CAMBRIA#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/conf/SHEEVAPLUG#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/include/_align.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/include/md_var.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/include/param.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/common.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/discovery/db78xxx.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/files.db88f6xxx#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/files.kirkwood#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/files.sheevaplug#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/sheevaplug.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/std.db88f6xxx#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/std.kirkwood#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/kirkwood/std.sheevaplug#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/mv_machdep.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/mvreg.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/mvvar.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/orion/db88f5xxx.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/xscale/ixp425/ixdp425_pci.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/boot/forth/loader.conf#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/gptboot/gptboot.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/libi386/pxe.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/boot/pc98/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/bsm/audit_kevents.h#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_all.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_all.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_da.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_xpt.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_ccb.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_periph.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_xpt.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_xpt_internal.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_cd.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_da.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_target.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/proc.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/taskq.h#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/vfs.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/vnode.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#3 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#4 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_misc.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#17 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/syscalls.master#14 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/ia32/ia32_sysvec.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/linprocfs/linprocfs.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_ioctl.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_misc.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_proto.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/x86bios/x86bios.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/x86bios/x86bios.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/x86bios/x86bios_alloc.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/NOTES#13 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/files#18 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.amd64#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.i386#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.ia64#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.pc98#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.powerpc#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.sparc64#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/newvers.sh#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/options#14 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/options.amd64#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/options.arm#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/options.i386#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/options.pc98#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/altq/altq/altq_subr.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/changes.txt#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmtable.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/asldefine.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslload.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evgpe.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exfield.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exutils.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acconfig.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acdebug.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acglobal.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/achware.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acinterp.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/aclocal.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acmacros.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acobject.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acparser.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acpredef.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/actbl.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/actbl1.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/actbl2.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/actypes.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/amlcode.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/parser/psloop.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/parser/psxface.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utids.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/pf/net/pf.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/pf/net/pf_if.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/pf/net/pfvar.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/x86emu/x86emu.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/x86emu/x86emu.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/x86emu/x86emu_regs.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/x86emu/x86emu_util.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/aac/aac.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/aac/aacvar.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpi_support/acpi_aiboost.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpi_support/acpi_ibm.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_acad.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_battery.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_cpu.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_dock.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_pcib_acpi.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_thermal.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_video.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpivar.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/adb/adb_bus.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ae/if_ae.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/age/if_age.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/agp/agp_i810.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ahci/ahci.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ahci/ahci.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/alc/if_alc.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ale/if_ale.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/amdtemp/amdtemp.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/amr/amr.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/asmc/asmc.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/asmc/asmcvar.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-all.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-disk.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-dma.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-raid.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-acerlabs.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-marvell.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ah_osdep.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ah.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ah_regdomain.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/if_ath.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/atkbdc/atkbd.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/atkbdc/psm.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/bce/if_bce.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/bktr/bktr_os.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ciss/ciss.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ciss/cissreg.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ciss/cissvar.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/coretemp/coretemp.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_main.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_sge.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/de/if_de.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/de/if_devar.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/dpms/dpms.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drmP.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drm_bufs.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drm_drv.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drm_fops.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drm_pciids.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drm_sysctl.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/r600_blit.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/r600_cp.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/radeon_cp.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/radeon_cs.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/radeon_drm.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/radeon_drv.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/radeon_irq.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/radeon_state.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/e1000/if_em.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/e1000/if_igb.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ep/if_ep.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ep/if_epreg.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/fb/s3_pci.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/fb/vesa.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/fb/vesa.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/fb/vga.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/firewire/fwcrom.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/firewire/fwdev.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/fxp/if_fxp.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/hptiop/hptiop.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/hptrr/hptrr_osm_bsd.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/hwpmc_core.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/pmc_events.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ichwd/ichwd.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/if_ndis/if_ndis.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/iir/iir.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ips/ips_pci.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/iscsi/initiator/isc_cam.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/isp/isp.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/isp/isp_freebsd.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/isp/isp_stds.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/isp/isp_tpublic.h#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/isp/ispmbox.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ixgbe/ixgbe.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/jme/if_jme.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/kbd/kbd.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/lindev/full.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/lindev/lindev.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/lindev/lindev.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mfi/mfi.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mfi/mfi_ioctl.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mfi/mfireg.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mge/if_mge.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mii/e1000phy.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mii/e1000phyreg.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mlx/mlx.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mmc/mmc.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mpt/mpt_raid.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/msk/if_msk.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/msk/if_mskreg.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mwl/if_mwl.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mxge/if_mxge.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mxge/if_mxge_var.h#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/null/null.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/pccbb/pccbb.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/pci/pci.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/pci/pci_user.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/pci/pcireg.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/pci/pcivar.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/vpo.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/pst/pst-iop.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/pty/pty.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/re/if_re.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/rp/rp.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/rp/rp_pci.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/siis/siis.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/snp/snp.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/es137x.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/es137x.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hda_reg.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac_private.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac_reg.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/t4dwave.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudio.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/daemon/daemon_saver.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/scmouse.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/scterm-teken.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/scvesactl.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/scvgarndr.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/scvidctl.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/syscons.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/syscons.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/Makefile#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/gensequences#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/sequences#4 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken.c#6 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken.h#5 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_demo.c#4 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_scs.h#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_stress.c#3 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_subr.h#4 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_subr_compat.h#4 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/teken/teken_wcwidth.h#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/twa/tw_cl_io.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/twa/tw_cl_share.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/twe/twe.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/twe/twevar.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/txp/if_txp.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/atmegadci.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_pci.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/usb_controller.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/ukbd.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/misc/ufm.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_aue.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_axe.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cdce.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cdcereg.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/usb_ethernet.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/quirk/usb_quirk.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/u3g.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uark.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ubsa.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ubser.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uch341.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uchcom.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ucycom.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ufoma.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uftdi.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ugensa.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uipaq.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umct.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umodem.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umoscom.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uplcom.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/usb_serial.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/usb_serial.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uslcom.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uvisor.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uvscom.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/umass.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/urio.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb.h#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_bus.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_busdma.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_cdc.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_compat_linux.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dev.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_device.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_device.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_handle_request.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hub.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_process.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_process.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_transfer.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdevs#16 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rum.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rumreg.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_upgt.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtw.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zyd.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/wi/if_wi.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/xen/blkback/blkback.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/xen/blkfront/blkfront.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/xen/console/console.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/xen/netback/netback.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/fifofs/fifo_vnops.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/msdosfs/msdosfs_conv.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfs/nfs_commonacl.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clnode.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clport.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clsubs.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clvnops.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/procfs/procfs.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/procfs/procfs.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/procfs/procfs_osrel.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/pseudofs/pseudofs_vncache.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/geom_dev.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/geom_disk.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/geom_io.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/geom_vfs.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/multipath/g_multipath.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/part/g_part.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/part/g_part_ebr.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/part/g_part_gpt.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/stripe/g_stripe.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/acpica/acpi_machdep.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/acpica/madt.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/bios/smapi.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/bios/smbios.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/bios/vpd.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/GENERIC#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/NOTES#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/cpufreq/hwpstate.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/elf_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/identcpu.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/initcpu.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/local_apic.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/machdep.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/mp_machdep.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/msi.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/pmap.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/trap.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_proto.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/_align.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/acpica_machdep.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/apicvar.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/apm_bios.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/cpufunc.h#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/param.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/pc/vesa.h#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/pcpu.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/pmap.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/pmc_mdep.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/smp.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/specialreg.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/xen/xen-os.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/isa/dpms.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/isa/vesa.c#4 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_proto.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_sysvec.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/pci/pci_cfgreg.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/xen/locore.s#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/xen/mp_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/xen/pmap.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/genassym.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/interrupt.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/machdep.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/mp_machdep.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/_align.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/param.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/smp.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/isa/isahint.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_main.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#39 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_conf.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_cons.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#29 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_event.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#21 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#18 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_fork.c#13 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_jail.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_kthread.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_linker.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_lock.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_mib.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_mutex.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_poll.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_proc.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_rwlock.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_shutdown.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_sig.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_subr.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_sx.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_sysctl.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_thr.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_thread.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_timeout.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_umtx.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_uuid.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sched_ule.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_acl_nfs4.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_bus.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_devstat.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_kdb.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_pcpu.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_sglist.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_smp.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_taskqueue.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_witness.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_generic.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_pipe.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#39 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#21 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty_pts.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty_pty.c#8 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty_ttydisc.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_domain.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_mqueue.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_socket.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_syscalls.c#16 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_aio.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_cache.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_export.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_subr.c#13 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#17 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_vnops.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/mips/include/_align.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/mips/include/param.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/mips/include/smp.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/mp_machdep.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/Makefile#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/acpi/acpi/Makefile#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/dpms/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/drm/radeon/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/dtrace/lockstat/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/lindev/Makefile#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/nfslockd/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/procfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/pty/Makefile#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/usb/Makefile#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/usb/uch341/Makefile#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/vesa/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/x86bios/Makefile#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/zfs/Makefile#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/bpf.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/bpf_buffer.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/bpf_zerocopy.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/bpfdesc.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/bridgestp.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/flowtable.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/flowtable.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if_arp.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if_bridge.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if_ef.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if_llatbl.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if_llatbl.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if_var.h#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if_vlan.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/route.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/rtsock.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/vnet.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/vnet.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211.h#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_action.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_dfs.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_hwmp.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_input.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_mesh.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_mesh.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_proto.h#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_sta.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netatalk/at_control.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_gif.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/if_ether.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/if_ether.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in_mcast.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in_pcb.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in_proto.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_carp.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_divert.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_divert.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_fastfwd.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_fw.h#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_mroute.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_output.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ipfw/ip_fw2.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ipfw/ip_fw_pfil.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/raw_ip.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_asconf.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_bsd_addr.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_indata.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_input.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_os_bsd.h#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_output.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_pcb.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_pcb.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_structs.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_sysctl.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_timer.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_usrreq.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctputil.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctputil.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_subr.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_timer.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_timer.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_timewait.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_usrreq.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_var.h#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/icmp6.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6_ifattach.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6_proto.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6_src.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/ip6_input.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/ip6_output.c#11 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Oct  1 18:45:52 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 444C4106568B; Thu,  1 Oct 2009 18:45:52 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4D201065676
	for ; Thu,  1 Oct 2009 18:45:51 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D2D8B8FC15
	for ; Thu,  1 Oct 2009 18:45:51 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n91IjpIx053435
	for ; Thu, 1 Oct 2009 18:45:51 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n91IjpqV053433
	for perforce@freebsd.org; Thu, 1 Oct 2009 18:45:51 GMT
	(envelope-from scottl@freebsd.org)
Date: Thu, 1 Oct 2009 18:45:51 GMT
Message-Id: <200910011845.n91IjpqV053433@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169097 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Oct 2009 18:45:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=169097

Change 169097 by scottl@scottl-y1 on 2009/10/01 18:45:12

	Prototype work for moving the boot-time CAM scan from
	SI_SUB_CONF_INTR_HOOK to its own SYSINIT.

Affected files ...

.. //depot/projects/firewire/sys/cam/cam_xpt.c#2 edit
.. //depot/projects/firewire/sys/sys/kernel.h#2 edit

Differences ...

==== //depot/projects/firewire/sys/cam/cam_xpt.c#2 (text+ko) ====

@@ -107,8 +107,6 @@
 	TAILQ_HEAD(,cam_eb)	xpt_busses;
 	u_int			bus_generation;
 
-	struct intr_config_hook	*xpt_config_hook;
-
 	struct mtx		xpt_topo_lock;
 	struct mtx		xpt_lock;
 };
@@ -910,35 +908,19 @@
 	xpt_free_path(path);
 	mtx_unlock(&xsoftc.xpt_lock);
 
-	/*
-	 * Register a callback for when interrupts are enabled.
-	 */
-	xsoftc.xpt_config_hook =
-	    (struct intr_config_hook *)malloc(sizeof(struct intr_config_hook),
-					      M_CAMXPT, M_NOWAIT | M_ZERO);
-	if (xsoftc.xpt_config_hook == NULL) {
-		printf("xpt_init: Cannot malloc config hook "
-		       "- failing attach\n");
-		return (ENOMEM);
-	}
-
-	xsoftc.xpt_config_hook->ich_func = xpt_config;
-	if (config_intrhook_establish(xsoftc.xpt_config_hook) != 0) {
-		free (xsoftc.xpt_config_hook, M_CAMXPT);
-		printf("xpt_init: config_intrhook_establish failed "
-		       "- failing attach\n");
-	}
-
 	/* fire up rescan thread */
 	if (kproc_create(xpt_scanner_thread, NULL, NULL, 0, 0, "xpt_thrd")) {
 		printf("xpt_init: failed to create rescan thread\n");
 	}
 	/* Install our software interrupt handlers */
-	swi_add(NULL, "cambio", camisr, NULL, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih);
+	swi_add(NULL, "cambio", camisr, NULL, SWI_CAMBIO, INTR_MPSAFE,
+		&cambio_ih);
 
 	return (0);
 }
 
+SYSINIT(cam_config, SI_SUB_CONFIG_CAM, SI_ORDER_FIRST, xpt_config, NULL);
+
 static cam_status
 xptregister(struct cam_periph *periph, void *arg)
 {
@@ -4697,6 +4679,13 @@
 		}
 		xpt_for_all_busses(xptconfigfunc, NULL);
 	}
+
+	mtx_lock(&xsoftc.xpt_lock);
+	while (msleep(xpt_config, &xsoftc.xpt_lock, PCONFIG, "camhk",
+		      30 * hz) == EWOULDBLOCK) {
+		printf("Warning\n");
+	}
+	mtx_unlock(&xsoftc.xpt_lock);
 }
 
 /*
@@ -4727,6 +4716,7 @@
 	struct	periph_driver **p_drv;
 	int	i;
 
+	mtx_lock(&xsoftc.xpt_lock);
 	if (busses_to_config == 0) {
 		/* Register all the peripheral drivers */
 		/* XXX This will have to change when we have loadable modules */
@@ -4743,12 +4733,11 @@
 		xpt_for_all_devices(xptpassannouncefunc, NULL);
 
 		/* Release our hook so that the boot can continue. */
-		config_intrhook_disestablish(xsoftc.xpt_config_hook);
-		free(xsoftc.xpt_config_hook, M_CAMXPT);
-		xsoftc.xpt_config_hook = NULL;
+		wakeup(xpt_config);
 	}
 
 	free(context, M_CAMXPT);
+	mtx_unlock(&xsoftc.xpt_lock);
 }
 
 static void

==== //depot/projects/firewire/sys/sys/kernel.h#2 (text+ko) ====

@@ -154,6 +154,7 @@
 	SI_SUB_KPROF		= 0x9000000,	/* kernel profiling*/
 	SI_SUB_KICK_SCHEDULER	= 0xa000000,	/* start the timeout events*/
 	SI_SUB_INT_CONFIG_HOOKS	= 0xa800000,	/* Interrupts enabled config */
+	SI_SUB_CONFIG_CAM	= 0xa900000,	/* Interrupts enabled config */
 	SI_SUB_ROOT_CONF	= 0xb000000,	/* Find root devices */
 	SI_SUB_DUMP_CONF	= 0xb200000,	/* Find dump devices */
 	SI_SUB_RAID		= 0xb380000,	/* Configure GEOM classes */

From owner-p4-projects@FreeBSD.ORG  Thu Oct  1 19:32:45 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E3B151065693; Thu,  1 Oct 2009 19:32:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8E75810656AA
	for ; Thu,  1 Oct 2009 19:32:44 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7ACAC8FC16
	for ; Thu,  1 Oct 2009 19:32:44 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n91JWi37057715
	for ; Thu, 1 Oct 2009 19:32:44 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n91JWhJl057713
	for perforce@freebsd.org; Thu, 1 Oct 2009 19:32:43 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 1 Oct 2009 19:32:43 GMT
Message-Id: <200910011932.n91JWhJl057713@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 
Cc: 
Subject: PERFORCE change 169100 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Oct 2009 19:32:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=169100

Change 169100 by jhb@jhb_jhbbsd on 2009/10/01 19:32:01

	IFC @169099

Affected files ...

.. //depot/projects/smpng/share/man/man9/Makefile#10 integrate
.. //depot/projects/smpng/share/man/man9/VOP_ACCESS.9#3 integrate
.. //depot/projects/smpng/share/man/man9/acl.9#3 integrate
.. //depot/projects/smpng/share/man/man9/fail.9#2 integrate
.. //depot/projects/smpng/share/man/man9/ieee80211.9#3 integrate
.. //depot/projects/smpng/share/man/man9/ieee80211_amrr.9#2 integrate
.. //depot/projects/smpng/share/man/man9/ieee80211_beacon.9#2 integrate
.. //depot/projects/smpng/share/man/man9/ieee80211_bmiss.9#2 integrate
.. //depot/projects/smpng/share/man/man9/ieee80211_crypto.9#3 integrate
.. //depot/projects/smpng/share/man/man9/ieee80211_ddb.9#2 integrate
.. //depot/projects/smpng/share/man/man9/ieee80211_input.9#3 integrate
.. //depot/projects/smpng/share/man/man9/ieee80211_node.9#3 integrate
.. //depot/projects/smpng/share/man/man9/ieee80211_output.9#3 integrate
.. //depot/projects/smpng/share/man/man9/ieee80211_proto.9#3 integrate
.. //depot/projects/smpng/share/man/man9/ieee80211_radiotap.9#3 integrate
.. //depot/projects/smpng/share/man/man9/ieee80211_regdomain.9#2 integrate
.. //depot/projects/smpng/share/man/man9/ieee80211_scan.9#2 integrate
.. //depot/projects/smpng/share/man/man9/ieee80211_vap.9#2 integrate
.. //depot/projects/smpng/share/man/man9/vaccess.9#2 integrate
.. //depot/projects/smpng/share/man/man9/vaccess_acl_nfs4.9#1 branch
.. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#14 integrate
.. //depot/projects/smpng/sys/amd64/acpica/madt.c#19 integrate
.. //depot/projects/smpng/sys/amd64/amd64/initcpu.c#12 integrate
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#86 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#100 integrate
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#69 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#84 integrate
.. //depot/projects/smpng/sys/amd64/conf/NOTES#55 integrate
.. //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#7 integrate
.. //depot/projects/smpng/sys/amd64/include/apm_bios.h#1 branch
.. //depot/projects/smpng/sys/amd64/include/cpufunc.h#18 integrate
.. //depot/projects/smpng/sys/amd64/include/param.h#27 integrate
.. //depot/projects/smpng/sys/amd64/pci/pci_cfgreg.c#14 integrate
.. //depot/projects/smpng/sys/arm/arm/identcpu.c#15 integrate
.. //depot/projects/smpng/sys/arm/include/md_var.h#6 integrate
.. //depot/projects/smpng/sys/arm/include/param.h#14 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf#65 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/pxe.c#7 integrate
.. //depot/projects/smpng/sys/boot/pc98/Makefile.inc#7 integrate
.. //depot/projects/smpng/sys/bsm/audit_kevents.h#18 integrate
.. //depot/projects/smpng/sys/cam/ata/ata_all.c#3 integrate
.. //depot/projects/smpng/sys/cam/cam_periph.c#34 integrate
.. //depot/projects/smpng/sys/cam/cam_xpt.c#62 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#29 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#8 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/vfs.h#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#5 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#5 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#5 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#8 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#9 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#16 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#60 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#59 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#59 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#60 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#63 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#66 integrate
.. //depot/projects/smpng/sys/compat/x86bios/x86bios.c#1 branch
.. //depot/projects/smpng/sys/compat/x86bios/x86bios.h#1 branch
.. //depot/projects/smpng/sys/compat/x86bios/x86bios_alloc.c#1 branch
.. //depot/projects/smpng/sys/conf/NOTES#178 integrate
.. //depot/projects/smpng/sys/conf/files#253 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#69 integrate
.. //depot/projects/smpng/sys/conf/files.i386#128 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#100 integrate
.. //depot/projects/smpng/sys/conf/newvers.sh#28 integrate
.. //depot/projects/smpng/sys/conf/options#178 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/changes.txt#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtable.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.l#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asldefine.h#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfiles.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslload.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllookup.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmap.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstubs.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpe.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exfield.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exutils.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acconfig.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdebug.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acglobal.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/achware.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acinterp.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/aclocal.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acmacros.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acobject.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acparser.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpixf.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpredef.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/actbl.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/actbl1.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/actbl2.h#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/actypes.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acutils.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/amlcode.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psloop.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psxface.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utids.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate
.. //depot/projects/smpng/sys/contrib/x86emu/x86emu.c#2 integrate
.. //depot/projects/smpng/sys/contrib/x86emu/x86emu_util.c#2 integrate
.. //depot/projects/smpng/sys/ddb/db_ps.c#43 integrate
.. //depot/projects/smpng/sys/dev/acpi_support/acpi_aiboost.c#4 integrate
.. //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#15 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#117 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#28 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#49 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#30 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#13 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#71 integrate
.. //depot/projects/smpng/sys/dev/ae/if_ae.c#6 integrate
.. //depot/projects/smpng/sys/dev/age/if_age.c#9 integrate
.. //depot/projects/smpng/sys/dev/agp/agp_i810.c#9 integrate
.. //depot/projects/smpng/sys/dev/alc/if_alc.c#5 integrate
.. //depot/projects/smpng/sys/dev/ale/if_ale.c#5 integrate
.. //depot/projects/smpng/sys/dev/amdtemp/amdtemp.c#4 integrate
.. //depot/projects/smpng/sys/dev/asmc/asmc.c#9 integrate
.. //depot/projects/smpng/sys/dev/asmc/asmcvar.h#5 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-marvell.c#9 integrate
.. //depot/projects/smpng/sys/dev/atkbdc/atkbd.c#8 integrate
.. //depot/projects/smpng/sys/dev/ciss/ciss.c#64 integrate
.. //depot/projects/smpng/sys/dev/ciss/cissreg.h#15 integrate
.. //depot/projects/smpng/sys/dev/ciss/cissvar.h#14 integrate
.. //depot/projects/smpng/sys/dev/de/if_de.c#9 integrate
.. //depot/projects/smpng/sys/dev/de/if_devar.h#4 integrate
.. //depot/projects/smpng/sys/dev/dpms/dpms.c#2 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#16 integrate
.. //depot/projects/smpng/sys/dev/drm/r600_blit.c#2 integrate
.. //depot/projects/smpng/sys/dev/drm/radeon_cs.c#2 integrate
.. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#24 integrate
.. //depot/projects/smpng/sys/dev/drm/radeon_irq.c#14 integrate
.. //depot/projects/smpng/sys/dev/drm/radeon_state.c#20 integrate
.. //depot/projects/smpng/sys/dev/e1000/if_em.c#14 integrate
.. //depot/projects/smpng/sys/dev/e1000/if_igb.c#14 integrate
.. //depot/projects/smpng/sys/dev/fb/s3_pci.c#11 integrate
.. //depot/projects/smpng/sys/dev/fb/vesa.c#2 integrate
.. //depot/projects/smpng/sys/dev/fb/vga.c#26 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#95 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/pmc_events.h#7 integrate
.. //depot/projects/smpng/sys/dev/ichwd/ichwd.c#13 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#64 integrate
.. //depot/projects/smpng/sys/dev/isp/isp.c#61 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#62 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_stds.h#6 integrate
.. //depot/projects/smpng/sys/dev/isp/isp_tpublic.h#15 delete
.. //depot/projects/smpng/sys/dev/isp/ispmbox.h#29 integrate
.. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#12 integrate
.. //depot/projects/smpng/sys/dev/jme/if_jme.c#8 integrate
.. //depot/projects/smpng/sys/dev/kbd/kbd.c#23 integrate
.. //depot/projects/smpng/sys/dev/lindev/full.c#1 branch
.. //depot/projects/smpng/sys/dev/lindev/lindev.c#1 branch
.. //depot/projects/smpng/sys/dev/lindev/lindev.h#1 branch
.. //depot/projects/smpng/sys/dev/mii/e1000phy.c#22 integrate
.. //depot/projects/smpng/sys/dev/mii/e1000phyreg.h#8 integrate
.. //depot/projects/smpng/sys/dev/msk/if_msk.c#21 integrate
.. //depot/projects/smpng/sys/dev/msk/if_mskreg.h#11 integrate
.. //depot/projects/smpng/sys/dev/mwl/if_mwl.c#6 integrate
.. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#34 integrate
.. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#19 integrate
.. //depot/projects/smpng/sys/dev/pci/pci.c#113 integrate
.. //depot/projects/smpng/sys/dev/pci/pci_user.c#21 integrate
.. //depot/projects/smpng/sys/dev/pci/pcireg.h#33 integrate
.. //depot/projects/smpng/sys/dev/pci/pcivar.h#31 integrate
.. //depot/projects/smpng/sys/dev/ppbus/vpo.c#17 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#28 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/es137x.h#4 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/hda/hda_reg.h#4 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#40 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#27 integrate
.. //depot/projects/smpng/sys/dev/syscons/scmouse.c#17 integrate
.. //depot/projects/smpng/sys/dev/syscons/scterm-teken.c#8 integrate
.. //depot/projects/smpng/sys/dev/syscons/syscons.c#73 integrate
.. //depot/projects/smpng/sys/dev/syscons/syscons.h#23 integrate
.. //depot/projects/smpng/sys/dev/twa/tw_cl_io.c#5 integrate
.. //depot/projects/smpng/sys/dev/twa/tw_cl_share.h#5 integrate
.. //depot/projects/smpng/sys/dev/twe/twe.c#18 integrate
.. //depot/projects/smpng/sys/dev/twe/twevar.h#10 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#14 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ehci_pci.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#14 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#12 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_cdcereg.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#12 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uark.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ubser.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uch341.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ucycom.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ufoma.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ugensa.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uipaq.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/umct.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/umodem.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#9 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.h#5 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uvscom.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/storage/umass.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/usb.h#23 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_bus.h#9 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_cdc.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_device.c#16 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_device.h#15 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_hub.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#145 integrate
.. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#54 integrate
.. //depot/projects/smpng/sys/fs/nfs/nfs_commonacl.c#4 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs.c#18 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs.h#13 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs_osrel.c#1 branch
.. //depot/projects/smpng/sys/geom/part/g_part.c#22 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_ebr.c#9 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#36 integrate
.. //depot/projects/smpng/sys/i386/acpica/madt.c#26 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#115 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#147 integrate
.. //depot/projects/smpng/sys/i386/i386/initcpu.c#35 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#147 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#139 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#118 integrate
.. //depot/projects/smpng/sys/i386/include/acpica_machdep.h#9 integrate
.. //depot/projects/smpng/sys/i386/include/apm_bios.h#5 integrate
.. //depot/projects/smpng/sys/i386/include/cpufunc.h#42 integrate
.. //depot/projects/smpng/sys/i386/include/param.h#25 integrate
.. //depot/projects/smpng/sys/i386/include/xen/xen-os.h#5 integrate
.. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#39 integrate
.. //depot/projects/smpng/sys/i386/xen/locore.s#5 integrate
.. //depot/projects/smpng/sys/ia64/include/param.h#24 integrate
.. //depot/projects/smpng/sys/kern/init_main.c#82 integrate
.. //depot/projects/smpng/sys/kern/init_sysent.c#96 integrate
.. //depot/projects/smpng/sys/kern/kern_descrip.c#130 integrate
.. //depot/projects/smpng/sys/kern/kern_event.c#60 integrate
.. //depot/projects/smpng/sys/kern/kern_mib.c#46 integrate
.. //depot/projects/smpng/sys/kern/kern_rwlock.c#31 integrate
.. //depot/projects/smpng/sys/kern/kern_shutdown.c#80 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#151 integrate
.. //depot/projects/smpng/sys/kern/kern_sx.c#61 integrate
.. //depot/projects/smpng/sys/kern/kern_timeout.c#46 integrate
.. //depot/projects/smpng/sys/kern/kern_umtx.c#37 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#96 integrate
.. //depot/projects/smpng/sys/kern/subr_acl_nfs4.c#2 integrate
.. //depot/projects/smpng/sys/kern/subr_acl_posix1e.c#8 integrate
.. //depot/projects/smpng/sys/kern/subr_bus.c#85 integrate
.. //depot/projects/smpng/sys/kern/subr_devstat.c#18 integrate
.. //depot/projects/smpng/sys/kern/subr_smp.c#58 integrate
.. //depot/projects/smpng/sys/kern/sys_pipe.c#67 integrate
.. //depot/projects/smpng/sys/kern/syscalls.c#95 integrate
.. //depot/projects/smpng/sys/kern/syscalls.master#101 integrate
.. //depot/projects/smpng/sys/kern/tty.c#98 integrate
.. //depot/projects/smpng/sys/kern/tty_pts.c#24 integrate
.. //depot/projects/smpng/sys/kern/uipc_mqueue.c#23 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#133 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#122 integrate
.. //depot/projects/smpng/sys/kern/vfs_aio.c#87 integrate
.. //depot/projects/smpng/sys/kern/vfs_default.c#64 integrate
.. //depot/projects/smpng/sys/kern/vfs_export.c#36 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#172 integrate
.. //depot/projects/smpng/sys/kern/vfs_vnops.c#100 integrate
.. //depot/projects/smpng/sys/mips/include/param.h#6 integrate
.. //depot/projects/smpng/sys/modules/Makefile#168 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#19 integrate
.. //depot/projects/smpng/sys/modules/dtrace/lockstat/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/lindev/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/nfslockd/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/procfs/Makefile#8 integrate
.. //depot/projects/smpng/sys/modules/usb/Makefile#19 integrate
.. //depot/projects/smpng/sys/modules/usb/uch341/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/x86bios/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/x86emu/Makefile#2 delete
.. //depot/projects/smpng/sys/net/bpf.c#91 integrate
.. //depot/projects/smpng/sys/net/if.c#129 integrate
.. //depot/projects/smpng/sys/net/if_llatbl.c#8 integrate
.. //depot/projects/smpng/sys/net/if_var.h#71 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211.h#25 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_hwmp.c#3 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_mesh.c#3 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_mesh.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#8 integrate
.. //depot/projects/smpng/sys/netinet/if_ether.c#77 integrate
.. //depot/projects/smpng/sys/netinet/in.c#62 integrate
.. //depot/projects/smpng/sys/netinet/in_mcast.c#19 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.c#102 integrate
.. //depot/projects/smpng/sys/netinet/in_proto.c#37 integrate
.. //depot/projects/smpng/sys/netinet/ip_mroute.c#71 integrate
.. //depot/projects/smpng/sys/netinet/raw_ip.c#87 integrate
.. //depot/projects/smpng/sys/netinet/sctp_asconf.c#15 integrate
.. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.c#14 integrate
.. //depot/projects/smpng/sys/netinet/sctp_input.c#28 integrate
.. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#27 integrate
.. //depot/projects/smpng/sys/netinet/sctp_output.c#32 integrate
.. //depot/projects/smpng/sys/netinet/sctp_pcb.c#31 integrate
.. //depot/projects/smpng/sys/netinet/sctp_pcb.h#18 integrate
.. //depot/projects/smpng/sys/netinet/sctp_structs.h#17 integrate
.. //depot/projects/smpng/sys/netinet/sctp_sysctl.c#16 integrate
.. //depot/projects/smpng/sys/netinet/sctp_timer.c#20 integrate
.. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#27 integrate
.. //depot/projects/smpng/sys/netinet/sctputil.c#33 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#119 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timer.c#50 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timer.h#17 integrate
.. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#83 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#74 integrate
.. //depot/projects/smpng/sys/netinet6/in6.c#67 integrate
.. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#43 integrate
.. //depot/projects/smpng/sys/netinet6/in6_proto.c#34 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_input.c#71 integrate
.. //depot/projects/smpng/sys/netinet6/nd6.c#61 integrate
.. //depot/projects/smpng/sys/netinet6/nd6.h#19 integrate
.. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#39 integrate
.. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#39 integrate
.. //depot/projects/smpng/sys/netinet6/sctp6_usrreq.c#18 integrate
.. //depot/projects/smpng/sys/netipsec/key.c#44 integrate
.. //depot/projects/smpng/sys/netipsec/xform_esp.c#21 integrate
.. //depot/projects/smpng/sys/netsmb/smb_dev.c#27 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#75 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#68 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#87 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#70 integrate
.. //depot/projects/smpng/sys/pci/intpm.c#20 integrate
.. //depot/projects/smpng/sys/pci/intpmreg.h#4 integrate
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC#63 integrate
.. //depot/projects/smpng/sys/powerpc/include/param.h#19 integrate
.. //depot/projects/smpng/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#4 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#99 integrate
.. //depot/projects/smpng/sys/sparc64/include/param.h#24 integrate
.. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#15 integrate
.. //depot/projects/smpng/sys/sparc64/pci/psycho.c#50 integrate
.. //depot/projects/smpng/sys/sparc64/pci/schizo.c#6 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/jbusppm.c#3 integrate
.. //depot/projects/smpng/sys/sun4v/include/param.h#6 integrate
.. //depot/projects/smpng/sys/sys/ata.h#32 integrate
.. //depot/projects/smpng/sys/sys/bus.h#38 integrate
.. //depot/projects/smpng/sys/sys/event.h#27 integrate
.. //depot/projects/smpng/sys/sys/fcntl.h#13 integrate
.. //depot/projects/smpng/sys/sys/kbio.h#5 integrate
.. //depot/projects/smpng/sys/sys/mman.h#13 integrate
.. //depot/projects/smpng/sys/sys/param.h#157 integrate
.. //depot/projects/smpng/sys/sys/rwlock.h#18 integrate
.. //depot/projects/smpng/sys/sys/smp.h#23 integrate
.. //depot/projects/smpng/sys/sys/sx.h#34 integrate
.. //depot/projects/smpng/sys/sys/syscall.h#94 integrate
.. //depot/projects/smpng/sys/sys/syscall.mk#94 integrate
.. //depot/projects/smpng/sys/sys/sysproto.h#99 integrate
.. //depot/projects/smpng/sys/sys/systm.h#97 integrate
.. //depot/projects/smpng/sys/sys/vnode.h#104 integrate
.. //depot/projects/smpng/sys/teken/sequences#2 integrate
.. //depot/projects/smpng/sys/teken/teken.c#2 integrate
.. //depot/projects/smpng/sys/teken/teken.h#2 integrate
.. //depot/projects/smpng/sys/teken/teken_demo.c#2 integrate
.. //depot/projects/smpng/sys/teken/teken_scs.h#2 integrate
.. //depot/projects/smpng/sys/teken/teken_stress.c#2 integrate
.. //depot/projects/smpng/sys/teken/teken_subr.h#2 integrate
.. //depot/projects/smpng/sys/teken/teken_subr_compat.h#2 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_gjournal.c#4 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#80 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#103 integrate
.. //depot/projects/smpng/sys/vm/vm_mmap.c#81 integrate

Differences ...

==== //depot/projects/smpng/share/man/man9/Makefile#10 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.359 2009/08/23 07:48:11 julian Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.360 2009/09/22 15:15:03 trasz Exp $
 
 MAN=	accept_filter.9 \
 	accf_data.9 \
@@ -253,6 +253,7 @@
 	usbdi.9 \
 	utopia.9 \
 	vaccess.9 \
+	vaccess_acl_nfs4.9 \
 	vaccess_acl_posix1e.9 \
 	vcount.9 \
 	vflush.9 \

==== //depot/projects/smpng/share/man/man9/VOP_ACCESS.9#3 (text+ko) ====

@@ -27,9 +27,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.26 2009/06/01 07:48:27 trasz Exp $
+.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.27 2009/09/22 15:15:03 trasz Exp $
 .\"
-.Dd June 1, 2009
+.Dd September 18, 2009
 .Os
 .Dt VOP_ACCESS 9
 .Sh NAME
@@ -95,6 +95,7 @@
 .El
 .Sh SEE ALSO
 .Xr vaccess 9 ,
+.Xr vaccess_acl_nfs4 9 ,
 .Xr vaccess_acl_posix1e 9 ,
 .Xr vnode 9
 .Sh AUTHORS

==== //depot/projects/smpng/share/man/man9/acl.9#3 (text+ko) ====

@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/acl.9,v 1.19 2009/05/24 20:34:29 trasz Exp $
+.\" $FreeBSD: src/share/man/man9/acl.9,v 1.20 2009/09/22 15:15:03 trasz Exp $
 .\"
-.Dd December 23, 1999
+.Dd September 18, 2009
 .Os
 .Dt ACL 9
 .Sh NAME
@@ -207,6 +207,7 @@
 .El
 .Sh SEE ALSO
 .Xr acl 3 ,
+.Xr vaccess_acl_nfs4 9 ,
 .Xr vaccess_acl_posix1e 9 ,
 .Xr VFS 9 ,
 .Xr vnaccess 9 ,

==== //depot/projects/smpng/share/man/man9/fail.9#2 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/fail.9,v 1.2 2009/05/28 15:02:52 zml Exp $
+.\" $FreeBSD: src/share/man/man9/fail.9,v 1.3 2009/09/18 14:05:56 brueffer Exp $
 .\"
 .Dd May 10, 2009
 .Dt FAIL 9
@@ -37,7 +37,6 @@
 .Nm KFAIL_POINT_GOTO ,
 .Nm fail_point ,
 .Nm DEBUG_FP
-.
 .Nd fail points
 .Sh SYNOPSIS
 .In sys/fail.h
@@ -79,7 +78,7 @@
 .Fn return
 value set in the sysctl MIB.
 See
-.Sx SYSCTL SETTINGS
+.Sx SYSCTL VARIABLES
 below.
 .Pp
 The remaining
@@ -100,7 +99,6 @@
 .Sy KFAIL_POINT_CODE(...,
   { error_var = RETURN_VALUE; goto label;})
 .El
-.Pp
 .Sh SYSCTL VARIABLES
 The
 .Fn KFAIL_POINT_*
@@ -108,28 +106,28 @@
 Many base kernel MIBs can be found in the
 .Sy debug.fail_point
 tree (referenced in code by
-.Sy DEBUG_FP
-).
+.Sy DEBUG_FP ) .
 .Pp
 The sysctl variable may be set using the following grammar:
 .Pp
+.Bd -literal
    ::
        ( "->"  )*
-.Pp
+
    ::
       ( ( "%") | ( "*" ) )*
       
       [ "("  ")" ]
-.Pp
+
    ::
        [ "."  ] |
       "." 
-.Pp
+
    ::
       "off" | "return" | "sleep" | "panic" | "break" | "print"
+.Ed
 .Pp
-The 
-argument specifies which action to take:
+The  argument specifies which action to take:
 .Bl -tag -width ".Dv return"
 .It Sy off
 Take no action (does not trigger fail point code)
@@ -158,13 +156,13 @@
 but only 5 times total".
 .Pp
 The operator -> can be used to express cascading terms.
-If you specify ->, it means that if  doesn't
-'execute',  is evaluated.
+If you specify ->, it means that if  does not
+.Ql execute ,
+ is evaluated.
 For the purpose of this operator, the return() and print() operators
 are the only types that cascade.
 A return() term only cascades if the code executes, and a print()
 term only cascades when passed a non-zero argument.
-.Pp
 .Sh EXAMPLES
 .Bl -tag
 .It Sy sysctl debug.fail_point.foobar="2.1%return(5)"
@@ -175,7 +173,7 @@
 2/100ths of the time, execute
 .Fa code
 with RETURN_VALUE set to 5.
-If that doesn't happen, 5% of the time execute
+If that does not happen, 5% of the time execute
 .Fa code
 with RETURN_VALUE set to 22.
 .It Sy sysctl debug.fail_point.foobar="5*return(5)->0.1%return(22)"
@@ -186,9 +184,8 @@
 .It Sy sysctl debug.fail_point.foobar="1%*sleep(50)"
 1/100th of the time, sleep 50ms.
 .El
-.Pp
 .Sh CAVEATS
-It's easy to shoot yourself in the foot by setting fail points too
+It is easy to shoot yourself in the foot by setting fail points too
 aggressively or setting too many in combination.
 For example, forcing
 .Fn malloc
@@ -201,7 +198,6 @@
 .Fn fail_point_eval
 does not verify whether the context is appropriate for calling
 .Fn msleep .
-.Pp
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by

==== //depot/projects/smpng/share/man/man9/ieee80211.9#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/share/man/man9/ieee80211.9,v 1.5 2009/08/12 21:03:16 sam Exp $
+.\" $FreeBSD: src/share/man/man9/ieee80211.9,v 1.6 2009/09/18 00:33:47 brueffer Exp $
 .\"
 .Dd August 4, 2009
 .Dt NET80211 9
@@ -225,7 +225,7 @@
 structure.
 This method cannot sleep.
 The default method allocates zero'd memory using
-.Xr malloc 9.
+.Xr malloc 9 .
 Drivers should override this method to allocate extended storage
 for their own needs.
 Memory allocated by the driver must be tagged with
@@ -301,7 +301,7 @@
 and must initiate the work to scan a channel and schedule a timer
 to advance to the next channel in the scan list.
 This callback is done in a sleepable context.
-The default method handles active scan work (e.g. sending ProbRequest
+The default method handles active scan work (e.g. sending ProbeRequest
 frames), and schedules a call to 
 .Xr ieee80211_scan_next 9
 according to the maximum dwell time for the channel.
@@ -558,4 +558,4 @@
 .Xr ieee80211_send_action 9 ,
 .Xr ieee80211_radiotap_attach 9 ,
 .Xr ifnet 9 ,
-.Xr malloc 9 .
+.Xr malloc 9

==== //depot/projects/smpng/share/man/man9/ieee80211_amrr.9#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/ieee80211_amrr.9,v 1.1 2009/08/12 21:03:16 sam Exp $
+.\" $FreeBSD: src/share/man/man9/ieee80211_amrr.9,v 1.2 2009/09/18 00:33:47 brueffer Exp $
 .\"
 .Dd August 4, 2009
 .Dt IEEE8021_AMRR 9
@@ -191,4 +191,4 @@
 (instead or in addition).
 .Sh SEE ALSO
 .Xr ieee80211 9 ,
-.Xr ieee80211_output 9 ,
+.Xr ieee80211_output 9

==== //depot/projects/smpng/share/man/man9/ieee80211_beacon.9#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/ieee80211_beacon.9,v 1.1 2009/08/12 21:03:16 sam Exp $
+.\" $FreeBSD: src/share/man/man9/ieee80211_beacon.9,v 1.2 2009/09/18 00:33:47 brueffer Exp $
 .\"
 .Dd August 4, 2009
 .Dt IEEE80211_BEACON 9
@@ -112,4 +112,4 @@
 about eight vaps, at which point the overhead becomes significant and
 the channel becomes noticeably busy anyway.
 .Sh SEE ALSO
-.Xr ieee80211 9 .
+.Xr ieee80211 9

==== //depot/projects/smpng/share/man/man9/ieee80211_bmiss.9#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/ieee80211_bmiss.9,v 1.1 2009/08/12 21:03:16 sam Exp $
+.\" $FreeBSD: src/share/man/man9/ieee80211_bmiss.9,v 1.2 2009/09/18 00:33:47 brueffer Exp $
 .\"
 .Dd August 4, 2009
 .Dt IEEE80211_BMISS 9
@@ -86,6 +86,6 @@
 it can be used in any operating mode where beacons from a peer station
 are received.
 .Sh SEE ALSO
+.Xr wpa_supplicant 8 ,
 .Xr ieee80211 9 ,
-.Xr ieee80211_vap 9 ,
-.Xr wpa_supplicant 8 ,
+.Xr ieee80211_vap 9

==== //depot/projects/smpng/share/man/man9/ieee80211_crypto.9#3 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/ieee80211_crypto.9,v 1.4 2009/08/12 21:03:16 sam Exp $
+.\" $FreeBSD: src/share/man/man9/ieee80211_crypto.9,v 1.5 2009/09/18 00:33:47 brueffer Exp $
 .\" $Id: ieee80211_crypto.9,v 1.3 2004/03/04 10:42:56 bruce Exp $
 .\"
 .Dd August 4, 2009
@@ -65,10 +65,10 @@
 .\"
 .Ft int
 .Fo ieee80211_crypto_newkey
-.Fa "struct ieee80211vap *
-.Fa "int cipher
-.Fa "int flags
-.Fa "struct ieee80211_key *
+.Fa "struct ieee80211vap *"
+.Fa "int cipher"
+.Fa "int flags"
+.Fa "struct ieee80211_key *"
 .Fc
 .\"
 .Ft int
@@ -141,7 +141,7 @@
 .Pp
 Crypto modules can notify the system of two events.
 When a packet replay event is recognized
-.Fn ieee80111_notify_replay_failure
+.Fn ieee80211_notify_replay_failure
 can be used to signal the event.
 When a
 .Dv TKIP
@@ -256,4 +256,4 @@
 .Xr ioctl 2 ,
 .Xr wlan_ccmp 4 ,
 .Xr wlan_tkip 4 ,
-.Xr wlan_wep 4 .
+.Xr wlan_wep 4

==== //depot/projects/smpng/share/man/man9/ieee80211_ddb.9#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/ieee80211_ddb.9,v 1.1 2009/08/12 21:03:16 sam Exp $
+.\" $FreeBSD: src/share/man/man9/ieee80211_ddb.9,v 1.2 2009/09/18 00:33:47 brueffer Exp $
 .\"
 .Dd August 4, 2009
 .Dt IEEE80211_DDB 9
@@ -54,7 +54,7 @@
 built for embedded environments where cross-machine or post-mortem
 debugging facilities like
 .Xr kgdb 1
-infeasible.
+are infeasible.
 .Pp
 The most commonly used command is
 .Bd -literal -offset indent
@@ -69,4 +69,4 @@
 data structures in the system.
 .Sh SEE ALSO
 .Xr ddb 4 ,
-.Xr ieee80211 9 .
+.Xr ieee80211 9

==== //depot/projects/smpng/share/man/man9/ieee80211_input.9#3 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/ieee80211_input.9,v 1.4 2009/08/12 21:03:16 sam Exp $
+.\" $FreeBSD: src/share/man/man9/ieee80211_input.9,v 1.5 2009/09/18 00:33:47 brueffer Exp $
 .\"
 .Dd August 4, 2009
 .Dt IEEE80211_INPUT 9
@@ -113,4 +113,4 @@
 (with the rssi presented as a filtered average over the last ten values 
 and the noise floor the last reported value).
 .Sh SEE ALSO
-.Xr ieee80211 9 .
+.Xr ieee80211 9

==== //depot/projects/smpng/share/man/man9/ieee80211_node.9#3 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/ieee80211_node.9,v 1.5 2009/08/12 21:03:16 sam Exp $
+.\" $FreeBSD: src/share/man/man9/ieee80211_node.9,v 1.6 2009/09/18 00:33:47 brueffer Exp $
 .\"
 .Dd August 4, 2009
 .Dt IEEE80211_NODE 9
@@ -248,4 +248,4 @@
 .Sh SEE ALSO
 .Xr ddb 9
 .Xr ieee80211 9 ,
-.Xr ieee80211_proto 9 ,
+.Xr ieee80211_proto 9

==== //depot/projects/smpng/share/man/man9/ieee80211_output.9#3 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/ieee80211_output.9,v 1.4 2009/08/12 21:03:16 sam Exp $
+.\" $FreeBSD: src/share/man/man9/ieee80211_output.9,v 1.5 2009/09/18 00:33:47 brueffer Exp $
 .\" $Id: ieee80211_output.9,v 1.5 2004/03/04 12:31:18 bruce Exp $
 .\"
 .Dd August 4, 2009
@@ -47,9 +47,9 @@
 .\"
 .Ft void
 .Fo ieee80211_process_callback
-.Fa struct ieee80211_node *
-.Fa struct mbuf *
-.Fa int
+.Fa "struct ieee80211_node *"
+.Fa "struct mbuf *"
+.Fa "int"
 .Fc
 .Sh DESCRIPTION
 The
@@ -101,7 +101,7 @@
 .Nm net80211
 handles activities such as background scanning and power save mode,
 frames will not be sent to a driver unless it is operating on the
-BSS channel will
+BSS channel with
 .Dq full power .
 .Pp
 All frames passed to a driver for transmit hold a reference to a

==== //depot/projects/smpng/share/man/man9/ieee80211_proto.9#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/share/man/man9/ieee80211_proto.9,v 1.4 2009/08/12 21:03:16 sam Exp $
+.\" $FreeBSD: src/share/man/man9/ieee80211_proto.9,v 1.5 2009/09/18 00:33:47 brueffer Exp $
 .\"
 .Dd August 4, 2009
 .Dt IEEE80211_PROTO 9
@@ -119,7 +119,7 @@
 .Vt ic_bsschan
 are guaranteed to be usable.
 .It Dv IEEE80211_S_CSA
-Channel Switch Annoucememnt (CSA) is pending.
+Channel Switch Announcement (CSA) is pending.
 This state is reached only from
 .Dv IEEE80211_S_RUN
 when either a CSA is received from an access point (in station mode)
@@ -229,11 +229,11 @@
 or, in the case of card eject or vap destroy,
 work will be initiated outside the driver.
 .Sh SEE ALSO
-.Xr ioctl 2
+.Xr ioctl 2 ,
+.Xr wpa_supplicant 8 ,
 .Xr ieee80211 9 ,
-.Xr ifnet 9
+.Xr ifnet 9 ,
 .Xr taskqueue 9
-.Xr wpa_supplicant 8
 .Sh HISTORY
 The state machine concept was part of the original
 .Nm ieee80211

==== //depot/projects/smpng/share/man/man9/ieee80211_radiotap.9#3 (text+ko) ====

@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/ieee80211_radiotap.9,v 1.6 2009/08/12 21:03:16 sam Exp $
+.\" $FreeBSD: src/share/man/man9/ieee80211_radiotap.9,v 1.7 2009/09/18 00:33:47 brueffer Exp $
 .\"
 .Dd August 4, 2009
 .Dt IEEE80211_RADIOTAP 9
@@ -198,11 +198,11 @@
 .\"power as unitless distance from maximum power set at factory calibration.
 .\"0 indicates maximum transmit power.
 .\"Monotonically nondecreasing with lower power levels.
-\.".It Dv IEEE80211_RADIOTAP_DB_TX_ATTENUATION
-\."This field contains a single unsigned 16-bit value, expressing transmit
-\."power as decibel distance from maximum power set at factory calibration.
-\."0 indicates maximum transmit power.
-\."Monotonically nondecreasing with lower power levels.
+.\".It Dv IEEE80211_RADIOTAP_DB_TX_ATTENUATION
+.\"This field contains a single unsigned 16-bit value, expressing transmit
+.\"power as decibel distance from maximum power set at factory calibration.
+.\"0 indicates maximum transmit power.
+.\"Monotonically nondecreasing with lower power levels.
 .It Dv IEEE80211_RADIOTAP_DBM_TX_POWER
 Transmit power expressed as decibels from a 1mW reference.
 This field is a single signed 8-bit value.
@@ -223,9 +223,9 @@
 RF noise power at the antenna, in decibels difference from an
 arbitrary, fixed reference.
 .It Dv IEEE80211_RADIOTAP_XCHANNEL
-This field containts four values: a 32-bit unsigned bitmap of
+This field contains four values: a 32-bit unsigned bitmap of
 flags that describe the channel attributes, a 16-bit unsigned
-freqeuncy in MHz (typically the channel center), an 8-bit
+frequency in MHz (typically the channel center), an 8-bit
 unsigned IEEE channel number, and a signed 8-bit value that
 holds the maximum regulatory transmit power cap in .5 dBm
 (8 bytes total).
@@ -237,10 +237,10 @@
 .Dv IEEE80211_RADIOTAP_CHANNEL
 and is the only way to completely express all
 channel attributes and the
-mapping between channel freqeuncy and IEEE channel number.
+mapping between channel frequency and IEEE channel number.
 .El
 .Sh EXAMPLES
-Radiotap receive definitions for the Intersil Prims driver:
+Radiotap receive definitions for the Intersil Prism driver:
 .Bd -literal -offset indent
 #define WI_RX_RADIOTAP_PRESENT \\
         ((1 << IEEE80211_RADIOTAP_TSFT) \\
@@ -298,7 +298,6 @@
 .\"
 .Sh AUTHORS
 .An -nosplit
-.Pp
 The original version of this manual page was written by
 .An Bruce M. Simpson Aq bms@FreeBSD.org
 and

==== //depot/projects/smpng/share/man/man9/ieee80211_regdomain.9#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/ieee80211_regdomain.9,v 1.1 2009/08/12 21:03:16 sam Exp $
+.\" $FreeBSD: src/share/man/man9/ieee80211_regdomain.9,v 1.2 2009/09/18 00:33:47 brueffer Exp $
 .\"
 .Dd August 4, 2009
 .Dt IEEE80211_REGDOMAIN 9
@@ -112,7 +112,7 @@
 This should be done whenever the channel table contents are modified.
 .Pp
 The
-.Fn ieee80211_alloc_countrie
+.Fn ieee80211_alloc_countryie
 function allocates an information element as specified by 802.11h.
 Because this is expensive to generate it is cached in
 .Vt ic_countryie
@@ -140,4 +140,4 @@
 .Sh SEE ALSO
 .Xr regdomain 5 ,
 .Xr ifconfig 8 ,
-.Xr ieee80211 9 .
+.Xr ieee80211 9

==== //depot/projects/smpng/share/man/man9/ieee80211_scan.9#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/ieee80211_scan.9,v 1.1 2009/08/12 21:03:16 sam Exp $
+.\" $FreeBSD: src/share/man/man9/ieee80211_scan.9,v 1.2 2009/09/18 00:33:47 brueffer Exp $
 .\"
 .Dd August 4, 2009
 .Dt IEEE80211_SCAN 9
@@ -347,4 +347,4 @@
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr ieee80211 9 .
-.Xr ieee80211_proto 9 .
+.Xr ieee80211_proto 9

==== //depot/projects/smpng/share/man/man9/ieee80211_vap.9#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/ieee80211_vap.9,v 1.1 2009/08/12 21:03:16 sam Exp $
+.\" $FreeBSD: src/share/man/man9/ieee80211_vap.9,v 1.2 2009/09/18 00:33:47 brueffer Exp $
 .\"
 .Dd August 4, 2009
 .Dt IEEE8021_VAP 9
@@ -151,4 +151,4 @@
 .Sh SEE ALSO
 .Xr ieee80211 9 ,
 .Xr ifnet 9 ,
-.Xr malloc 9 .
+.Xr malloc 9

==== //depot/projects/smpng/share/man/man9/vaccess.9#2 (text+ko) ====


>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Oct  1 19:42:56 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1D747106568B; Thu,  1 Oct 2009 19:42:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC7751065676
	for ; Thu,  1 Oct 2009 19:42:55 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A78538FC17
	for ; Thu,  1 Oct 2009 19:42:55 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n91JgtXB058514
	for ; Thu, 1 Oct 2009 19:42:55 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n91JgtKG058512
	for perforce@freebsd.org; Thu, 1 Oct 2009 19:42:55 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 1 Oct 2009 19:42:55 GMT
Message-Id: <200910011942.n91JgtKG058512@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 
Cc: 
Subject: PERFORCE change 169101 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Oct 2009 19:42:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=169101

Change 169101 by rwatson@rwatson_freebsd_capabilities on 2009/10/01 19:42:15

	Regenerate generated syscall files following integ.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_proto.h#6 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_syscall.h#5 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_sysent.c#6 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#18 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscall.h#18 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscalls.c#18 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_sysent.c#18 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_proto.h#5 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_syscall.h#4 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_syscallnames.c#4 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_sysent.c#4 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_proto.h#5 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_syscall.h#4 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_sysent.c#4 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_proto.h#6 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_syscall.h#5 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_sysent.c#6 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#40 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#40 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#39 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#40 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#40 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#40 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_proto.h#6 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.40 2009/09/10 13:20:27 des Exp $
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.36 2008/11/29 14:55:24 kib Exp 
  */
 
 #ifndef _LINUX_SYSPROTO_H_

==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_syscall.h#5 (text+ko) ====


==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_sysent.c#6 (text+ko) ====


==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#18 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.108 2009/09/30 08:48:59 rwatson Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 197636 2009-09-30 08:46:01Z rwatson 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.124 2009/09/30 08:46:01 rwatson Exp 
  */
 
 #ifndef _FREEBSD32_SYSPROTO_H_

==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscall.h#18 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.106 2009/09/30 08:48:59 rwatson Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 197636 2009-09-30 08:46:01Z rwatson 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.124 2009/09/30 08:46:01 rwatson Exp 
  */
 
 #define	FREEBSD32_SYS_syscall	0

==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscalls.c#18 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.97 2009/09/30 08:48:59 rwatson Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 197636 2009-09-30 08:46:01Z rwatson 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.124 2009/09/30 08:46:01 rwatson Exp 
  */
 
 const char *freebsd32_syscallnames[] = {
@@ -521,12 +521,12 @@
 	"freebsd32_msgctl",			/* 511 = freebsd32_msgctl */
 	"freebsd32_shmctl",			/* 512 = freebsd32_shmctl */
 	"lpathconf",			/* 513 = lpathconf */
-	"#514",			/* 514 = cap_new */
-	"#515",			/* 515 = cap_getrights */
-	"#516",			/* 516 = cap_enter */
-	"#517",			/* 517 = cap_getmode */
-	"#518",			/* 518 = pdfork */
-	"#519",			/* 519 = pdkill */
-	"#520",			/* 520 = pdgetpid */
-	"#521",			/* 521 = pdwait */
+	"cap_new",			/* 514 = cap_new */
+	"cap_getrights",			/* 515 = cap_getrights */
+	"cap_enter",			/* 516 = cap_enter */
+	"cap_getmode",			/* 517 = cap_getmode */
+	"pdfork",			/* 518 = pdfork */
+	"pdkill",			/* 519 = pdkill */
+	"pdgetpid",			/* 520 = pdgetpid */
+	"pdwait",			/* 521 = pdwait */
 };

==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_sysent.c#18 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.108 2009/09/30 08:48:59 rwatson Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 197636 2009-09-30 08:46:01Z rwatson 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.124 2009/09/30 08:46:01 rwatson Exp 
  */
 
 #include "opt_compat.h"
@@ -558,12 +558,12 @@
 	{ AS(freebsd32_msgctl_args), (sy_call_t *)freebsd32_msgctl, AUE_MSGCTL, NULL, 0, 0, 0 },	/* 511 = freebsd32_msgctl */
 	{ AS(freebsd32_shmctl_args), (sy_call_t *)freebsd32_shmctl, AUE_SHMCTL, NULL, 0, 0, 0 },	/* 512 = freebsd32_shmctl */
 	{ AS(lpathconf_args), (sy_call_t *)lpathconf, AUE_LPATHCONF, NULL, 0, 0, 0 },	/* 513 = lpathconf */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 514 = cap_new */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 515 = cap_getrights */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 516 = cap_enter */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 517 = cap_getmode */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 518 = pdfork */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 519 = pdkill */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 520 = pdgetpid */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 521 = pdwait */
+	{ AS(cap_new_args), (sy_call_t *)cap_new, AUE_CAP_NEW, NULL, 0, 0, 0 },	/* 514 = cap_new */
+	{ AS(cap_getrights_args), (sy_call_t *)cap_getrights, AUE_CAP_GETRIGHTS, NULL, 0, 0, 0 },	/* 515 = cap_getrights */
+	{ 0, (sy_call_t *)cap_enter, AUE_CAP_ENTER, NULL, 0, 0, 0 },	/* 516 = cap_enter */
+	{ AS(cap_getmode_args), (sy_call_t *)cap_getmode, AUE_CAP_GETMODE, NULL, 0, 0, 0 },	/* 517 = cap_getmode */
+	{ AS(pdfork_args), (sy_call_t *)pdfork, AUE_NULL, NULL, 0, 0, 0 },	/* 518 = pdfork */
+	{ AS(pdkill_args), (sy_call_t *)pdkill, AUE_NULL, NULL, 0, 0, 0 },	/* 519 = pdkill */
+	{ AS(pdgetpid_args), (sy_call_t *)pdgetpid, AUE_NULL, NULL, 0, 0, 0 },	/* 520 = pdgetpid */
+	{ AS(pdwait_args), (sy_call_t *)pdwait, AUE_NULL, NULL, 0, 0, 0 },	/* 521 = pdwait */
 };

==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_proto.h#5 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.30 2009/09/10 13:20:27 des Exp $
- * created from FreeBSD: head/sys/compat/svr4/syscalls.master 160798 2006-07-28 19:05:28Z jhb 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp 
  */
 
 #ifndef _SVR4_SYSPROTO_H_

==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_syscall.h#4 (text+ko) ====


==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_syscallnames.c#4 (text+ko) ====


==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_sysent.c#4 (text+ko) ====


==== //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_proto.h#5 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/i386/ibcs2/ibcs2_proto.h,v 1.33 2009/09/10 13:20:27 des Exp $
- * created from FreeBSD: head/sys/i386/ibcs2/syscalls.master 191919 2009-05-08 20:06:37Z ed 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.29 2009/05/08 20:06:37 ed Exp 
  */
 
 #ifndef _IBCS2_SYSPROTO_H_

==== //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_syscall.h#4 (text+ko) ====


==== //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_sysent.c#4 (text+ko) ====


==== //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_proto.h#6 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.101 2009/09/10 13:20:27 des Exp $
- * created from FreeBSD: head/sys/i386/linux/syscalls.master 184789 2008-11-09 10:45:13Z ed 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.94 2008/11/09 10:45:13 ed Exp 
  */
 
 #ifndef _LINUX_SYSPROTO_H_

==== //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_syscall.h#5 (text+ko) ====


==== //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_sysent.c#6 (text+ko) ====


==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#40 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/init_sysent.c,v 1.254 2009/09/30 08:48:59 rwatson Exp $
- * created from FreeBSD: head/sys/kern/syscalls.master 197636 2009-09-30 08:46:01Z rwatson 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.260 2009/09/30 08:46:01 rwatson Exp 
  */
 
 #include "opt_compat.h"
@@ -35,12 +35,12 @@
 /* The casts are bogus but will do for now. */
 struct sysent sysent[] = {
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },		/* 0 = syscall */
-	{ AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0, 0 },	/* 1 = exit */
-	{ 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0, 0 },		/* 2 = fork */
-	{ AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0, 0 },	/* 3 = read */
-	{ AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0, 0 },	/* 4 = write */
+	{ AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0, SYF_CAPENABLED },	/* 1 = exit */
+	{ 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0, SYF_CAPENABLED },	/* 2 = fork */
+	{ AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 3 = read */
+	{ AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 4 = write */
 	{ AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC, NULL, 0, 0, 0 },	/* 5 = open */
-	{ AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0, 0 },	/* 6 = close */
+	{ AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0, SYF_CAPENABLED },	/* 6 = close */
 	{ AS(wait_args), (sy_call_t *)wait4, AUE_WAIT4, NULL, 0, 0, 0 },	/* 7 = wait4 */
 	{ compat(AS(ocreat_args),creat), AUE_CREAT, NULL, 0, 0, 0 },	/* 8 = old creat */
 	{ AS(link_args), (sy_call_t *)link, AUE_LINK, NULL, 0, 0, 0 },	/* 9 = link */
@@ -51,199 +51,199 @@
 	{ AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD, NULL, 0, 0, 0 },	/* 14 = mknod */
 	{ AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD, NULL, 0, 0, 0 },	/* 15 = chmod */
 	{ AS(chown_args), (sy_call_t *)chown, AUE_CHOWN, NULL, 0, 0, 0 },	/* 16 = chown */
-	{ AS(obreak_args), (sy_call_t *)obreak, AUE_NULL, NULL, 0, 0, 0 },	/* 17 = break */
+	{ AS(obreak_args), (sy_call_t *)obreak, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 17 = break */
 	{ compat4(AS(freebsd4_getfsstat_args),getfsstat), AUE_GETFSSTAT, NULL, 0, 0, 0 },	/* 18 = freebsd4 getfsstat */
-	{ compat(AS(olseek_args),lseek), AUE_LSEEK, NULL, 0, 0, 0 },	/* 19 = old lseek */
-	{ 0, (sy_call_t *)getpid, AUE_GETPID, NULL, 0, 0, 0 },		/* 20 = getpid */
+	{ compat(AS(olseek_args),lseek), AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED },	/* 19 = old lseek */
+	{ 0, (sy_call_t *)getpid, AUE_GETPID, NULL, 0, 0, SYF_CAPENABLED },	/* 20 = getpid */
 	{ AS(mount_args), (sy_call_t *)mount, AUE_MOUNT, NULL, 0, 0, 0 },	/* 21 = mount */
 	{ AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT, NULL, 0, 0, 0 },	/* 22 = unmount */
-	{ AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0, 0 },	/* 23 = setuid */
-	{ 0, (sy_call_t *)getuid, AUE_GETUID, NULL, 0, 0, 0 },		/* 24 = getuid */
-	{ 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0, 0 },	/* 25 = geteuid */
+	{ AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0, SYF_CAPENABLED },	/* 23 = setuid */
+	{ 0, (sy_call_t *)getuid, AUE_GETUID, NULL, 0, 0, SYF_CAPENABLED },	/* 24 = getuid */
+	{ 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0, SYF_CAPENABLED },	/* 25 = geteuid */
 	{ AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE, NULL, 0, 0, 0 },	/* 26 = ptrace */
-	{ AS(recvmsg_args), (sy_call_t *)recvmsg, AUE_RECVMSG, NULL, 0, 0, 0 },	/* 27 = recvmsg */
-	{ AS(sendmsg_args), (sy_call_t *)sendmsg, AUE_SENDMSG, NULL, 0, 0, 0 },	/* 28 = sendmsg */
-	{ AS(recvfrom_args), (sy_call_t *)recvfrom, AUE_RECVFROM, NULL, 0, 0, 0 },	/* 29 = recvfrom */
-	{ AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT, NULL, 0, 0, 0 },	/* 30 = accept */
-	{ AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME, NULL, 0, 0, 0 },	/* 31 = getpeername */
-	{ AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME, NULL, 0, 0, 0 },	/* 32 = getsockname */
+	{ AS(recvmsg_args), (sy_call_t *)recvmsg, AUE_RECVMSG, NULL, 0, 0, SYF_CAPENABLED },	/* 27 = recvmsg */
+	{ AS(sendmsg_args), (sy_call_t *)sendmsg, AUE_SENDMSG, NULL, 0, 0, SYF_CAPENABLED },	/* 28 = sendmsg */
+	{ AS(recvfrom_args), (sy_call_t *)recvfrom, AUE_RECVFROM, NULL, 0, 0, SYF_CAPENABLED },	/* 29 = recvfrom */
+	{ AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED },	/* 30 = accept */
+	{ AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME, NULL, 0, 0, SYF_CAPENABLED },	/* 31 = getpeername */
+	{ AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME, NULL, 0, 0, SYF_CAPENABLED },	/* 32 = getsockname */
 	{ AS(access_args), (sy_call_t *)access, AUE_ACCESS, NULL, 0, 0, 0 },	/* 33 = access */
 	{ AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS, NULL, 0, 0, 0 },	/* 34 = chflags */
-	{ AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS, NULL, 0, 0, 0 },	/* 35 = fchflags */
-	{ 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0, 0 },		/* 36 = sync */
+	{ AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS, NULL, 0, 0, SYF_CAPENABLED },	/* 35 = fchflags */
+	{ 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0, SYF_CAPENABLED },	/* 36 = sync */
 	{ AS(kill_args), (sy_call_t *)kill, AUE_KILL, NULL, 0, 0, 0 },	/* 37 = kill */
 	{ compat(AS(ostat_args),stat), AUE_STAT, NULL, 0, 0, 0 },	/* 38 = old stat */
-	{ 0, (sy_call_t *)getppid, AUE_GETPPID, NULL, 0, 0, 0 },	/* 39 = getppid */
+	{ 0, (sy_call_t *)getppid, AUE_GETPPID, NULL, 0, 0, SYF_CAPENABLED },	/* 39 = getppid */
 	{ compat(AS(olstat_args),lstat), AUE_LSTAT, NULL, 0, 0, 0 },	/* 40 = old lstat */
-	{ AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0, 0 },	/* 41 = dup */
-	{ 0, (sy_call_t *)pipe, AUE_PIPE, NULL, 0, 0, 0 },		/* 42 = pipe */
-	{ 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0, 0 },	/* 43 = getegid */
-	{ AS(profil_args), (sy_call_t *)profil, AUE_PROFILE, NULL, 0, 0, 0 },	/* 44 = profil */
+	{ AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0, SYF_CAPENABLED },	/* 41 = dup */
+	{ 0, (sy_call_t *)pipe, AUE_PIPE, NULL, 0, 0, SYF_CAPENABLED },	/* 42 = pipe */
+	{ 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0, SYF_CAPENABLED },	/* 43 = getegid */
+	{ AS(profil_args), (sy_call_t *)profil, AUE_PROFILE, NULL, 0, 0, SYF_CAPENABLED },	/* 44 = profil */
 	{ AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE, NULL, 0, 0, 0 },	/* 45 = ktrace */
-	{ compat(AS(osigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, 0 },	/* 46 = old sigaction */
-	{ 0, (sy_call_t *)getgid, AUE_GETGID, NULL, 0, 0, 0 },		/* 47 = getgid */
-	{ compat(AS(osigprocmask_args),sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0, 0 },	/* 48 = old sigprocmask */
-	{ AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN, NULL, 0, 0, 0 },	/* 49 = getlogin */
+	{ compat(AS(osigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED },	/* 46 = old sigaction */
+	{ 0, (sy_call_t *)getgid, AUE_GETGID, NULL, 0, 0, SYF_CAPENABLED },	/* 47 = getgid */
+	{ compat(AS(osigprocmask_args),sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0, SYF_CAPENABLED },	/* 48 = old sigprocmask */
+	{ AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN, NULL, 0, 0, SYF_CAPENABLED },	/* 49 = getlogin */
 	{ AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN, NULL, 0, 0, 0 },	/* 50 = setlogin */
 	{ AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0, 0 },	/* 51 = acct */
-	{ compat(0,sigpending), AUE_SIGPENDING, NULL, 0, 0, 0 },	/* 52 = old sigpending */
-	{ AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0, 0 },	/* 53 = sigaltstack */
+	{ compat(0,sigpending), AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED },	/* 52 = old sigpending */
+	{ AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0, SYF_CAPENABLED },	/* 53 = sigaltstack */
 	{ AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0, 0 },	/* 54 = ioctl */
 	{ AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0, 0 },	/* 55 = reboot */
 	{ AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0, 0 },	/* 56 = revoke */
 	{ AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0, 0 },	/* 57 = symlink */
 	{ AS(readlink_args), (sy_call_t *)readlink, AUE_READLINK, NULL, 0, 0, 0 },	/* 58 = readlink */
 	{ AS(execve_args), (sy_call_t *)execve, AUE_EXECVE, NULL, 0, 0, 0 },	/* 59 = execve */
-	{ AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0, 0 },	/* 60 = umask */
+	{ AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0, SYF_CAPENABLED },	/* 60 = umask */
 	{ AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0, 0 },	/* 61 = chroot */
-	{ compat(AS(ofstat_args),fstat), AUE_FSTAT, NULL, 0, 0, 0 },	/* 62 = old fstat */
+	{ compat(AS(ofstat_args),fstat), AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED },	/* 62 = old fstat */
 	{ compat(AS(getkerninfo_args),getkerninfo), AUE_NULL, NULL, 0, 0, 0 },	/* 63 = old getkerninfo */
-	{ compat(0,getpagesize), AUE_NULL, NULL, 0, 0, 0 },		/* 64 = old getpagesize */
-	{ AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, 0 },	/* 65 = msync */
+	{ compat(0,getpagesize), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 64 = old getpagesize */
+	{ AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED },	/* 65 = msync */
 	{ 0, (sy_call_t *)vfork, AUE_VFORK, NULL, 0, 0, 0 },		/* 66 = vfork */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 67 = obsolete vread */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 68 = obsolete vwrite */
-	{ AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK, NULL, 0, 0, 0 },	/* 69 = sbrk */
-	{ AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK, NULL, 0, 0, 0 },	/* 70 = sstk */
-	{ compat(AS(ommap_args),mmap), AUE_MMAP, NULL, 0, 0, 0 },	/* 71 = old mmap */
+	{ AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK, NULL, 0, 0, SYF_CAPENABLED },	/* 69 = sbrk */
+	{ AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK, NULL, 0, 0, SYF_CAPENABLED },	/* 70 = sstk */
+	{ compat(AS(ommap_args),mmap), AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED },	/* 71 = old mmap */
 	{ AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE, NULL, 0, 0, 0 },	/* 72 = vadvise */
-	{ AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0, 0 },	/* 73 = munmap */
-	{ AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT, NULL, 0, 0, 0 },	/* 74 = mprotect */
-	{ AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0, 0 },	/* 75 = madvise */
+	{ AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0, SYF_CAPENABLED },	/* 73 = munmap */
+	{ AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT, NULL, 0, 0, SYF_CAPENABLED },	/* 74 = mprotect */
+	{ AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0, SYF_CAPENABLED },	/* 75 = madvise */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 76 = obsolete vhangup */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 77 = obsolete vlimit */
-	{ AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE, NULL, 0, 0, 0 },	/* 78 = mincore */
-	{ AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS, NULL, 0, 0, 0 },	/* 79 = getgroups */
+	{ AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE, NULL, 0, 0, SYF_CAPENABLED },	/* 78 = mincore */
+	{ AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS, NULL, 0, 0, SYF_CAPENABLED },	/* 79 = getgroups */
 	{ AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS, NULL, 0, 0, 0 },	/* 80 = setgroups */
-	{ 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0, 0 },	/* 81 = getpgrp */
+	{ 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0, SYF_CAPENABLED },	/* 81 = getpgrp */
 	{ AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0, 0 },	/* 82 = setpgid */
-	{ AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER, NULL, 0, 0, 0 },	/* 83 = setitimer */
+	{ AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER, NULL, 0, 0, SYF_CAPENABLED },	/* 83 = setitimer */
 	{ compat(0,wait), AUE_WAIT4, NULL, 0, 0, 0 },			/* 84 = old wait */
 	{ AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0, 0 },	/* 85 = swapon */
-	{ AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER, NULL, 0, 0, 0 },	/* 86 = getitimer */
-	{ compat(AS(gethostname_args),gethostname), AUE_SYSCTL, NULL, 0, 0, 0 },	/* 87 = old gethostname */
+	{ AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER, NULL, 0, 0, SYF_CAPENABLED },	/* 86 = getitimer */
+	{ compat(AS(gethostname_args),gethostname), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED },	/* 87 = old gethostname */
 	{ compat(AS(sethostname_args),sethostname), AUE_SYSCTL, NULL, 0, 0, 0 },	/* 88 = old sethostname */
 	{ 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE, NULL, 0, 0, 0 },	/* 89 = getdtablesize */
-	{ AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0, 0 },	/* 90 = dup2 */
+	{ AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0, SYF_CAPENABLED },	/* 90 = dup2 */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 91 = getdopt */
-	{ AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL, NULL, 0, 0, 0 },	/* 92 = fcntl */
-	{ AS(select_args), (sy_call_t *)select, AUE_SELECT, NULL, 0, 0, 0 },	/* 93 = select */
+	{ AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL, NULL, 0, 0, SYF_CAPENABLED },	/* 92 = fcntl */
+	{ AS(select_args), (sy_call_t *)select, AUE_SELECT, NULL, 0, 0, SYF_CAPENABLED },	/* 93 = select */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 94 = setdopt */
-	{ AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0, 0 },	/* 95 = fsync */
-	{ AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0, 0 },	/* 96 = setpriority */
-	{ AS(socket_args), (sy_call_t *)socket, AUE_SOCKET, NULL, 0, 0, 0 },	/* 97 = socket */
+	{ AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0, SYF_CAPENABLED },	/* 95 = fsync */
+	{ AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0, SYF_CAPENABLED },	/* 96 = setpriority */
+	{ AS(socket_args), (sy_call_t *)socket, AUE_SOCKET, NULL, 0, 0, SYF_CAPENABLED },	/* 97 = socket */
 	{ AS(connect_args), (sy_call_t *)connect, AUE_CONNECT, NULL, 0, 0, 0 },	/* 98 = connect */
-	{ compat(AS(accept_args),accept), AUE_ACCEPT, NULL, 0, 0, 0 },	/* 99 = old accept */
-	{ AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY, NULL, 0, 0, 0 },	/* 100 = getpriority */
-	{ compat(AS(osend_args),send), AUE_SEND, NULL, 0, 0, 0 },	/* 101 = old send */
-	{ compat(AS(orecv_args),recv), AUE_RECV, NULL, 0, 0, 0 },	/* 102 = old recv */
-	{ compat(AS(osigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, 0 },	/* 103 = old sigreturn */
+	{ compat(AS(accept_args),accept), AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED },	/* 99 = old accept */
+	{ AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY, NULL, 0, 0, SYF_CAPENABLED },	/* 100 = getpriority */
+	{ compat(AS(osend_args),send), AUE_SEND, NULL, 0, 0, SYF_CAPENABLED },	/* 101 = old send */
+	{ compat(AS(orecv_args),recv), AUE_RECV, NULL, 0, 0, SYF_CAPENABLED },	/* 102 = old recv */
+	{ compat(AS(osigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED },	/* 103 = old sigreturn */
 	{ AS(bind_args), (sy_call_t *)bind, AUE_BIND, NULL, 0, 0, 0 },	/* 104 = bind */
-	{ AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT, NULL, 0, 0, 0 },	/* 105 = setsockopt */
-	{ AS(listen_args), (sy_call_t *)listen, AUE_LISTEN, NULL, 0, 0, 0 },	/* 106 = listen */
+	{ AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT, NULL, 0, 0, SYF_CAPENABLED },	/* 105 = setsockopt */
+	{ AS(listen_args), (sy_call_t *)listen, AUE_LISTEN, NULL, 0, 0, SYF_CAPENABLED },	/* 106 = listen */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 107 = obsolete vtimes */
-	{ compat(AS(osigvec_args),sigvec), AUE_NULL, NULL, 0, 0, 0 },	/* 108 = old sigvec */
-	{ compat(AS(osigblock_args),sigblock), AUE_NULL, NULL, 0, 0, 0 },	/* 109 = old sigblock */
-	{ compat(AS(osigsetmask_args),sigsetmask), AUE_NULL, NULL, 0, 0, 0 },	/* 110 = old sigsetmask */
-	{ compat(AS(osigsuspend_args),sigsuspend), AUE_NULL, NULL, 0, 0, 0 },	/* 111 = old sigsuspend */
-	{ compat(AS(osigstack_args),sigstack), AUE_NULL, NULL, 0, 0, 0 },	/* 112 = old sigstack */
-	{ compat(AS(orecvmsg_args),recvmsg), AUE_RECVMSG, NULL, 0, 0, 0 },	/* 113 = old recvmsg */
-	{ compat(AS(osendmsg_args),sendmsg), AUE_SENDMSG, NULL, 0, 0, 0 },	/* 114 = old sendmsg */
+	{ compat(AS(osigvec_args),sigvec), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 108 = old sigvec */
+	{ compat(AS(osigblock_args),sigblock), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 109 = old sigblock */
+	{ compat(AS(osigsetmask_args),sigsetmask), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 110 = old sigsetmask */
+	{ compat(AS(osigsuspend_args),sigsuspend), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 111 = old sigsuspend */
+	{ compat(AS(osigstack_args),sigstack), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 112 = old sigstack */
+	{ compat(AS(orecvmsg_args),recvmsg), AUE_RECVMSG, NULL, 0, 0, SYF_CAPENABLED },	/* 113 = old recvmsg */
+	{ compat(AS(osendmsg_args),sendmsg), AUE_SENDMSG, NULL, 0, 0, SYF_CAPENABLED },	/* 114 = old sendmsg */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 115 = obsolete vtrace */
-	{ AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_GETTIMEOFDAY, NULL, 0, 0, 0 },	/* 116 = gettimeofday */
-	{ AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE, NULL, 0, 0, 0 },	/* 117 = getrusage */
-	{ AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT, NULL, 0, 0, 0 },	/* 118 = getsockopt */
+	{ AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_GETTIMEOFDAY, NULL, 0, 0, SYF_CAPENABLED },	/* 116 = gettimeofday */
+	{ AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE, NULL, 0, 0, SYF_CAPENABLED },	/* 117 = getrusage */
+	{ AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT, NULL, 0, 0, SYF_CAPENABLED },	/* 118 = getsockopt */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 119 = resuba */
-	{ AS(readv_args), (sy_call_t *)readv, AUE_READV, NULL, 0, 0, 0 },	/* 120 = readv */
-	{ AS(writev_args), (sy_call_t *)writev, AUE_WRITEV, NULL, 0, 0, 0 },	/* 121 = writev */
+	{ AS(readv_args), (sy_call_t *)readv, AUE_READV, NULL, 0, 0, SYF_CAPENABLED },	/* 120 = readv */
+	{ AS(writev_args), (sy_call_t *)writev, AUE_WRITEV, NULL, 0, 0, SYF_CAPENABLED },	/* 121 = writev */
 	{ AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0, 0 },	/* 122 = settimeofday */
-	{ AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0, 0 },	/* 123 = fchown */
-	{ AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0, 0 },	/* 124 = fchmod */
-	{ compat(AS(recvfrom_args),recvfrom), AUE_RECVFROM, NULL, 0, 0, 0 },	/* 125 = old recvfrom */
-	{ AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0, 0 },	/* 126 = setreuid */
-	{ AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0, 0 },	/* 127 = setregid */
+	{ AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0, SYF_CAPENABLED },	/* 123 = fchown */
+	{ AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0, SYF_CAPENABLED },	/* 124 = fchmod */
+	{ compat(AS(recvfrom_args),recvfrom), AUE_RECVFROM, NULL, 0, 0, SYF_CAPENABLED },	/* 125 = old recvfrom */
+	{ AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0, SYF_CAPENABLED },	/* 126 = setreuid */
+	{ AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0, SYF_CAPENABLED },	/* 127 = setregid */
 	{ AS(rename_args), (sy_call_t *)rename, AUE_RENAME, NULL, 0, 0, 0 },	/* 128 = rename */
 	{ compat(AS(otruncate_args),truncate), AUE_TRUNCATE, NULL, 0, 0, 0 },	/* 129 = old truncate */
-	{ compat(AS(oftruncate_args),ftruncate), AUE_FTRUNCATE, NULL, 0, 0, 0 },	/* 130 = old ftruncate */
-	{ AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0, 0 },	/* 131 = flock */
+	{ compat(AS(oftruncate_args),ftruncate), AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED },	/* 130 = old ftruncate */
+	{ AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0, SYF_CAPENABLED },	/* 131 = flock */
 	{ AS(mkfifo_args), (sy_call_t *)mkfifo, AUE_MKFIFO, NULL, 0, 0, 0 },	/* 132 = mkfifo */
-	{ AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO, NULL, 0, 0, 0 },	/* 133 = sendto */
-	{ AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN, NULL, 0, 0, 0 },	/* 134 = shutdown */
-	{ AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR, NULL, 0, 0, 0 },	/* 135 = socketpair */
+	{ AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO, NULL, 0, 0, SYF_CAPENABLED },	/* 133 = sendto */
+	{ AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN, NULL, 0, 0, SYF_CAPENABLED },	/* 134 = shutdown */
+	{ AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR, NULL, 0, 0, SYF_CAPENABLED },	/* 135 = socketpair */
 	{ AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR, NULL, 0, 0, 0 },	/* 136 = mkdir */
 	{ AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR, NULL, 0, 0, 0 },	/* 137 = rmdir */
 	{ AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES, NULL, 0, 0, 0 },	/* 138 = utimes */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 139 = obsolete 4.2 sigreturn */
 	{ AS(adjtime_args), (sy_call_t *)adjtime, AUE_ADJTIME, NULL, 0, 0, 0 },	/* 140 = adjtime */
-	{ compat(AS(ogetpeername_args),getpeername), AUE_GETPEERNAME, NULL, 0, 0, 0 },	/* 141 = old getpeername */
-	{ compat(0,gethostid), AUE_SYSCTL, NULL, 0, 0, 0 },		/* 142 = old gethostid */
+	{ compat(AS(ogetpeername_args),getpeername), AUE_GETPEERNAME, NULL, 0, 0, SYF_CAPENABLED },	/* 141 = old getpeername */
+	{ compat(0,gethostid), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED },	/* 142 = old gethostid */
 	{ compat(AS(osethostid_args),sethostid), AUE_SYSCTL, NULL, 0, 0, 0 },	/* 143 = old sethostid */
-	{ compat(AS(ogetrlimit_args),getrlimit), AUE_GETRLIMIT, NULL, 0, 0, 0 },	/* 144 = old getrlimit */
-	{ compat(AS(osetrlimit_args),setrlimit), AUE_SETRLIMIT, NULL, 0, 0, 0 },	/* 145 = old setrlimit */
+	{ compat(AS(ogetrlimit_args),getrlimit), AUE_GETRLIMIT, NULL, 0, 0, SYF_CAPENABLED },	/* 144 = old getrlimit */
+	{ compat(AS(osetrlimit_args),setrlimit), AUE_SETRLIMIT, NULL, 0, 0, SYF_CAPENABLED },	/* 145 = old setrlimit */
 	{ compat(AS(okillpg_args),killpg), AUE_KILLPG, NULL, 0, 0, 0 },	/* 146 = old killpg */
-	{ 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0, 0 },		/* 147 = setsid */
+	{ 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0, SYF_CAPENABLED },	/* 147 = setsid */
 	{ AS(quotactl_args), (sy_call_t *)quotactl, AUE_QUOTACTL, NULL, 0, 0, 0 },	/* 148 = quotactl */
 	{ compat(0,quota), AUE_O_QUOTA, NULL, 0, 0, 0 },		/* 149 = old quota */
-	{ compat(AS(getsockname_args),getsockname), AUE_GETSOCKNAME, NULL, 0, 0, 0 },	/* 150 = old getsockname */
+	{ compat(AS(getsockname_args),getsockname), AUE_GETSOCKNAME, NULL, 0, 0, SYF_CAPENABLED },	/* 150 = old getsockname */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 151 = sem_lock */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 152 = sem_wakeup */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 153 = asyncdaemon */
 	{ AS(nlm_syscall_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 154 = nlm_syscall */
 	{ AS(nfssvc_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 155 = nfssvc */
-	{ compat(AS(ogetdirentries_args),getdirentries), AUE_GETDIRENTRIES, NULL, 0, 0, 0 },	/* 156 = old getdirentries */
+	{ compat(AS(ogetdirentries_args),getdirentries), AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED },	/* 156 = old getdirentries */
 	{ compat4(AS(freebsd4_statfs_args),statfs), AUE_STATFS, NULL, 0, 0, 0 },	/* 157 = freebsd4 statfs */
-	{ compat4(AS(freebsd4_fstatfs_args),fstatfs), AUE_FSTATFS, NULL, 0, 0, 0 },	/* 158 = freebsd4 fstatfs */
+	{ compat4(AS(freebsd4_fstatfs_args),fstatfs), AUE_FSTATFS, NULL, 0, 0, SYF_CAPENABLED },	/* 158 = freebsd4 fstatfs */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 159 = nosys */
 	{ AS(lgetfh_args), (sy_call_t *)lgetfh, AUE_LGETFH, NULL, 0, 0, 0 },	/* 160 = lgetfh */
 	{ AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH, NULL, 0, 0, 0 },	/* 161 = getfh */
-	{ compat4(AS(freebsd4_getdomainname_args),getdomainname), AUE_SYSCTL, NULL, 0, 0, 0 },	/* 162 = freebsd4 getdomainname */
+	{ compat4(AS(freebsd4_getdomainname_args),getdomainname), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED },	/* 162 = freebsd4 getdomainname */
 	{ compat4(AS(freebsd4_setdomainname_args),setdomainname), AUE_SYSCTL, NULL, 0, 0, 0 },	/* 163 = freebsd4 setdomainname */
 	{ compat4(AS(freebsd4_uname_args),uname), AUE_NULL, NULL, 0, 0, 0 },	/* 164 = freebsd4 uname */
-	{ AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0, 0 },	/* 165 = sysarch */
-	{ AS(rtprio_args), (sy_call_t *)rtprio, AUE_RTPRIO, NULL, 0, 0, 0 },	/* 166 = rtprio */
+	{ AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0, SYF_CAPENABLED },	/* 165 = sysarch */
+	{ AS(rtprio_args), (sy_call_t *)rtprio, AUE_RTPRIO, NULL, 0, 0, SYF_CAPENABLED },	/* 166 = rtprio */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 167 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 168 = nosys */
 	{ AS(semsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 169 = semsys */
 	{ AS(msgsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 170 = msgsys */
 	{ AS(shmsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 171 = shmsys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 172 = nosys */
-	{ AS(freebsd6_pread_args), (sy_call_t *)freebsd6_pread, AUE_PREAD, NULL, 0, 0, 0 },	/* 173 = freebsd6_pread */
-	{ AS(freebsd6_pwrite_args), (sy_call_t *)freebsd6_pwrite, AUE_PWRITE, NULL, 0, 0, 0 },	/* 174 = freebsd6_pwrite */
+	{ AS(freebsd6_pread_args), (sy_call_t *)freebsd6_pread, AUE_PREAD, NULL, 0, 0, SYF_CAPENABLED },	/* 173 = freebsd6_pread */
+	{ AS(freebsd6_pwrite_args), (sy_call_t *)freebsd6_pwrite, AUE_PWRITE, NULL, 0, 0, SYF_CAPENABLED },	/* 174 = freebsd6_pwrite */
 	{ AS(setfib_args), (sy_call_t *)setfib, AUE_NULL, NULL, 0, 0, 0 },	/* 175 = setfib */
 	{ AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0, 0 },	/* 176 = ntp_adjtime */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 177 = sfork */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 178 = getdescriptor */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 179 = setdescriptor */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 180 = nosys */
-	{ AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0, 0 },	/* 181 = setgid */
-	{ AS(setegid_args), (sy_call_t *)setegid, AUE_SETEGID, NULL, 0, 0, 0 },	/* 182 = setegid */
-	{ AS(seteuid_args), (sy_call_t *)seteuid, AUE_SETEUID, NULL, 0, 0, 0 },	/* 183 = seteuid */
+	{ AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0, SYF_CAPENABLED },	/* 181 = setgid */
+	{ AS(setegid_args), (sy_call_t *)setegid, AUE_SETEGID, NULL, 0, 0, SYF_CAPENABLED },	/* 182 = setegid */
+	{ AS(seteuid_args), (sy_call_t *)seteuid, AUE_SETEUID, NULL, 0, 0, SYF_CAPENABLED },	/* 183 = seteuid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 184 = lfs_bmapv */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 185 = lfs_markv */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 186 = lfs_segclean */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 187 = lfs_segwait */
 	{ AS(stat_args), (sy_call_t *)stat, AUE_STAT, NULL, 0, 0, 0 },	/* 188 = stat */
-	{ AS(fstat_args), (sy_call_t *)fstat, AUE_FSTAT, NULL, 0, 0, 0 },	/* 189 = fstat */
+	{ AS(fstat_args), (sy_call_t *)fstat, AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED },	/* 189 = fstat */
 	{ AS(lstat_args), (sy_call_t *)lstat, AUE_LSTAT, NULL, 0, 0, 0 },	/* 190 = lstat */
 	{ AS(pathconf_args), (sy_call_t *)pathconf, AUE_PATHCONF, NULL, 0, 0, 0 },	/* 191 = pathconf */
-	{ AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF, NULL, 0, 0, 0 },	/* 192 = fpathconf */
+	{ AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF, NULL, 0, 0, SYF_CAPENABLED },	/* 192 = fpathconf */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 193 = nosys */
-	{ AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0, 0 },	/* 194 = getrlimit */
-	{ AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0, 0 },	/* 195 = setrlimit */
-	{ AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, 0 },	/* 196 = getdirentries */
-	{ AS(freebsd6_mmap_args), (sy_call_t *)freebsd6_mmap, AUE_MMAP, NULL, 0, 0, 0 },	/* 197 = freebsd6_mmap */
+	{ AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0, SYF_CAPENABLED },	/* 194 = getrlimit */
+	{ AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0, SYF_CAPENABLED },	/* 195 = setrlimit */
+	{ AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED },	/* 196 = getdirentries */
+	{ AS(freebsd6_mmap_args), (sy_call_t *)freebsd6_mmap, AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED },	/* 197 = freebsd6_mmap */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },		/* 198 = __syscall */
-	{ AS(freebsd6_lseek_args), (sy_call_t *)freebsd6_lseek, AUE_LSEEK, NULL, 0, 0, 0 },	/* 199 = freebsd6_lseek */
+	{ AS(freebsd6_lseek_args), (sy_call_t *)freebsd6_lseek, AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED },	/* 199 = freebsd6_lseek */
 	{ AS(freebsd6_truncate_args), (sy_call_t *)freebsd6_truncate, AUE_TRUNCATE, NULL, 0, 0, 0 },	/* 200 = freebsd6_truncate */
-	{ AS(freebsd6_ftruncate_args), (sy_call_t *)freebsd6_ftruncate, AUE_FTRUNCATE, NULL, 0, 0, 0 },	/* 201 = freebsd6_ftruncate */
-	{ AS(sysctl_args), (sy_call_t *)__sysctl, AUE_SYSCTL, NULL, 0, 0, 0 },	/* 202 = __sysctl */
-	{ AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0, 0 },	/* 203 = mlock */
-	{ AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0, 0 },	/* 204 = munlock */
+	{ AS(freebsd6_ftruncate_args), (sy_call_t *)freebsd6_ftruncate, AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED },	/* 201 = freebsd6_ftruncate */
+	{ AS(sysctl_args), (sy_call_t *)__sysctl, AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED },	/* 202 = __sysctl */
+	{ AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0, SYF_CAPENABLED },	/* 203 = mlock */
+	{ AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0, SYF_CAPENABLED },	/* 204 = munlock */
 	{ AS(undelete_args), (sy_call_t *)undelete, AUE_UNDELETE, NULL, 0, 0, 0 },	/* 205 = undelete */
-	{ AS(futimes_args), (sy_call_t *)futimes, AUE_FUTIMES, NULL, 0, 0, 0 },	/* 206 = futimes */
-	{ AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0, 0 },	/* 207 = getpgid */
+	{ AS(futimes_args), (sy_call_t *)futimes, AUE_FUTIMES, NULL, 0, 0, SYF_CAPENABLED },	/* 206 = futimes */
+	{ AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0, SYF_CAPENABLED },	/* 207 = getpgid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 208 = newreboot */
-	{ AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0, 0 },	/* 209 = poll */
+	{ AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0, SYF_CAPENABLED },	/* 209 = poll */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 },	/* 210 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 },	/* 211 = lkmnosys */
 	{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 },	/* 212 = lkmnosys */
@@ -266,15 +266,15 @@
 	{ 0, (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },		/* 229 = freebsd7 shmctl */
 	{ AS(shmdt_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 230 = shmdt */
 	{ AS(shmget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 231 = shmget */
-	{ AS(clock_gettime_args), (sy_call_t *)clock_gettime, AUE_NULL, NULL, 0, 0, 0 },	/* 232 = clock_gettime */
+	{ AS(clock_gettime_args), (sy_call_t *)clock_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 232 = clock_gettime */
 	{ AS(clock_settime_args), (sy_call_t *)clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0, 0 },	/* 233 = clock_settime */
-	{ AS(clock_getres_args), (sy_call_t *)clock_getres, AUE_NULL, NULL, 0, 0, 0 },	/* 234 = clock_getres */
-	{ AS(ktimer_create_args), (sy_call_t *)ktimer_create, AUE_NULL, NULL, 0, 0, 0 },	/* 235 = ktimer_create */
-	{ AS(ktimer_delete_args), (sy_call_t *)ktimer_delete, AUE_NULL, NULL, 0, 0, 0 },	/* 236 = ktimer_delete */
-	{ AS(ktimer_settime_args), (sy_call_t *)ktimer_settime, AUE_NULL, NULL, 0, 0, 0 },	/* 237 = ktimer_settime */
-	{ AS(ktimer_gettime_args), (sy_call_t *)ktimer_gettime, AUE_NULL, NULL, 0, 0, 0 },	/* 238 = ktimer_gettime */
-	{ AS(ktimer_getoverrun_args), (sy_call_t *)ktimer_getoverrun, AUE_NULL, NULL, 0, 0, 0 },	/* 239 = ktimer_getoverrun */
-	{ AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL, NULL, 0, 0, 0 },	/* 240 = nanosleep */
+	{ AS(clock_getres_args), (sy_call_t *)clock_getres, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 234 = clock_getres */
+	{ AS(ktimer_create_args), (sy_call_t *)ktimer_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 235 = ktimer_create */
+	{ AS(ktimer_delete_args), (sy_call_t *)ktimer_delete, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 236 = ktimer_delete */
+	{ AS(ktimer_settime_args), (sy_call_t *)ktimer_settime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 237 = ktimer_settime */
+	{ AS(ktimer_gettime_args), (sy_call_t *)ktimer_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 238 = ktimer_gettime */
+	{ AS(ktimer_getoverrun_args), (sy_call_t *)ktimer_getoverrun, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 239 = ktimer_getoverrun */
+	{ AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 240 = nanosleep */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 241 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 242 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 243 = nosys */
@@ -282,12 +282,12 @@
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 245 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 246 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 247 = nosys */
-	{ AS(ntp_gettime_args), (sy_call_t *)ntp_gettime, AUE_NULL, NULL, 0, 0, 0 },	/* 248 = ntp_gettime */
+	{ AS(ntp_gettime_args), (sy_call_t *)ntp_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 248 = ntp_gettime */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 249 = nosys */
-	{ AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT, NULL, 0, 0, 0 },	/* 250 = minherit */
+	{ AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT, NULL, 0, 0, SYF_CAPENABLED },	/* 250 = minherit */
 	{ AS(rfork_args), (sy_call_t *)rfork, AUE_RFORK, NULL, 0, 0, 0 },	/* 251 = rfork */
-	{ AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL, NULL, 0, 0, 0 },	/* 252 = openbsd_poll */
-	{ 0, (sy_call_t *)issetugid, AUE_ISSETUGID, NULL, 0, 0, 0 },	/* 253 = issetugid */
+	{ AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL, NULL, 0, 0, SYF_CAPENABLED },	/* 252 = openbsd_poll */
+	{ 0, (sy_call_t *)issetugid, AUE_ISSETUGID, NULL, 0, 0, SYF_CAPENABLED },	/* 253 = issetugid */
 	{ AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0 },	/* 254 = lchown */
 	{ AS(aio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 255 = aio_read */
 	{ AS(aio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 256 = aio_write */
@@ -306,12 +306,12 @@
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 269 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 270 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 271 = nosys */
-	{ AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0, 0 },	/* 272 = getdents */
+	{ AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0, SYF_CAPENABLED },	/* 272 = getdents */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 273 = nosys */
 	{ AS(lchmod_args), (sy_call_t *)lchmod, AUE_LCHMOD, NULL, 0, 0, 0 },	/* 274 = lchmod */
 	{ AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0 },	/* 275 = netbsd_lchown */
 	{ AS(lutimes_args), (sy_call_t *)lutimes, AUE_LUTIMES, NULL, 0, 0, 0 },	/* 276 = lutimes */
-	{ AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, 0 },	/* 277 = netbsd_msync */
+	{ AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED },	/* 277 = netbsd_msync */
 	{ AS(nstat_args), (sy_call_t *)nstat, AUE_STAT, NULL, 0, 0, 0 },	/* 278 = nstat */
 	{ AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT, NULL, 0, 0, 0 },	/* 279 = nfstat */
 	{ AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT, NULL, 0, 0, 0 },	/* 280 = nlstat */
@@ -323,8 +323,8 @@
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 286 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 287 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 288 = nosys */
-	{ AS(preadv_args), (sy_call_t *)preadv, AUE_PREADV, NULL, 0, 0, 0 },	/* 289 = preadv */
-	{ AS(pwritev_args), (sy_call_t *)pwritev, AUE_PWRITEV, NULL, 0, 0, 0 },	/* 290 = pwritev */
+	{ AS(preadv_args), (sy_call_t *)preadv, AUE_PREADV, NULL, 0, 0, SYF_CAPENABLED },	/* 289 = preadv */
+	{ AS(pwritev_args), (sy_call_t *)pwritev, AUE_PWRITEV, NULL, 0, 0, SYF_CAPENABLED },	/* 290 = pwritev */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 291 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 292 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 293 = nosys */
@@ -344,9 +344,9 @@
 	{ AS(kldnext_args), (sy_call_t *)kldnext, AUE_NULL, NULL, 0, 0, 0 },	/* 307 = kldnext */
 	{ AS(kldstat_args), (sy_call_t *)kldstat, AUE_NULL, NULL, 0, 0, 0 },	/* 308 = kldstat */
 	{ AS(kldfirstmod_args), (sy_call_t *)kldfirstmod, AUE_NULL, NULL, 0, 0, 0 },	/* 309 = kldfirstmod */
-	{ AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID, NULL, 0, 0, 0 },	/* 310 = getsid */
-	{ AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0, 0 },	/* 311 = setresuid */
-	{ AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0, 0 },	/* 312 = setresgid */
+	{ AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID, NULL, 0, 0, SYF_CAPENABLED },	/* 310 = getsid */
+	{ AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0, SYF_CAPENABLED },	/* 311 = setresuid */
+	{ AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0, SYF_CAPENABLED },	/* 312 = setresgid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 313 = obsolete signanosleep */
 	{ AS(aio_return_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 314 = aio_return */
 	{ AS(aio_suspend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 315 = aio_suspend */
@@ -355,49 +355,49 @@
 	{ AS(oaio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 318 = oaio_read */
 	{ AS(oaio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 319 = oaio_write */
 	{ AS(olio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 320 = olio_listio */
-	{ 0, (sy_call_t *)yield, AUE_NULL, NULL, 0, 0, 0 },		/* 321 = yield */
+	{ 0, (sy_call_t *)yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 321 = yield */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 322 = obsolete thr_sleep */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 323 = obsolete thr_wakeup */
-	{ AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0, 0 },	/* 324 = mlockall */
-	{ 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0, 0 },	/* 325 = munlockall */
+	{ AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0, SYF_CAPENABLED },	/* 324 = mlockall */
+	{ 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0, SYF_CAPENABLED },	/* 325 = munlockall */
 	{ AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_GETCWD, NULL, 0, 0, 0 },	/* 326 = __getcwd */
-	{ AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL, NULL, 0, 0, 0 },	/* 327 = sched_setparam */
-	{ AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL, NULL, 0, 0, 0 },	/* 328 = sched_getparam */
-	{ AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL, NULL, 0, 0, 0 },	/* 329 = sched_setscheduler */
-	{ AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler, AUE_NULL, NULL, 0, 0, 0 },	/* 330 = sched_getscheduler */
-	{ 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0, 0 },	/* 331 = sched_yield */
-	{ AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max, AUE_NULL, NULL, 0, 0, 0 },	/* 332 = sched_get_priority_max */
-	{ AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL, NULL, 0, 0, 0 },	/* 333 = sched_get_priority_min */
+	{ AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 327 = sched_setparam */
+	{ AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 328 = sched_getparam */
+	{ AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 329 = sched_setscheduler */
+	{ AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 330 = sched_getscheduler */
+	{ 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 331 = sched_yield */
+	{ AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 332 = sched_get_priority_max */
+	{ AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 333 = sched_get_priority_min */
 	{ AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL, NULL, 0, 0, 0 },	/* 334 = sched_rr_get_interval */
-	{ AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0, 0 },	/* 335 = utrace */
-	{ compat4(AS(freebsd4_sendfile_args),sendfile), AUE_SENDFILE, NULL, 0, 0, 0 },	/* 336 = freebsd4 sendfile */
+	{ AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 335 = utrace */
+	{ compat4(AS(freebsd4_sendfile_args),sendfile), AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED },	/* 336 = freebsd4 sendfile */
 	{ AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL, NULL, 0, 0, 0 },	/* 337 = kldsym */
 	{ AS(jail_args), (sy_call_t *)jail, AUE_JAIL, NULL, 0, 0, 0 },	/* 338 = jail */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 339 = pioctl */
-	{ AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, 0 },	/* 340 = sigprocmask */
-	{ AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0, 0 },	/* 341 = sigsuspend */
-	{ compat4(AS(freebsd4_sigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, 0 },	/* 342 = freebsd4 sigaction */
-	{ AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING, NULL, 0, 0, 0 },	/* 343 = sigpending */
-	{ compat4(AS(freebsd4_sigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, 0 },	/* 344 = freebsd4 sigreturn */
-	{ AS(sigtimedwait_args), (sy_call_t *)sigtimedwait, AUE_SIGWAIT, NULL, 0, 0, 0 },	/* 345 = sigtimedwait */
-	{ AS(sigwaitinfo_args), (sy_call_t *)sigwaitinfo, AUE_NULL, NULL, 0, 0, 0 },	/* 346 = sigwaitinfo */
+	{ AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, SYF_CAPENABLED },	/* 340 = sigprocmask */
+	{ AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0, SYF_CAPENABLED },	/* 341 = sigsuspend */
+	{ compat4(AS(freebsd4_sigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED },	/* 342 = freebsd4 sigaction */
+	{ AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED },	/* 343 = sigpending */
+	{ compat4(AS(freebsd4_sigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED },	/* 344 = freebsd4 sigreturn */
+	{ AS(sigtimedwait_args), (sy_call_t *)sigtimedwait, AUE_SIGWAIT, NULL, 0, 0, SYF_CAPENABLED },	/* 345 = sigtimedwait */
+	{ AS(sigwaitinfo_args), (sy_call_t *)sigwaitinfo, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 346 = sigwaitinfo */
 	{ AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL, NULL, 0, 0, 0 },	/* 347 = __acl_get_file */
 	{ AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL, NULL, 0, 0, 0 },	/* 348 = __acl_set_file */
-	{ AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0, 0 },	/* 349 = __acl_get_fd */
-	{ AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL, NULL, 0, 0, 0 },	/* 350 = __acl_set_fd */
+	{ AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 349 = __acl_get_fd */
+	{ AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 350 = __acl_set_fd */
 	{ AS(__acl_delete_file_args), (sy_call_t *)__acl_delete_file, AUE_NULL, NULL, 0, 0, 0 },	/* 351 = __acl_delete_file */
-	{ AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL, NULL, 0, 0, 0 },	/* 352 = __acl_delete_fd */
+	{ AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 352 = __acl_delete_fd */
 	{ AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL, NULL, 0, 0, 0 },	/* 353 = __acl_aclcheck_file */
-	{ AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL, NULL, 0, 0, 0 },	/* 354 = __acl_aclcheck_fd */
+	{ AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 354 = __acl_aclcheck_fd */
 	{ AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_EXTATTRCTL, NULL, 0, 0, 0 },	/* 355 = extattrctl */
 	{ AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_EXTATTR_SET_FILE, NULL, 0, 0, 0 },	/* 356 = extattr_set_file */
 	{ AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_EXTATTR_GET_FILE, NULL, 0, 0, 0 },	/* 357 = extattr_get_file */
 	{ AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_EXTATTR_DELETE_FILE, NULL, 0, 0, 0 },	/* 358 = extattr_delete_file */
 	{ AS(aio_waitcomplete_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 359 = aio_waitcomplete */
-	{ AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0, 0 },	/* 360 = getresuid */
-	{ AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0, 0 },	/* 361 = getresgid */
-	{ 0, (sy_call_t *)kqueue, AUE_KQUEUE, NULL, 0, 0, 0 },		/* 362 = kqueue */
-	{ AS(kevent_args), (sy_call_t *)kevent, AUE_NULL, NULL, 0, 0, 0 },	/* 363 = kevent */
+	{ AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0, SYF_CAPENABLED },	/* 360 = getresuid */
+	{ AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0, SYF_CAPENABLED },	/* 361 = getresgid */
+	{ 0, (sy_call_t *)kqueue, AUE_KQUEUE, NULL, 0, 0, SYF_CAPENABLED },	/* 362 = kqueue */
+	{ AS(kevent_args), (sy_call_t *)kevent, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 363 = kevent */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 364 = __cap_get_proc */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 365 = __cap_set_proc */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 366 = __cap_get_fd */
@@ -405,9 +405,9 @@
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 368 = __cap_set_fd */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 369 = __cap_set_file */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 370 = nosys */
-	{ AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0, 0 },	/* 371 = extattr_set_fd */
-	{ AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0, 0 },	/* 372 = extattr_get_fd */
-	{ AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0, 0 },	/* 373 = extattr_delete_fd */
+	{ AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0, SYF_CAPENABLED },	/* 371 = extattr_set_fd */
+	{ AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0, SYF_CAPENABLED },	/* 372 = extattr_get_fd */
+	{ AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0, SYF_CAPENABLED },	/* 373 = extattr_delete_fd */
 	{ AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL, NULL, 0, 0, 0 },	/* 374 = __setugid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 375 = nfsclnt */
 	{ AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0, 0 },	/* 376 = eaccess */
@@ -418,20 +418,20 @@
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 381 = kse_create */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 382 = kse_thr_interrupt */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 383 = kse_release */
-	{ AS(__mac_get_proc_args), (sy_call_t *)__mac_get_proc, AUE_NULL, NULL, 0, 0, 0 },	/* 384 = __mac_get_proc */
-	{ AS(__mac_set_proc_args), (sy_call_t *)__mac_set_proc, AUE_NULL, NULL, 0, 0, 0 },	/* 385 = __mac_set_proc */
-	{ AS(__mac_get_fd_args), (sy_call_t *)__mac_get_fd, AUE_NULL, NULL, 0, 0, 0 },	/* 386 = __mac_get_fd */
+	{ AS(__mac_get_proc_args), (sy_call_t *)__mac_get_proc, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 384 = __mac_get_proc */
+	{ AS(__mac_set_proc_args), (sy_call_t *)__mac_set_proc, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 385 = __mac_set_proc */
+	{ AS(__mac_get_fd_args), (sy_call_t *)__mac_get_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 386 = __mac_get_fd */
 	{ AS(__mac_get_file_args), (sy_call_t *)__mac_get_file, AUE_NULL, NULL, 0, 0, 0 },	/* 387 = __mac_get_file */
-	{ AS(__mac_set_fd_args), (sy_call_t *)__mac_set_fd, AUE_NULL, NULL, 0, 0, 0 },	/* 388 = __mac_set_fd */
+	{ AS(__mac_set_fd_args), (sy_call_t *)__mac_set_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 388 = __mac_set_fd */
 	{ AS(__mac_set_file_args), (sy_call_t *)__mac_set_file, AUE_NULL, NULL, 0, 0, 0 },	/* 389 = __mac_set_file */
 	{ AS(kenv_args), (sy_call_t *)kenv, AUE_NULL, NULL, 0, 0, 0 },	/* 390 = kenv */
 	{ AS(lchflags_args), (sy_call_t *)lchflags, AUE_LCHFLAGS, NULL, 0, 0, 0 },	/* 391 = lchflags */
-	{ AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL, NULL, 0, 0, 0 },	/* 392 = uuidgen */
-	{ AS(sendfile_args), (sy_call_t *)sendfile, AUE_SENDFILE, NULL, 0, 0, 0 },	/* 393 = sendfile */
+	{ AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 392 = uuidgen */
+	{ AS(sendfile_args), (sy_call_t *)sendfile, AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED },	/* 393 = sendfile */
 	{ AS(mac_syscall_args), (sy_call_t *)mac_syscall, AUE_NULL, NULL, 0, 0, 0 },	/* 394 = mac_syscall */
 	{ AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT, NULL, 0, 0, 0 },	/* 395 = getfsstat */
 	{ AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS, NULL, 0, 0, 0 },	/* 396 = statfs */
-	{ AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0, 0 },	/* 397 = fstatfs */
+	{ AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0, SYF_CAPENABLED },	/* 397 = fstatfs */
 	{ AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_FHSTATFS, NULL, 0, 0, 0 },	/* 398 = fhstatfs */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 399 = nosys */
 	{ AS(ksem_close_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 400 = ksem_close */
@@ -450,13 +450,13 @@
 	{ AS(extattr_get_link_args), (sy_call_t *)extattr_get_link, AUE_EXTATTR_GET_LINK, NULL, 0, 0, 0 },	/* 413 = extattr_get_link */
 	{ AS(extattr_delete_link_args), (sy_call_t *)extattr_delete_link, AUE_EXTATTR_DELETE_LINK, NULL, 0, 0, 0 },	/* 414 = extattr_delete_link */
 	{ AS(__mac_execve_args), (sy_call_t *)__mac_execve, AUE_NULL, NULL, 0, 0, 0 },	/* 415 = __mac_execve */
-	{ AS(sigaction_args), (sy_call_t *)sigaction, AUE_SIGACTION, NULL, 0, 0, 0 },	/* 416 = sigaction */
-	{ AS(sigreturn_args), (sy_call_t *)sigreturn, AUE_SIGRETURN, NULL, 0, 0, 0 },	/* 417 = sigreturn */
+	{ AS(sigaction_args), (sy_call_t *)sigaction, AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED },	/* 416 = sigaction */
+	{ AS(sigreturn_args), (sy_call_t *)sigreturn, AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED },	/* 417 = sigreturn */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 418 = __xstat */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 419 = __xfstat */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 420 = __xlstat */
-	{ AS(getcontext_args), (sy_call_t *)getcontext, AUE_NULL, NULL, 0, 0, 0 },	/* 421 = getcontext */
-	{ AS(setcontext_args), (sy_call_t *)setcontext, AUE_NULL, NULL, 0, 0, 0 },	/* 422 = setcontext */
+	{ AS(getcontext_args), (sy_call_t *)getcontext, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 421 = getcontext */
+	{ AS(setcontext_args), (sy_call_t *)setcontext, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 422 = setcontext */
 	{ AS(swapcontext_args), (sy_call_t *)swapcontext, AUE_NULL, NULL, 0, 0, 0 },	/* 423 = swapcontext */
 	{ AS(swapoff_args), (sy_call_t *)swapoff, AUE_SWAPOFF, NULL, 0, 0, 0 },	/* 424 = swapoff */
 	{ AS(__acl_get_link_args), (sy_call_t *)__acl_get_link, AUE_NULL, NULL, 0, 0, 0 },	/* 425 = __acl_get_link */
@@ -464,59 +464,59 @@
 	{ AS(__acl_delete_link_args), (sy_call_t *)__acl_delete_link, AUE_NULL, NULL, 0, 0, 0 },	/* 427 = __acl_delete_link */
 	{ AS(__acl_aclcheck_link_args), (sy_call_t *)__acl_aclcheck_link, AUE_NULL, NULL, 0, 0, 0 },	/* 428 = __acl_aclcheck_link */
 	{ AS(sigwait_args), (sy_call_t *)sigwait, AUE_SIGWAIT, NULL, 0, 0, 0 },	/* 429 = sigwait */
-	{ AS(thr_create_args), (sy_call_t *)thr_create, AUE_NULL, NULL, 0, 0, 0 },	/* 430 = thr_create */
-	{ AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL, NULL, 0, 0, 0 },	/* 431 = thr_exit */
-	{ AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL, NULL, 0, 0, 0 },	/* 432 = thr_self */
-	{ AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL, NULL, 0, 0, 0 },	/* 433 = thr_kill */
-	{ AS(_umtx_lock_args), (sy_call_t *)_umtx_lock, AUE_NULL, NULL, 0, 0, 0 },	/* 434 = _umtx_lock */
-	{ AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock, AUE_NULL, NULL, 0, 0, 0 },	/* 435 = _umtx_unlock */
+	{ AS(thr_create_args), (sy_call_t *)thr_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 430 = thr_create */
+	{ AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 431 = thr_exit */
+	{ AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 432 = thr_self */
+	{ AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 433 = thr_kill */
+	{ AS(_umtx_lock_args), (sy_call_t *)_umtx_lock, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 434 = _umtx_lock */
+	{ AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 435 = _umtx_unlock */
 	{ AS(jail_attach_args), (sy_call_t *)jail_attach, AUE_NULL, NULL, 0, 0, 0 },	/* 436 = jail_attach */
-	{ AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_EXTATTR_LIST_FD, NULL, 0, 0, 0 },	/* 437 = extattr_list_fd */
+	{ AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_EXTATTR_LIST_FD, NULL, 0, 0, SYF_CAPENABLED },	/* 437 = extattr_list_fd */
 	{ AS(extattr_list_file_args), (sy_call_t *)extattr_list_file, AUE_EXTATTR_LIST_FILE, NULL, 0, 0, 0 },	/* 438 = extattr_list_file */
 	{ AS(extattr_list_link_args), (sy_call_t *)extattr_list_link, AUE_EXTATTR_LIST_LINK, NULL, 0, 0, 0 },	/* 439 = extattr_list_link */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 440 = kse_switchin */
 	{ AS(ksem_timedwait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 441 = ksem_timedwait */
-	{ AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL, NULL, 0, 0, 0 },	/* 442 = thr_suspend */
-	{ AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL, NULL, 0, 0, 0 },	/* 443 = thr_wake */
+	{ AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 442 = thr_suspend */
+	{ AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 443 = thr_wake */
 	{ AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_MODUNLOAD, NULL, 0, 0, 0 },	/* 444 = kldunloadf */
 	{ AS(audit_args), (sy_call_t *)audit, AUE_AUDIT, NULL, 0, 0, 0 },	/* 445 = audit */
 	{ AS(auditon_args), (sy_call_t *)auditon, AUE_AUDITON, NULL, 0, 0, 0 },	/* 446 = auditon */
-	{ AS(getauid_args), (sy_call_t *)getauid, AUE_GETAUID, NULL, 0, 0, 0 },	/* 447 = getauid */
-	{ AS(setauid_args), (sy_call_t *)setauid, AUE_SETAUID, NULL, 0, 0, 0 },	/* 448 = setauid */
-	{ AS(getaudit_args), (sy_call_t *)getaudit, AUE_GETAUDIT, NULL, 0, 0, 0 },	/* 449 = getaudit */
-	{ AS(setaudit_args), (sy_call_t *)setaudit, AUE_SETAUDIT, NULL, 0, 0, 0 },	/* 450 = setaudit */
-	{ AS(getaudit_addr_args), (sy_call_t *)getaudit_addr, AUE_GETAUDIT_ADDR, NULL, 0, 0, 0 },	/* 451 = getaudit_addr */
-	{ AS(setaudit_addr_args), (sy_call_t *)setaudit_addr, AUE_SETAUDIT_ADDR, NULL, 0, 0, 0 },	/* 452 = setaudit_addr */
+	{ AS(getauid_args), (sy_call_t *)getauid, AUE_GETAUID, NULL, 0, 0, SYF_CAPENABLED },	/* 447 = getauid */
+	{ AS(setauid_args), (sy_call_t *)setauid, AUE_SETAUID, NULL, 0, 0, SYF_CAPENABLED },	/* 448 = setauid */
+	{ AS(getaudit_args), (sy_call_t *)getaudit, AUE_GETAUDIT, NULL, 0, 0, SYF_CAPENABLED },	/* 449 = getaudit */
+	{ AS(setaudit_args), (sy_call_t *)setaudit, AUE_SETAUDIT, NULL, 0, 0, SYF_CAPENABLED },	/* 450 = setaudit */
+	{ AS(getaudit_addr_args), (sy_call_t *)getaudit_addr, AUE_GETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED },	/* 451 = getaudit_addr */
+	{ AS(setaudit_addr_args), (sy_call_t *)setaudit_addr, AUE_SETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED },	/* 452 = setaudit_addr */
 	{ AS(auditctl_args), (sy_call_t *)auditctl, AUE_AUDITCTL, NULL, 0, 0, 0 },	/* 453 = auditctl */
-	{ AS(_umtx_op_args), (sy_call_t *)_umtx_op, AUE_NULL, NULL, 0, 0, 0 },	/* 454 = _umtx_op */
-	{ AS(thr_new_args), (sy_call_t *)thr_new, AUE_NULL, NULL, 0, 0, 0 },	/* 455 = thr_new */
-	{ AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL, NULL, 0, 0, 0 },	/* 456 = sigqueue */
+	{ AS(_umtx_op_args), (sy_call_t *)_umtx_op, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 454 = _umtx_op */
+	{ AS(thr_new_args), (sy_call_t *)thr_new, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 455 = thr_new */
+	{ AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 456 = sigqueue */
 	{ AS(kmq_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 457 = kmq_open */
 	{ AS(kmq_setattr_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 458 = kmq_setattr */
 	{ AS(kmq_timedreceive_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 459 = kmq_timedreceive */
 	{ AS(kmq_timedsend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 460 = kmq_timedsend */
 	{ AS(kmq_notify_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 461 = kmq_notify */
 	{ AS(kmq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 462 = kmq_unlink */
-	{ AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0, 0 },	/* 463 = abort2 */
-	{ AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0, 0 },	/* 464 = thr_set_name */
+	{ AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 463 = abort2 */
+	{ AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 464 = thr_set_name */
 	{ AS(aio_fsync_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 465 = aio_fsync */
-	{ AS(rtprio_thread_args), (sy_call_t *)rtprio_thread, AUE_RTPRIO, NULL, 0, 0, 0 },	/* 466 = rtprio_thread */
+	{ AS(rtprio_thread_args), (sy_call_t *)rtprio_thread, AUE_RTPRIO, NULL, 0, 0, SYF_CAPENABLED },	/* 466 = rtprio_thread */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 467 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 468 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 469 = __getpath_fromfd */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 470 = __getpath_fromaddr */
-	{ AS(sctp_peeloff_args), (sy_call_t *)sctp_peeloff, AUE_NULL, NULL, 0, 0, 0 },	/* 471 = sctp_peeloff */
-	{ AS(sctp_generic_sendmsg_args), (sy_call_t *)sctp_generic_sendmsg, AUE_NULL, NULL, 0, 0, 0 },	/* 472 = sctp_generic_sendmsg */
-	{ AS(sctp_generic_sendmsg_iov_args), (sy_call_t *)sctp_generic_sendmsg_iov, AUE_NULL, NULL, 0, 0, 0 },	/* 473 = sctp_generic_sendmsg_iov */
-	{ AS(sctp_generic_recvmsg_args), (sy_call_t *)sctp_generic_recvmsg, AUE_NULL, NULL, 0, 0, 0 },	/* 474 = sctp_generic_recvmsg */
-	{ AS(pread_args), (sy_call_t *)pread, AUE_PREAD, NULL, 0, 0, 0 },	/* 475 = pread */
-	{ AS(pwrite_args), (sy_call_t *)pwrite, AUE_PWRITE, NULL, 0, 0, 0 },	/* 476 = pwrite */
-	{ AS(mmap_args), (sy_call_t *)mmap, AUE_MMAP, NULL, 0, 0, 0 },	/* 477 = mmap */
-	{ AS(lseek_args), (sy_call_t *)lseek, AUE_LSEEK, NULL, 0, 0, 0 },	/* 478 = lseek */
+	{ AS(sctp_peeloff_args), (sy_call_t *)sctp_peeloff, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 471 = sctp_peeloff */
+	{ AS(sctp_generic_sendmsg_args), (sy_call_t *)sctp_generic_sendmsg, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 472 = sctp_generic_sendmsg */
+	{ AS(sctp_generic_sendmsg_iov_args), (sy_call_t *)sctp_generic_sendmsg_iov, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 473 = sctp_generic_sendmsg_iov */
+	{ AS(sctp_generic_recvmsg_args), (sy_call_t *)sctp_generic_recvmsg, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 474 = sctp_generic_recvmsg */
+	{ AS(pread_args), (sy_call_t *)pread, AUE_PREAD, NULL, 0, 0, SYF_CAPENABLED },	/* 475 = pread */
+	{ AS(pwrite_args), (sy_call_t *)pwrite, AUE_PWRITE, NULL, 0, 0, SYF_CAPENABLED },	/* 476 = pwrite */
+	{ AS(mmap_args), (sy_call_t *)mmap, AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED },	/* 477 = mmap */
+	{ AS(lseek_args), (sy_call_t *)lseek, AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED },	/* 478 = lseek */
 	{ AS(truncate_args), (sy_call_t *)truncate, AUE_TRUNCATE, NULL, 0, 0, 0 },	/* 479 = truncate */
-	{ AS(ftruncate_args), (sy_call_t *)ftruncate, AUE_FTRUNCATE, NULL, 0, 0, 0 },	/* 480 = ftruncate */
+	{ AS(ftruncate_args), (sy_call_t *)ftruncate, AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED },	/* 480 = ftruncate */
 	{ AS(thr_kill2_args), (sy_call_t *)thr_kill2, AUE_KILL, NULL, 0, 0, 0 },	/* 481 = thr_kill2 */
-	{ AS(shm_open_args), (sy_call_t *)shm_open, AUE_SHMOPEN, NULL, 0, 0, 0 },	/* 482 = shm_open */
+	{ AS(shm_open_args), (sy_call_t *)shm_open, AUE_SHMOPEN, NULL, 0, 0, SYF_CAPENABLED },	/* 482 = shm_open */
 	{ AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_SHMUNLINK, NULL, 0, 0, 0 },	/* 483 = shm_unlink */
 	{ AS(cpuset_args), (sy_call_t *)cpuset, AUE_NULL, NULL, 0, 0, 0 },	/* 484 = cpuset */
 	{ AS(cpuset_setid_args), (sy_call_t *)cpuset_setid, AUE_NULL, NULL, 0, 0, 0 },	/* 485 = cpuset_setid */
@@ -526,7 +526,7 @@
 	{ AS(faccessat_args), (sy_call_t *)faccessat, AUE_FACCESSAT, NULL, 0, 0, 0 },	/* 489 = faccessat */
 	{ AS(fchmodat_args), (sy_call_t *)fchmodat, AUE_FCHMODAT, NULL, 0, 0, 0 },	/* 490 = fchmodat */
 	{ AS(fchownat_args), (sy_call_t *)fchownat, AUE_FCHOWNAT, NULL, 0, 0, 0 },	/* 491 = fchownat */
-	{ AS(fexecve_args), (sy_call_t *)fexecve, AUE_FEXECVE, NULL, 0, 0, 0 },	/* 492 = fexecve */
+	{ AS(fexecve_args), (sy_call_t *)fexecve, AUE_FEXECVE, NULL, 0, 0, SYF_CAPENABLED },	/* 492 = fexecve */
 	{ AS(fstatat_args), (sy_call_t *)fstatat, AUE_FSTATAT, NULL, 0, 0, 0 },	/* 493 = fstatat */
 	{ AS(futimesat_args), (sy_call_t *)futimesat, AUE_FUTIMESAT, NULL, 0, 0, 0 },	/* 494 = futimesat */
 	{ AS(linkat_args), (sy_call_t *)linkat, AUE_LINKAT, NULL, 0, 0, 0 },	/* 495 = linkat */
@@ -543,17 +543,17 @@
 	{ AS(jail_get_args), (sy_call_t *)jail_get, AUE_NULL, NULL, 0, 0, 0 },	/* 506 = jail_get */
 	{ AS(jail_set_args), (sy_call_t *)jail_set, AUE_NULL, NULL, 0, 0, 0 },	/* 507 = jail_set */
 	{ AS(jail_remove_args), (sy_call_t *)jail_remove, AUE_NULL, NULL, 0, 0, 0 },	/* 508 = jail_remove */
-	{ AS(closefrom_args), (sy_call_t *)closefrom, AUE_CLOSEFROM, NULL, 0, 0, 0 },	/* 509 = closefrom */
+	{ AS(closefrom_args), (sy_call_t *)closefrom, AUE_CLOSEFROM, NULL, 0, 0, SYF_CAPENABLED },	/* 509 = closefrom */
 	{ AS(__semctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 510 = __semctl */
 	{ AS(msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 511 = msgctl */
 	{ AS(shmctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 },	/* 512 = shmctl */
 	{ AS(lpathconf_args), (sy_call_t *)lpathconf, AUE_LPATHCONF, NULL, 0, 0, 0 },	/* 513 = lpathconf */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 514 = cap_new */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 515 = cap_getrights */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 516 = cap_enter */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 517 = cap_getmode */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 518 = pdfork */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 519 = pdkill */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 520 = pdgetpid */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 },			/* 521 = pdwait */
+	{ AS(cap_new_args), (sy_call_t *)cap_new, AUE_CAP_NEW, NULL, 0, 0, SYF_CAPENABLED },	/* 514 = cap_new */
+	{ AS(cap_getrights_args), (sy_call_t *)cap_getrights, AUE_CAP_GETRIGHTS, NULL, 0, 0, SYF_CAPENABLED },	/* 515 = cap_getrights */
+	{ 0, (sy_call_t *)cap_enter, AUE_CAP_ENTER, NULL, 0, 0, SYF_CAPENABLED },	/* 516 = cap_enter */
+	{ AS(cap_getmode_args), (sy_call_t *)cap_getmode, AUE_CAP_GETMODE, NULL, 0, 0, SYF_CAPENABLED },	/* 517 = cap_getmode */
+	{ AS(pdfork_args), (sy_call_t *)pdfork, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 518 = pdfork */
+	{ AS(pdkill_args), (sy_call_t *)pdkill, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 519 = pdkill */
+	{ AS(pdgetpid_args), (sy_call_t *)pdgetpid, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED },	/* 520 = pdgetpid */
+	{ AS(pdwait_args), (sy_call_t *)pdwait, AUE_NULL, NULL, 0, 0, 0 },	/* 521 = pdwait */
 };

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#40 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/syscalls.c,v 1.237 2009/09/30 08:48:59 rwatson Exp $
- * created from FreeBSD: head/sys/kern/syscalls.master 197636 2009-09-30 08:46:01Z rwatson 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.260 2009/09/30 08:46:01 rwatson Exp 
  */
 
 const char *syscallnames[] = {
@@ -521,12 +521,12 @@
 	"msgctl",			/* 511 = msgctl */
 	"shmctl",			/* 512 = shmctl */
 	"lpathconf",			/* 513 = lpathconf */
-	"#514",			/* 514 = cap_new */
-	"#515",			/* 515 = cap_getrights */
-	"#516",			/* 516 = cap_enter */
-	"#517",			/* 517 = cap_getmode */
-	"#518",			/* 518 = pdfork */
-	"#519",			/* 519 = pdkill */
-	"#520",			/* 520 = pdgetpid */
-	"#521",			/* 521 = pdwait */
+	"cap_new",			/* 514 = cap_new */
+	"cap_getrights",			/* 515 = cap_getrights */
+	"cap_enter",			/* 516 = cap_enter */
+	"cap_getmode",			/* 517 = cap_getmode */
+	"pdfork",			/* 518 = pdfork */
+	"pdkill",			/* 519 = pdkill */
+	"pdgetpid",			/* 520 = pdgetpid */
+	"pdwait",			/* 521 = pdwait */
 };

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#39 (text+ko) ====


==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#40 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/sys/syscall.h,v 1.234 2009/09/30 08:48:59 rwatson Exp $
- * created from FreeBSD: head/sys/kern/syscalls.master 197636 2009-09-30 08:46:01Z rwatson 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.260 2009/09/30 08:46:01 rwatson Exp 
  */
 
 #define	SYS_syscall	0
@@ -428,4 +428,12 @@
 #define	SYS_msgctl	511
 #define	SYS_shmctl	512
 #define	SYS_lpathconf	513
+#define	SYS_cap_new	514
+#define	SYS_cap_getrights	515
+#define	SYS_cap_enter	516
+#define	SYS_cap_getmode	517
+#define	SYS_pdfork	518
+#define	SYS_pdkill	519
+#define	SYS_pdgetpid	520
+#define	SYS_pdwait	521
 #define	SYS_MAXSYSCALL	522

==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#40 (text+ko) ====

@@ -1,7 +1,7 @@
 # FreeBSD system call names.
 # DO NOT EDIT-- this file is automatically generated.
-# $FreeBSD: src/sys/sys/syscall.mk,v 1.189 2009/09/30 08:48:59 rwatson Exp $
-# created from FreeBSD: head/sys/kern/syscalls.master 197636 2009-09-30 08:46:01Z rwatson 
+# $FreeBSD$
+# created from FreeBSD: src/sys/kern/syscalls.master,v 1.260 2009/09/30 08:46:01 rwatson Exp 
 MIASM =  \
 	syscall.o \
 	exit.o \
@@ -376,4 +376,12 @@
 	__semctl.o \
 	msgctl.o \
 	shmctl.o \
-	lpathconf.o
+	lpathconf.o \
+	cap_new.o \
+	cap_getrights.o \
+	cap_enter.o \
+	cap_getmode.o \
+	pdfork.o \
+	pdkill.o \
+	pdgetpid.o \
+	pdwait.o

==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#40 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/sys/sysproto.h,v 1.239 2009/09/30 08:48:59 rwatson Exp $
- * created from FreeBSD: head/sys/kern/syscalls.master 197636 2009-09-30 08:46:01Z rwatson 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.260 2009/09/30 08:46:01 rwatson Exp 
  */
 
 #ifndef _SYS_SYSPROTO_H_
@@ -1641,6 +1641,37 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Oct  1 19:49:03 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E42511065694; Thu,  1 Oct 2009 19:49:02 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9C6CE106566B
	for ; Thu,  1 Oct 2009 19:49:02 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 717DC8FC1E
	for ; Thu,  1 Oct 2009 19:49:02 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n91Jn29o058922
	for ; Thu, 1 Oct 2009 19:49:02 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n91Jn2AC058920
	for perforce@freebsd.org; Thu, 1 Oct 2009 19:49:02 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Thu, 1 Oct 2009 19:49:02 GMT
Message-Id: <200910011949.n91Jn2AC058920@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169102 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Oct 2009 19:49:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=169102

Change 169102 by truncs@aditya on 2009/10/01 19:48:54

	Remove unused file.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_bitops.h#2 delete

Differences ...

From owner-p4-projects@FreeBSD.ORG  Thu Oct  1 20:13:29 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 918CB1065696; Thu,  1 Oct 2009 20:13:29 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 54F581065692
	for ; Thu,  1 Oct 2009 20:13:29 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 43BAA8FC1E
	for ; Thu,  1 Oct 2009 20:13:29 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n91KDTOf061634
	for ; Thu, 1 Oct 2009 20:13:29 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n91KDTa1061632
	for perforce@freebsd.org; Thu, 1 Oct 2009 20:13:29 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Thu, 1 Oct 2009 20:13:29 GMT
Message-Id: <200910012013.n91KDTa1061632@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169103 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Oct 2009 20:13:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=169103

Change 169103 by truncs@aditya on 2009/10/01 20:13:08

	Make the comment more verbose - include why these parameters were introduced
	in orlov block allocator.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/fs.h#4 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/fs.h#4 (text+ko) ====

@@ -57,15 +57,26 @@
 /*
  * The path name on which the file system is mounted is maintained
  * in fs_fsmnt. MAXMNTLEN defines the amount of space allocated in 
- * the super block for this name. AVFPDIR is the expected number of
- * files per directory. AVGDIRSIZE is obtained by multiplying AVFPDIR
- * and AVFILESIZ which is assumed to be 16384. Both AVFPDIR and AVFFIZSIZ
- * are taken from UFS and they are used in implementation of Orlov Block
- * Allocator.
+ * the super block for this name. 
  */
 #define MAXMNTLEN	512
+
+/*
+ * Grigoriy Orlov  has done some extensive work to fine
+ * tune the layout preferences for directories within a filesystem.
+ * His algorithm can be tuned by adjusting the following parameters
+ * which tell the system the average file size and the average number
+ * of files per directory. These defaults are well selected for typical
+ * filesystems, but may need to be tuned for odd cases like filesystems
+ * being used for sqiud caches or news spools.
+ * AVFPDIR is the expected number of files per directory. AVGDIRSIZE is 
+ * obtained by multiplying AVFPDIR and AVFILESIZ which is assumed to be 
+ * 16384.
+ */
+
 #define AFPDIR		64
 #define AVGDIRSIZE	1048576
+
 /*
  * Macros for access to superblock array structures
  */

From owner-p4-projects@FreeBSD.ORG  Thu Oct  1 20:30:49 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5AF961065694; Thu,  1 Oct 2009 20:30:49 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1E8B9106568F
	for ; Thu,  1 Oct 2009 20:30:49 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0B3DB8FC12
	for ; Thu,  1 Oct 2009 20:30:49 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n91KUm6u062886
	for ; Thu, 1 Oct 2009 20:30:48 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n91KUmMI062884
	for perforce@freebsd.org; Thu, 1 Oct 2009 20:30:48 GMT
	(envelope-from trasz@freebsd.org)
Date: Thu, 1 Oct 2009 20:30:48 GMT
Message-Id: <200910012030.n91KUmMI062884@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169104 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Oct 2009 20:30:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=169104

Change 169104 by trasz@trasz_anger on 2009/10/01 20:29:49

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#43 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ChangeLog#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/README#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/README.platform#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth-pam.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth-passwd.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth-sia.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth1.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-jpake.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-kbdint.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-none.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-passwd.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-pubkey.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/canohost.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/canohost.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/channels.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/clientloop.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/config.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/config.h.in#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/defines.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/gss-genr.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/includes.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/jpake.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/jpake.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/kex.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/kex.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/kexdhs.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/kexgexs.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/monitor.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/monitor_mm.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/monitor_wrap.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/monitor_wrap.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/daemon.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/openssl-compat.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/openssl-compat.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/port-aix.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/port-aix.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/packet.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/packet.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/readconf.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/readconf.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/roaming.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/roaming_common.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/roaming_dummy.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/schnorr.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/schnorr.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/servconf.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/serverloop.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/session.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sftp-client.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sftp-server.8#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sftp-server.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-agent.1#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-agent.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh-keygen.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh.1#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh_config#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh_config.5#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh_namespace.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshconnect.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshconnect.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshconnect2.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshd.8#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshd.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshd_config#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshd_config.5#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshlogin.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/uuencode.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/version.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.usr.dist#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/daily/400.status-disks#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/security/200.chkmounts#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/defaultroute#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ip6addrctl#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netif#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netoptions#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/routing#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/rtadvd#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/_pthread_stubs.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/nls/Makefile.inc#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/malloc.3#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/malloc.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/fcntl.2#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libradius/radlib.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_spec.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_umtx.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/libexec/rpc.rquotad/rquotad.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/camcontrol/camcontrol.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.8#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/shutdown/shutdown.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/secure/libexec/sftp-server/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/secure/libexec/ssh-keysign/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/scp/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/sftp/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/ssh-add/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/ssh-agent/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/ssh-keygen/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/ssh-keyscan/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.bin/ssh/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/secure/usr.sbin/sshd/Makefile#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#27 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/lindev.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/msk.4#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man7/tuning.7#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/asia#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/southamerica#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/acpica/acpi_machdep.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/acpica/madt.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/initcpu.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#24 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/trap.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#26 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/NOTES#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/acpica_machdep.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/apm_bios.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/cpufunc.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/pci/pci_cfgreg.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/identcpu.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/md_var.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/loader.conf#19 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_kevents.h#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_all.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#36 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_proto.h#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscall.h#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscalls.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_sysent.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/syscalls.master#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/x86bios/x86bios.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/x86bios/x86bios.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/x86bios/x86bios_alloc.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#54 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#20 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.pc98#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ddb/db_ps.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_ibm.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_acad.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_video.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpivar.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ae/if_ae.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/age/if_age.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/alc/if_alc.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ale/if_ale.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/atkbdc/atkbd.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/de/if_de.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/de/if_devar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dpms/dpms.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r600_blit.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_cs.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_drv.h#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_irq.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_state.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vesa.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fxp/if_fxp.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/jme/if_jme.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/lindev/full.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/lindev/lindev.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/lindev/lindev.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/e1000phy.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/e1000phyreg.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_msk.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_mskreg.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mwl/if_mwl.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/if_mxge.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/if_mxge_var.h#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pcireg.h#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hda_reg.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#29 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scmouse.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scterm-teken.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/atmegadci.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci_pci.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/usb_controller.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_axe.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cdce.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cdcereg.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/quirk/usb_quirk.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/u3g.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uark.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ubsa.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ubser.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uch341.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uchcom.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ucycom.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ufoma.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uftdi.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ugensa.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uipaq.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/umct.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/umodem.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/umoscom.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uplcom.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/usb_serial.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/usb_serial.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uslcom.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uvscom.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/umass.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb.h#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_bus.h#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_cdc.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_device.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_device.h#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hub.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_transfer.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#32 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/x86bios/x86bios.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/x86bios/x86bios.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/x86bios/x86bios_alloc.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fifofs/fifo_vnops.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_ebr.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/acpica/acpi_machdep.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/acpica/madt.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#28 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/NOTES#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/initcpu.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/acpica_machdep.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/apm_bios.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/cpufunc.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/pci/pci_cfgreg.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_main.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_sysent.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_descrip.c#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_event.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_rwlock.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sig.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sx.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_umtx.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_bus.c#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.master#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_syscalls.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_default.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_export.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#41 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#23 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#34 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/lindev/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfslockd/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb/Makefile#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb/uch341/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/x86bios/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_esp.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_serv.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/GENERIC#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/NOTES#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/conf/GENERIC#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ata.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/fcntl.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/rwlock.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sx.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.h#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.mk#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysproto.h#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#37 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/sequences#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_demo.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_scs.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_stress.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_subr.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_subr_compat.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_map.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_mmap.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/mmap/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/mmap/mmap.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/mwl/mwlstats/mwlstats.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/nanobsd.sh#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#23 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/apm/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/freebsd-update/freebsd-update.sh#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/lpr/lp/lp.sh#3 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#43 (text+ko) ====

@@ -22,10 +22,61 @@
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090926:
+	The rc.d/network_ipv6, IPv6 configuration script has been integrated
+	into rc.d/netif.  The changes are the following:
+
+	1. To use IPv6, simply define $ifconfig_IF_ipv6 like $ifconfig_IF
+	   for IPv4.  For aliases, $ifconfig_IF_aliasN should be used.
+	   Note that both variables need the "inet6" keyword at the head.
+
+	   Do not set $ipv6_network_interfaces manually if you do not
+	   understand what you are doing.  It is not needed in most cases. 
+
+	   $ipv6_ifconfig_IF and $ipv6_ifconfig_IF_aliasN still work, but
+	   they are obsolete.
+
+	2. $ipv6_enable is obsolete.  Use $ipv6_prefer and
+	   "inet6 accept_rtadv" keyword in ifconfig(8) instead.
+
+	   If you define $ipv6_enable=YES, it means $ipv6_prefer=YES and
+	   all configured interfaces have "inet6 accept_rtadv" in the
+	   $ifconfig_IF_ipv6.  These are for backward compatibility.
+
+	3. A new variable $ipv6_prefer has been added.  If NO, IPv6
+	   functionality of interfaces with no corresponding
+	   $ifconfig_IF_ipv6 is disabled by using "inet6 ifdisabled" flag,
+	   and the default address selection policy of ip6addrctl(8) 
+	   is the IPv4-preferred one (see rc.d/ip6addrctl for more details).
+	   Note that if you want to configure IPv6 functionality on the
+	   disabled interfaces after boot, first you need to clear the flag by
+	   using ifconfig(8) like:
+
+		ifconfig em0 inet6 -ifdisabled
+
+	   If YES, the default address selection policy is set as
+	   IPv6-preferred.
+
+	   The default value of $ipv6_prefer is NO.
+
+	4. If your system need to receive Router Advertisement messages,
+	   define "inet6 accept_rtadv" in $ifconfig_IF_ipv6.  The rc(8)
+	   scripts automatically invoke rtsol(8) when the interface becomes
+	   UP.  The Router Advertisement messages are used for SLAAC
+	   (State-Less Address AutoConfiguration).
+
 20090922:
 	802.11s D3.03 support was committed. This is incompatible with the
 	previous code, which was based on D3.0.
 
+20090912:
+	A sysctl variable net.inet6.ip6.accept_rtadv now sets the default value
+	of a per-interface flag ND6_IFF_ACCEPT_RTADV, not a global knob to
+	control whether accepting Router Advertisement messages or not.
+	Also, a per-interface flag ND6_IFF_AUTO_LINKLOCAL has been added and
+	a sysctl variable net.inet6.ip6.auto_linklocal is its default value.
+	The ifconfig(8) utility now supports these flags.
+
 20090910:
 	ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for
 	mount(8) and -a option for df(1) to see them.
@@ -979,4 +1030,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.640 2009/09/22 18:19:18 rpaulo Exp $
+$FreeBSD: src/UPDATING,v 1.641 2009/09/26 18:59:00 hrs Exp $

==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 (text+ko) ====

@@ -535,7 +535,7 @@
 .ad
 .sp .6
 .RS 4n
-Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher2\fR, but this may change in future releases). The value "off" disables integrity
+Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher4\fR, but this may change in future releases). The value "off" disables integrity
 checking on user data. Disabling checksums is NOT a recommended practice.
 .RE
 

==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ChangeLog#4 (text+ko) ====

@@ -1,3 +1,282 @@
+20090926
+ - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+         [contrib/suse/openssh.spec] Update for release
+ - (djm) [README] update relnotes URL
+ - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere
+ - (djm) Release 5.3p1
+
+20090911
+ - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X
+   10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query).  Patch
+   from jbasney at ncsa uiuc edu.
+
+20090908
+ - (djm) [serverloop.c] Fix test for server-assigned remote forwarding port
+   (-R 0:...); bz#1578, spotted and fix by gavin AT emf.net; ok dtucker@
+
+20090901
+ - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for
+   krb5-config if it's not in the location specified by --with-kerberos5.
+   Patch from jchadima at redhat.
+
+20090829
+ - (dtucker) [README.platform] Add text about development packages, based on
+   text from Chris Pepper in bug #1631.
+
+20090828
+ - dtucker [auth-sia.c] Roll back the change for bug #1241 as it apparently
+   causes problems in some Tru64 configurations.
+ - (djm) [sshd_config.5] downgrade mention of login.conf to be an example
+   and mention PAM as another provider for ChallengeResponseAuthentication;
+   bz#1408; ok dtucker@
+ - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when
+   attempting atomic rename(); ok dtucker@
+ - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables
+   in argv, so pass them in the environment; ok dtucker@
+ - (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on
+    the pty master on Solaris, since it never succeeds and can hang if large
+    amounts of data is sent to the slave (eg a copy-paste).  Based on a patch
+    originally from Doke Scott, ok djm@
+ - (dtucker) [clientloop.c configure.ac defines.h] Make the client's IO buffer
+   size a compile-time option and set it to 64k on Cygwin, since Corinna
+   reports that it makes a significant difference to performance.  ok djm@
+ - (dtucker) [configure.ac] Fix the syntax of the Solaris tcgetattr entry.
+
+20090820
+ - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not
+   using it since the type conflicts can cause problems on FreeBSD.  Patch
+   from Jonathan Chen.
+ - (dtucker) [session.c openbsd-compat/port-aix.h] Bugs #1249 and #1567: move
+   the setpcred call on AIX to immediately before the permanently_set_uid().
+   Ensures that we still have privileges when we call chroot and
+   pam_open_sesson.  Based on a patch from David Leonard.
+
+20090817
+ - (dtucker) [configure.ac] Check for headers before libraries for openssl an
+   zlib, which should make the errors slightly more meaningful on platforms
+   where there's separate "-devel" packages for those.
+ - (dtucker) [sshlogin.c openbsd-compat/port-aix.{c,h}] Bug #1595: make
+   PrintLastLog work on AIX.  Based in part on a patch from Miguel Sanders.
+
+20090729
+ - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error
+   function. Patch from Corinna Vinschen.
+
+20090713
+ - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it
+   fits into 16 bits to work around a bug in glibc's resolver where it masks
+   off the buffer size at 16 bits.  Patch from Hauke Lampe, ok djm jakob.
+
+20090712
+ - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test,
+   prevents configure complaining on older BSDs.
+ - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch
+   from Corinna Vinschen.
+ - (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on
+   logout to after the session close.  Patch from Anicka Bernathova,
+   originally from Andreas Schwab via Novelll ok djm.
+
+20090707
+ - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated
+   scripts and fix usage of eval.  Patch from Corinna Vinschen.
+
+20090705
+ - (dtucker) OpenBSD CVS Sync
+   - andreas@cvs.openbsd.org 2009/06/27 09:29:06
+     [packet.h packet.c]
+     packet_bacup_state() and packet_restore_state() will be used to
+     temporarily save the current state ren resuming a suspended connection.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/06/27 09:32:43
+     [roaming_common.c roaming.h]
+     It may be necessary to retransmit some data when resuming, so add it
+     to a buffer when roaming is enabled.
+     Most of this code was written by Martin Forssen, maf at appgate dot com.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/06/27 09:35:06
+     [readconf.h readconf.c]
+     Add client option UseRoaming. It doesn't do anything yet but will
+     control whether the client tries to use roaming if enabled on the
+     server. From Martin Forssen.
+     ok markus@
+   - markus@cvs.openbsd.org 2009/06/30 14:54:40
+     [version.h]
+     crank version; ok deraadt
+   - dtucker@cvs.openbsd.org 2009/07/02 02:11:47
+     [ssh.c]
+     allow for long home dir paths (bz #1615).  ok deraadt
+     (based in part on a patch from jchadima at redhat)
+   - stevesk@cvs.openbsd.org 2009/07/05 19:28:33
+     [clientloop.c]
+     only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@
+     ok deraadt@ markus@
+
+20090622
+ - (dtucker) OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2009/06/22 05:39:28
+     [monitor_wrap.c monitor_mm.c ssh-keygen.c auth2.c gss-genr.c sftp-client.c]
+     alphabetize includes; reduces diff vs portable and style(9).
+     ok stevesk djm
+     (Id sync only; these were already in order in -portable)
+
+20090621
+ - (dtucker) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2009/03/17 21:37:00
+     [ssh.c]
+     pass correct argv[0] to openlog(); ok djm@
+  - jmc@cvs.openbsd.org 2009/03/19 15:15:09
+     [ssh.1]
+     for "Ciphers", just point the reader to the keyword in ssh_config(5), just
+     as we do for "MACs": this stops us getting out of sync when the lists
+     change;
+     fixes documentation/6102, submitted by Peter J. Philipp
+     alternative fix proposed by djm
+     ok markus
+   - tobias@cvs.openbsd.org 2009/03/23 08:31:19
+     [ssh-agent.c]
+     Fixed a possible out-of-bounds memory access if the environment variable
+     SHELL is shorter than 3 characters.
+     with input by and ok dtucker
+   - tobias@cvs.openbsd.org 2009/03/23 19:38:04
+     [ssh-agent.c]
+     My previous commit didn't fix the problem at all, so stick at my first
+     version of the fix presented to dtucker.
+     Issue notified by Matthias Barkhoff (matthias dot barkhoff at gmx dot de).
+     ok dtucker
+   - sobrado@cvs.openbsd.org 2009/03/26 08:38:39
+     [sftp-server.8 sshd.8 ssh-agent.1]
+     fix a few typographical errors found by spell(1).
+     ok dtucker@, jmc@
+   - stevesk@cvs.openbsd.org 2009/04/13 19:07:44
+     [sshd_config.5]
+     fix possessive; ok djm@
+   - stevesk@cvs.openbsd.org 2009/04/14 16:33:42
+     [sftp-server.c]
+     remove unused option character from getopt() optstring; ok markus@
+   - jj@cvs.openbsd.org 2009/04/14 21:10:54
+     [servconf.c]
+     Fixed a few the-the misspellings in comments. Skipped a bunch in
+     binutils,gcc and so on. ok jmc@
+   - stevesk@cvs.openbsd.org 2009/04/17 19:23:06
+     [session.c]
+     use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server;
+     ok djm@ markus@
+   - stevesk@cvs.openbsd.org 2009/04/17 19:40:17
+     [sshd_config.5]
+     clarify that even internal-sftp needs /dev/log for logging to work; ok
+     markus@
+   - jmc@cvs.openbsd.org 2009/04/18 18:39:10
+     [sshd_config.5]
+     tweak previous; ok stevesk
+   - stevesk@cvs.openbsd.org 2009/04/21 15:13:17
+     [sshd_config.5]
+     clarify we cd to user's home after chroot; ok markus@ on
+     earlier version; tweaks and ok jmc@
+   - andreas@cvs.openbsd.org 2009/05/25 06:48:01
+     [channels.c packet.c clientloop.c packet.h serverloop.c monitor_wrap.c
+     monitor.c]
+     Put the globals in packet.c into a struct and don't access it directly
+     from other files. No functional changes.
+     ok markus@ djm@
+   - andreas@cvs.openbsd.org 2009/05/27 06:31:25
+     [canohost.h canohost.c]
+     Add clear_cached_addr(), needed for upcoming changes allowing the peer
+     address to change.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:33:39
+     [clientloop.c]
+     Send SSH2_MSG_DISCONNECT when the client disconnects. From a larger
+     change from Martin Forssen, maf at appgate dot com.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:34:36
+     [kex.c kex.h]
+     Move the KEX_COOKIE_LEN define to kex.h
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:36:07
+     [packet.h packet.c]
+     Add packet_put_int64() and packet_get_int64(), part of a larger change
+     from Martin Forssen.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:38:16
+     [sshconnect.h sshconnect.c]
+     Un-static ssh_exchange_identification(), part of a larger change from
+     Martin Forssen and needed for upcoming changes.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/28 16:50:16
+     [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c
+     monitor.c Added roaming.h roaming_common.c roaming_dummy.c]
+     Keep track of number of bytes read and written. Needed for upcoming
+     changes. Most code from Martin Forssen, maf at appgate dot com.
+     ok markus@
+     Also, applied appropriate changes to Makefile.in
+   - andreas@cvs.openbsd.org 2009/06/12 20:43:22
+     [monitor.c packet.c]
+     Fix warnings found by chl@ and djm@ and change roaming_atomicio's
+     return type to match atomicio's
+     Diff from djm@, ok markus@
+   - andreas@cvs.openbsd.org 2009/06/12 20:58:32
+     [packet.c]
+     Move some more statics into session_state
+     ok markus@ djm@
+   - dtucker@cvs.openbsd.org 2009/06/21 07:37:15
+     [kexdhs.c kexgexs.c]
+     abort if key_sign fails, preventing possible null deref.  Based on report
+     from Paolo Ganci, ok markus@ djm@
+   - dtucker@cvs.openbsd.org 2009/06/21 09:04:03
+     [roaming.h roaming_common.c roaming_dummy.c]
+     Add  tags for the benefit of the sync scripts
+     Also: pull in the changes for 1.1->1.2 missed in the previous sync.
+ - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and
+   header-order changes to reduce diff vs OpenBSD.
+ - (dtucker) [servconf.c sshd.c] More whitespace sync.
+ - (dtucker) [roaming_common.c roaming_dummy.c] Wrap #include  in
+   ifdef.
+
+20090616
+ - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
+   is a struct with a __val member.  Fixes build on, eg, Redhat 6.2.
+
+20090504
+ - (dtucker) [sshlogin.c] Move the NO_SSH_LASTLOG #ifndef line to include
+   variable declarations.  Should prevent unused warnings anywhere it's set
+   (only Crays as far as I can tell) and be a no-op everywhere else.
+
+20090318
+ - (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem
+   that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005.
+   Based on patch from vinschen at redhat com.
+
+20090308
+ - (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c
+   auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h}
+   openbsd-compat/daemon.c] Remove support for Windows 95/98/ME and very old
+   version of Cygwin.  Patch from vinschen at redhat com.
+
+20090307
+ - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it
+   exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS
+   has a /dev/random).
+ - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add
+   EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c
+   to use them.  Allows building with older OpenSSL versions.
+ - (dtucker) [configure.ac defines.h] Check for in_port_t and typedef if needed.
+ - (dtucker) [configure.ac] Missing comma in type list.
+ - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}]
+   EVP_DigestUpdate does not exactly match the other OLD_EVP functions (eg
+   in openssl 0.9.6) so add an explicit test for it.
+
+20090306
+ - (djm) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2009/03/05 07:18:19
+     [auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c]
+     [sshconnect2.c]
+     refactor the (disabled) Schnorr proof code to make it a little more
+     generally useful
+   - djm@cvs.openbsd.org 2009/03/05 11:30:50
+     [uuencode.c]
+     document what these functions do so I don't ever have to recuse into
+     b64_pton/ntop to remember their return values
+
 20090223
  - (djm) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2009/02/22 23:50:57

==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/README#4 (text+ko) ====

@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-5.2 for the release notes.
+See http://www.openssh.com/txt/release-5.3 for the release notes.
 
 - A Japanese translation of this document and of the OpenSSH FAQ is
 - available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@
 [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
 [7] http://www.openssh.com/faq.html
 
-$Id: README,v 1.70 2009/02/23 00:11:57 djm Exp $
+$Id: README,v 1.70.4.1 2009/09/26 04:11:47 djm Exp $

==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/README.platform#3 (text+ko) ====

@@ -56,6 +56,18 @@
 	http://www-user.rhrk.uni-kl.de/~nissler/tuntap/
 
 
+Linux
+-----
+
+Some Linux distributions (including Red Hat/Fedora/CentOS) include
+headers and library links in the -devel RPMs rather than the main
+binary RPMs. If you get an error about headers, or complaining about a
+missing prerequisite then you may need to install the equivalent
+development packages.  On Redhat based distros these may be openssl-devel,
+zlib-devel and pam-devel, on Debian based distros these may be
+libssl-dev, libz-dev and libpam-dev.
+
+
 Solaris
 -------
 If you enable BSM auditing on Solaris, you need to update audit_event(4)
@@ -81,4 +93,4 @@
 return the output from pam_nologin to the client.
 
 
-$Id: README.platform,v 1.9 2007/08/09 04:31:53 dtucker Exp $
+$Id: README.platform,v 1.10 2009/08/28 23:14:48 dtucker Exp $

==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth-pam.c#4 (text+ko) ====

@@ -45,7 +45,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.22 2009/05/22 18:46:28 des Exp $ */
+/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.23 2009/10/01 17:12:52 des Exp $ */
 #include "includes.h"
 
 #include 
@@ -602,16 +602,16 @@
 		return;
 	debug("PAM: cleanup");
 	pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv);
+	if (sshpam_session_open) {
+		debug("PAM: closing session");
+		pam_close_session(sshpam_handle, PAM_SILENT);
+		sshpam_session_open = 0;
+	}
 	if (sshpam_cred_established) {
 		debug("PAM: deleting credentials");
 		pam_setcred(sshpam_handle, PAM_DELETE_CRED);
 		sshpam_cred_established = 0;
 	}
-	if (sshpam_session_open) {
-		debug("PAM: closing session");
-		pam_close_session(sshpam_handle, PAM_SILENT);
-		sshpam_session_open = 0;
-	}
 	sshpam_authenticated = 0;
 	pam_end(sshpam_handle, sshpam_err);
 	sshpam_handle = NULL;

==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth-passwd.c#3 (text+ko) ====

@@ -102,7 +102,7 @@
 	}
 #endif
 #ifdef HAVE_CYGWIN
-	if (is_winnt) {
+	{
 		HANDLE hToken = cygwin_logon_user(pw, password);
 
 		if (hToken == INVALID_HANDLE_VALUE)

==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth-sia.c#3 (text+ko) ====

@@ -34,10 +34,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
 
 #include "ssh.h"
 #include "key.h"
@@ -53,52 +49,6 @@
 extern int saved_argc;
 extern char **saved_argv;
 
-static int
-sia_password_change_required(const char *user)
-{
-	struct es_passwd *acct;
-	time_t pw_life;
-	time_t pw_date;
-
-	set_auth_parameters(saved_argc, saved_argv);
-
-	if ((acct = getespwnam(user)) == NULL) {
-		error("Couldn't access protected database entry for %s", user);
-		endprpwent();
-		return (0);
-	}
-
-	/* If forced password change flag is set, honor it */
-	if (acct->uflg->fg_psw_chg_reqd && acct->ufld->fd_psw_chg_reqd) {
-		endprpwent();
-		return (1);
-	}
-
-	/* Obtain password lifetime; if none, it can't have expired */
-	if (acct->uflg->fg_expire)
-		pw_life = acct->ufld->fd_expire;
-	else if (acct->sflg->fg_expire)
-		pw_life = acct->sfld->fd_expire;
-	else {
-		endprpwent();
-		return (0);
-	}
-
-	/* Offset from last change; if none, it must be expired */
-	if (acct->uflg->fg_schange)
-		pw_date = acct->ufld->fd_schange + pw_life;
-	else {
-		endprpwent();
-		return (1);
-	}
-
-	endprpwent();
-
-	/* If expiration date is prior to now, change password */
-	
-	return (pw_date <= time((time_t *) NULL));
-}
-
 int
 sys_auth_passwd(Authctxt *authctxt, const char *pass)
 {
@@ -126,9 +76,6 @@
 
 	sia_ses_release(&ent);
 
-	authctxt->force_pwchange = sia_password_change_required(
-		authctxt->user);
-
 	return (1);
 }
 

==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth1.c#3 (text+ko) ====

@@ -318,15 +318,7 @@
 		}
 #endif /* _UNICOS */
 
-#ifdef HAVE_CYGWIN
-		if (authenticated &&
-		    !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD,
-		    authctxt->pw)) {
-			packet_disconnect("Authentication rejected for uid %d.",
-			    authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid);
-			authenticated = 0;
-		}
-#else
+#ifndef HAVE_CYGWIN
 		/* Special handling for root */
 		if (authenticated && authctxt->pw->pw_uid == 0 &&
 		    !auth_root_allowed(meth->name)) {

==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-jpake.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-jpake.c,v 1.2 2008/11/07 23:34:48 dtucker Exp $ */
+/* $OpenBSD: auth2-jpake.c,v 1.3 2009/03/05 07:18:19 djm Exp $ */
 /*
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
  *
@@ -42,8 +42,8 @@
 #include "ssh2.h"
 #include "key.h"
 #include "hostfile.h"
+#include "auth.h"
 #include "buffer.h"
-#include "auth.h"
 #include "packet.h"
 #include "dispatch.h"
 #include "log.h"
@@ -55,6 +55,7 @@
 #endif
 #include "monitor_wrap.h"
 
+#include "schnorr.h"
 #include "jpake.h"
 
 /*
@@ -359,7 +360,7 @@
 }
 
 /*
- * Being authentication attempt.
+ * Begin authentication attempt.
  * Note, sets authctxt->postponed while in subprotocol
  */
 static int

==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-kbdint.c#3 (text+ko) ====

@@ -58,10 +58,6 @@
 
 	xfree(devs);
 	xfree(lang);
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(0, authctxt->pw) == 0)
-		authenticated = 0;
-#endif
 	return authenticated;
 }
 

==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-none.c#3 (text+ko) ====

@@ -61,10 +61,6 @@
 {
 	none_enabled = 0;
 	packet_check_eom();
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(1, authctxt->pw) == 0)
-		return (0);
-#endif
 	if (options.password_authentication)
 		return (PRIVSEP(auth_password(authctxt, "")));
 	return (0);

==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-passwd.c#2 (text+ko) ====

@@ -68,10 +68,6 @@
 		logit("password change not supported");
 	else if (PRIVSEP(auth_password(authctxt, password)) == 1)
 		authenticated = 1;
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(1, authctxt->pw) == 0)
-		authenticated = 0;
-#endif
 	memset(password, 0, len);
 	xfree(password);
 	return authenticated;

==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2-pubkey.c#3 (text+ko) ====

@@ -170,10 +170,6 @@
 		key_free(key);
 	xfree(pkalg);
 	xfree(pkblob);
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(0, authctxt->pw) == 0)
-		authenticated = 0;
-#endif
 	return authenticated;
 }
 

==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/auth2.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.120 2008/11/04 08:22:12 djm Exp $ */
+/* $OpenBSD: auth2.c,v 1.121 2009/06/22 05:39:28 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.30 2009/05/22 18:46:28 des Exp $");
+__RCSID("$FreeBSD: src/crypto/openssh/auth2.c,v 1.31 2009/10/01 17:12:52 des Exp $");
 
 #include 
 #include 
@@ -36,8 +36,8 @@
 #include 
 #include 
 
+#include "atomicio.h"
 #include "xmalloc.h"
-#include "atomicio.h"
 #include "ssh2.h"
 #include "packet.h"
 #include "log.h"

==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/canohost.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $OpenBSD: canohost.c,v 1.64 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: canohost.c,v 1.65 2009/05/27 06:31:25 andreas Exp $ */
 /*
  * Author: Tatu Ylonen 
  * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland
@@ -35,6 +35,8 @@
 #include "misc.h"
 
 static void check_ip_options(int, char *);
+static char *canonical_host_ip = NULL;
+static int cached_port = -1;
 
 /*
  * Return the canonical name of the host at the other end of the socket. The

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Oct  1 20:30:51 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 638E21065760; Thu,  1 Oct 2009 20:30:50 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 26FF01065759
	for ; Thu,  1 Oct 2009 20:30:50 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1384D8FC0C
	for ; Thu,  1 Oct 2009 20:30:50 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n91KUnxh062891
	for ; Thu, 1 Oct 2009 20:30:49 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n91KUn7F062889
	for perforce@freebsd.org; Thu, 1 Oct 2009 20:30:49 GMT
	(envelope-from trasz@freebsd.org)
Date: Thu, 1 Oct 2009 20:30:49 GMT
Message-Id: <200910012030.n91KUn7F062889@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169105 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Oct 2009 20:30:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=169105

Change 169105 by trasz@trasz_anger on 2009/10/01 20:30:29

	IFC.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/UPDATING#15 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/ChangeLog#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/README#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/README.platform#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth-pam.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth-passwd.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth-sia.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth1.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-jpake.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-kbdint.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-none.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-passwd.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-pubkey.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/canohost.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/canohost.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/channels.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/clientloop.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/config.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/config.h.in#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/defines.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/gss-genr.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/includes.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/jpake.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/jpake.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/kex.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/kex.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/kexdhs.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/kexgexs.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/monitor.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/monitor_mm.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/monitor_wrap.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/monitor_wrap.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/daemon.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/openssl-compat.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/port-aix.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/port-aix.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/packet.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/packet.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/readconf.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/readconf.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/roaming.h#1 branch
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/roaming_common.c#1 branch
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/roaming_dummy.c#1 branch
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/schnorr.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/schnorr.h#1 branch
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/servconf.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/serverloop.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/session.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/sftp-client.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/sftp-server.8#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/sftp-server.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh-agent.1#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh-agent.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh-keygen.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh.1#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh_config#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh_config.5#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh_namespace.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshconnect.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshconnect.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshconnect2.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshd.8#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshd.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshd_config#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshd_config.5#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshlogin.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/uuencode.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/version.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/etc/defaults/rc.conf#9 integrate
.. //depot/projects/soc2009/trasz_limits/etc/mtree/BSD.usr.dist#4 integrate
.. //depot/projects/soc2009/trasz_limits/etc/network.subr#6 integrate
.. //depot/projects/soc2009/trasz_limits/etc/periodic/daily/400.status-disks#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/periodic/security/200.chkmounts#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.d/defaultroute#3 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.d/ip6addrctl#3 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.d/netif#5 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.d/netoptions#3 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.d/routing#3 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.d/rtadvd#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/gen/_pthread_stubs.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/nls/Makefile.inc#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch
.. //depot/projects/soc2009/trasz_limits/lib/libc/stdlib/malloc.3#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/stdlib/malloc.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/sys/fcntl.2#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libradius/radlib.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_spec.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_umtx.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/libexec/rpc.rquotad/rquotad.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/camcontrol/camcontrol.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/ifconfig.8#5 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/shutdown/shutdown.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/secure/libexec/sftp-server/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/secure/libexec/ssh-keysign/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/scp/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/sftp/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/ssh-add/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/ssh-agent/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/ssh-keygen/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/ssh-keyscan/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/ssh/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.sbin/sshd/Makefile#3 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/Makefile#11 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/lindev.4#1 branch
.. //depot/projects/soc2009/trasz_limits/share/man/man4/msk.4#4 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man5/procfs.5#3 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man5/rc.conf.5#6 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man7/tuning.7#3 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/Makefile#9 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/VOP_ACCESS.9#4 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/acl.9#3 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/vaccess.9#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/vaccess_acl_nfs4.9#1 branch
.. //depot/projects/soc2009/trasz_limits/share/zoneinfo/asia#7 integrate
.. //depot/projects/soc2009/trasz_limits/share/zoneinfo/southamerica#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/madt.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/initcpu.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/machdep.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/pmap.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/trap.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/GENERIC#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/NOTES#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/include/acpica_machdep.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/include/apm_bios.h#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/amd64/include/cpufunc.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/include/md_var.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/boot/forth/loader.conf#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/bsm/audit_kevents.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cam/ata/ata_all.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cam/cam_periph.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_proto.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/syscalls.master#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/x86bios/x86bios.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/compat/x86bios/x86bios.h#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/compat/x86bios/x86bios_alloc.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/files#18 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/files.amd64#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/files.i386#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/files.pc98#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/newvers.sh#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpi_support/acpi_aiboost.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpi_support/acpi_ibm.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_acad.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_video.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpivar.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ae/if_ae.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/age/if_age.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/alc/if_alc.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ale/if_ale.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-marvell.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/atkbdc/atkbd.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/de/if_de.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/de/if_devar.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/dpms/dpms.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/drm/r600_blit.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/drm/radeon_cs.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/drm/radeon_drv.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/drm/radeon_irq.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/drm/radeon_state.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/fb/vesa.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/fxp/if_fxp.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/hwpmc/pmc_events.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/if_ndis/if_ndis.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/jme/if_jme.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/kbd/kbd.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/lindev/full.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/lindev/lindev.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/lindev/lindev.h#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/mii/e1000phy.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mii/e1000phyreg.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/msk/if_msk.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/msk/if_mskreg.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mwl/if_mwl.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mxge/if_mxge.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mxge/if_mxge_var.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pci.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pcireg.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ppbus/vpo.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/es137x.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/es137x.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/hda/hda_reg.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/hda/hdac.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/t4dwave.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/scmouse.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/scterm-teken.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/syscons.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/syscons.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_cl_io.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_cl_share.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/twe/twe.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/twe/twevar.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/atmegadci.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci_pci.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/usb_controller.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_axe.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_cdce.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_cdcereg.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/quirk/usb_quirk.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/u3g.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uark.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ubsa.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ubser.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uch341.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uchcom.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ucycom.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ufoma.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uftdi.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ugensa.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uipaq.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umct.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umodem.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umoscom.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uplcom.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/usb_serial.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/usb_serial.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uslcom.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uvscom.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/storage/umass.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_bus.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_cdc.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_device.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_device.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_hub.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_transfer.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdevs#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/x86bios/x86bios.c#2 delete
.. //depot/projects/soc2009/trasz_limits/sys/dev/x86bios/x86bios.h#2 delete
.. //depot/projects/soc2009/trasz_limits/sys/dev/x86bios/x86bios_alloc.c#2 delete
.. //depot/projects/soc2009/trasz_limits/sys/fs/fifofs/fifo_vnops.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_commonacl.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/procfs/procfs.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/procfs/procfs.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/procfs/procfs_osrel.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/geom/part/g_part.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/part/g_part_ebr.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/acpica/acpi_machdep.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/acpica/madt.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/conf/NOTES#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/i386/initcpu.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/i386/machdep.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/include/acpica_machdep.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/include/apm_bios.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/include/cpufunc.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/init_sysent.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_event.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rwlock.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sig.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sx.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_umtx.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_acl_nfs4.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_acl_posix1e.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_bus.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.master#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_syscalls.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_default.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_export.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_subr.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_vnops.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/Makefile#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/lindev/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/modules/nfslockd/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/procfs/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/usb/Makefile#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/usb/uch341/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/modules/x86bios/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_hwmp.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_mesh.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_mesh.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netipsec/xform_esp.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/nfsserver/nfs_serv.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/pc98/conf/GENERIC#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/pc98/conf/NOTES#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sparc64/conf/GENERIC#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/ata.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/event.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/fcntl.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/param.h#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/rwlock.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/sx.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.mk#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/sysproto.h#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/vnode.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/teken/sequences#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/teken/teken.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/teken/teken.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/teken/teken_demo.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/teken/teken_scs.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/teken/teken_stress.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/teken/teken_subr.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/teken/teken_subr_compat.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ufs/ufs/ufs_gjournal.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/acltools/00.t#3 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/acltools/03.t#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/acltools/aclfuzzer.sh#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/acltools/tools-crossfs.test#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/mmap/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/mmap/mmap.c#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/tools/tools/mwl/mwlstats/mwlstats.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/tools/tools/nanobsd/nanobsd.sh#4 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/gcore/elfcore.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/netstat/inet.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/Makefile#8 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/apm/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/lpr/lp/lp.sh#3 integrate

Differences ...

==== //depot/projects/soc2009/trasz_limits/UPDATING#15 (text+ko) ====

@@ -22,6 +22,61 @@
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090926:
+	The rc.d/network_ipv6, IPv6 configuration script has been integrated
+	into rc.d/netif.  The changes are the following:
+
+	1. To use IPv6, simply define $ifconfig_IF_ipv6 like $ifconfig_IF
+	   for IPv4.  For aliases, $ifconfig_IF_aliasN should be used.
+	   Note that both variables need the "inet6" keyword at the head.
+
+	   Do not set $ipv6_network_interfaces manually if you do not
+	   understand what you are doing.  It is not needed in most cases. 
+
+	   $ipv6_ifconfig_IF and $ipv6_ifconfig_IF_aliasN still work, but
+	   they are obsolete.
+
+	2. $ipv6_enable is obsolete.  Use $ipv6_prefer and
+	   "inet6 accept_rtadv" keyword in ifconfig(8) instead.
+
+	   If you define $ipv6_enable=YES, it means $ipv6_prefer=YES and
+	   all configured interfaces have "inet6 accept_rtadv" in the
+	   $ifconfig_IF_ipv6.  These are for backward compatibility.
+
+	3. A new variable $ipv6_prefer has been added.  If NO, IPv6
+	   functionality of interfaces with no corresponding
+	   $ifconfig_IF_ipv6 is disabled by using "inet6 ifdisabled" flag,
+	   and the default address selection policy of ip6addrctl(8) 
+	   is the IPv4-preferred one (see rc.d/ip6addrctl for more details).
+	   Note that if you want to configure IPv6 functionality on the
+	   disabled interfaces after boot, first you need to clear the flag by
+	   using ifconfig(8) like:
+
+		ifconfig em0 inet6 -ifdisabled
+
+	   If YES, the default address selection policy is set as
+	   IPv6-preferred.
+
+	   The default value of $ipv6_prefer is NO.
+
+	4. If your system need to receive Router Advertisement messages,
+	   define "inet6 accept_rtadv" in $ifconfig_IF_ipv6.  The rc(8)
+	   scripts automatically invoke rtsol(8) when the interface becomes
+	   UP.  The Router Advertisement messages are used for SLAAC
+	   (State-Less Address AutoConfiguration).
+
+20090922:
+	802.11s D3.03 support was committed. This is incompatible with the
+	previous code, which was based on D3.0.
+
+20090912:
+	A sysctl variable net.inet6.ip6.accept_rtadv now sets the default value
+	of a per-interface flag ND6_IFF_ACCEPT_RTADV, not a global knob to
+	control whether accepting Router Advertisement messages or not.
+	Also, a per-interface flag ND6_IFF_AUTO_LINKLOCAL has been added and
+	a sysctl variable net.inet6.ip6.auto_linklocal is its default value.
+	The ifconfig(8) utility now supports these flags.
+
 20090910:
 	ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for
 	mount(8) and -a option for df(1) to see them.
@@ -975,4 +1030,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.639 2009/09/14 21:10:40 pjd Exp $
+$FreeBSD: src/UPDATING,v 1.641 2009/09/26 18:59:00 hrs Exp $

==== //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 (text+ko) ====

@@ -535,7 +535,7 @@
 .ad
 .sp .6
 .RS 4n
-Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher2\fR, but this may change in future releases). The value "off" disables integrity
+Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher4\fR, but this may change in future releases). The value "off" disables integrity
 checking on user data. Disabling checksums is NOT a recommended practice.
 .RE
 

==== //depot/projects/soc2009/trasz_limits/crypto/openssh/ChangeLog#3 (text+ko) ====

@@ -1,3 +1,282 @@
+20090926
+ - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+         [contrib/suse/openssh.spec] Update for release
+ - (djm) [README] update relnotes URL
+ - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere
+ - (djm) Release 5.3p1
+
+20090911
+ - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X
+   10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query).  Patch
+   from jbasney at ncsa uiuc edu.
+
+20090908
+ - (djm) [serverloop.c] Fix test for server-assigned remote forwarding port
+   (-R 0:...); bz#1578, spotted and fix by gavin AT emf.net; ok dtucker@
+
+20090901
+ - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for
+   krb5-config if it's not in the location specified by --with-kerberos5.
+   Patch from jchadima at redhat.
+
+20090829
+ - (dtucker) [README.platform] Add text about development packages, based on
+   text from Chris Pepper in bug #1631.
+
+20090828
+ - dtucker [auth-sia.c] Roll back the change for bug #1241 as it apparently
+   causes problems in some Tru64 configurations.
+ - (djm) [sshd_config.5] downgrade mention of login.conf to be an example
+   and mention PAM as another provider for ChallengeResponseAuthentication;
+   bz#1408; ok dtucker@
+ - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when
+   attempting atomic rename(); ok dtucker@
+ - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables
+   in argv, so pass them in the environment; ok dtucker@
+ - (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on
+    the pty master on Solaris, since it never succeeds and can hang if large
+    amounts of data is sent to the slave (eg a copy-paste).  Based on a patch
+    originally from Doke Scott, ok djm@
+ - (dtucker) [clientloop.c configure.ac defines.h] Make the client's IO buffer
+   size a compile-time option and set it to 64k on Cygwin, since Corinna
+   reports that it makes a significant difference to performance.  ok djm@
+ - (dtucker) [configure.ac] Fix the syntax of the Solaris tcgetattr entry.
+
+20090820
+ - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not
+   using it since the type conflicts can cause problems on FreeBSD.  Patch
+   from Jonathan Chen.
+ - (dtucker) [session.c openbsd-compat/port-aix.h] Bugs #1249 and #1567: move
+   the setpcred call on AIX to immediately before the permanently_set_uid().
+   Ensures that we still have privileges when we call chroot and
+   pam_open_sesson.  Based on a patch from David Leonard.
+
+20090817
+ - (dtucker) [configure.ac] Check for headers before libraries for openssl an
+   zlib, which should make the errors slightly more meaningful on platforms
+   where there's separate "-devel" packages for those.
+ - (dtucker) [sshlogin.c openbsd-compat/port-aix.{c,h}] Bug #1595: make
+   PrintLastLog work on AIX.  Based in part on a patch from Miguel Sanders.
+
+20090729
+ - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error
+   function. Patch from Corinna Vinschen.
+
+20090713
+ - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it
+   fits into 16 bits to work around a bug in glibc's resolver where it masks
+   off the buffer size at 16 bits.  Patch from Hauke Lampe, ok djm jakob.
+
+20090712
+ - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test,
+   prevents configure complaining on older BSDs.
+ - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch
+   from Corinna Vinschen.
+ - (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on
+   logout to after the session close.  Patch from Anicka Bernathova,
+   originally from Andreas Schwab via Novelll ok djm.
+
+20090707
+ - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated
+   scripts and fix usage of eval.  Patch from Corinna Vinschen.
+
+20090705
+ - (dtucker) OpenBSD CVS Sync
+   - andreas@cvs.openbsd.org 2009/06/27 09:29:06
+     [packet.h packet.c]
+     packet_bacup_state() and packet_restore_state() will be used to
+     temporarily save the current state ren resuming a suspended connection.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/06/27 09:32:43
+     [roaming_common.c roaming.h]
+     It may be necessary to retransmit some data when resuming, so add it
+     to a buffer when roaming is enabled.
+     Most of this code was written by Martin Forssen, maf at appgate dot com.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/06/27 09:35:06
+     [readconf.h readconf.c]
+     Add client option UseRoaming. It doesn't do anything yet but will
+     control whether the client tries to use roaming if enabled on the
+     server. From Martin Forssen.
+     ok markus@
+   - markus@cvs.openbsd.org 2009/06/30 14:54:40
+     [version.h]
+     crank version; ok deraadt
+   - dtucker@cvs.openbsd.org 2009/07/02 02:11:47
+     [ssh.c]
+     allow for long home dir paths (bz #1615).  ok deraadt
+     (based in part on a patch from jchadima at redhat)
+   - stevesk@cvs.openbsd.org 2009/07/05 19:28:33
+     [clientloop.c]
+     only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@
+     ok deraadt@ markus@
+
+20090622
+ - (dtucker) OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2009/06/22 05:39:28
+     [monitor_wrap.c monitor_mm.c ssh-keygen.c auth2.c gss-genr.c sftp-client.c]
+     alphabetize includes; reduces diff vs portable and style(9).
+     ok stevesk djm
+     (Id sync only; these were already in order in -portable)
+
+20090621
+ - (dtucker) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2009/03/17 21:37:00
+     [ssh.c]
+     pass correct argv[0] to openlog(); ok djm@
+  - jmc@cvs.openbsd.org 2009/03/19 15:15:09
+     [ssh.1]
+     for "Ciphers", just point the reader to the keyword in ssh_config(5), just
+     as we do for "MACs": this stops us getting out of sync when the lists
+     change;
+     fixes documentation/6102, submitted by Peter J. Philipp
+     alternative fix proposed by djm
+     ok markus
+   - tobias@cvs.openbsd.org 2009/03/23 08:31:19
+     [ssh-agent.c]
+     Fixed a possible out-of-bounds memory access if the environment variable
+     SHELL is shorter than 3 characters.
+     with input by and ok dtucker
+   - tobias@cvs.openbsd.org 2009/03/23 19:38:04
+     [ssh-agent.c]
+     My previous commit didn't fix the problem at all, so stick at my first
+     version of the fix presented to dtucker.
+     Issue notified by Matthias Barkhoff (matthias dot barkhoff at gmx dot de).
+     ok dtucker
+   - sobrado@cvs.openbsd.org 2009/03/26 08:38:39
+     [sftp-server.8 sshd.8 ssh-agent.1]
+     fix a few typographical errors found by spell(1).
+     ok dtucker@, jmc@
+   - stevesk@cvs.openbsd.org 2009/04/13 19:07:44
+     [sshd_config.5]
+     fix possessive; ok djm@
+   - stevesk@cvs.openbsd.org 2009/04/14 16:33:42
+     [sftp-server.c]
+     remove unused option character from getopt() optstring; ok markus@
+   - jj@cvs.openbsd.org 2009/04/14 21:10:54
+     [servconf.c]
+     Fixed a few the-the misspellings in comments. Skipped a bunch in
+     binutils,gcc and so on. ok jmc@
+   - stevesk@cvs.openbsd.org 2009/04/17 19:23:06
+     [session.c]
+     use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server;
+     ok djm@ markus@
+   - stevesk@cvs.openbsd.org 2009/04/17 19:40:17
+     [sshd_config.5]
+     clarify that even internal-sftp needs /dev/log for logging to work; ok
+     markus@
+   - jmc@cvs.openbsd.org 2009/04/18 18:39:10
+     [sshd_config.5]
+     tweak previous; ok stevesk
+   - stevesk@cvs.openbsd.org 2009/04/21 15:13:17
+     [sshd_config.5]
+     clarify we cd to user's home after chroot; ok markus@ on
+     earlier version; tweaks and ok jmc@
+   - andreas@cvs.openbsd.org 2009/05/25 06:48:01
+     [channels.c packet.c clientloop.c packet.h serverloop.c monitor_wrap.c
+     monitor.c]
+     Put the globals in packet.c into a struct and don't access it directly
+     from other files. No functional changes.
+     ok markus@ djm@
+   - andreas@cvs.openbsd.org 2009/05/27 06:31:25
+     [canohost.h canohost.c]
+     Add clear_cached_addr(), needed for upcoming changes allowing the peer
+     address to change.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:33:39
+     [clientloop.c]
+     Send SSH2_MSG_DISCONNECT when the client disconnects. From a larger
+     change from Martin Forssen, maf at appgate dot com.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:34:36
+     [kex.c kex.h]
+     Move the KEX_COOKIE_LEN define to kex.h
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:36:07
+     [packet.h packet.c]
+     Add packet_put_int64() and packet_get_int64(), part of a larger change
+     from Martin Forssen.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/27 06:38:16
+     [sshconnect.h sshconnect.c]
+     Un-static ssh_exchange_identification(), part of a larger change from
+     Martin Forssen and needed for upcoming changes.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/05/28 16:50:16
+     [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c
+     monitor.c Added roaming.h roaming_common.c roaming_dummy.c]
+     Keep track of number of bytes read and written. Needed for upcoming
+     changes. Most code from Martin Forssen, maf at appgate dot com.
+     ok markus@
+     Also, applied appropriate changes to Makefile.in
+   - andreas@cvs.openbsd.org 2009/06/12 20:43:22
+     [monitor.c packet.c]
+     Fix warnings found by chl@ and djm@ and change roaming_atomicio's
+     return type to match atomicio's
+     Diff from djm@, ok markus@
+   - andreas@cvs.openbsd.org 2009/06/12 20:58:32
+     [packet.c]
+     Move some more statics into session_state
+     ok markus@ djm@
+   - dtucker@cvs.openbsd.org 2009/06/21 07:37:15
+     [kexdhs.c kexgexs.c]
+     abort if key_sign fails, preventing possible null deref.  Based on report
+     from Paolo Ganci, ok markus@ djm@
+   - dtucker@cvs.openbsd.org 2009/06/21 09:04:03
+     [roaming.h roaming_common.c roaming_dummy.c]
+     Add  tags for the benefit of the sync scripts
+     Also: pull in the changes for 1.1->1.2 missed in the previous sync.
+ - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and
+   header-order changes to reduce diff vs OpenBSD.
+ - (dtucker) [servconf.c sshd.c] More whitespace sync.
+ - (dtucker) [roaming_common.c roaming_dummy.c] Wrap #include  in
+   ifdef.
+
+20090616
+ - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
+   is a struct with a __val member.  Fixes build on, eg, Redhat 6.2.
+
+20090504
+ - (dtucker) [sshlogin.c] Move the NO_SSH_LASTLOG #ifndef line to include
+   variable declarations.  Should prevent unused warnings anywhere it's set
+   (only Crays as far as I can tell) and be a no-op everywhere else.
+
+20090318
+ - (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem
+   that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005.
+   Based on patch from vinschen at redhat com.
+
+20090308
+ - (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c
+   auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h}
+   openbsd-compat/daemon.c] Remove support for Windows 95/98/ME and very old
+   version of Cygwin.  Patch from vinschen at redhat com.
+
+20090307
+ - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it
+   exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS
+   has a /dev/random).
+ - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add
+   EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c
+   to use them.  Allows building with older OpenSSL versions.
+ - (dtucker) [configure.ac defines.h] Check for in_port_t and typedef if needed.
+ - (dtucker) [configure.ac] Missing comma in type list.
+ - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}]
+   EVP_DigestUpdate does not exactly match the other OLD_EVP functions (eg
+   in openssl 0.9.6) so add an explicit test for it.
+
+20090306
+ - (djm) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2009/03/05 07:18:19
+     [auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c]
+     [sshconnect2.c]
+     refactor the (disabled) Schnorr proof code to make it a little more
+     generally useful
+   - djm@cvs.openbsd.org 2009/03/05 11:30:50
+     [uuencode.c]
+     document what these functions do so I don't ever have to recuse into
+     b64_pton/ntop to remember their return values
+
 20090223
  - (djm) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2009/02/22 23:50:57

==== //depot/projects/soc2009/trasz_limits/crypto/openssh/README#3 (text+ko) ====

@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-5.2 for the release notes.
+See http://www.openssh.com/txt/release-5.3 for the release notes.
 
 - A Japanese translation of this document and of the OpenSSH FAQ is
 - available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@
 [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
 [7] http://www.openssh.com/faq.html
 
-$Id: README,v 1.70 2009/02/23 00:11:57 djm Exp $
+$Id: README,v 1.70.4.1 2009/09/26 04:11:47 djm Exp $

==== //depot/projects/soc2009/trasz_limits/crypto/openssh/README.platform#2 (text+ko) ====

@@ -56,6 +56,18 @@
 	http://www-user.rhrk.uni-kl.de/~nissler/tuntap/
 
 
+Linux
+-----
+
+Some Linux distributions (including Red Hat/Fedora/CentOS) include
+headers and library links in the -devel RPMs rather than the main
+binary RPMs. If you get an error about headers, or complaining about a
+missing prerequisite then you may need to install the equivalent
+development packages.  On Redhat based distros these may be openssl-devel,
+zlib-devel and pam-devel, on Debian based distros these may be
+libssl-dev, libz-dev and libpam-dev.
+
+
 Solaris
 -------
 If you enable BSM auditing on Solaris, you need to update audit_event(4)
@@ -81,4 +93,4 @@
 return the output from pam_nologin to the client.
 
 
-$Id: README.platform,v 1.9 2007/08/09 04:31:53 dtucker Exp $
+$Id: README.platform,v 1.10 2009/08/28 23:14:48 dtucker Exp $

==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth-pam.c#3 (text+ko) ====

@@ -45,7 +45,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.22 2009/05/22 18:46:28 des Exp $ */
+/* Based on $FreeBSD: src/crypto/openssh/auth-pam.c,v 1.23 2009/10/01 17:12:52 des Exp $ */
 #include "includes.h"
 
 #include 
@@ -602,16 +602,16 @@
 		return;
 	debug("PAM: cleanup");
 	pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv);
+	if (sshpam_session_open) {
+		debug("PAM: closing session");
+		pam_close_session(sshpam_handle, PAM_SILENT);
+		sshpam_session_open = 0;
+	}
 	if (sshpam_cred_established) {
 		debug("PAM: deleting credentials");
 		pam_setcred(sshpam_handle, PAM_DELETE_CRED);
 		sshpam_cred_established = 0;
 	}
-	if (sshpam_session_open) {
-		debug("PAM: closing session");
-		pam_close_session(sshpam_handle, PAM_SILENT);
-		sshpam_session_open = 0;
-	}
 	sshpam_authenticated = 0;
 	pam_end(sshpam_handle, sshpam_err);
 	sshpam_handle = NULL;

==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth-passwd.c#2 (text+ko) ====

@@ -102,7 +102,7 @@
 	}
 #endif
 #ifdef HAVE_CYGWIN
-	if (is_winnt) {
+	{
 		HANDLE hToken = cygwin_logon_user(pw, password);
 
 		if (hToken == INVALID_HANDLE_VALUE)

==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth-sia.c#2 (text+ko) ====

@@ -34,10 +34,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
 
 #include "ssh.h"
 #include "key.h"
@@ -53,52 +49,6 @@
 extern int saved_argc;
 extern char **saved_argv;
 
-static int
-sia_password_change_required(const char *user)
-{
-	struct es_passwd *acct;
-	time_t pw_life;
-	time_t pw_date;
-
-	set_auth_parameters(saved_argc, saved_argv);
-
-	if ((acct = getespwnam(user)) == NULL) {
-		error("Couldn't access protected database entry for %s", user);
-		endprpwent();
-		return (0);
-	}
-
-	/* If forced password change flag is set, honor it */
-	if (acct->uflg->fg_psw_chg_reqd && acct->ufld->fd_psw_chg_reqd) {
-		endprpwent();
-		return (1);
-	}
-
-	/* Obtain password lifetime; if none, it can't have expired */
-	if (acct->uflg->fg_expire)
-		pw_life = acct->ufld->fd_expire;
-	else if (acct->sflg->fg_expire)
-		pw_life = acct->sfld->fd_expire;
-	else {
-		endprpwent();
-		return (0);
-	}
-
-	/* Offset from last change; if none, it must be expired */
-	if (acct->uflg->fg_schange)
-		pw_date = acct->ufld->fd_schange + pw_life;
-	else {
-		endprpwent();
-		return (1);
-	}
-
-	endprpwent();
-
-	/* If expiration date is prior to now, change password */
-	
-	return (pw_date <= time((time_t *) NULL));
-}
-
 int
 sys_auth_passwd(Authctxt *authctxt, const char *pass)
 {
@@ -126,9 +76,6 @@
 
 	sia_ses_release(&ent);
 
-	authctxt->force_pwchange = sia_password_change_required(
-		authctxt->user);
-
 	return (1);
 }
 

==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth1.c#2 (text+ko) ====

@@ -318,15 +318,7 @@
 		}
 #endif /* _UNICOS */
 
-#ifdef HAVE_CYGWIN
-		if (authenticated &&
-		    !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD,
-		    authctxt->pw)) {
-			packet_disconnect("Authentication rejected for uid %d.",
-			    authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid);
-			authenticated = 0;
-		}
-#else
+#ifndef HAVE_CYGWIN
 		/* Special handling for root */
 		if (authenticated && authctxt->pw->pw_uid == 0 &&
 		    !auth_root_allowed(meth->name)) {

==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-jpake.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-jpake.c,v 1.2 2008/11/07 23:34:48 dtucker Exp $ */
+/* $OpenBSD: auth2-jpake.c,v 1.3 2009/03/05 07:18:19 djm Exp $ */
 /*
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
  *
@@ -42,8 +42,8 @@
 #include "ssh2.h"
 #include "key.h"
 #include "hostfile.h"
+#include "auth.h"
 #include "buffer.h"
-#include "auth.h"
 #include "packet.h"
 #include "dispatch.h"
 #include "log.h"
@@ -55,6 +55,7 @@
 #endif
 #include "monitor_wrap.h"
 
+#include "schnorr.h"
 #include "jpake.h"
 
 /*
@@ -359,7 +360,7 @@
 }
 
 /*
- * Being authentication attempt.
+ * Begin authentication attempt.
  * Note, sets authctxt->postponed while in subprotocol
  */
 static int

==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-kbdint.c#2 (text+ko) ====

@@ -58,10 +58,6 @@
 
 	xfree(devs);
 	xfree(lang);
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(0, authctxt->pw) == 0)
-		authenticated = 0;
-#endif
 	return authenticated;
 }
 

==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-none.c#2 (text+ko) ====

@@ -61,10 +61,6 @@
 {
 	none_enabled = 0;
 	packet_check_eom();
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(1, authctxt->pw) == 0)
-		return (0);
-#endif
 	if (options.password_authentication)
 		return (PRIVSEP(auth_password(authctxt, "")));
 	return (0);

==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-passwd.c#2 (text+ko) ====

@@ -68,10 +68,6 @@
 		logit("password change not supported");
 	else if (PRIVSEP(auth_password(authctxt, password)) == 1)
 		authenticated = 1;
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(1, authctxt->pw) == 0)
-		authenticated = 0;
-#endif
 	memset(password, 0, len);
 	xfree(password);
 	return authenticated;

==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-pubkey.c#2 (text+ko) ====

@@ -170,10 +170,6 @@
 		key_free(key);
 	xfree(pkalg);
 	xfree(pkblob);
-#ifdef HAVE_CYGWIN
-	if (check_nt_auth(0, authctxt->pw) == 0)
-		authenticated = 0;
-#endif
 	return authenticated;
 }
 

==== //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2.c#3 (text+ko) ====

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Oct  1 20:30:52 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9F8401065767; Thu,  1 Oct 2009 20:30:50 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A732106575E
	for ; Thu,  1 Oct 2009 20:30:50 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 266F68FC14
	for ; Thu,  1 Oct 2009 20:30:50 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n91KUo4p062896
	for ; Thu, 1 Oct 2009 20:30:50 GMT
	(envelope-from gk@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n91KUofl062894
	for perforce@freebsd.org; Thu, 1 Oct 2009 20:30:50 GMT
	(envelope-from gk@FreeBSD.org)
Date: Thu, 1 Oct 2009 20:30:50 GMT
Message-Id: <200910012030.n91KUofl062894@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gk@FreeBSD.org using -f
From: Gleb Kurtsou 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169106 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 01 Oct 2009 20:30:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=169106

Change 169106 by gk@gk_h1 on 2009/10/01 20:30:32

	remove pefs_bypass
	add pefs_accessx
	pefs_rename: vput vnode after VOP_LOOKUP
	VOP_RENAME is expected to vrele vnodes in error case
	whitespace

Affected files ...

.. //depot/projects/soc2009/gk_pefs/sbin/pefs/Makefile#5 edit
.. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#10 edit
.. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_keychain.c#6 edit
.. //depot/projects/soc2009/gk_pefs/sys/crypto/salsa20/salsa20.c#3 edit
.. //depot/projects/soc2009/gk_pefs/sys/crypto/salsa20/salsa20.h#2 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#13 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#13 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_hmac.c#3 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#13 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#19 edit
.. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_xbase64.c#6 edit

Differences ...

==== //depot/projects/soc2009/gk_pefs/sbin/pefs/Makefile#5 (text+ko) ====

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-MOUNT=	${.CURDIR}/../mount 
+MOUNT=	${.CURDIR}/../mount
 SYS=	${.CURDIR}/../../sys
 .PATH:	${MOUNT} ${SYS}/geom/eli ${SYS}/crypto/sha2
 

==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#10 (text+ko) ====

@@ -370,7 +370,7 @@
 		warn("cannot open %s", argv[0]);
 		return (EX_IOERR);
 	}
-	
+
 	if (ioctl(fd, PEFS_SETKEY, &k) == -1) {
 		warn("cannot set key");
 		error = EX_OSERR;
@@ -463,7 +463,7 @@
 		}
 	argc -= optind;
 	argv += optind;
-	
+
 	if (!checkargs_fs(argc, argv)) {
 		pefs_usage();
 	}
@@ -805,7 +805,7 @@
 			    pefs_keyid_as_int(k[1].pxk_keyid));
 		}
 	}
-	
+
 	close(fd);
 
 	return (0);
@@ -882,7 +882,7 @@
 			return (cmd->func(argc, argv));
 		}
 	}
-	
+
 	warnx("unknown command: %s", argv[1]);
 	pefs_usage();
 

==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_keychain.c#6 (text+ko) ====

@@ -112,11 +112,11 @@
 		}
 		if (db_data.size != sizeof(struct pefs_xkeyenc))
 			errx(EX_DATAERR, "keychain: db damaged");
-		
+
 		kc = calloc(1, sizeof(struct pefs_keychain));
 		if (kc == NULL)
 			err(EX_OSERR, "calloc");
-		
+
 		memcpy(&ke, db_data.data, sizeof(struct pefs_xkeyenc));
 		error = pefs_key_decrypt(&ke, &kc_parent->kc_key);
 		if (error)
@@ -164,7 +164,7 @@
 		err(EX_OSERR, "calloc");
 	kc->kc_key = *xk;
 	TAILQ_INSERT_HEAD(kch, kc, kc_entry);
-	
+
 	if (flags == 0)
 		return (0);
 
@@ -205,7 +205,7 @@
 	ke.keybits = htole32(xk->pxk_keybits);
 	if (pefs_key_encrypt(&ke, xk) != 0)
 		return (-1);
-	
+
 	db = keychain_dbopen(filesystem, PEFS_KEYCHAIN_USE, O_RDWR | O_CREAT);
 	if (db == NULL)
 		return (-1);

==== //depot/projects/soc2009/gk_pefs/sys/crypto/salsa20/salsa20.c#3 (text+ko) ====

@@ -23,7 +23,7 @@
 static const char sigma[16] = "expand 32-byte k";
 static const char tau[16] = "expand 16-byte k";
 
-void 
+void
 salsa20_keysetup(salsa20_ctx *x, const uint8_t *k, uint32_t kbits)
 {
 	const char *constants;
@@ -48,7 +48,7 @@
 	x->input[15] = U8TO32_LITTLE(constants + 12);
 }
 
-void 
+void
 salsa20_ivsetup(salsa20_ctx *x, const uint8_t *iv, uint64_t offset)
 {
 	x->skip = offset & ((1 << 6) - 1);
@@ -60,10 +60,10 @@
 	x->input[9] = htole32((uint32_t) offset);
 }
 
-void 
+void
 salsa20_crypt(salsa20_ctx *x, const uint8_t *m, uint8_t *c, uint32_t bytes)
 {
-	uint32_t x0, x1, x2, x3, x4, x5, x6, x7, 
+	uint32_t x0, x1, x2, x3, x4, x5, x6, x7,
 		 x8, x9, x10, x11, x12, x13, x14, x15;
 	uint8_t *ctarget = NULL;
 	const uint8_t *msrc = NULL;

==== //depot/projects/soc2009/gk_pefs/sys/crypto/salsa20/salsa20.h#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * salsa20-merged.c version 20051118 
+ * salsa20-merged.c version 20051118
  * D. J. Bernstein
  * Public domain.
  */

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#13 (text+ko) ====

@@ -171,7 +171,7 @@
 void pefs_crypto_init(void);
 void pefs_crypto_uninit(void);
 
-int pefs_node_get_nokey(struct mount *mp, struct vnode *lvp, 
+int pefs_node_get_nokey(struct mount *mp, struct vnode *lvp,
     struct vnode **vpp);
 int pefs_node_get_haskey(struct mount *mp, struct vnode *lvp,
     struct vnode **vpp, struct pefs_tkey *ptk);

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_crypto.c#13 (text+ko) ====

@@ -50,7 +50,7 @@
 
 #define PEFS_CTR_BLOCK_SIZE		16
 #define PEFS_NAME_BLOCK_SIZE		16
-#define PEFS_BLOCK_ROUND(block, a)	(((a) + (block) - 1) & ~((block) - 1)) 
+#define PEFS_BLOCK_ROUND(block, a)	(((a) + (block) - 1) & ~((block) - 1))
 
 CTASSERT(PEFS_KEY_SIZE <= SHA512_DIGEST_LENGTH);
 CTASSERT(PEFS_TWEAK_SIZE == 64/8);
@@ -98,23 +98,23 @@
 static algop_keysetup_t pefs_camellia_keysetup;
 static algop_crypt_t pefs_camellia_crypt;
 
-static const struct pefs_alg pefs_alg_salsa20 = { 
+static const struct pefs_alg pefs_alg_salsa20 = {
 	PEFS_ALG_SALSA20,
-	pefs_salsa20_keysetup, 
+	pefs_salsa20_keysetup,
 	pefs_salsa20_ivsetup,
 	pefs_salsa20_crypt
 };
 
-static const struct pefs_alg pefs_alg_aes = { 
+static const struct pefs_alg pefs_alg_aes = {
 	PEFS_ALG_AES_CTR,
-	pefs_aes_keysetup, 
+	pefs_aes_keysetup,
 	pefs_ctr_ivsetup,
 	pefs_aes_crypt
 };
 
-static const struct pefs_alg pefs_alg_camellia = { 
+static const struct pefs_alg pefs_alg_camellia = {
 	PEFS_ALG_CAMELLIA_CTR,
-	pefs_camellia_keysetup, 
+	pefs_camellia_keysetup,
 	pefs_ctr_ivsetup,
 	pefs_camellia_crypt
 };
@@ -143,9 +143,9 @@
 void
 pefs_crypto_init(void)
 {
-	pefs_ctx_zone = uma_zcreate("pefs_ctx", sizeof(struct pefs_ctx), 
+	pefs_ctx_zone = uma_zcreate("pefs_ctx", sizeof(struct pefs_ctx),
 	    NULL, NULL, NULL, (uma_fini)bzero, UMA_ALIGN_PTR, 0);
-	pefs_key_zone = uma_zcreate("pefs_key", sizeof(struct pefs_key), 
+	pefs_key_zone = uma_zcreate("pefs_key", sizeof(struct pefs_key),
 	    NULL, NULL, NULL, (uma_fini)bzero, UMA_ALIGN_PTR, 0);
 }
 
@@ -447,7 +447,7 @@
 
 	MPASS(size > PEFS_NAME_CSUM_SIZE && size <= MAXNAMLEN);
 	psize = size - PEFS_NAME_CSUM_SIZE;
-	psize = PEFS_NAME_CSUM_SIZE + 
+	psize = PEFS_NAME_CSUM_SIZE +
 	    PEFS_BLOCK_ROUND(PEFS_NAME_BLOCK_SIZE, psize);
 
 	return (psize);
@@ -479,7 +479,7 @@
 	MPASS(size > PEFS_NAME_CSUM_SIZE &&
 	    size <= MAXNAMLEN &&
 	    (size - PEFS_NAME_CSUM_SIZE) % PEFS_NAME_BLOCK_SIZE == 0);
-	
+
 	pefs_ctx_cpy(ctx, pk->pk_name_csum_ctx);
 	csum_int = vmac(name + PEFS_NAME_CSUM_SIZE,
 	    size - PEFS_NAME_CSUM_SIZE,
@@ -710,13 +710,13 @@
 
 	pos = c->pctr_pos;
 	while (len) {
-		l = pos + len > PEFS_CTR_BLOCK_SIZE ? 
+		l = pos + len > PEFS_CTR_BLOCK_SIZE ?
 		    PEFS_CTR_BLOCK_SIZE - pos : len;
 		le_offset = htole64(c->pctr_offset);
-		memcpy(c->pctr_block + PEFS_TWEAK_SIZE, &le_offset, 
+		memcpy(c->pctr_block + PEFS_TWEAK_SIZE, &le_offset,
 		    sizeof(uint64_t));
 		memcpy(c->pctr_block, c->pctr_tweak, PEFS_TWEAK_SIZE);
-		
+
 		cryptblock(ctx, c->pctr_block);
 		for (i = 0; i < l; i++) {
 			*(ciphertext++) = c->pctr_block[pos + i] ^
@@ -744,10 +744,10 @@
 }
 
 static void
-pefs_camellia_crypt(struct pefs_ctx *ctx, const uint8_t *plaintext, 
+pefs_camellia_crypt(struct pefs_ctx *ctx, const uint8_t *plaintext,
     uint8_t *ciphertext, uint32_t len)
 {
-	pefs_ctr_crypt(ctx, pefs_camellia_cryptblock, 
+	pefs_ctr_crypt(ctx, pefs_camellia_cryptblock,
 	    plaintext, ciphertext, len);
 }
 
@@ -764,10 +764,10 @@
 }
 
 static void
-pefs_aes_crypt(struct pefs_ctx *ctx, const uint8_t *plaintext, 
+pefs_aes_crypt(struct pefs_ctx *ctx, const uint8_t *plaintext,
     uint8_t *ciphertext, uint32_t len)
 {
-	pefs_ctr_crypt(ctx, pefs_aes_cryptblock, 
+	pefs_ctr_crypt(ctx, pefs_aes_cryptblock,
 	    plaintext, ciphertext, len);
 }
 

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_hmac.c#3 (text+ko) ====

@@ -49,7 +49,7 @@
 	else if (hkeylen <= SHA512_BLOCK_LENGTH)
 		bcopy(hkey, ctx->kpad, hkeylen);
 	else {
-		/* 
+		/*
 		 * If key is longer than SHA512_BLOCK_LENGTH bytes
 		 * reset it to key = SHA512(key).
 		 */
@@ -94,7 +94,7 @@
 	/* mdsize == 0 means "Give me the whole hash!" */
 	if (mdsize == 0)
 		mdsize = SHA512_DIGEST_LENGTH;
-	
+
 	bcopy(digest, md, mdsize);
 }
 

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#13 (text+ko) ====

@@ -127,7 +127,7 @@
 
 	pefs_node_zone = uma_zcreate("pefs_node", sizeof(struct pefs_node),
 	    NULL, NULL, NULL, (uma_fini) bzero, UMA_ALIGN_PTR, 0);
-	
+
 	pefs_node_hashtbl = hashinit(NPENODECACHE, M_PEFSHASH, &pefs_node_hash);
 	mtx_init(&pefs_node_listmtx, "pefs_node_list", NULL, MTX_DEF);
 	pefs_crypto_init();
@@ -240,7 +240,7 @@
 	struct vnode *nldvp;
 	int error, locked, dlocked;
 	int buflen = *encname_len;
- 
+
 	ASSERT_VOP_LOCKED(lvp, "pefs_node_lookup_name");
 	locked = VOP_ISLOCKED(lvp);
 	if (ldvp) {
@@ -250,7 +250,7 @@
 	} else {
 		dlocked = 0;
 	}
- 
+
 	vref(lvp);
 	VOP_UNLOCK(lvp, 0);
 	nldvp = lvp;
@@ -277,34 +277,34 @@
 pefs_node_lookup_key(struct pefs_mount *pm, struct vnode *lvp,
     struct vnode *ldvp, struct ucred *cred, struct pefs_tkey *ptk)
 {
- 	char *namebuf;
+	char *namebuf;
 	char *encname;
 	int error, encname_len, name_len;
- 
+
 	namebuf = malloc((MAXNAMLEN + 1)*2, M_PEFSBUF, M_WAITOK | M_ZERO);
 	encname = namebuf + MAXNAMLEN + 1;
 	encname_len = MAXNAMLEN + 1;
- 
+
 	error = pefs_node_lookup_name(lvp, ldvp, cred, encname, &encname_len);
 	if (error) {
 		free(namebuf, M_PEFSBUF);
 		return (error);
 	}
- 
+
 	PEFSDEBUG("pefs_node_lookup_key: encname=%.*s\n", encname_len, encname);
-	
-	name_len = pefs_name_decrypt(NULL, pefs_rootkey(pm), ptk, 
-			encname, encname_len, 
+
+	name_len = pefs_name_decrypt(NULL, pefs_rootkey(pm), ptk,
+			encname, encname_len,
 			namebuf, MAXNAMLEN + 1);
 
 	if (name_len > 0) {
 		pefs_key_ref(ptk->ptk_key);
- 	} else {
+	} else {
 		PEFSDEBUG("pefs_node_lookup_key: not found: %.*s\n", encname_len, encname);
 	}
-	
- 	free(namebuf, M_PEFSBUF);
-	
+
+	free(namebuf, M_PEFSBUF);
+
 	return (error);
 }
 
@@ -361,7 +361,7 @@
  * the caller's "spare" reference to created pefs vnode.
  */
 static int
-pefs_node_get(struct mount *mp, struct vnode *lvp, struct vnode **vpp, 
+pefs_node_get(struct mount *mp, struct vnode *lvp, struct vnode **vpp,
     pefs_node_init_fn *init_fn, void *context)
 {
 	struct pefs_node *pn;

==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#19 (text+ko) ====

@@ -281,7 +281,7 @@
 		offset = uio->uio_offset;
 
 		pefs_chunk_setsize(&pc, pc.pc_size - uio->uio_resid);
-		de = pefs_enccn_lookup_dirent(dpn_key, &ptk, 
+		de = pefs_enccn_lookup_dirent(dpn_key, &ptk,
 		    pc.pc_base, pc.pc_size,
 		    cnp->cn_nameptr, cnp->cn_namelen);
 		if (de != NULL)
@@ -370,14 +370,14 @@
 			continue;
 		VI_LOCK(vp);
 		pn = VP_TO_PN(vp);
-		if (((pn->pn_flags & PN_HASKEY) && 
+		if (((pn->pn_flags & PN_HASKEY) &&
 		    ((flags & PEFS_FLUSHKEY_ALL) ||
 		    pn->pn_tkey.ptk_key == pk)) ||
 		    ((pn->pn_flags & PN_HASKEY) == 0 && pk == NULL)) {
 			vholdl(vp);
 			MNT_IUNLOCK(mp);
 			error = vn_lock(vp, LK_INTERLOCK | LK_EXCLUSIVE);
-			if (error) {
+			if (error != 0) {
 				vdrop(vp);
 				MNT_ILOCK(mp);
 				MNT_VNODE_FOREACH_ABORT_ILOCKED(mp, mvp);
@@ -398,154 +398,6 @@
 	return (0);
 }
 
-/*
- * This is the 10-Apr-92 bypass routine.
- *    This version has been optimized for speed, throwing away some
- * safety checks.  It should still always work, but it's not as
- * robust to programmer errors.
- *
- * In general, we map all vnodes going down and unmap them on the way back.
- * As an exception to this, vnodes can be marked "unmapped" by setting
- * the Nth bit in operation's vdesc_flags.
- *
- * Also, some BSD vnode operations have the side effect of vrele'ing
- * their arguments.  With stacking, the reference counts are held
- * by the upper node, not the lower one, so we must handle these
- * side-effects here.  This is not of concern in Sun-derived systems
- * since there are no such side-effects.
- *
- * This makes the following assumptions:
- * - only one returned vpp
- * - no INOUT vpp's (Sun's vop_open has one of these)
- * - the vnode operation vector of the first vnode should be used
- *   to determine what implementation of the op should be invoked
- * - all mapped vnodes are of our vnode-type (NEEDSWORK:
- *   problems on rmdir'ing mount points and renaming?)
- */
-static int
-pefs_bypass(struct vop_generic_args *ap, struct pefs_tkey *ptk)
-{
-	struct vnode **this_vp_p;
-	int error;
-	struct vnode *old_vps[VDESC_MAX_VPS];
-	struct vnode **vps_p[VDESC_MAX_VPS];
-	struct vnode ***vppp;
-	struct vnodeop_desc *descp = ap->a_desc;
-	int reles, i;
-
-	if (pefs_bug_bypass)
-		printf ("pefs_bypass: %s\n", descp->vdesc_name);
-
-#ifdef DIAGNOSTIC
-	/*
-	 * We require at least one vp.
-	 */
-	if (descp->vdesc_vp_offsets == NULL ||
-	    descp->vdesc_vp_offsets[0] == VDESC_NO_OFFSET)
-		panic ("pefs_bypass: no vp's in map");
-#endif
-
-	/*
-	 * Map the vnodes going in.
-	 * Later, we'll invoke the operation based on
-	 * the first mapped vnode's operation vector.
-	 */
-	reles = descp->vdesc_flags;
-	for (i = 0; i < VDESC_MAX_VPS; reles >>= 1, i++) {
-		if (descp->vdesc_vp_offsets[i] == VDESC_NO_OFFSET)
-			break;   /* bail out at end of list */
-		vps_p[i] = this_vp_p = VOPARG_OFFSETTO(struct vnode**,
-			    descp->vdesc_vp_offsets[i],ap);
-		/*
-		 * We're not guaranteed that any but the first vnode
-		 * are of our type.  Check for and don't map any
-		 * that aren't.  (We must always map first vp or vclean fails.)
-		 */
-		if (i && (*this_vp_p == NULLVP ||
-		    (*this_vp_p)->v_op != &pefs_vnodeops)) {
-			old_vps[i] = NULLVP;
-		} else {
-			old_vps[i] = *this_vp_p;
-			*(vps_p[i]) = PEFS_LOWERVP(*this_vp_p);
-			/*
-			 * XXX - Several operations have the side effect
-			 * of vrele'ing their vp's.  We must account for
-			 * that.  (This should go away in the future.)
-			 */
-			if (reles & VDESC_VP0_WILLRELE)
-				VREF(*this_vp_p);
-		}
-
-	}
-
-	/*
-	 * Call the operation on the lower layer
-	 * with the modified argument structure.
-	 */
-	if (vps_p[0] && *vps_p[0])
-		error = VCALL(ap);
-	else {
-		printf("pefs_bypass: no map for %s\n", descp->vdesc_name);
-		error = EINVAL;
-	}
-
-	/*
-	 * Maintain the illusion of call-by-value
-	 * by restoring vnodes in the argument structure
-	 * to their original value.
-	 */
-	reles = descp->vdesc_flags;
-	for (i = 0; i < VDESC_MAX_VPS; reles >>= 1, i++) {
-		if (descp->vdesc_vp_offsets[i] == VDESC_NO_OFFSET)
-			break;   /* bail out at end of list */
-		if (old_vps[i]) {
-			*(vps_p[i]) = old_vps[i];
-#if 0
-			if (reles & VDESC_VP0_WILLUNLOCK)
-				VOP_UNLOCK(*(vps_p[i]), 0);
-#endif
-			if (reles & VDESC_VP0_WILLRELE)
-				vrele(*(vps_p[i]));
-		}
-	}
-
-	/*
-	 * Map the possible out-going vpp
-	 * (Assumes that the lower layer always returns
-	 * a VREF'ed vpp unless it gets an error.)
-	 */
-	if (descp->vdesc_vpp_offset != VDESC_NO_OFFSET &&
-	    !(descp->vdesc_flags & VDESC_NOMAP_VPP) &&
-	    !error) {
-		/* XXX should panic here unconditionally or remove the func */
-		if (ptk == NULL || ptk->ptk_key == NULL) {
-			panic("vop_bypass: map of outgoing vnode without encrypted name: %s", descp->vdesc_name);
-		}
-		/*
-		 * XXX - even though some ops have vpp returned vp's,
-		 * several ops actually vrele this before returning.
-		 * We must avoid these ops.
-		 * (This should go away when these ops are regularized.)
-		 */
-		if (descp->vdesc_flags & VDESC_VPP_WILLRELE)
-			goto out;
-		vppp = VOPARG_OFFSETTO(struct vnode***,
-				 descp->vdesc_vpp_offset,ap);
-		if (*vppp) {
-			error = pefs_node_get_haskey(old_vps[0]->v_mount,
-				**vppp, *vppp, ptk);
-		}
-	}
-
- out:
-	return (error);
-}
-
-/*
- * We have to carry on the locking protocol on the null layer vnodes
- * as we progress through the tree. We also have to enforce read-only
- * if this layer is mounted read-only.
- */
 static int
 pefs_lookup(struct vop_cachedlookup_args *ap)
 {
@@ -565,7 +417,7 @@
 
 	pefs_enccn_init(&enccn);
 
-	if ((flags & ISLASTCN) && 
+	if ((flags & ISLASTCN) &&
 	    ((dvp->v_mount->mnt_flag & MNT_RDONLY) || pefs_no_keys(dvp)) &&
 	    (cnp->cn_nameiop != LOOKUP))
 		return (EROFS);
@@ -589,7 +441,7 @@
 		    (cnp->cn_nameiop == DELETE &&
 		    (cnp->cn_flags & DOWHITEOUT) &&
 		    (cnp->cn_flags & ISWHITEOUT)))) {
-			/* 
+			/*
 			 * Some filesystems (like ufs) update internal inode
 			 * fields during VOP_LOOKUP which are later used by
 			 * VOP_CREATE, VOP_MKDIR, etc. That's why we can't
@@ -640,13 +492,13 @@
 			else
 				error = pefs_node_get_haskey(dvp->v_mount, lvp,
 				    &vp, &enccn.pec_tkey);
-			if (error) {
+			if (error != 0) {
 				vput(lvp);
 			} else {
 				*ap->a_vpp = vp;
 				if ((cnp->cn_flags & MAKEENTRY) &&
 				    cnp->cn_nameiop != CREATE) {
-					PEFSDEBUG("pefs_lookup: cache_enter %.*s\n", 
+					PEFSDEBUG("pefs_lookup: cache_enter %.*s\n",
 					    (int)cnp->cn_namelen,cnp->cn_nameptr);
 					cache_enter(dvp, vp, cnp);
 				}
@@ -669,16 +521,17 @@
 pefs_open(struct vop_open_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
+	struct vnode *lvp = PEFS_LOWERVP(vp);
 	struct pefs_node *pn = VP_TO_PN(vp);
 	int error;
 
 	if (pefs_no_keys(vp) && (ap->a_mode & (FWRITE | O_APPEND)))
 		return (EROFS);
 
-	error = pefs_bypass(&ap->a_gen, NULL);
+	error = VOP_OPEN(lvp, ap->a_mode, ap->a_cred, ap->a_td, ap->a_fp);
 	if (error == 0) {
 		if ((pn->pn_flags & PN_HASKEY) == 0)
-			vp->v_object = PEFS_LOWERVP(vp)->v_object;
+			vp->v_object = lvp->v_object;
 		else
 			vnode_create_vobject(vp, 0, ap->a_td);
 	}
@@ -703,7 +556,7 @@
 	MPASS(pn->pn_flags & PN_HASKEY);
 
 	error = VOP_GETATTR(lvp, &va, cred);
-	if (error)
+	if (error != 0)
 		return (error);
 	osize = va.va_size;
 
@@ -713,7 +566,7 @@
 	if (VOP_ISLOCKED(vp) != LK_EXCLUSIVE) {
 		vn_lock(vp, LK_UPGRADE | LK_RETRY);
 		error = VOP_GETATTR(lvp, &va, cred);
-		if (error)
+		if (error != 0)
 			return (error);
 		osize = va.va_size;
 		if (nsize <= osize)
@@ -739,9 +592,10 @@
 		pefs_chunk_zero(&pc);
 		pefs_data_encrypt_update(ctx, &pn->pn_tkey, &pc);
 		puio = pefs_chunk_uio(&pc, offset, UIO_WRITE);
-		PEFSDEBUG("pefs_tryextend: resizing file; filling with zeros: offset=0x%jx, resid=0x%jx\n", offset, bsize);
+		PEFSDEBUG("pefs_tryextend: resizing file; filling with zeros: offset=0x%jx, resid=0x%jx\n",
+		    offset, bsize);
 		error = VOP_WRITE(lvp, puio, 0, cred);
-		if (error) {
+		if (error != 0) {
 			/* try to reset */
 			VATTR_NULL(&va);
 			va.va_size = osize;
@@ -772,20 +626,20 @@
 	struct vattr *vap = ap->a_vap;
 	int error;
 
-  	if ((vap->va_flags != VNOVAL || vap->va_uid != (uid_t)VNOVAL ||
+	if ((vap->va_flags != VNOVAL || vap->va_uid != (uid_t)VNOVAL ||
 	    vap->va_gid != (gid_t)VNOVAL || vap->va_atime.tv_sec != VNOVAL ||
 	    vap->va_mtime.tv_sec != VNOVAL || vap->va_mode != (mode_t)VNOVAL) &&
 	    (vp->v_mount->mnt_flag & MNT_RDONLY || pefs_no_keys(vp)))
 		return (EROFS);
 
 	if (vap->va_size != VNOVAL) {
- 		switch (vp->v_type) {
- 		case VDIR:
- 			return (EISDIR);
- 		case VCHR:
- 		case VBLK:
- 		case VSOCK:
- 		case VFIFO:
+		switch (vp->v_type) {
+		case VDIR:
+			return (EISDIR);
+		case VCHR:
+		case VBLK:
+		case VSOCK:
+		case VFIFO:
 			if (vap->va_flags != VNOVAL)
 				return (EOPNOTSUPP);
 			return (0);
@@ -805,11 +659,11 @@
 				error = pefs_tryextend(vp, vap->va_size, cred);
 			else
 				error = EOPNOTSUPP; /* TODO */
-			if (error)
+			if (error != 0)
 				return (error);
 			vnode_pager_setsize(vp, vap->va_size);
 			break;
- 		default:
+		default:
 			return (EOPNOTSUPP);
 		}
 	}
@@ -823,13 +677,15 @@
 static int
 pefs_getattr(struct vop_getattr_args *ap)
 {
+	struct vnode *vp = ap->a_vp;
 	struct vattr *vap = ap->a_vap;
 	int error;
 
-	if ((error = pefs_bypass((struct vop_generic_args *)ap, NULL)) != 0)
+	error = VOP_GETATTR(PEFS_LOWERVP(vp), vap, ap->a_cred);
+	if (error != 0)
 		return (error);
 
-	vap->va_fsid = ap->a_vp->v_mount->mnt_stat.f_fsid.val[0];
+	vap->va_fsid = vp->v_mount->mnt_stat.f_fsid.val[0];
 	if (vap->va_type == VLNK) {
 		vap->va_size = PEFS_NAME_PTON_SIZE(vap->va_size);
 	}
@@ -840,11 +696,8 @@
  * Handle to disallow write access if mounted read-only.
  */
 static int
-pefs_access(struct vop_access_args *ap)
+pefs_access_checkmode(struct vnode *vp, accmode_t accmode)
 {
-	struct vnode *vp = ap->a_vp;
-	accmode_t accmode = ap->a_accmode;
-
 	/*
 	 * Disallow write attempts on read-only layers;
 	 * unless the file is a socket, fifo, or a block or
@@ -855,6 +708,10 @@
 		case VDIR:
 		case VLNK:
 		case VREG:
+			/*
+			 * Do not check pefs_no_keys(vp) here because ioctls
+			 * expect filesystem to be writable right after mount
+			 */
 			if (vp->v_mount->mnt_flag & MNT_RDONLY)
 				return (EROFS);
 			break;
@@ -862,21 +719,49 @@
 			break;
 		}
 	}
-	return (pefs_bypass((struct vop_generic_args *)ap, NULL));
+
+	return (0);
+}
+
+static int
+pefs_access(struct vop_access_args *ap)
+{
+	struct vnode *vp = ap->a_vp;
+	accmode_t accmode = ap->a_accmode;
+	int error;
+
+	error = pefs_access_checkmode(vp, accmode);
+	if (error != 0)
+		return (error);
+	error = VOP_ACCESS(PEFS_LOWERVP(vp), accmode, ap->a_cred, ap->a_td);
+	return (error);
+}
+
+static int
+pefs_accessx(struct vop_accessx_args *ap)
+{
+	struct vnode *vp = ap->a_vp;
+	accmode_t accmode = ap->a_accmode;
+	int error;
+
+	error = pefs_access_checkmode(vp, accmode);
+	if (error != 0)
+		return (error);
+	error = VOP_ACCESSX(PEFS_LOWERVP(vp), accmode, ap->a_cred, ap->a_td);
+	return (error);
 }
 
-/*
- * We handle this to eliminate null FS to lower FS
- * file moving. Don't know why we don't allow this,
- * possibly we should.
- */
 static int
 pefs_rename(struct vop_rename_args *ap)
 {
 	struct vnode *fdvp = ap->a_fdvp;
+	struct vnode *lfdvp = PEFS_LOWERVP(fdvp);
 	struct vnode *fvp = ap->a_fvp;
+	struct vnode *lfvp = PEFS_LOWERVP(fvp);
 	struct vnode *tdvp = ap->a_tdvp;
+	struct vnode *ltdvp = PEFS_LOWERVP(tdvp);
 	struct vnode *tvp = ap->a_tvp;
+	struct vnode *ltvp = (tvp == NULL ? NULL : PEFS_LOWERVP(tvp));
 	struct vnode *tovp = NULL;
 	struct componentname *fcnp = ap->a_fcnp;
 	struct componentname *tcnp = ap->a_tcnp;
@@ -910,9 +795,14 @@
 			PEFSDEBUG("pefs_rename: target dir !HASKEY: %s\n",
 			    tcnp->cn_nameptr);
 			/* Allow unencrypted to unencrypted rename. */
-			error = pefs_bypass((struct vop_generic_args *)ap,
-			    NULL);
-			return (error);
+			vref(lfdvp);
+			vref(lfvp);
+			vref(ltdvp);
+			if (ltvp != NULL)
+				vref(ltvp);
+			error = VOP_RENAME(lfdvp, lfvp, fcnp, ltdvp, ltvp,
+			    tcnp);
+			goto done;
 		}
 		/* Target directory is encrypted. Files should be recreated. */
 		error = EXDEV;
@@ -920,12 +810,12 @@
 	}
 
 	error = pefs_enccn_get(&fenccn, fvp, fcnp);
-	if (error) {
+	if (error != 0) {
 		goto bad;
 	}
 	error = pefs_enccn_create(&tenccn, fenccn.pec_tkey.ptk_key,
 	    fenccn.pec_tkey.ptk_tweak, tcnp);
-	if (error) {
+	if (error != 0) {
 		pefs_enccn_free(&fenccn);
 		goto bad;
 	}
@@ -933,27 +823,31 @@
 		tcnp->cn_nameiop = DELETE;
 		error = VOP_LOOKUP(tdvp, &tovp, tcnp);
 		tcnp->cn_nameiop = RENAME;
-		PEFSDEBUG("pefs_rename: lookup target vnode: %s: error=%d, tovp=%p\n", tcnp->cn_nameptr, error, tovp);
+		PEFSDEBUG("pefs_rename: lookup target vnode: %s: error=%d, tovp=%p\n",
+		    tcnp->cn_nameptr, error, tovp);
 		if (error == ENOENT)
 			error = 0;
 	}
-	if (error) {
+	if (error != 0) {
 		pefs_enccn_free(&fenccn);
 		pefs_enccn_free(&tenccn);
 		goto bad;
 	}
 
-	ap->a_fcnp = &fenccn.pec_cn;
-	ap->a_tcnp = &tenccn.pec_cn;
-	error = pefs_bypass((struct vop_generic_args *)ap, NULL);
-	ap->a_fcnp = fcnp;
-	ap->a_tcnp = tcnp;
+	vref(lfdvp);
+	vref(lfvp);
+	vref(ltdvp);
+	if (ltvp != NULL)
+		vref(ltvp);
+	error = VOP_RENAME(lfdvp, lfvp, &fenccn.pec_cn, ltdvp, ltvp,
+	    &tenccn.pec_cn);
 
 	pefs_enccn_free(&fenccn);
 	pefs_enccn_free(&tenccn);
 
-	if (!error) {
+	if (error == 0) {
 		if (tovp != NULL) {
+			MPASS(tovp->v_type == VREG);
 			vn_lock(tdvp, LK_EXCLUSIVE | LK_RETRY);
 			tcnp->cn_nameiop = DELETE;
 			error = VOP_REMOVE(tdvp, tovp, tcnp);
@@ -964,10 +858,18 @@
 		cache_purge(fdvp);
 		cache_purge(fvp);
 	} else {
-		if (tovp != NULL);
-			VOP_UNLOCK(tovp, 0);
+		if (tovp != NULL)
+			vput(tovp);
 	}
 
+done:
+	ASSERT_VOP_UNLOCKED(tdvp, "pefs_rename");
+	vrele(fdvp);
+	vrele(fvp);
+	vrele(tdvp);
+	if (tvp != NULL)
+		vrele(tvp);
+
 	return (error);
 
 bad:
@@ -975,7 +877,7 @@
 		vrele(tdvp);
 	else
 		vput(tdvp);
-	if (tvp)
+	if (tvp != NULL)
 		vput(tvp);
 	vrele(fdvp);
 	vrele(fvp);
@@ -1264,6 +1166,7 @@
 pefs_readdir(struct vop_readdir_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
+	struct vnode *lvp = PEFS_LOWERVP(vp);
 	struct uio *uio = ap->a_uio;
 	struct ucred *cred = ap->a_cred;
 	int *eofflag = ap->a_eofflag;
@@ -1278,8 +1181,11 @@
 	int *a_ncookies;
 	u_long **a_cookies;
 
-	if (pefs_no_keys(vp))
-		return (pefs_bypass((struct vop_generic_args *)ap, NULL));
+	if (pefs_no_keys(vp)) {
+		error = VOP_READDIR(lvp, uio, cred, eofflag, ap->a_ncookies,
+		    ap->a_cookies);
+		return (error);
+	}
 
 	if (ap->a_ncookies == NULL || ap->a_cookies == NULL) {
 		a_ncookies = NULL;
@@ -1295,9 +1201,9 @@
 		if (uio->uio_resid < pc.pc_size)
 			pefs_chunk_setsize(&pc, uio->uio_resid);
 		puio = pefs_chunk_uio(&pc, uio->uio_offset, uio->uio_rw);
-		error = VOP_READDIR(PEFS_LOWERVP(vp), puio, cred, eofflag,
+		error = VOP_READDIR(lvp, puio, cred, eofflag,
 		    a_ncookies, a_cookies);
-		if (error)
+		if (error != 0)
 			break;
 
 		if (pc.pc_size == puio->uio_resid)
@@ -1364,6 +1270,7 @@
 pefs_mkdir(struct vop_mkdir_args *ap)
 {
 	struct vnode *dvp = ap->a_dvp;
+	struct vnode *lvp;
 	struct componentname *cnp = ap->a_cnp;
 	struct pefs_enccn enccn;
 	int error;
@@ -1374,13 +1281,17 @@
 	pefs_enccn_init(&enccn);
 	PEFS_ENCCN_ASSERT_NOENT(dvp, cnp);
 	error = pefs_enccn_create_node(&enccn, dvp, cnp);
-	if (error) {
+	if (error != 0) {
 		return (error);
 	}
 
-	ap->a_cnp = &enccn.pec_cn;
-	error = pefs_bypass((struct vop_generic_args *)ap, &enccn.pec_tkey);
-	ap->a_cnp = cnp;
+	error = VOP_MKDIR(PEFS_LOWERVP(dvp), &lvp, &enccn.pec_cn, ap->a_vap);
+	if (error == 0 && lvp != NULL) {
+		error = pefs_node_get_haskey(dvp->v_mount, lvp, ap->a_vpp,
+		    &enccn.pec_tkey);
+		if (error != 0)
+			vput(lvp);
+	}
 
 	pefs_enccn_free(&enccn);
 
@@ -1401,20 +1312,17 @@
 		return (EROFS);
 	pefs_enccn_init(&enccn);
 	error = pefs_enccn_get(&enccn, vp, cnp);
-	if (error) {
+	if (error != 0) {
 		PEFSDEBUG("pefs_rmdir: pefs_enccn_get failed: %d\n", error);
 		return (error);
 	}
 
-	ap->a_cnp = &enccn.pec_cn;
-	error = pefs_bypass((struct vop_generic_args *)ap, NULL);
-	ap->a_cnp = cnp;
-
+	error = VOP_RMDIR(PEFS_LOWERVP(dvp), PEFS_LOWERVP(vp), &enccn.pec_cn);
 	VP_TO_PN(vp)->pn_flags |= PN_WANTRECYCLE;
 
 	pefs_enccn_free(&enccn);
 
-	if (!error) {
+	if (error == 0) {
 		cache_purge(dvp);
 		cache_purge(vp);
 	}
@@ -1426,6 +1334,7 @@
 pefs_create(struct vop_create_args *ap)
 {
 	struct vnode *dvp = ap->a_dvp;
+	struct vnode *lvp;
 	struct componentname *cnp = ap->a_cnp;
 	struct pefs_enccn enccn;
 	int error;
@@ -1436,13 +1345,17 @@
 	pefs_enccn_init(&enccn);
 	PEFS_ENCCN_ASSERT_NOENT(dvp, cnp);
 	error = pefs_enccn_create_node(&enccn, dvp, cnp);
-	if (error) {
+	if (error != 0) {

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 01:58:49 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C8C66106568D; Fri,  2 Oct 2009 01:58:49 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8D53B106566B
	for ; Fri,  2 Oct 2009 01:58:49 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7CA6E8FC17
	for ; Fri,  2 Oct 2009 01:58:49 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n921wnx3031411
	for ; Fri, 2 Oct 2009 01:58:49 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n921wnsh031409
	for perforce@freebsd.org; Fri, 2 Oct 2009 01:58:49 GMT
	(envelope-from scottl@freebsd.org)
Date: Fri, 2 Oct 2009 01:58:49 GMT
Message-Id: <200910020158.n921wnsh031409@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169116 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 01:58:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=169116

Change 169116 by scottl@scottl-y1 on 2009/10/02 01:58:39

	Reduce the scope of the locking in xpt_finishconfig_func.  The locking
	is wonky because of the device iteration code that needs to grab each
	SIM lock.

Affected files ...

.. //depot/projects/firewire/sys/cam/cam_xpt.c#3 edit

Differences ...

==== //depot/projects/firewire/sys/cam/cam_xpt.c#3 (text+ko) ====

@@ -4716,7 +4716,6 @@
 	struct	periph_driver **p_drv;
 	int	i;
 
-	mtx_lock(&xsoftc.xpt_lock);
 	if (busses_to_config == 0) {
 		/* Register all the peripheral drivers */
 		/* XXX This will have to change when we have loadable modules */
@@ -4733,11 +4732,12 @@
 		xpt_for_all_devices(xptpassannouncefunc, NULL);
 
 		/* Release our hook so that the boot can continue. */
+		mtx_lock(&xsoftc.xpt_lock);
 		wakeup(xpt_config);
+		mtx_unlock(&xsoftc.xpt_lock);
 	}
 
 	free(context, M_CAMXPT);
-	mtx_unlock(&xsoftc.xpt_lock);
 }
 
 static void

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 05:00:12 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9E91C106568B; Fri,  2 Oct 2009 05:00:11 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5A4451065670
	for ; Fri,  2 Oct 2009 05:00:11 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 481DE8FC1C
	for ; Fri,  2 Oct 2009 05:00:11 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92507cZ058477
	for ; Fri, 2 Oct 2009 05:00:07 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92507Q3058475
	for perforce@freebsd.org; Fri, 2 Oct 2009 05:00:07 GMT
	(envelope-from scottl@freebsd.org)
Date: Fri, 2 Oct 2009 05:00:07 GMT
Message-Id: <200910020500.n92507Q3058475@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169118 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 05:00:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=169118

Change 169118 by scottl@scottl-y1 on 2009/10/02 05:00:03

	Clean up xpt_config timeout messages.

Affected files ...

.. //depot/projects/firewire/sys/cam/cam_xpt.c#4 edit

Differences ...

==== //depot/projects/firewire/sys/cam/cam_xpt.c#4 (text+ko) ====

@@ -4628,9 +4628,13 @@
 	return(1);
 }
 
+#define CAM_WARN_INTERVAL_SECS	60
+
 static void
 xpt_config(void *arg)
 {
+	u_int warned = 0;
+
 	/*
 	 * Now that interrupts are enabled, go find our devices
 	 */
@@ -4682,8 +4686,12 @@
 
 	mtx_lock(&xsoftc.xpt_lock);
 	while (msleep(xpt_config, &xsoftc.xpt_lock, PCONFIG, "camhk",
-		      30 * hz) == EWOULDBLOCK) {
-		printf("Warning\n");
+		      CAM_WARN_INTERVAL_SECS * hz) == EWOULDBLOCK) {
+		if (++warned < 6)
+			printf("xpt_config: still waiting after %d seconds "
+			       "for CAM buses to respond\n",
+			       warned * CAM_WARN_INTERVAL_SECS);
+		KASSERT(warned < 6, ("xpt_config: waited too long"));
 	}
 	mtx_unlock(&xsoftc.xpt_lock);
 }

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 11:12:51 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E28AB106568B; Fri,  2 Oct 2009 11:12:50 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8E4DE106566B
	for ; Fri,  2 Oct 2009 11:12:50 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7CB888FC1F
	for ; Fri,  2 Oct 2009 11:12:50 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92BCoqu001779
	for ; Fri, 2 Oct 2009 11:12:50 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92BCofn001777
	for perforce@freebsd.org; Fri, 2 Oct 2009 11:12:50 GMT
	(envelope-from rene@FreeBSD.org)
Date: Fri, 2 Oct 2009 11:12:50 GMT
Message-Id: <200910021112.n92BCofn001777@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169123 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 11:12:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=169123

Change 169123 by rene@rene_self on 2009/10/02 11:12:25

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#9 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#45 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#14 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#14 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/csjp.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#26 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#23 integrate
.. //depot/projects/docproj_nl/www/en/donations/donors.sgml#21 integrate
.. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#7 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#9 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -1162,8 +1162,12 @@
     
       Using XDM
 
-      The XDM daemon program is
-        located in /usr/local/bin/xdm.  This program
+      To start using XDM, install the
+	x11/xdm port (it is not
+	installed by default in recent versions of
+	&xorg;).
+	The XDM daemon program may then be
+        found in /usr/local/bin/xdm.  This program
         can be run at any time as root and it will
         start managing the X display on the local machine.  If
         XDM is to be run every

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#45 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
 
-    
-      Using KDE
+    
+      Using Qt
 
-      
-	Variable definitions
-
-	
-	  Variables for ports that use KDE
-
-	  
-	    
-	      
-		USE_KDELIBS_VER
-
-		The port uses KDE libraries.  It specifies the
-		  major version of KDE to use and implies
-		  USE_QT_VER of the appropriate
-		  version.  The only possible value is
-		  3.
-	      
-
-	      
-		USE_KDEBASE_VER
-
-		The port uses KDE base.  It specifies the major
-		  version of KDE to use and implies
-		  USE_QT_VER of the appropriate version.
-		  The only possible value is 3.
-	      
-	    
-	  
-	
    
-
-          
-
-      
+      
 	Ports that require Qt
 
 	
@@ -5809,6 +5777,141 @@
 
     
 
+    
+      Using KDE
+
+      
+	Variable definitions (KDE 3.x only)
+
+	
    
+	  Variables for ports that use KDE 3.x
+
+	  
+	    
+	      
+		USE_KDELIBS_VER
+
+		The port uses KDE libraries.  It specifies the
+		  major version of KDE to use and implies
+		  USE_QT_VER of the appropriate
+		  version.  The only possible value is
+		  3.
+	      
+
+	      
+		USE_KDEBASE_VER
+
+		The port uses KDE base.  It specifies the major
+		  version of KDE to use and implies
+		  USE_QT_VER of the appropriate version.
+		  The only possible value is 3.
+	      
+	    
+	  
+	
    
+
+          
+
+      
+	KDE 4 variable definitions
+
+	If your application depends on KDE 4.x, set USE_KDE4
+	  to the list of required components. The most commonly used components are listed below
+	  (up-to-date components are listed in _USE_KDE4_ALL in
+	  /usr/ports/Mk/bsd.kde4.mk):
+
+	
+	  Available KDE4 components
+
+	  
+	    
+	      
+		Name
+		Description
+	      
+	    
+
+	    
+	      
+		akonadi
+		Personal information management (PIM) storage service
+	      
+
+	      
+		automoc4
+		Makes port use automoc4 build tool
+	      
+
+	      
+		kdebase
+		Basic KDE applications (Konqueror, Dolphin, Konsole)
+	      
+
+	      
+		kdeexp
+		Experimental KDE libraries (with non-stable API)
+	      
+
+	      
+		kdehier
+		Provides common KDE directories
+	      
+
+	      
+		kdelibs
+		The base set of KDE libraries
+	      
+
+	      
+		kdeprefix
+		If set, port will be installed into
+		  ${KDE4_PREFIX}
+		  instead of ${LOCALBASE}
+	      
+
+	      
+		pimlibs
+		PIM libraries
+	      
+
+	      
+		workspace
+		Applications and libraries which form desktop (Plasma, KWin)
+	      
+
+	    
+	  
+	
    
+
+	KDE 4.x ports are installed into ${KDE4_PREFIX},
+	  which is /usr/local/kde4 currently, to avoid conflicts
+	  with KDE 3.x ports. This is achieved by specifying kdeprefix
+	  component, which overrides default PREFIX. The ports however
+	  respect PREFIX set via MAKEFLAGS environment
+	  variable and/or make arguments.
+
+	
+	  <makevar>USE_KDE4</makevar> example
+
+	  This is a simple example for KDE 4 port. USE_CMAKE
+	  instructs port to utilize CMake —
+	  configuration tool widely spread among KDE 4 projects.
+	  USE_KDE4 brings dependency on KDE libraries and makes port using
+	  automoc4 at build stage. Required KDE components
+	  and other dependencies can be determined through configure log.
+	  USE_KDE4 does not imply USE_QT_VER.
+	  If port requires some of Qt4 components, USE_QT_VER should be set
+	  and then needed components can be specified.
+
+	  USE_CMAKE=     yes
+USE_KDE4=      automoc4 kdelibs kdeprefix
+USE_QT_VER=    4
+QT_COMPONENTS= qmake_build moc_build rcc_build uic_build
+	
+          
+
+        
+
     
       Using Java
 

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#14 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
     
@@ -1011,6 +1011,11 @@
       &pgpkey.cperciva;
     
 
+    
+      &a.csjp;
+      &pgpkey.csjp;
+    
+
     
       &a.gerald;
       &pgpkey.gerald;

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#23 (text+ko) ====

@@ -1,5 +1,5 @@
 
-
+
 
 
 
@@ -60,6 +60,7 @@
 
 
 
+
 
 
 

==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#21 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
  %developers;
@@ -2635,6 +2635,21 @@
      lstewart 
      Received 
   
+
+  
+     gavin 
+     3 Zip 100 drives
    
+	 3 3ware cards
+     mav 
+     Received 
+  
+
+  
+     Gareth Randall 
+     HP C1636-00100 SCSI tape drive 
+     cracauer 
+     Received 
+  
 
 
 &footer;

==== //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#7 (text+ko) ====

@@ -5,7 +5,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/usergroups.xml,v 1.80 2009/06/09 20:45:27 marius Exp $
+      $FreeBSD: www/share/sgml/usergroups.xml,v 1.81 2009/10/02 00:40:43 delphij Exp $
     
   
 
@@ -325,7 +325,7 @@
   
     
       The Serbian BSD User Group
-      http://www.bsd-srbija.org/
+      http://www.bsdserbia.org/
 
       The Serbian BSD Users Group provides an open forum
         for all things BSD-related in the Serbian language.  Located

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 11:23:02 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F33661065695; Fri,  2 Oct 2009 11:23:01 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B7E22106566B
	for ; Fri,  2 Oct 2009 11:23:01 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A77D68FC0A
	for ; Fri,  2 Oct 2009 11:23:01 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92BN17P002532
	for ; Fri, 2 Oct 2009 11:23:01 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92BN1M2002530
	for perforce@freebsd.org; Fri, 2 Oct 2009 11:23:01 GMT
	(envelope-from rene@FreeBSD.org)
Date: Fri, 2 Oct 2009 11:23:01 GMT
Message-Id: <200910021123.n92BN1M2002530@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169125 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 11:23:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=169125

Change 169125 by rene@rene_self on 2009/10/02 11:22:12

	MFen handbook/x11 1.194 -> 1.195

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#17 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#17 (text+ko) ====

@@ -3,7 +3,7 @@
 
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.21 2009/08/27 20:01:58 rene Exp $
      %SOURCE%	en_US.ISO8859-1/books/handbook/x11/chapter.sgml
-     %SRCID%	1.194
+     %SRCID%	1.195
 -->
 
 
@@ -1239,7 +1239,11 @@
     
       XDM gebruiken
 
-      De XDM daemon staat in
+      Om XDM te gebruiken moet de port
+	x11/xdm geïnstalleerd worden
+	(het wordt in recente versies van &xorg; niet
+	standaard geïnstalleerd).  Het daemon-programma
+	XDM is daarna beschikbaar in
 	/usr/local/bin/xdm.  Dit programma
 	kan als root altijd gestart worden en
 	regelt dan het X weergavegedeelte van de lokale machine.  Als

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 12:32:27 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1B7421065695; Fri,  2 Oct 2009 12:32:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D4257106568B
	for ; Fri,  2 Oct 2009 12:32:26 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C20388FC13
	for ; Fri,  2 Oct 2009 12:32:26 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92CWQxb008467
	for ; Fri, 2 Oct 2009 12:32:26 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92CWQC5008465
	for perforce@freebsd.org; Fri, 2 Oct 2009 12:32:26 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 2 Oct 2009 12:32:26 GMT
Message-Id: <200910021232.n92CWQC5008465@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 
Cc: 
Subject: PERFORCE change 169127 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 12:32:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=169127

Change 169127 by rwatson@rwatson_freebsd_capabilities on 2009/10/02 12:32:03

	Close a race in which a process managed using a process descriptor is
	exiting simultaneously with the process descriptor being closed by
	extending coverage of the proctree lock during close.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#13 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_procdesc.c#13 (text+ko) ====

@@ -337,11 +337,11 @@
 	pd = fp->f_data;
 	fp->f_ops = &badfileops;
 	fp->f_data = NULL;
+
+	sx_xlock(&proctree_lock);
 	PROCDESC_LOCK(pd);
 	pd->pd_flags |= PD_CLOSED;
 	PROCDESC_UNLOCK(pd);
-
-	sx_xlock(&proctree_lock);
 	p = pd->pd_proc;
 	PROC_LOCK(p);
 	if (p->p_state == PRS_ZOMBIE) {

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 14:42:49 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A85C1106568B; Fri,  2 Oct 2009 14:42:49 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6141D106568F
	for ; Fri,  2 Oct 2009 14:42:49 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4EEB08FC39
	for ; Fri,  2 Oct 2009 14:42:49 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92EgnAA029745
	for ; Fri, 2 Oct 2009 14:42:49 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92EgnCw029743
	for perforce@freebsd.org; Fri, 2 Oct 2009 14:42:49 GMT
	(envelope-from stas@freebsd.org)
Date: Fri, 2 Oct 2009 14:42:49 GMT
Message-Id: <200910021442.n92EgnCw029743@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169130 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 14:42:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=169130

Change 169130 by stas@stas_yandex on 2009/10/02 14:42:33

	- Add the workaround for memcheck's mprotect issue.  Memcheck
	  tracking scheme doesn't allow to mark memory bytes as
	  unaddressable and defined simultaneously so if we mark
	  them unaccessible on mprotect with PROT_NONE we loose
	  any information on definiteness.  So don't alter flags
	  at all of permissions get decreased and operate only on
	  unaccessible bytes if additional read/write permissions
	  were granted.

Affected files ...

.. //depot/projects/valgrind/memcheck/mc_main.c#6 edit

Differences ...

==== //depot/projects/valgrind/memcheck/mc_main.c#6 (text+ko) ====

@@ -1635,13 +1635,38 @@
    }
 }
 
+static void make_mem_defined_if_unaddressable ( Addr a, SizeT len )
+{
+   SizeT i;
+   UChar vabits2;
+   DEBUG("make_mem_defined_if_unaddressable(%p, %llu)\n", a, (ULong)len);
+   for (i = 0; i < len; i++) {
+      vabits2 = get_vabits2( a+i );
+      if (vabits2 == VA_BITS2_NOACCESS) {
+         set_vabits2(a+i, VA_BITS2_DEFINED);
+         if (UNLIKELY(MC_(clo_mc_level) >= 3)) {
+            MC_(helperc_b_store1)( a+i, 0 ); /* clear the origin tag */
+         } 
+      }
+   }
+}
+
 /* Track changes in the virtual memory space. */
 static void track_perms_change( Addr a, SizeT len,
                       Bool rr, Bool ww, Bool xx )
 {
+/*
    if (!(rr || ww))
       MC_(make_mem_noaccess) ( a, len );
-   MC_(make_mem_defined) ( a, len );
+*/
+   /*
+    * Valgrind's memory management implementation is brain-damaged
+    * so we can't mark memory as unaccessible but defined :-(
+    * Thus we don't alter it if the new bits indicate the range
+    * as unaccessible and only change access bits for unaccessible
+    * bytes if permissions were given
+    */
+   make_mem_defined_if_unaddressable ( a, len );
 }
 
 

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 14:46:54 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 85FE91065679; Fri,  2 Oct 2009 14:46:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 492EC1065670
	for ; Fri,  2 Oct 2009 14:46:54 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1C1738FC12
	for ; Fri,  2 Oct 2009 14:46:54 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92Ekrh6030033
	for ; Fri, 2 Oct 2009 14:46:53 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92EkrWq030031
	for perforce@freebsd.org; Fri, 2 Oct 2009 14:46:53 GMT
	(envelope-from stas@freebsd.org)
Date: Fri, 2 Oct 2009 14:46:53 GMT
Message-Id: <200910021446.n92EkrWq030031@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169131 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 14:46:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=169131

Change 169131 by stas@stas_yandex on 2009/10/02 14:46:18

	- Add forgotten conditional.

Affected files ...

.. //depot/projects/valgrind/memcheck/mc_main.c#7 edit

Differences ...

==== //depot/projects/valgrind/memcheck/mc_main.c#7 (text+ko) ====

@@ -1666,7 +1666,8 @@
     * as unaccessible and only change access bits for unaccessible
     * bytes if permissions were given
     */
-   make_mem_defined_if_unaddressable ( a, len );
+   if (rr || ww)
+      make_mem_defined_if_unaddressable ( a, len );
 }
 
 

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 14:46:54 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C268C1065753; Fri,  2 Oct 2009 14:46:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 634AE1065672
	for ; Fri,  2 Oct 2009 14:46:54 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4735B8FC16
	for ; Fri,  2 Oct 2009 14:46:54 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92EkrwU030038
	for ; Fri, 2 Oct 2009 14:46:53 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92EkrkE030036
	for perforce@freebsd.org; Fri, 2 Oct 2009 14:46:53 GMT
	(envelope-from stas@freebsd.org)
Date: Fri, 2 Oct 2009 14:46:53 GMT
Message-Id: <200910021446.n92EkrkE030036@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169132 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 14:46:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=169132

Change 169132 by stas@stas_yandex on 2009/10/02 14:46:47

	- Reflect the line numbers change in addressable test.

Affected files ...

.. //depot/projects/valgrind/memcheck/tests/addressable.stderr.exp#5 edit

Differences ...

==== //depot/projects/valgrind/memcheck/tests/addressable.stderr.exp#5 (text+ko) ====

@@ -9,26 +9,16 @@
 For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 Unaddressable byte(s) found during client check request
-   at 0x........: test2 (addressable.c:48)
-   by 0x........: main (addressable.c:125)
+   at 0x........: test2 (addressable.c:50)
+   by 0x........: main (addressable.c:127)
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 Invalid write of size 1
-   at 0x........: test2 (addressable.c:51)
-   by 0x........: main (addressable.c:125)
+   at 0x........: test2 (addressable.c:53)
+   by 0x........: main (addressable.c:127)
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 
-Process terminating with default action of signal N (SIGSEGV or SIGBUS)
- Bad memory (SIGSEGV or SIGBUS) at address 0x........
-   at 0x........: test2 (addressable.c:51)
-   by 0x........: main (addressable.c:125)
- If you believe this happened as a result of a stack
- overflow in your program's main thread (unlikely but
- possible), you can try to increase the size of the
- main thread stack using the --main-stacksize= flag.
- The main thread stack size used in this run was ....
-
 HEAP SUMMARY:
     in use at exit: ... bytes in ... blocks
   total heap usage: ... allocs, ... frees, ... bytes allocated
@@ -36,38 +26,15 @@
 For a detailed leak analysis, rerun with: --leak-check=full
 
 For counts of detected and suppressed errors, rerun with: -v
-ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
-
-HEAP SUMMARY:
-    in use at exit: ... bytes in ... blocks
-  total heap usage: ... allocs, ... frees, ... bytes allocated
-
-For a detailed leak analysis, rerun with: --leak-check=full
-
-For counts of detected and suppressed errors, rerun with: -v
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-
-Process terminating with default action of signal N (SIGSEGV or SIGBUS)
- Bad memory (SIGSEGV or SIGBUS) at address 0x........
-   at 0x........: test4 (addressable.c:74)
-   by 0x........: main (addressable.c:125)
-
-HEAP SUMMARY:
-    in use at exit: ... bytes in ... blocks
-  total heap usage: ... allocs, ... frees, ... bytes allocated
-
-For a detailed leak analysis, rerun with: --leak-check=full
-
-For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 Uninitialised byte(s) found during client check request
-   at 0x........: test5 (addressable.c:85)
-   by 0x........: main (addressable.c:125)
+   at 0x........: test5 (addressable.c:87)
+   by 0x........: main (addressable.c:127)
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 Uninitialised byte(s) found during client check request
-   at 0x........: test5 (addressable.c:91)
-   by 0x........: main (addressable.c:125)
+   at 0x........: test5 (addressable.c:93)
+   by 0x........: main (addressable.c:127)
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 15:12:22 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 72C26106568B; Fri,  2 Oct 2009 15:12:22 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 375651065679
	for ; Fri,  2 Oct 2009 15:12:22 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 250588FC0C
	for ; Fri,  2 Oct 2009 15:12:22 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92FCLCx032867
	for ; Fri, 2 Oct 2009 15:12:21 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92FCLEl032865
	for perforce@freebsd.org; Fri, 2 Oct 2009 15:12:21 GMT
	(envelope-from stas@freebsd.org)
Date: Fri, 2 Oct 2009 15:12:21 GMT
Message-Id: <200910021512.n92FCLEl032865@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169133 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 15:12:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=169133

Change 169133 by stas@stas_yandex on 2009/10/02 15:11:31

	- Use the same exit(2) parameter name as other OSes does - that's
	  what regressions tests expect.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#45 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#45 (text+ko) ====

@@ -693,7 +693,7 @@
    ThreadState* tst;
 
    PRINT("exit( %ld )", ARG1);
-   PRE_REG_READ1(void, "exit", int, exitcode);
+   PRE_REG_READ1(void, "exit", int, status);
    tst = VG_(get_ThreadState)(tid);
 
    /* Mark all threads (including this one) to exit. */

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 15:34:46 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C7E6A1065676; Fri,  2 Oct 2009 15:34:46 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8C3741065670
	for ; Fri,  2 Oct 2009 15:34:46 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 799E58FC14
	for ; Fri,  2 Oct 2009 15:34:46 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92FYk92034400
	for ; Fri, 2 Oct 2009 15:34:46 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92FYkR1034398
	for perforce@freebsd.org; Fri, 2 Oct 2009 15:34:46 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Fri, 2 Oct 2009 15:34:46 GMT
Message-Id: <200910021534.n92FYkR1034398@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169134 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 15:34:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=169134

Change 169134 by truncs@aditya on 2009/10/02 15:34:00

	Fix typo.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/fs.h#5 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/fs.h#5 (text+ko) ====

@@ -68,7 +68,7 @@
  * which tell the system the average file size and the average number
  * of files per directory. These defaults are well selected for typical
  * filesystems, but may need to be tuned for odd cases like filesystems
- * being used for sqiud caches or news spools.
+ * being used for squid caches or news spools.
  * AVFPDIR is the expected number of files per directory. AVGDIRSIZE is 
  * obtained by multiplying AVFPDIR and AVFILESIZ which is assumed to be 
  * 16384.

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 16:00:15 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EBF0D106568D; Fri,  2 Oct 2009 16:00:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A72B71065672
	for ; Fri,  2 Oct 2009 16:00:14 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 947778FC1A
	for ; Fri,  2 Oct 2009 16:00:14 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92G0ESn036187
	for ; Fri, 2 Oct 2009 16:00:14 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92G0EIa036185
	for perforce@freebsd.org; Fri, 2 Oct 2009 16:00:14 GMT
	(envelope-from stas@freebsd.org)
Date: Fri, 2 Oct 2009 16:00:14 GMT
Message-Id: <200910021600.n92G0EIa036185@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169135 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 16:00:15 -0000

http://perforce.freebsd.org/chv.cgi?CH=169135

Change 169135 by stas@stas_yandex on 2009/10/02 15:59:57

	- Fix a couple of regressions tests.

Affected files ...

.. //depot/projects/valgrind/memcheck/tests/amd64/Makefile.am#4 edit
.. //depot/projects/valgrind/memcheck/tests/amd64/xor-undef-amd64.stderr.exp-freebsd#1 add
.. //depot/projects/valgrind/memcheck/tests/noisy_child.stderr.exp#4 edit

Differences ...

==== //depot/projects/valgrind/memcheck/tests/amd64/Makefile.am#4 (text+ko) ====

@@ -18,7 +18,7 @@
 	more_x87_fp.stderr.exp more_x87_fp.stdout.exp more_x87_fp.vgtest \
 	sse_memory.stderr.exp sse_memory.stdout.exp sse_memory.vgtest \
 	xor-undef-amd64.stderr.exp xor-undef-amd64.stdout.exp \
-	xor-undef-amd64.vgtest
+	xor-undef-amd64.stderr.exp-freebsd xor-undef-amd64.vgtest
 
 check_PROGRAMS = bt_everything bug132146 fxsave-amd64 \
 		xor-undef-amd64

==== //depot/projects/valgrind/memcheck/tests/noisy_child.stderr.exp#4 (text+ko) ====

@@ -12,6 +12,23 @@
    at 0x........: free (vg_replace_malloc.c:...)
    by 0x........: main (noisy_child.c:24)
 
+Invalid free() / delete / delete[]
+   at 0x........: free (vg_replace_malloc.c:...)
+   by 0x........: do_child_badness (noisy_child.c:10)
+   by 0x........: main (noisy_child.c:34)
+ Address 0x........ is 0 bytes inside a block of size 10 free'd
+   at 0x........: free (vg_replace_malloc.c:...)
+   by 0x........: main (noisy_child.c:24)
+
+
+HEAP SUMMARY:
+    in use at exit: ... bytes in ... blocks
+  total heap usage: ... allocs, ... frees, ... bytes allocated
+
+For a detailed leak analysis, rerun with: --leak-check=full
+
+For counts of detected and suppressed errors, rerun with: -v
+ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
 
 HEAP SUMMARY:
     in use at exit: ... bytes in ... blocks

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 16:07:22 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AB3A110656A3; Fri,  2 Oct 2009 16:07:22 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6FE261065696
	for ; Fri,  2 Oct 2009 16:07:22 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 435608FC08
	for ; Fri,  2 Oct 2009 16:07:22 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92G7MR4037630
	for ; Fri, 2 Oct 2009 16:07:22 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92G7M9p037628
	for perforce@freebsd.org; Fri, 2 Oct 2009 16:07:22 GMT
	(envelope-from stas@freebsd.org)
Date: Fri, 2 Oct 2009 16:07:22 GMT
Message-Id: <200910021607.n92G7M9p037628@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169136 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 16:07:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=169136

Change 169136 by stas@stas_yandex on 2009/10/02 16:06:58

	- Account for 32-bit version of ld-elf in FreeBSD suppressions
	  file as well.

Affected files ...

.. //depot/projects/valgrind/freebsd.supp#5 edit

Differences ...

==== //depot/projects/valgrind/freebsd.supp#5 (text+ko) ====

@@ -7,7 +7,7 @@
 {
    rtld-1
    Memcheck:Cond
-   obj:/libexec/ld-elf.so.1
+   obj:/libexec/ld-elf*.so.1
 }
 {
    libc puts leak

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 17:16:39 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9B0371065693; Fri,  2 Oct 2009 17:16:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5F946106568B
	for ; Fri,  2 Oct 2009 17:16:38 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2E4F68FC0C
	for ; Fri,  2 Oct 2009 17:16:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92HGc51053740
	for ; Fri, 2 Oct 2009 17:16:38 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92HGc0e053738
	for perforce@freebsd.org; Fri, 2 Oct 2009 17:16:38 GMT
	(envelope-from stas@freebsd.org)
Date: Fri, 2 Oct 2009 17:16:38 GMT
Message-Id: <200910021716.n92HGc0e053738@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169138 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 17:16:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=169138

Change 169138 by stas@stas_yandex on 2009/10/02 17:15:51

	- It's safer to use types that actually assumed later.

Affected files ...

.. //depot/projects/valgrind/memcheck/tests/x86/more_x86_fp.c#3 edit

Differences ...

==== //depot/projects/valgrind/memcheck/tests/x86/more_x86_fp.c#3 (text+ko) ====

@@ -87,7 +87,7 @@
     long double la;
     int16_t fpuc;
     int i;
-    int64_t lla;
+    long long int lla;
     int ia;
     int16_t wa;
     double ra;

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 17:20:43 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F36651065676; Fri,  2 Oct 2009 17:20:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B7004106566B
	for ; Fri,  2 Oct 2009 17:20:42 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A42458FC17
	for ; Fri,  2 Oct 2009 17:20:42 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92HKgNv054090
	for ; Fri, 2 Oct 2009 17:20:42 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92HKgnC054088
	for perforce@freebsd.org; Fri, 2 Oct 2009 17:20:42 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 2 Oct 2009 17:20:42 GMT
Message-Id: <200910021720.n92HKgnC054088@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169139 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 17:20:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=169139

Change 169139 by trasz@trasz_victim on 2009/10/02 17:20:24

	Rework rule storage to store pointers to subjects instead of their
	id's.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/TODO#11 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#61 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#14 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#12 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_proc.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#22 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#24 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#34 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/TODO#11 (text+ko) ====

@@ -1,7 +1,4 @@
 
- - In hrl_rule, instead of keeping subject ids, keep links to a process,
-   uidinfo and gidinfo, the same way we do with loginclasses.
-
  - Why did I put the loginclass pointer into the proc and not into the cred?
 
  - Make the limits lists protected by the subjects lock (e.g. process lock)

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#61 (text+ko) ====

@@ -71,11 +71,11 @@
 };
 
 struct dict subjectnames[] = {
-	{ "process", HRL_SUBJECT_PROCESS },
-	{ "user", HRL_SUBJECT_USER },
-	{ "group", HRL_SUBJECT_GROUP },
-	{ "loginclass", HRL_SUBJECT_LOGINCLASS },
-	{ "jail", HRL_SUBJECT_JAIL },
+	{ "process", HRL_SUBJECT_TYPE_PROCESS },
+	{ "user", HRL_SUBJECT_TYPE_USER },
+	{ "group", HRL_SUBJECT_TYPE_GROUP },
+	{ "loginclass", HRL_SUBJECT_TYPE_LOGINCLASS },
+	{ "jail", HRL_SUBJECT_TYPE_JAIL },
 	{ NULL, -1 }};
 
 struct dict resourcenames[] = {
@@ -195,7 +195,7 @@
 }
 
 static const char *
-hrl_subject_name(int subject)
+hrl_subject_type_name(int subject)
 {
 	int i;
 
@@ -204,7 +204,7 @@
 			return (subjectnames[i].d_name);
 	}
 
-	panic("hrl_subject_name: unknown subject");
+	panic("hrl_subject_type_name: unknown subject type %d", subject);
 }
 
 static const char *
@@ -217,7 +217,7 @@
 			return (actionnames[i].d_name);
 	}
 
-	panic("hrl_action_name: unknown action");
+	panic("hrl_action_name: unknown action %d", action);
 }
 
 static const char *
@@ -230,7 +230,7 @@
 			return (resourcenames[i].d_name);
 	}
 
-	panic("hrl_resource_name: unknown resource");
+	panic("hrl_resource_name: unknown resource %d", resource);
 }
 
 static void
@@ -259,26 +259,26 @@
 hrl_available_resource(const struct proc *p, const struct hrl_rule *rule)
 {
 	int resource, i;
-	int64_t available, found = 0;
+	int64_t available = INT64_MAX, found = 0;
 	struct ucred *cred = p->p_ucred;
 
 	mtx_assert(&hrl_lock, MA_OWNED);
 
 	resource = rule->hr_resource;
 	switch (rule->hr_per) {
-	case HRL_SUBJECT_PROCESS:
+	case HRL_SUBJECT_TYPE_PROCESS:
 		available = rule->hr_amount -
 		    p->p_usage.hu_resources[resource];
 		break;
-	case HRL_SUBJECT_USER:
+	case HRL_SUBJECT_TYPE_USER:
 		available = rule->hr_amount -
 		    cred->cr_ruidinfo->ui_usage.hu_resources[resource];
 		break;
-	case HRL_SUBJECT_GROUP:
+	case HRL_SUBJECT_TYPE_GROUP:
 		if (hrl_group_accounting) {
 			for (i = 0; i < cred->cr_ngroups; i++) {
-				if (cred->cr_gidinfos[i]->gi_gid !=
-				    rule->hr_subject_id)
+				if (cred->cr_gidinfos[i] !=
+				    rule->hr_subject.hs_gip)
 					continue;
 
 				found = 1;
@@ -288,12 +288,12 @@
 			KASSERT(found, ("hrl_available_resource: group not found"));
 		}
 		break;
-	case HRL_SUBJECT_LOGINCLASS:
+	case HRL_SUBJECT_TYPE_LOGINCLASS:
 		available = rule->hr_amount -
 		    p->p_loginclass->lc_usage.hu_resources[resource];
-		available = INT64_MAX;
+		available = INT64_MAX; /* XXX */
 		break;
-	case HRL_SUBJECT_JAIL:
+	case HRL_SUBJECT_TYPE_JAIL:
 		available = rule->hr_amount -
 		    cred->cr_prison->pr_usage.hu_resources[resource];
 		break;
@@ -479,11 +479,11 @@
 	struct ucred *cred;
 	struct prison *pr;
 
-	KASSERT(amount > 0, ("hrl_alloc: invalid amount for %s: %lld",
+	KASSERT(amount > 0, ("hrl_alloc: invalid amount for %s: %ju",
 	    hrl_resource_name(resource), amount));
 
 #if 0
-	printf("hrl_alloc: allocating %lld of %s for %s (pid %d)\n", amount, hrl_resource_name(resource), p->p_comm, p->p_pid);
+	printf("hrl_alloc: allocating %ju of %s for %s (pid %d)\n", amount, hrl_resource_name(resource), p->p_comm, p->p_pid);
 #endif
 
 	mtx_lock(&hrl_lock);
@@ -540,7 +540,7 @@
 	struct ucred *cred;
 	struct prison *pr;
 
-	KASSERT(amount >= 0, ("hrl_allocated: invalid amount for %s: %lld",
+	KASSERT(amount >= 0, ("hrl_allocated: invalid amount for %s: %ju",
 	    hrl_resource_name(resource), amount));
 
 #if 0
@@ -599,7 +599,7 @@
 	struct ucred *cred;
 	struct prison *pr;
 
-	KASSERT(amount > 0, ("hrl_free: invalid amount for %s: %lld",
+	KASSERT(amount > 0, ("hrl_free: invalid amount for %s: %ju",
 	    hrl_resource_name(resource), amount));
 
 #if 0
@@ -608,8 +608,8 @@
 
 	mtx_lock(&hrl_lock);
 	KASSERT(amount <= p->p_usage.hu_resources[resource],
-	    ("hrl_free: freeing %lld of %s, which is more than allocated "
-	    "%lld for %s (pid %d)", amount, hrl_resource_name(resource),
+	    ("hrl_free: freeing %ju of %s, which is more than allocated "
+	    "%ld for %s (pid %d)", amount, hrl_resource_name(resource),
 	    p->p_usage.hu_resources[resource], p->p_comm, p->p_pid));
 	p->p_usage.hu_resources[resource] -= amount;
 	p->p_loginclass->lc_usage.hu_resources[resource] -= amount;
@@ -684,14 +684,40 @@
 hrl_rule_matches(const struct hrl_rule *rule, const struct hrl_rule *filter)
 {
 
-	if (filter->hr_subject != HRL_SUBJECT_UNDEFINED) {
-		if (rule->hr_subject != filter->hr_subject)
+	if (filter->hr_subject_type != HRL_SUBJECT_TYPE_UNDEFINED) {
+		if (rule->hr_subject_type != filter->hr_subject_type)
 			return (0);
-	}
 
-	if (filter->hr_subject_id != HRL_SUBJECT_ID_UNDEFINED) {
-		if (rule->hr_subject_id != filter->hr_subject_id)
-			return (0);
+		switch (filter->hr_subject_type) {
+		case HRL_SUBJECT_TYPE_PROCESS:
+			if (filter->hr_subject.hs_proc !=
+			    filter->hr_subject.hs_proc)
+				return (0);
+			break;
+		case HRL_SUBJECT_TYPE_USER:
+			if (filter->hr_subject.hs_uip !=
+			    filter->hr_subject.hs_uip)
+				return (0);
+			break;
+		case HRL_SUBJECT_TYPE_GROUP:
+			if (filter->hr_subject.hs_gip !=
+			    filter->hr_subject.hs_gip)
+				return (0);
+			break;
+		case HRL_SUBJECT_TYPE_LOGINCLASS:
+			if (filter->hr_subject.hs_loginclass !=
+			    filter->hr_subject.hs_loginclass)
+				return (0);
+			break;
+		case HRL_SUBJECT_TYPE_JAIL:
+			if (filter->hr_subject.hs_prison !=
+			    filter->hr_subject.hs_prison)
+				return (0);
+			break;
+		default:
+			panic("hrl_rule_matches: unknown subject type %d",
+			    filter->hr_subject_type);
+		}
 	}
 
 	if (filter->hr_resource != HRL_RESOURCE_UNDEFINED) {
@@ -709,7 +735,7 @@
 			return (0);
 	}
 
-	if (filter->hr_per != HRL_SUBJECT_UNDEFINED) {
+	if (filter->hr_per != HRL_SUBJECT_TYPE_UNDEFINED) {
 		if (rule->hr_per != filter->hr_per)
 			return (0);
 	}
@@ -828,6 +854,69 @@
 	return (removed);
 }
 
+static void
+hrl_rule_acquire_subject(struct hrl_rule *rule)
+{
+
+	switch (rule->hr_subject_type) {
+	case HRL_SUBJECT_TYPE_UNDEFINED:
+	case HRL_SUBJECT_TYPE_PROCESS:
+		break;
+	case HRL_SUBJECT_TYPE_USER:
+		if (rule->hr_subject.hs_uip != NULL)
+			uihold(rule->hr_subject.hs_uip);
+		break;
+	case HRL_SUBJECT_TYPE_GROUP:
+		if (rule->hr_subject.hs_gip != NULL)
+			gihold(rule->hr_subject.hs_gip);
+		break;
+	case HRL_SUBJECT_TYPE_LOGINCLASS:
+		if (rule->hr_subject.hs_loginclass != NULL)
+			loginclass_acquire(rule->hr_subject.hs_loginclass);
+		break;
+	case HRL_SUBJECT_TYPE_JAIL:
+		if (rule->hr_subject.hs_loginclass != NULL)
+			prison_hold(rule->hr_subject.hs_prison);
+		break;
+	default:
+		panic("hrl_rule_acquire_subject: unknown subject type %d",
+		    rule->hr_subject_type);
+	}
+}
+
+static void
+hrl_rule_release_subject(struct hrl_rule *rule)
+{
+
+	switch (rule->hr_subject_type) {
+	case HRL_SUBJECT_TYPE_UNDEFINED:
+	case HRL_SUBJECT_TYPE_PROCESS:
+		break;
+	case HRL_SUBJECT_TYPE_USER:
+		if (rule->hr_subject.hs_uip != NULL)
+			uifree(rule->hr_subject.hs_uip);
+		break;
+	case HRL_SUBJECT_TYPE_GROUP:
+		if (rule->hr_subject.hs_gip != NULL)
+			gifree(rule->hr_subject.hs_gip);
+		break;
+	case HRL_SUBJECT_TYPE_LOGINCLASS:
+		if (rule->hr_subject.hs_loginclass != NULL)
+			loginclass_release(rule->hr_subject.hs_loginclass);
+		break;
+	case HRL_SUBJECT_TYPE_JAIL:
+		if (rule->hr_subject.hs_prison != NULL) {
+			prison_free(rule->hr_subject.hs_prison);
+			sx_xunlock(&allprison_lock);
+		}
+		break;
+	default:
+		panic("hrl_rule_release_subject: unknown subject type %d",
+		    rule->hr_subject_type);
+	}
+}
+
+
 struct hrl_rule *
 hrl_rule_alloc(int flags)
 {
@@ -836,9 +925,13 @@
 	rule = uma_zalloc(hrl_rule_zone, flags);
 	if (rule == NULL)
 		return (NULL);
-	rule->hr_subject = HRL_SUBJECT_UNDEFINED;
-	rule->hr_subject_id = HRL_SUBJECT_ID_UNDEFINED;
-	rule->hr_per = HRL_SUBJECT_UNDEFINED;
+	rule->hr_subject_type = HRL_SUBJECT_TYPE_UNDEFINED;
+	rule->hr_subject.hs_proc = NULL;
+	rule->hr_subject.hs_uip = NULL;
+	rule->hr_subject.hs_gip = NULL;
+	rule->hr_subject.hs_loginclass = NULL;
+	rule->hr_subject.hs_prison = NULL;
+	rule->hr_per = HRL_SUBJECT_TYPE_UNDEFINED;
 	rule->hr_resource = HRL_RESOURCE_UNDEFINED;
 	rule->hr_action = HRL_ACTION_UNDEFINED;
 	rule->hr_amount = HRL_AMOUNT_UNDEFINED;
@@ -855,13 +948,18 @@
 	copy = uma_zalloc(hrl_rule_zone, flags);
 	if (copy == NULL)
 		return (NULL);
-	copy->hr_subject = rule->hr_subject;
-	copy->hr_subject_id = rule->hr_subject_id;
+	copy->hr_subject_type = rule->hr_subject_type;
+	copy->hr_subject.hs_proc = rule->hr_subject.hs_proc;
+	copy->hr_subject.hs_uip = rule->hr_subject.hs_uip;
+	copy->hr_subject.hs_gip = rule->hr_subject.hs_gip;
+	copy->hr_subject.hs_loginclass = rule->hr_subject.hs_loginclass;
+	copy->hr_subject.hs_prison = rule->hr_subject.hs_prison;
 	copy->hr_per = rule->hr_per;
 	copy->hr_resource = rule->hr_resource;
 	copy->hr_action = rule->hr_action;
 	copy->hr_amount = rule->hr_amount;
 	refcount_init(©->hr_refcount, 1);
+	hrl_rule_acquire_subject(copy);
 
 	return (copy);
 }
@@ -882,10 +980,7 @@
 	KASSERT(rule->hr_refcount > 0, ("rule->hr_refcount > 0"));
 
 	if (refcount_release(&rule->hr_refcount)) {
-		if (rule->hr_subject == HRL_SUBJECT_LOGINCLASS &&
-		    rule->hr_subject_id != HRL_SUBJECT_ID_UNDEFINED)
-			loginclass_release((struct loginclass *)(long)
-			    rule->hr_subject_id);
+		hrl_rule_release_subject(rule);
 		uma_zfree(hrl_rule_zone, rule);
 	}
 }
@@ -894,17 +989,40 @@
 hrl_rule_fully_specified(const struct hrl_rule *rule)
 {
 
-	if (rule->hr_subject == HRL_SUBJECT_UNDEFINED)
+	switch (rule->hr_subject_type) {
+	case HRL_SUBJECT_TYPE_UNDEFINED:
 		return (0);
-	if (rule->hr_subject_id == HRL_SUBJECT_ID_UNDEFINED)
-		return (0);
+	case HRL_SUBJECT_TYPE_PROCESS:
+		if (rule->hr_subject.hs_proc == NULL)
+			return (0);
+		break;
+	case HRL_SUBJECT_TYPE_USER:
+		if (rule->hr_subject.hs_uip == NULL)
+			return (0);
+		break;
+	case HRL_SUBJECT_TYPE_GROUP:
+		if (rule->hr_subject.hs_gip == NULL)
+			return (0);
+		break;
+	case HRL_SUBJECT_TYPE_LOGINCLASS:
+		if (rule->hr_subject.hs_loginclass == NULL)
+			return (0);
+		break;
+	case HRL_SUBJECT_TYPE_JAIL:
+		if (rule->hr_subject.hs_prison == NULL)
+			return (0);
+		break;
+	default:
+		panic("hrl_rule_fully_specified: unknown subject type %d",
+		    rule->hr_subject_type);
+	}
 	if (rule->hr_resource == HRL_RESOURCE_UNDEFINED)
 		return (0);
 	if (rule->hr_action == HRL_ACTION_UNDEFINED)
 		return (0);
 	if (rule->hr_amount == HRL_AMOUNT_UNDEFINED)
 		return (0);
-	if (rule->hr_per == HRL_SUBJECT_UNDEFINED)
+	if (rule->hr_per == HRL_SUBJECT_TYPE_UNDEFINED)
 		return (0);
 
 	return (1);
@@ -913,11 +1031,11 @@
 static struct hrl_rule *
 hrl_rule_from_string(char *rulestr)
 {
-	int error;
+	int error = 0;
 	char *subjectstr, *subject_idstr, *resourcestr, *actionstr,
 	     *amountstr, *perstr;
-	struct loginclass *lc;
 	struct hrl_rule *rule;
+	id_t id;
 
 	rule = hrl_rule_alloc(M_WAITOK);
 
@@ -929,32 +1047,64 @@
 	perstr = rulestr;
 
 	if (subjectstr == NULL || subjectstr[0] == '\0')
-		rule->hr_subject = HRL_SUBJECT_UNDEFINED;
+		rule->hr_subject_type = HRL_SUBJECT_TYPE_UNDEFINED;
 	else {
-		error = str2value(subjectstr, &rule->hr_subject, subjectnames);
+		error = str2value(subjectstr, &rule->hr_subject_type, subjectnames);
 		if (error)
 			goto out;
 	}
 
-	/*
-	 * Login classes don't have any ID.  Instead, we just put a pointer
-	 * to the 'struct loginclass' into the hr_subject_id field.
-	 */
-	if (rule->hr_subject == HRL_SUBJECT_LOGINCLASS) {
-		if (subject_idstr == NULL || subject_idstr[0] == '\0') {
-			rule->hr_subject_id = HRL_SUBJECT_ID_UNDEFINED;
-		} else {
-			lc = loginclass_find(subject_idstr);
-			rule->hr_subject_id = (long)lc;
-		}
+	if (subject_idstr == NULL || subject_idstr[0] == '\0') {
+		rule->hr_subject.hs_proc = NULL;
+		rule->hr_subject.hs_uip = NULL;
+		rule->hr_subject.hs_gip = NULL;
+		rule->hr_subject.hs_loginclass = NULL;
+		rule->hr_subject.hs_prison = NULL;
 	} else {
-		if (subject_idstr == NULL || subject_idstr[0] == '\0')
-			rule->hr_subject_id = HRL_SUBJECT_ID_UNDEFINED;
-		else {
-			error = str2id(subject_idstr, &rule->hr_subject_id);
+
+		/*
+		 * Loginclasses don't have any numerical ID's.
+		 */
+		if (rule->hr_subject_type != HRL_SUBJECT_TYPE_LOGINCLASS) {
+			error = str2id(subject_idstr, &id);
 			if (error)
 				goto out;
 		}
+		switch (rule->hr_subject_type) {
+		case HRL_SUBJECT_TYPE_UNDEFINED:
+			error = EINVAL;
+			goto out;
+		case HRL_SUBJECT_TYPE_PROCESS:
+			sx_assert(&allproc_lock, SA_LOCKED);
+			rule->hr_subject.hs_proc = pfind(id);
+			if (rule->hr_subject.hs_proc == NULL) {
+				error = ESRCH;
+				goto out;
+			}
+			PROC_UNLOCK(rule->hr_subject.hs_proc);
+			break;
+		case HRL_SUBJECT_TYPE_USER:
+			rule->hr_subject.hs_uip = uifind(id);
+			break;
+		case HRL_SUBJECT_TYPE_GROUP:
+			rule->hr_subject.hs_gip = gifind(id);
+			break;
+		case HRL_SUBJECT_TYPE_LOGINCLASS:
+			rule->hr_subject.hs_loginclass = loginclass_find(subject_idstr);
+			break;
+		case HRL_SUBJECT_TYPE_JAIL:
+			sx_xlock(&allprison_lock);
+			rule->hr_subject.hs_prison = prison_find(id);
+			if (rule->hr_subject.hs_prison == NULL) {
+				sx_xunlock(&allprison_lock);
+				error = ESRCH;
+				goto out;
+			}
+			break;
+               default:
+                       panic("hrl_rule_from_string: unknown subject type %d",
+                           rule->hr_subject_type);
+               }
 	}
 
 	if (resourcestr == NULL || resourcestr[0] == '\0')
@@ -983,17 +1133,13 @@
 	}
 
 	if (perstr == NULL || perstr[0] == '\0')
-		rule->hr_per = HRL_SUBJECT_UNDEFINED;
+		rule->hr_per = HRL_SUBJECT_TYPE_UNDEFINED;
 	else {
 		error = str2value(perstr, &rule->hr_per, subjectnames);
 		if (error)
 			goto out;
 	}
 
-	if (rule->hr_subject_id != HRL_SUBJECT_ID_UNDEFINED &&
-	    rule->hr_subject == HRL_SUBJECT_UNDEFINED)
-		goto out;
-
 out:
 	if (error) {
 		hrl_rule_release(rule);
@@ -1019,8 +1165,8 @@
 
 	KASSERT(hrl_rule_fully_specified(rule), ("rule not fully specified"));
 
-	if ((rule->hr_subject == HRL_SUBJECT_GROUP ||
-	    rule->hr_per == HRL_SUBJECT_GROUP) && !hrl_group_accounting)
+	if ((rule->hr_subject_type == HRL_SUBJECT_TYPE_GROUP ||
+	    rule->hr_per == HRL_SUBJECT_TYPE_GROUP) && !hrl_group_accounting)
 		return (EOPNOTSUPP);
 
 	if (rule->hr_action == HRL_ACTION_DELAY)
@@ -1031,101 +1177,79 @@
 	 */
 	hrl_rule_remove(rule);
 
-	switch (rule->hr_subject) {
-	case HRL_SUBJECT_PROCESS:
-		/*
-		 * The sx lock is to keep the process from going away.
-		 */
-		sx_slock(&proctree_lock);
-		p = pfind(rule->hr_subject_id);
-		if (p == NULL) {
-			sx_sunlock(&proctree_lock);
-			return (ESRCH);
-		}
-
-		PROC_UNLOCK(p);
+	switch (rule->hr_subject_type) {
+	case HRL_SUBJECT_TYPE_PROCESS:
+		p = rule->hr_subject.hs_proc;
+		KASSERT(p != NULL, ("hrl_rule_add: NULL proc"));
 		hrl_limit_add(&p->p_limits, rule);
-		sx_sunlock(&proctree_lock);
 		/*
 		 * In case of per-process rule, we don't have anything more
 		 * to do.
 		 */
 		return (0);
 
-	case HRL_SUBJECT_USER:
-		uip = uifind(rule->hr_subject_id);
-		KASSERT(uip != NULL, ("hrl_rule_add: uifind failed"));
+	case HRL_SUBJECT_TYPE_USER:
+		uip = rule->hr_subject.hs_uip;
+		KASSERT(uip != NULL, ("hrl_rule_add: NULL uip"));
 		hrl_limit_add(&uip->ui_limits, rule);
-		/*
-		 * Don't call uifree(2); we don't want the uidinfo
-		 * to go away, because the rule should stay there even
-		 * if there are no processes with that uid.  The same
-		 * applies to the cases below.
-		 */
 		break;
 
-	case HRL_SUBJECT_GROUP:
-		gip = gifind_existing(rule->hr_subject_id);
-		KASSERT(gip != NULL, ("hrl_rule_add: gifind failed"));
+	case HRL_SUBJECT_TYPE_GROUP:
+		gip = rule->hr_subject.hs_gip;
+		KASSERT(gip != NULL, ("hrl_rule_add: NULL gip"));
 		hrl_limit_add(&gip->gi_limits, rule);
 		break;
 
-	case HRL_SUBJECT_LOGINCLASS:
-		lc = (struct loginclass *)(long)rule->hr_subject_id;
+	case HRL_SUBJECT_TYPE_LOGINCLASS:
+		lc = rule->hr_subject.hs_loginclass;
+		KASSERT(lc != NULL, ("hrl_rule_add: NULL loginclass"));
 		hrl_limit_add(&lc->lc_limits, rule);
 		break;
 
-	case HRL_SUBJECT_JAIL:
-		sx_xlock(&allprison_lock);
-		pr = prison_find(rule->hr_subject_id);
-		if (pr == NULL) {
-			sx_xunlock(&allprison_lock);
-			return (ESRCH);
-		}
+	case HRL_SUBJECT_TYPE_JAIL:
+		pr = rule->hr_subject.hs_prison;
+		KASSERT(pr != NULL, ("hrl_rule_add: NULL pr"));
 		hrl_limit_add(&pr->pr_limits, rule);
-		sx_xunlock(&allprison_lock);
 		break;
 
 	default:
-		panic("hrl_rule_add_limits: unknown subject %d",
-		    rule->hr_subject);
+		panic("hrl_rule_add_limits: unknown subject type %d",
+		    rule->hr_subject_type);
 	}
 
 	/*
 	 * Now go through all the processes and add the new rule to the ones
 	 * it applies to.
 	 */
-	sx_slock(&proctree_lock);
+	sx_assert(&allproc_lock, SA_LOCKED);
 	FOREACH_PROC_IN_SYSTEM(p) {
 		cred = p->p_ucred;
-		switch (rule->hr_subject) {
-		case HRL_SUBJECT_USER:
-			if (cred->cr_uid == rule->hr_subject_id ||
-			    cred->cr_ruid == rule->hr_subject_id)
+		switch (rule->hr_subject_type) {
+		case HRL_SUBJECT_TYPE_USER:
+			if (cred->cr_uidinfo == rule->hr_subject.hs_uip ||
+			    cred->cr_ruidinfo == rule->hr_subject.hs_uip)
 				break;
 			continue;
-		case HRL_SUBJECT_GROUP:
-			if (groupmember(rule->hr_subject_id, cred))
+		case HRL_SUBJECT_TYPE_GROUP:
+			if (groupmember(rule->hr_subject.hs_gip->gi_gid, cred))
 				break;
 			continue;
-		case HRL_SUBJECT_LOGINCLASS:
-			lc = (struct loginclass *)(long)rule->hr_subject_id; /* XXX: This line is here to remove cc warning; investigate. */
-			if (p->p_loginclass == lc)
+		case HRL_SUBJECT_TYPE_LOGINCLASS:
+			if (p->p_loginclass == rule->hr_subject.hs_loginclass)
 				break;
 			continue;
-		case HRL_SUBJECT_JAIL:
+		case HRL_SUBJECT_TYPE_JAIL:
 			for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
-				if (pr->pr_id == rule->hr_subject_id)
+				if (pr->pr_id == rule->hr_subject.hs_prison->pr_id)
 					break;
 			continue;
 		default:
-			panic("hrl_rule_add_limits: unknown subject %d",
-			    rule->hr_subject);
+			panic("hrl_rule_add_limits: unknown subject type %d",
+			    rule->hr_subject_type);
 		}
 
 		hrl_limit_add(&p->p_limits, rule);
 	}
-	sx_sunlock(&proctree_lock);
 
 	return (0);
 }
@@ -1148,15 +1272,10 @@
 	int error, found = 0;
 	struct proc *p;
 
-	if (filter->hr_subject == HRL_SUBJECT_PROCESS &&
-	    filter->hr_subject_id != HRL_SUBJECT_ID_UNDEFINED) {
-		sx_slock(&proctree_lock);
-		p = pfind(filter->hr_subject_id);
-		if (p == NULL)
-			return (ESRCH);
-		PROC_UNLOCK(p);
+	if (filter->hr_subject_type == HRL_SUBJECT_TYPE_PROCESS &&
+	    filter->hr_subject.hs_proc != NULL) {
+		p = filter->hr_subject.hs_proc;
 		found = hrl_limit_remove_matching(&p->p_limits, filter);
-		sx_sunlock(&proctree_lock);
 		if (found)
 			return (0);
 		return (ESRCH);
@@ -1172,13 +1291,12 @@
 	    (void *)&found);
 	KASSERT(error == 0, ("gi_limits_foreach failed"));
 
-	sx_slock(&proctree_lock);
+	sx_assert(&allproc_lock, SA_LOCKED);
 	FOREACH_PROC_IN_SYSTEM(p) {
 		found += hrl_limit_remove_matching(&p->p_limits, filter);
 		if (error == 0)
 			found = 1;
 	}
-	sx_sunlock(&proctree_lock);
 
 	if (found)
 		return (0);
@@ -1191,25 +1309,52 @@
 static void
 hrl_rule_to_sbuf(struct sbuf *sb, const struct hrl_rule *rule)
 {
-	if (rule->hr_subject == HRL_SUBJECT_LOGINCLASS) {
-		KASSERT(rule->hr_subject_id != HRL_SUBJECT_ID_UNDEFINED,
-		    ("rule->hr_subject_id != HRL_SUBJECT_ID_UNDEFINED"));
-		sbuf_printf(sb, "%s:%s:%s:%s=%jd",
-		    hrl_subject_name(rule->hr_subject),
-		    ((struct loginclass *)(long)rule->hr_subject_id)->lc_name,
-		    hrl_resource_name(rule->hr_resource),
-		    hrl_action_name(rule->hr_action),
-		    rule->hr_amount);
-	} else {
-		sbuf_printf(sb, "%s:%d:%s:%s=%jd",
-		    hrl_subject_name(rule->hr_subject),
-		    (int)rule->hr_subject_id,
-		    hrl_resource_name(rule->hr_resource),
-		    hrl_action_name(rule->hr_action),
-		    rule->hr_amount);
+
+	sbuf_printf(sb, "%s:", hrl_subject_type_name(rule->hr_subject_type));
+
+	switch (rule->hr_subject_type) {
+	case HRL_SUBJECT_TYPE_PROCESS:
+		if (rule->hr_subject.hs_proc == NULL)
+			sbuf_printf(sb, ":");
+		else
+			sbuf_printf(sb, "%d:", rule->hr_subject.hs_proc->p_pid);
+		break;
+	case HRL_SUBJECT_TYPE_USER:
+		if (rule->hr_subject.hs_uip == NULL)
+			sbuf_printf(sb, ":");
+		else
+			sbuf_printf(sb, "%d:", rule->hr_subject.hs_uip->ui_uid);
+		break;
+	case HRL_SUBJECT_TYPE_GROUP:
+		if (rule->hr_subject.hs_gip == NULL)
+			sbuf_printf(sb, ":");
+		else
+			sbuf_printf(sb, "%d:", rule->hr_subject.hs_gip->gi_gid);
+		break;
+	case HRL_SUBJECT_TYPE_LOGINCLASS:
+		if (rule->hr_subject.hs_loginclass == NULL)
+			sbuf_printf(sb, ":");
+		else
+			sbuf_printf(sb, "%s:", rule->hr_subject.hs_loginclass->lc_name);
+		break;
+	case HRL_SUBJECT_TYPE_JAIL:
+		if (rule->hr_subject.hs_prison == NULL)
+			sbuf_printf(sb, ":");
+		else
+			sbuf_printf(sb, "%d:", rule->hr_subject.hs_prison->pr_id);
+		break;
+	default:
+		panic("hrl_rule_to_sbuf: unknown subject type %d",
+		    rule->hr_subject_type);
 	}
-	if (rule->hr_per != rule->hr_subject)
-		sbuf_printf(sb, "/%s", hrl_subject_name(rule->hr_per));
+
+	sbuf_printf(sb, "%s:%s=%jd",
+	    hrl_resource_name(rule->hr_resource),
+	    hrl_action_name(rule->hr_action),
+	    rule->hr_amount);
+
+	if (rule->hr_per != rule->hr_subject_type)
+		sbuf_printf(sb, "/%s", hrl_subject_type_name(rule->hr_per));
 }
 
 /*
@@ -1273,87 +1418,6 @@
 	return (sb);
 }
 
-static int
-hrl_get_usage_pid(struct thread *td, id_t pid, struct sbuf **outputsbuf)
-{
-	struct proc *p;
-	struct hrl_usage usage;
-
-	if ((p = pfind(pid)) == NULL) {
-		if ((p = zpfind(pid)) == NULL)
-			return (ESRCH);
-	}
-	usage = p->p_usage;
-	PROC_UNLOCK(p);
-
-	*outputsbuf = hrl_usage_to_sbuf(&usage);
-
-	return (0);
-}
-
-static int
-hrl_get_usage_uid(struct thread *td, id_t uid, struct sbuf **outputsbuf)
-{
-	struct uidinfo *uip;
-
-	uip = uifind_existing(uid);
-	if (uip == NULL)
-		return (ESRCH);
-	*outputsbuf = hrl_usage_to_sbuf(&uip->ui_usage);
-	uifree(uip);
-
-	return (0);
-}
-
-static int
-hrl_get_usage_gid(struct thread *td, id_t gid, struct sbuf **outputsbuf)
-{
-	struct gidinfo *gip;
-
-	if (!hrl_group_accounting)
-		return (EOPNOTSUPP);
-
-	gip = gifind_existing(gid);
-	if (gip == NULL)
-		return (ESRCH);
-	*outputsbuf = hrl_usage_to_sbuf(&gip->gi_usage);
-	gifree(gip);
-
-	return (0);
-}
-
-static int
-hrl_get_usage_lc(struct thread *td, int lcp, struct sbuf **outputsbuf)
-{
-	struct loginclass *lc;
-
-	if (lcp == HRL_SUBJECT_ID_UNDEFINED)
-		return (EINVAL);
-
-	lc = (struct loginclass *)lcp;
-	*outputsbuf = hrl_usage_to_sbuf(&lc->lc_usage);
-
-	return (0);
-}
-
-static int
-hrl_get_usage_jid(struct thread *td, id_t jid, struct sbuf **outputsbuf)
-{
-	struct prison *pr;
-
-	sx_xlock(&allprison_lock);
-	pr = prison_find(jid);
-	if (pr == NULL) {
-		sx_xunlock(&allprison_lock);
-		return (ENOENT);
-	}
-	*outputsbuf = hrl_usage_to_sbuf(&pr->pr_usage);
-	prison_free(pr);
-	sx_xunlock(&allprison_lock);
-
-	return (0);
-}
-
 int
 hrl_get_usage(struct thread *td, struct hrl_get_usage_args *uap)
 {
@@ -1361,6 +1425,11 @@
 	char *inputstr;
 	struct hrl_rule *filter;
 	struct sbuf *outputsbuf = NULL;
+	struct proc *p;
+	struct uidinfo *uip;
+	struct gidinfo *gip;
+	struct loginclass *lc;
+	struct prison *pr;
 
 	error = hrl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen);
 	if (error)
@@ -1371,30 +1440,51 @@
 	if (filter == NULL)
 		return (EINVAL);
 
-	switch (filter->hr_subject) {
-	case HRL_SUBJECT_PROCESS:
-		error = hrl_get_usage_pid(td, filter->hr_subject_id,
-		    &outputsbuf);
+	switch (filter->hr_subject_type) {
+	case HRL_SUBJECT_TYPE_PROCESS:
+		p = filter->hr_subject.hs_proc;
+		if (p == NULL) {
+			error = EINVAL;
+			goto out;
+		}
+		outputsbuf = hrl_usage_to_sbuf(&p->p_usage);
 		break;
-	case HRL_SUBJECT_USER:
-		error = hrl_get_usage_uid(td, filter->hr_subject_id,
-		    &outputsbuf);
+	case HRL_SUBJECT_TYPE_USER:
+		uip = filter->hr_subject.hs_uip;
+		if (uip == NULL) {
+			error = EINVAL;
+			goto out;
+		}
+		outputsbuf = hrl_usage_to_sbuf(&uip->ui_usage);
 		break;
-	case HRL_SUBJECT_GROUP:
-		error = hrl_get_usage_gid(td, filter->hr_subject_id,
-		    &outputsbuf);
+	case HRL_SUBJECT_TYPE_GROUP:
+		gip = filter->hr_subject.hs_gip;
+		if (gip == NULL) {
+			error = EINVAL;
+			goto out;
+		}
+		outputsbuf = hrl_usage_to_sbuf(&gip->gi_usage);
 		break;
-	case HRL_SUBJECT_LOGINCLASS:
-		error = hrl_get_usage_lc(td, filter->hr_subject_id,
-		    &outputsbuf);
+	case HRL_SUBJECT_TYPE_LOGINCLASS:
+		lc = filter->hr_subject.hs_loginclass;
+		if (lc == NULL) {
+			error = EINVAL;
+			goto out;
+		}
+		outputsbuf = hrl_usage_to_sbuf(&lc->lc_usage);
 		break;
-	case HRL_SUBJECT_JAIL:
-		error = hrl_get_usage_jid(td, filter->hr_subject_id,
-		    &outputsbuf);
+	case HRL_SUBJECT_TYPE_JAIL:
+		pr = filter->hr_subject.hs_prison;
+		if (pr == NULL) {
+			error = EINVAL;
+			goto out;
+		}
+		outputsbuf = hrl_usage_to_sbuf(&pr->pr_usage);
 		break;
 	default:
 		error = EINVAL;
 	}
+out:
 	hrl_rule_release(filter);
 	if (error)
 		return (error);
@@ -1438,17 +1528,20 @@
 	if (error)
 		return (error);
 
+	sx_slock(&allproc_lock);
 	filter = hrl_rule_from_string(inputstr);
 	free(inputstr, M_HRL);
-	if (filter == NULL)
+	if (filter == NULL) {
+		sx_sunlock(&allproc_lock);
 		return (EINVAL);
+	}
 
 again:
 	buf = malloc(bufsize, M_HRL, M_WAITOK);
 	sb = sbuf_new(NULL, buf, bufsize, SBUF_FIXEDLEN);
 	KASSERT(sb != NULL, ("sbuf_new failed"));
 
-	sx_slock(&proctree_lock);
+	sx_assert(&allproc_lock, SA_LOCKED);
 	FOREACH_PROC_IN_SYSTEM(p) {
 		mtx_lock(&hrl_lock);
 		LIST_FOREACH(limit, &p->p_limits, hl_next) {
@@ -1456,7 +1549,7 @@
 			 * Non-process rules will be added to the buffer later.
 			 * Adding them here would result in duplicated output.
 			 */
-			if (limit->hl_rule->hr_subject != HRL_SUBJECT_PROCESS)
+			if (limit->hl_rule->hr_subject_type != HRL_SUBJECT_TYPE_PROCESS)
 				continue;
 			if (!hrl_rule_matches(limit->hl_rule, filter))
 				continue;
@@ -1465,7 +1558,6 @@
 		}
 		mtx_unlock(&hrl_lock);
 	}
-	sx_sunlock(&proctree_lock);
 
 	mtx_lock(&hrl_lock);
 	loginclass_limits_foreach(hrl_get_rules_callback, filter, sb);
@@ -1488,6 +1580,7 @@
 	error = hrl_write_outbuf(sb, uap->outbufp, uap->outbuflen);
 
 	hrl_rule_release(filter);
+	sx_sunlock(&allproc_lock);
 	free(buf, M_HRL);
 	return (error);
 }
@@ -1501,30 +1594,33 @@
 	struct sbuf *sb;
 	struct hrl_rule *filter;
 	struct hrl_limit *limit;
-	struct proc *p;
 
 	error = hrl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen);
 	if (error)
 		return (error);
 
+	sx_slock(&allproc_lock);
 	filter = hrl_rule_from_string(inputstr);
 	free(inputstr, M_HRL);
-	if (filter == NULL)
+	if (filter == NULL) {
+		sx_sunlock(&allproc_lock);
 		return (EINVAL);
+	}
 
-	if (filter->hr_subject == HRL_SUBJECT_UNDEFINED) {
+	if (filter->hr_subject_type == HRL_SUBJECT_TYPE_UNDEFINED) {
 		hrl_rule_release(filter);
+		sx_sunlock(&allproc_lock);

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 17:21:44 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 40CB710656A3; Fri,  2 Oct 2009 17:21:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E079F1065696
	for ; Fri,  2 Oct 2009 17:21:43 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CDEE98FC1A
	for ; Fri,  2 Oct 2009 17:21:43 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92HLhes054147
	for ; Fri, 2 Oct 2009 17:21:43 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92HLhi7054145
	for perforce@freebsd.org; Fri, 2 Oct 2009 17:21:43 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 2 Oct 2009 17:21:43 GMT
Message-Id: <200910021721.n92HLhi7054145@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169140 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 17:21:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=169140

Change 169140 by trasz@trasz_victim on 2009/10/02 17:20:43

	Partial IFC.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/bin/sh/parser.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/etc/network.subr#7 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.d/defaultroute#4 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.d/faith#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.d/ip6addrctl#4 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.d/netoptions#4 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.d/routing#4 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.d/static_arp#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/rc.d/stf#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/arm/cpufunc.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/xscale/xscalereg.h#2 delete
.. //depot/projects/soc2009/trasz_limits/sys/arm/xscale/xscalevar.h#2 delete
.. //depot/projects/soc2009/trasz_limits/sys/conf/files#19 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/i386/vm_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/include/cpufunc.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/xen/xen_machdep.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/acpi/acpi/Makefile#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/flowtable.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/flowtable.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/route.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/in.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet6/in6_ifattach.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/pmc.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/errors/backquote-error2.0#1 branch

Differences ...

==== //depot/projects/soc2009/trasz_limits/bin/sh/parser.c#4 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.63 2009/06/23 20:45:12 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.64 2009/10/01 21:40:08 jilles Exp $");
 
 #include 
 #include 
@@ -82,7 +82,6 @@
 
 
 STATIC struct heredoc *heredoclist;	/* list of here documents to read */
-STATIC int parsebackquote;	/* nonzero if we are inside backquotes */
 STATIC int doprompt;		/* if set, prompt the user */
 STATIC int needprompt;		/* true if interactive and at start of line */
 STATIC int lasttoken;		/* last token read */
@@ -1043,7 +1042,7 @@
 endword:
 	if (syntax == ARISYNTAX)
 		synerror("Missing '))'");
-	if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL)
+	if (syntax != BASESYNTAX && eofmark == NULL)
 		synerror("Unterminated quoted string");
 	if (varnest != 0) {
 		startlinno = plinno;
@@ -1303,7 +1302,6 @@
 
 parsebackq: {
 	struct nodelist **nlpp;
-	int savepbq;
 	union node *n;
 	char *volatile str;
 	struct jmploc jmploc;
@@ -1311,11 +1309,9 @@
 	int savelen;
 	int saveprompt;
 
-	savepbq = parsebackquote;
 	if (setjmp(jmploc.loc)) {
 		if (str)
 			ckfree(str);
-		parsebackquote = 0;
 		handler = savehandler;
 		longjmp(handler->loc, 1);
 	}
@@ -1397,7 +1393,6 @@
 		nlpp = &(*nlpp)->next;
 	*nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist));
 	(*nlpp)->next = NULL;
-	parsebackquote = oldstyle;
 
 	if (oldstyle) {
 		saveprompt = doprompt;
@@ -1433,7 +1428,6 @@
 		str = NULL;
 		INTON;
 	}
-	parsebackquote = savepbq;
 	handler = savehandler;
 	if (arinest || dblquote)
 		USTPUTC(CTLBACKQ | CTLQUOTE, out);

==== //depot/projects/soc2009/trasz_limits/etc/network.subr#7 (text+ko) ====

@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/network.subr,v 1.202 2009/09/26 18:59:00 hrs Exp $
+# $FreeBSD: src/etc/network.subr,v 1.203 2009/10/02 02:24:25 hrs Exp $
 #
 
 #
@@ -356,6 +356,16 @@
 	inet6)
 		${SYSCTL_N} net.inet6 > /dev/null 2>&1
 		;;
+	ipx)
+		${SYSCTL_N} net.ipx > /dev/null 2>&1
+		;;
+	atm)
+		if [ -x /sbin/atmconfig ]; then
+			/sbin/atmconfig diag list > /dev/null 2>&1
+		else
+			return 1
+		fi
+		;;
 	*)
 		err 1 "afexists(): Unsupported address family: $_af"
 		;;

==== //depot/projects/soc2009/trasz_limits/etc/rc.d/defaultroute#4 (text+ko) ====

@@ -2,7 +2,7 @@
 #
 # Wait for the default route to be up
 #
-# $FreeBSD: src/etc/rc.d/defaultroute,v 1.8 2009/09/26 19:00:20 hrs Exp $
+# $FreeBSD: src/etc/rc.d/defaultroute,v 1.9 2009/10/02 02:24:25 hrs Exp $
 #
 
 # PROVIDE: defaultroute
@@ -20,6 +20,8 @@
 {
 	local output carrier nocarrier nl
 
+	afexists inet || return 0
+
 	# Return without waiting if we don't have dhcp interfaces or
 	# if none of the dhcp interfaces is plugged in.
 	dhcp_interfaces=`list_net_interfaces dhcp`

==== //depot/projects/soc2009/trasz_limits/etc/rc.d/faith#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: src/etc/rc.d/faith,v 1.1 2009/09/12 22:13:41 hrs Exp $
+# $FreeBSD: src/etc/rc.d/faith,v 1.3 2009/10/02 06:19:34 hrs Exp $
 #
 
 # PROVIDE: faith

==== //depot/projects/soc2009/trasz_limits/etc/rc.d/ip6addrctl#4 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.7 2009/09/26 18:59:00 hrs Exp $
+# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.8 2009/10/02 02:24:25 hrs Exp $
 #
 
 # PROVIDE: ip6addrctl
@@ -9,6 +9,7 @@
 # KEYWORD: nojail
 
 . /etc/rc.subr
+. /etc/network.subr
 
 name="ip6addrctl"
 rcvar=`set_rcvar`
@@ -23,6 +24,8 @@
 
 ip6addrctl_prefer_ipv6()
 {
+	afexists inet6 || return 0
+
 	ip6addrctl flush >/dev/null 2>&1
 	ip6addrctl add ::1/128		50	0
 	ip6addrctl add ::/0		40	1
@@ -34,6 +37,8 @@
 
 ip6addrctl_prefer_ipv4()
 {
+	afexists inet6 || return 0
+
 	ip6addrctl flush >/dev/null 2>&1
 	ip6addrctl add ::ffff:0:0/96	50	0
 	ip6addrctl add ::1/128		40	1
@@ -45,30 +50,27 @@
 
 ip6addrctl_start()
 {
-	if ifconfig lo0 inet6 >/dev/null 2>&1; then
-		# We have IPv6 support in kernel.
+	afexists inet6 || return 0
 
-		# install the policy of the address selection algorithm.
-		if [ -f /etc/ip6addrctl.conf ]; then
-			ip6addrctl flush >/dev/null 2>&1
-			ip6addrctl install /etc/ip6addrctl.conf
-			checkyesno ip6addrctl_verbose && ip6addrctl
+	# install the policy of the address selection algorithm.
+	if [ -f /etc/ip6addrctl.conf ]; then
+		ip6addrctl flush >/dev/null 2>&1
+		ip6addrctl install /etc/ip6addrctl.conf
+		checkyesno ip6addrctl_verbose && ip6addrctl
+	else
+		if checkyesno ipv6_prefer; then
+			ip6addrctl_prefer_ipv6
 		else
-			if checkyesno ipv6_prefer; then
-				ip6addrctl_prefer_ipv6
-			else
-				ip6addrctl_prefer_ipv4
-			fi
+			ip6addrctl_prefer_ipv4
 		fi
 	fi
 }
 
 ip6addrctl_stop()
 {
-	if ifconfig lo0 inet6 >/dev/null 2>&1; then
-		# We have IPv6 support in kernel.
-		ip6addrctl flush >/dev/null 2>&1
-	fi
+	afexists inet6 || return 0
+
+	ip6addrctl flush >/dev/null 2>&1
 }
 
 load_rc_config $name

==== //depot/projects/soc2009/trasz_limits/etc/rc.d/netoptions#4 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/netoptions,v 1.148 2009/09/30 14:58:10 ume Exp $
+# $FreeBSD: src/etc/rc.d/netoptions,v 1.150 2009/10/02 06:51:39 hrs Exp $
 #
 
 # PROVIDE: netoptions
@@ -26,29 +26,51 @@
 
 netoptions_start()
 {
-	if checkyesno log_in_vain; then
+	local _af
+
+	for _af in inet inet6; do
+		afexists ${_af} && eval netoptions_${_af}
+	done
+	[ -n "${_netoptions_initdone}" ] && echo '.'
+}
+
+netoptions_inet()
+{
+	case ${log_in_vain} in
+	[12])
 		netoptions_init
 		echo -n " log_in_vain=${log_in_vain}"
-		${SYSCTL_W} net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null
-		${SYSCTL_W} net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null
-	fi
+		${SYSCTL_W} net.inet.tcp.log_in_vain=${log_in_vain} >/dev/null
+		${SYSCTL_W} net.inet.udp.log_in_vain=${log_in_vain} >/dev/null
+		;;
+	*)
+		${SYSCTL_W} net.inet.tcp.log_in_vain=0 >/dev/null
+		${SYSCTL_W} net.inet.udp.log_in_vain=0 >/dev/null
+		;;
+	esac
 
 	if checkyesno tcp_extensions; then
+		${SYSCTL_W} net.inet.tcp.rfc1323=1 >/dev/null
+	else
 		netoptions_init
-		echo -n ' rfc1323 extensions=NO'
+		echo -n ' rfc1323 extensions=${tcp_extensions}'
 		${SYSCTL_W} net.inet.tcp.rfc1323=0 >/dev/null
 	fi
 
-	if ! checkyesno tcp_keepalive; then
+	if checkyesno tcp_keepalive; then
+		${SYSCTL_W} net.inet.tcp.always_keepalive=1 >/dev/null
+	else
 		netoptions_init
-		echo -n ' TCP keepalive=NO'
+		echo -n ' TCP keepalive=${tcp_keepalive}'
 		${SYSCTL_W} net.inet.tcp.always_keepalive=0 >/dev/null
 	fi
 
 	if checkyesno tcp_drop_synfin; then
 		netoptions_init
-		echo -n ' drop SYN+FIN packets=YES'
+		echo -n ' drop SYN+FIN packets=${tcp_drop_synfin}'
 		${SYSCTL_W} net.inet.tcp.drop_synfin=1 >/dev/null
+	else
+		${SYSCTL_W} net.inet.tcp.drop_synfin=0 >/dev/null
 	fi
 
 	case ${ip_portrange_first} in
@@ -66,17 +88,17 @@
 		${SYSCTL_W} net.inet.ip.portrange.last=$ip_portrange_last >/dev/null
 		;;
 	esac
+}
 
-	if afexists inet6; then
-		if checkyesno ipv6_ipv4mapping; then
-			${SYSCTL_W} net.inet6.ip6.v6only=0 >/dev/null
-		else
-			echo -n " no-ipv4-mapped-ipv6"
-			${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null
-		fi
+netoptions_inet6()
+{
+	if checkyesno ipv6_ipv4mapping; then
+		netoptions_init
+		echo -n " ipv4-mapped-ipv6=${ipv6_ipv4mapping}"
+		${SYSCTL_W} net.inet6.ip6.v6only=0 >/dev/null
+	else
+		${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null
 	fi
-
-	[ -n "${_netoptions_initdone}" ] && echo '.'
 }
 
 load_rc_config $name

==== //depot/projects/soc2009/trasz_limits/etc/rc.d/routing#4 (text+ko) ====

@@ -2,7 +2,7 @@
 #
 # Configure routing and miscellaneous network tunables
 #
-# $FreeBSD: src/etc/rc.d/routing,v 1.150 2009/09/30 14:58:10 ume Exp $
+# $FreeBSD: src/etc/rc.d/routing,v 1.151 2009/10/02 02:28:59 hrs Exp $
 #
 
 # PROVIDE: routing
@@ -27,8 +27,24 @@
 
 routing_stop()
 {
+	local _af
+
 	static_stop "$@"
-	route -n flush
+	for _af in inet inet6; do
+		afexists ${_af} && eval routing_stop_${_af}
+	done
+}
+
+routing_stop_inet()
+{
+	route -n flush -inet
+}
+
+routing_stop_inet6()
+{
+	local i
+
+	route -n flush -inet6
 	for i in ${ipv6_network_interfaces}; do
 		ifconfig $i inet6 -defaultif
 	done
@@ -40,22 +56,12 @@
 	_af=$1
 
 	case ${_af} in
-	inet)
-		do_static inet add
+	inet|inet6|atm)
+		do_static add ${_af}
 		;;
-	inet6)
-		do_static inet6 add
+	"")
+		do_static add inet inet6 atm
 		;;
-	atm)
-		do_static atm add
-		;;
-	*)
-		do_static inet add
-		if afexists inet6; then
-			do_static inet6 add
-		fi
-		do_static atm add
-		;;
 	esac
 }
 
@@ -65,35 +71,27 @@
 	_af=$1
 
 	case ${_af} in
-	inet)
-		do_static inet delete
+	inet|inet6|atm)
+		do_static delete ${_af}
 		;;
-	inet6)
-		do_static inet6 delete
+	"")
+		do_static delete inet inet6 atm
 		;;
-	atm)
-		do_static atm delete
-		;;
-	*)
-		do_static inet delete
-		if afexists inet6; then
-			do_static inet6 delete
-		fi
-		do_static atm delete
-		;;
 	esac
 }
 
 do_static()
 {
 	local _af _action
-	_af=$1
-	_action=$2
+	_action=$1
 
-	eval $1_static $2
+	shift
+	for _af in "$@"; do
+		afexists ${_af} && eval static_${_af} ${_action}
+	done
 }
 
-inet_static()
+static_inet()
 {
 	local _action
 	_action=$1
@@ -115,7 +113,7 @@
 	fi
 }
 
-inet6_static()
+static_inet6()
 {
 	local _action i
 	_action=$1
@@ -222,9 +220,9 @@
 	esac
 }
 
-atm_static()
+static_atm()
 {
-	local _action i
+	local _action i route_args
 	_action=$1
 
 	if [ -n "${natm_static_routes}" ]; then
@@ -246,61 +244,93 @@
 
 options_start()
 {
+	local _af
+
+	for _af in inet inet6 ipx; do
+		afexists ${_af} && eval options_${_af}
+	done
+	 [ -n "${_ropts_initdone}" ] && echo '.'
+}
+
+options_inet()
+{
 	if checkyesno icmp_bmcastecho; then
 		ropts_init
 		echo -n ' broadcast ping responses=YES'
-		sysctl net.inet.icmp.bmcastecho=1 >/dev/null
+		${SYSCTL_W} net.inet.icmp.bmcastecho=1 > /dev/null
+	else
+		${SYSCTL_W} net.inet.icmp.bmcastecho=0 > /dev/null
 	fi
 
 	if checkyesno icmp_drop_redirect; then
 		ropts_init
 		echo -n ' ignore ICMP redirect=YES'
-		sysctl net.inet.icmp.drop_redirect=1 >/dev/null
+		${SYSCTL_W} net.inet.icmp.drop_redirect=1 > /dev/null
+	else
+		${SYSCTL_W} net.inet.icmp.drop_redirect=0 > /dev/null
 	fi
 
 	if checkyesno icmp_log_redirect; then
 		ropts_init
 		echo -n ' log ICMP redirect=YES'
-		sysctl net.inet.icmp.log_redirect=1 >/dev/null
+		${SYSCTL_W} net.inet.icmp.log_redirect=1 > /dev/null
+	else
+		${SYSCTL_W} net.inet.icmp.log_redirect=0 > /dev/null
 	fi
 
 	if checkyesno gateway_enable; then
 		ropts_init
 		echo -n ' IPv4 gateway=YES'
-		sysctl net.inet.ip.forwarding=1 >/dev/null
+		${SYSCTL_W} net.inet.ip.forwarding=1 > /dev/null
+	else
+		${SYSCTL_W} net.inet.ip.forwarding=0 > /dev/null
 	fi
 
-	if checkyesno ipv6_gateway_enable; then
-		ropts_init
-		echo -n ' IPv6 gateway=YES'
-		sysctl net.inet6.ip6.forwarding=1 >/dev/null
-	fi
-
 	if checkyesno forward_sourceroute; then
 		ropts_init
 		echo -n ' do source routing=YES'
-		sysctl net.inet.ip.sourceroute=1 >/dev/null
+		${SYSCTL_W} net.inet.ip.sourceroute=1 > /dev/null
+	else
+		${SYSCTL_W} net.inet.ip.sourceroute=0 > /dev/null
 	fi
 
 	if checkyesno accept_sourceroute; then
 		ropts_init
 		echo -n ' accept source routing=YES'
-		sysctl net.inet.ip.accept_sourceroute=1 >/dev/null
+		${SYSCTL_W} net.inet.ip.accept_sourceroute=1 > /dev/null
+	else
+		${SYSCTL_W} net.inet.ip.accept_sourceroute=0 > /dev/null
 	fi
 
-	if checkyesno ipxgateway_enable; then
+	if checkyesno arpproxy_all; then
 		ropts_init
-		echo -n ' IPX gateway=YES'
-		sysctl net.ipx.ipx.ipxforwarding=1 >/dev/null
+		echo -n ' ARP proxyall=YES'
+		${SYSCTL_W} net.link.ether.inet.proxyall=1 > /dev/null
+	else
+		${SYSCTL_W} net.link.ether.inet.proxyall=0 > /dev/null
 	fi
+}
 
-	if checkyesno arpproxy_all; then
+options_inet6()
+{
+	if checkyesno ipv6_gateway_enable; then
 		ropts_init
-		echo -n ' ARP proxyall=YES'
-		sysctl net.link.ether.inet.proxyall=1 >/dev/null
+		echo -n ' IPv6 gateway=YES'
+		${SYSCTL_W} net.inet6.ip6.forwarding=1 > /dev/null
+	else
+		${SYSCTL_W} net.inet6.ip6.forwarding=0 > /dev/null
 	fi
+}
 
-	 [ -n "${_ropts_initdone}" ] && echo '.'
+options_ipx()
+{
+	if checkyesno ipxgateway_enable; then
+		ropts_init
+		echo -n ' IPX gateway=YES'
+		${SYSCTL_W} net.ipx.ipx.ipxforwarding=1 > /dev/null
+	else
+		${SYSCTL_W} net.ipx.ipx.ipxforwarding=0 > /dev/null
+	fi
 }
 
 load_rc_config $name

==== //depot/projects/soc2009/trasz_limits/etc/rc.d/static_arp#2 (text+ko) ====

@@ -26,7 +26,7 @@
 #
 # Configure static ARP table
 #
-# $FreeBSD: src/etc/rc.d/static_arp,v 1.2 2009/08/25 20:05:51 delphij Exp $
+# $FreeBSD: src/etc/rc.d/static_arp,v 1.4 2009/10/02 06:19:34 hrs Exp $
 #
 
 # PROVIDE: static_arp
@@ -34,6 +34,7 @@
 # KEYWORD: nojail
 
 . /etc/rc.subr
+. /etc/network.subr
 
 name="static_arp"
 start_cmd="static_arp_start"

==== //depot/projects/soc2009/trasz_limits/etc/rc.d/stf#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: src/etc/rc.d/stf,v 1.1 2009/09/12 22:13:41 hrs Exp $
+# $FreeBSD: src/etc/rc.d/stf,v 1.3 2009/10/02 06:19:34 hrs Exp $
 #
 
 # PROVIDE: stf

==== //depot/projects/soc2009/trasz_limits/sys/arm/arm/cpufunc.c#3 (text+ko) ====

@@ -45,7 +45,7 @@
  * Created      : 30/01/97
  */
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.27 2009/07/21 08:29:19 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.28 2009/10/02 11:10:05 rpaulo Exp $");
 
 #include 
 #include 
@@ -83,15 +83,6 @@
 #include 
 #endif
 
-#if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
-    defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342)
-#include 
-#endif
-
-#if defined(PERFCTRS)
-struct arm_pmc_funcs *arm_pmc;
-#endif
-
 /* PRIMARY CACHE VARIABLES */
 int	arm_picache_size;
 int	arm_picache_line_size;
@@ -1128,10 +1119,6 @@
 			: "r" (BCUCTL_E0|BCUCTL_E1|BCUCTL_EV));
 
 		cpufuncs = xscale_cpufuncs;
-#if defined(PERFCTRS)
-		xscale_pmu_init();
-#endif
-
 		/*
 		 * i80200 errata: Step-A0 and A1 have a bug where
 		 * D$ dirty bits are not cleared on "invalidate by
@@ -1165,10 +1152,6 @@
 			       PMNC_CC_IF));
 
 		cpufuncs = xscale_cpufuncs;
-#if defined(PERFCTRS)
-		xscale_pmu_init();
-#endif
-
 		cpu_reset_needs_v4_MMU_disable = 1;	/* XScale needs it */
 		get_cachetype_cp15();
 		pmap_pte_init_xscale();
@@ -1179,10 +1162,6 @@
 #if defined(CPU_XSCALE_81342)
 	if (cputype == CPU_ID_81342) {
 		cpufuncs = xscalec3_cpufuncs;
-#if defined(PERFCTRS)
-		xscale_pmu_init();
-#endif
-
 		cpu_reset_needs_v4_MMU_disable = 1;	/* XScale needs it */
 		get_cachetype_cp15();
 		pmap_pte_init_xscale();
@@ -1196,10 +1175,6 @@
 	    (cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA210) {
 
 		cpufuncs = xscale_cpufuncs;
-#if defined(PERFCTRS)
-		xscale_pmu_init();
-#endif
-
 		cpu_reset_needs_v4_MMU_disable = 1;	/* XScale needs it */
 		get_cachetype_cp15();
 		pmap_pte_init_xscale();
@@ -1215,10 +1190,6 @@
             cputype == CPU_ID_IXP425_266 || cputype == CPU_ID_IXP435) {
 
 		cpufuncs = xscale_cpufuncs;
-#if defined(PERFCTRS)
-		xscale_pmu_init();
-#endif
-
 		cpu_reset_needs_v4_MMU_disable = 1;	/* XScale needs it */
 		get_cachetype_cp15();
 		pmap_pte_init_xscale();

==== //depot/projects/soc2009/trasz_limits/sys/conf/files#19 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1473 2009/09/28 07:32:11 thompsa Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1474 2009/10/02 12:47:01 nyan Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -2670,12 +2670,12 @@
 vm/vm_unix.c			standard
 vm/vm_zeroidle.c		standard
 vm/vnode_pager.c		standard
-xdr/xdr.c			optional krpc | nfslockd | nfsclient | nfsserver
-xdr/xdr_array.c			optional krpc | nfslockd | nfsclient | nfsserver
-xdr/xdr_mbuf.c			optional krpc | nfslockd | nfsclient | nfsserver
-xdr/xdr_mem.c			optional krpc | nfslockd | nfsclient | nfsserver
-xdr/xdr_reference.c		optional krpc | nfslockd | nfsclient | nfsserver
-xdr/xdr_sizeof.c		optional krpc | nfslockd | nfsclient | nfsserver
+xdr/xdr.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
+xdr/xdr_array.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
+xdr/xdr_mbuf.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
+xdr/xdr_mem.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
+xdr/xdr_reference.c		optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
+xdr/xdr_sizeof.c		optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
 #
 gnu/fs/xfs/xfs_alloc.c		optional xfs \
 	compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" \

==== //depot/projects/soc2009/trasz_limits/sys/i386/i386/vm_machdep.c#3 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.297 2009/07/29 08:49:58 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.298 2009/10/01 22:05:38 kmacy Exp $");
 
 #include "opt_isa.h"
 #include "opt_npx.h"
@@ -270,11 +270,7 @@
 	/*
 	 * XXX XEN need to check on PSL_USER is handled
 	 */
-#ifdef XEN
-	td2->td_md.md_saved_flags = 0;
-#else	
 	td2->td_md.md_saved_flags = PSL_KERNEL | PSL_I;
-#endif
 	/*
 	 * Now, cpu_switch() can schedule the new process.
 	 * pcb_esp is loaded pointing to the cpu_switch() stack frame
@@ -446,11 +442,7 @@
 
 	/* Setup to release spin count in fork_exit(). */
 	td->td_md.md_spinlock_count = 1;
-#ifdef XEN	
-	td->td_md.md_saved_flags = 0;	
-#else
 	td->td_md.md_saved_flags = PSL_KERNEL | PSL_I;
-#endif
 }
 
 /*

==== //depot/projects/soc2009/trasz_limits/sys/i386/include/cpufunc.h#5 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.156 2009/09/30 16:34:50 avg Exp $
+ * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.157 2009/10/01 22:05:38 kmacy Exp $
  */
 
 /*
@@ -49,8 +49,8 @@
 extern void xen_load_cr3(u_int data);
 extern void xen_tlb_flush(void);
 extern void xen_invlpg(u_int addr);
-extern int xen_save_and_cli(void);
-extern void xen_restore_flags(u_int eflags);
+extern void write_eflags(u_int eflags);
+extern u_int read_eflags(void);
 #endif
 
 struct region_descriptor;
@@ -293,7 +293,11 @@
 }
 
 static __inline u_int
+#ifdef XEN
+_read_eflags(void)
+#else	
 read_eflags(void)
+#endif
 {
 	u_int	ef;
 
@@ -335,7 +339,11 @@
 }
 
 static __inline void
+#ifdef XEN
+_write_eflags(u_int ef)
+#else
 write_eflags(u_int ef)
+#endif
 {
 	__asm __volatile("pushl %0; popfl" : : "r" (ef));
 }
@@ -653,23 +661,15 @@
 {
 	register_t eflags;
 
-#ifdef XEN
-	eflags = xen_save_and_cli();
-#else 	
 	eflags = read_eflags();
 	disable_intr();
-#endif	
 	return (eflags);
 }
 
 static __inline void
 intr_restore(register_t eflags)
 {
-#ifdef XEN
-	xen_restore_flags(eflags);
-#else
 	write_eflags(eflags);
-#endif
 }
 
 #else /* !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */

==== //depot/projects/soc2009/trasz_limits/sys/i386/xen/xen_machdep.c#2 (text+ko) ====

@@ -31,11 +31,12 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/i386/xen/xen_machdep.c,v 1.19 2009/04/01 17:06:28 dfr Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/xen/xen_machdep.c,v 1.20 2009/10/01 22:05:38 kmacy Exp $");
 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -101,6 +102,7 @@
 void
 ni_cli(void)
 {
+	CTR0(KTR_SPARE2, "ni_cli disabling interrupts");
 	__asm__("pushl %edx;"
 		"pushl %eax;"
 		);
@@ -345,33 +347,53 @@
 	PANIC_IF(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
 }
 
-void
-xen_restore_flags(u_int eflags)
+#ifdef KTR
+static __inline u_int
+rebp(void)
 {
-	if (eflags > 1)
-		eflags = ((eflags & PSL_I) == 0);
+	u_int	data;
 
-	__restore_flags(eflags);
+	__asm __volatile("movl 4(%%ebp),%0" : "=r" (data));	
+	return (data);
 }
+#endif
 
-int
-xen_save_and_cli(void)
+u_int
+read_eflags(void)
 {
-	int eflags;
-	
-	__save_and_cli(eflags);
+        vcpu_info_t *_vcpu;
+	u_int eflags;
+
+	eflags = _read_eflags();
+        _vcpu = &HYPERVISOR_shared_info->vcpu_info[smp_processor_id()]; 
+	if (_vcpu->evtchn_upcall_mask)
+		eflags &= ~PSL_I;
+
 	return (eflags);
 }
 
 void
+write_eflags(u_int eflags)
+{
+	u_int intr;
+
+	CTR2(KTR_SPARE2, "%x xen_restore_flags eflags %x", rebp(), eflags);
+	intr = ((eflags & PSL_I) == 0);
+	__restore_flags(intr);
+	_write_eflags(eflags);
+}
+
+void
 xen_cli(void)
 {
+	CTR1(KTR_SPARE2, "%x xen_cli disabling interrupts", rebp());
 	__cli();
 }
 
 void
 xen_sti(void)
 {
+	CTR1(KTR_SPARE2, "%x xen_sti enabling interrupts", rebp());
 	__sti();
 }
 

==== //depot/projects/soc2009/trasz_limits/sys/modules/acpi/acpi/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.24 2009/09/11 22:49:34 jkim Exp $
+# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.25 2009/10/01 20:56:15 jkim Exp $
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
 .error "ACPI can only be compiled into the kernel on the amd64 and ia64 platforms"
@@ -27,6 +27,10 @@
 KMOD=	acpi
 
 # ACPI CA sources
+SRCS+=	dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c dbinput.c dbstats.c
+SRCS+=	dbutils.c dbxface.c
+SRCS+=	dmbuffer.c dmnames.c dmopcode.c dmobject.c dmresrc.c dmresrcl.c
+SRCS+=	dmresrcs.c dmutils.c dmwalk.c
 SRCS+=	dsfield.c dsinit.c dsmethod.c dsmthdat.c dsobject.c dsopcode.c
 SRCS+=	dsutils.c dswexec.c dswload.c dswscope.c dswstate.c
 SRCS+=	evevent.c evgpe.c evgpeblk.c evmisc.c evregion.c evrgnini.c evsci.c
@@ -69,12 +73,6 @@
 # This obviously needs a better and more structural fix.
 SRCS+=	opt_kstack_pages.h opt_nfs.h opt_apic.h opt_compat.h opt_hwpmc_hooks.h
 
-# Debugging support
-DBSRC=	dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c dbinput.c dbstats.c
-DBSRC+=	dbutils.c dbxface.c
-DBSRC+=	dmbuffer.c dmnames.c dmopcode.c dmobject.c dmresrc.c dmresrcl.c
-DBSRC+=	dmresrcs.c dmutils.c dmwalk.c
-
 .if !defined(KERNBUILDDIR)
 .if KTR
 CFLAGS+=-DKTR
@@ -87,7 +85,6 @@
 .endif
 .if ACPI_DEBUG
 CFLAGS+=-DACPI_DEBUG
-SRCS+=	${DBSRC}
 opt_ddb.h: Makefile
 	echo "#define DDB 1" > ${.TARGET}
 .else
@@ -98,10 +95,12 @@
 
 # Machine-specific code such as sleep/wakeup
 SRCS+=	acpi_machdep.c acpi_wakecode.h acpi_wakeup.c
-.if ${MACHINE} == "i386"
-SRCS+=	madt.c assym.s
+SRCS+=	assym.s madt.c
+CLEANFILES+=	acpi_wakecode.bin acpi_wakecode.h acpi_wakecode.o
+.if ${MACHINE_ARCH} == "amd64"
+SRCS+=	opt_global.h
+CLEANFILES+=	acpi_wakedata.h
 .endif
-CLEANFILES+=	acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin ${DBSRC:.c=.o}
 
 acpi_wakecode.h: acpi_wakecode.S assym.s
 	${MAKE} -f ${.CURDIR}/../../../${MACHINE_ARCH}/acpica/Makefile \

==== //depot/projects/soc2009/trasz_limits/sys/net/flowtable.c#8 (text+ko) ====

@@ -32,7 +32,7 @@
 #include "opt_ddb.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/net/flowtable.c,v 1.20 2009/08/28 07:01:09 qingli Exp $");
+__FBSDID("$FreeBSD: src/sys/net/flowtable.c,v 1.21 2009/10/01 20:32:29 qingli Exp $");
 
 #include   
 #include 
@@ -830,7 +830,7 @@
 }
 
 static void
-flowtable_free_stale(struct flowtable *ft)
+flowtable_free_stale(struct flowtable *ft, struct rtentry *rt)
 {
 	int curbit = 0, count;
 	struct flentry *fle,  **flehead, *fleprev;
@@ -866,8 +866,14 @@
 			    curbit);
 		}
 #endif		

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 17:21:44 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8E7E6106575E; Fri,  2 Oct 2009 17:21:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 24CC61065697
	for ; Fri,  2 Oct 2009 17:21:44 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EE8F48FC1B
	for ; Fri,  2 Oct 2009 17:21:43 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92HLhvN054152
	for ; Fri, 2 Oct 2009 17:21:43 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92HLhF8054150
	for perforce@freebsd.org; Fri, 2 Oct 2009 17:21:43 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 2 Oct 2009 17:21:43 GMT
Message-Id: <200910021721.n92HLhF8054150@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169141 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 17:21:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=169141

Change 169141 by trasz@trasz_victim on 2009/10/02 17:21:01

	Style fix.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#24 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#24 (text+ko) ====

@@ -27,6 +27,8 @@
 #include 
 __FBSDID("$FreeBSD$");
 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -36,7 +38,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #define	HRL_DEFAULT_BUFSIZE	4096
 

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 17:54:20 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 48908106568B; Fri,  2 Oct 2009 17:54:20 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0CD201065679
	for ; Fri,  2 Oct 2009 17:54:20 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EFB998FC1F
	for ; Fri,  2 Oct 2009 17:54:19 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92HsJMv056487
	for ; Fri, 2 Oct 2009 17:54:19 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92HsJXF056485
	for perforce@freebsd.org; Fri, 2 Oct 2009 17:54:19 GMT
	(envelope-from stas@freebsd.org)
Date: Fri, 2 Oct 2009 17:54:19 GMT
Message-Id: <200910021754.n92HsJXF056485@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169145 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 17:54:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=169145

Change 169145 by stas@stas_yandex on 2009/10/02 17:54:11

	- Other regression tests fixes.

Affected files ...

.. //depot/projects/valgrind/memcheck/tests/Makefile.am#7 edit
.. //depot/projects/valgrind/memcheck/tests/pointer-trace.stderr.exp#5 edit
.. //depot/projects/valgrind/memcheck/tests/sigkill.stderr.exp-freebsd#1 add
.. //depot/projects/valgrind/memcheck/tests/x86/Makefile.am#6 edit

Differences ...

==== //depot/projects/valgrind/memcheck/tests/Makefile.am#7 (text+ko) ====

@@ -143,7 +143,8 @@
 	sh-mem-random.stderr.exp sh-mem-random.stdout.exp64 \
 	sh-mem-random.stdout.exp sh-mem-random.vgtest \
 	sigaltstack.stderr.exp sigaltstack.vgtest \
-	sigkill.stderr.exp sigkill.stderr.exp-darwin sigkill.vgtest \
+	sigkill.stderr.exp sigkill.stderr.exp-darwin sigkill.stderr.exp-freebsd \
+	sigkill.vgtest \
 	signal2.stderr.exp signal2.stdout.exp signal2.vgtest \
 	sigprocmask.stderr.exp sigprocmask.stderr.exp2 sigprocmask.vgtest \
 	strchr.stderr.exp strchr.stderr.exp2 strchr.stderr.exp-darwin \

==== //depot/projects/valgrind/memcheck/tests/pointer-trace.stderr.exp#5 (text+ko) ====

@@ -1,4 +1,4 @@
 1,000 bytes in 1 blocks are definitely lost in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: main (pointer-trace.c:86)
+   by 0x........: main (pointer-trace.c:90)
 

==== //depot/projects/valgrind/memcheck/tests/x86/Makefile.am#6 (text+ko) ====

@@ -34,6 +34,7 @@
 	pushfpopf \
 	pushfw_x86 \
 	pushpopmem \
+	sse_memory \
 	tronical \
 	xor-undef-x86
 

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 20:23:08 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7943010656A4; Fri,  2 Oct 2009 20:23:08 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3C7961065696
	for ; Fri,  2 Oct 2009 20:23:08 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 29D5A8FC17
	for ; Fri,  2 Oct 2009 20:23:08 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92KN8KZ070403
	for ; Fri, 2 Oct 2009 20:23:08 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92KN7PY070401
	for perforce@freebsd.org; Fri, 2 Oct 2009 20:23:07 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Fri, 2 Oct 2009 20:23:07 GMT
Message-Id: <200910022023.n92KN7PY070401@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169156 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 20:23:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=169156

Change 169156 by truncs@aditya on 2009/10/02 20:22:14

	IFC.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/acpica/madt.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/initcpu.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/machdep.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/pmap.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/trap.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/GENERIC#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/NOTES#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/acpica_machdep.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/apm_bios.h#1 branch
.. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/cpufunc.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/param.h#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/cpufunc.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/include/md_var.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/include/param.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/xscale/xscalereg.h#2 delete
.. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/xscale/xscalevar.h#2 delete
.. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/forth/loader.conf#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/bsm/audit_kevents.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/ata/ata_all.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam_periph.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam_xpt.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_target.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_proto.h#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/syscalls.master#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_ioctl.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/x86bios/x86bios.c#1 branch
.. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/x86bios/x86bios.h#1 branch
.. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/x86bios/x86bios_alloc.c#1 branch
.. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/NOTES#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.amd64#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.i386#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.pc98#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/newvers.sh#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/options#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/x86emu/x86emu.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/x86emu/x86emu_util.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpi_support/acpi_aiboost.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_acad.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_video.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpivar.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ae/if_ae.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/age/if_age.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/agp/agp_i810.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/alc/if_alc.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ale/if_ale.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/amdtemp/amdtemp.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/asmc/asmc.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/asmc/asmcvar.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-marvell.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/atkbdc/atkbd.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ciss/ciss.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ciss/cissreg.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ciss/cissvar.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/de/if_de.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/de/if_devar.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/dpms/dpms.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/r600_blit.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/radeon_cs.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/radeon_drv.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/radeon_irq.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/radeon_state.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/s3_pci.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/vesa.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/vga.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fxp/if_fxp.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/pmc_events.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_freebsd.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_stds.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_tpublic.h#2 delete
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/ispmbox.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/jme/if_jme.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/kbd/kbd.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/lindev/full.c#1 branch
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/lindev/lindev.c#1 branch
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/lindev/lindev.h#1 branch
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mii/e1000phy.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mii/e1000phyreg.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/msk/if_msk.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/msk/if_mskreg.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mwl/if_mwl.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mxge/if_mxge.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mxge/if_mxge_var.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pci/pci.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pci/pcireg.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ppbus/vpo.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/es137x.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/es137x.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/hda/hda_reg.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/hda/hdac.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/t4dwave.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/scmouse.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/scterm-teken.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/syscons.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/syscons.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/twa/tw_cl_io.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/twa/tw_cl_share.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/twe/twe.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/twe/twevar.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/atmegadci.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ehci.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ehci_pci.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/usb_controller.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_axe.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_cdce.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_cdcereg.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/quirk/usb_quirk.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/u3g.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uark.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ubsa.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ubser.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uch341.c#1 branch
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uchcom.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ucycom.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ufoma.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uftdi.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ugensa.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uipaq.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/umct.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/umodem.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/umoscom.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uplcom.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/usb_serial.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/usb_serial.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uslcom.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uvscom.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/storage/umass.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb.h#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_bus.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_cdc.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_device.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_device.h#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_hub.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_transfer.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/fifofs/fifo_vnops.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfs_commonacl.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/procfs/procfs.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/procfs/procfs.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/procfs/procfs_osrel.c#1 branch
.. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/part/g_part.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/part/g_part_ebr.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/acpica/acpi_machdep.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/acpica/madt.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/conf/GENERIC#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/conf/NOTES#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/initcpu.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/machdep.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/pmap.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/trap.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/vm_machdep.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/acpica_machdep.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/apm_bios.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/cpufunc.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/param.h#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/xen/xen_machdep.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/include/param.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/init_main.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/init_sysent.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_event.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_exec.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_mib.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_proc.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_rwlock.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_sig.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_sx.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_umtx.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/sched_ule.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_acl_nfs4.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_acl_posix1e.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_bus.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_devstat.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_smp.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/syscalls.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/syscalls.master#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_socket.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_syscalls.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_default.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_export.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_vnops.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/mips/include/param.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/Makefile#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/acpi/acpi/Makefile#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/lindev/Makefile#1 branch
.. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/nfslockd/Makefile#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/procfs/Makefile#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/usb/Makefile#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/usb/uch341/Makefile#1 branch
.. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/x86bios/Makefile#1 branch
.. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/x86emu/Makefile#2 delete
.. //depot/projects/soc2009/soc_ext2fs/src/sys/net/flowtable.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/net/flowtable.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_llatbl.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_var.h#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/net/route.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_hwmp.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_mesh.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_mesh.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/if_ether.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_mcast.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_pcb.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_proto.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/raw_ip.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_asconf.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_bsd_addr.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_input.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_os_bsd.h#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_output.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_pcb.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_pcb.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_structs.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_sysctl.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_timer.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_usrreq.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctputil.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_subr.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_timer.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_timer.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_var.h#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6_ifattach.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/sctp6_usrreq.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/key.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/netipsec/xform_esp.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/nfsclient/nfs_vfsops.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/nfsserver/nfs_serv.c#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/pc98/conf/GENERIC#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/pc98/conf/NOTES#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/pci/intpm.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/powerpc/include/param.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sparc64/conf/GENERIC#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sparc64/include/param.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sun4v/include/param.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/ata.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/bus.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/event.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/fcntl.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/kbio.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/mman.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/param.h#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/pmc.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/rwlock.h#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/smp.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/sx.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/syscall.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/syscall.mk#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/sysproto.h#5 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/systm.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/sys/vnode.h#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/sequences#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_demo.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_scs.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_stress.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_subr.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/teken/teken_subr_compat.h#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/ufs/ufs/ufs_gjournal.c#2 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/ufs/ufs/ufs_vnops.c#4 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/vm/vm_map.c#3 integrate
.. //depot/projects/soc2009/soc_ext2fs/src/sys/vm/vm_mmap.c#4 integrate

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/acpica/acpi_machdep.c#3 (text+ko) ====

@@ -25,20 +25,42 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.21 2009/06/05 18:44:36 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.23 2009/09/27 14:00:16 jkim Exp $");
 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
+#include 
+#include 
 
 #include 
 
 #include 
 
+/*
+ * APM driver emulation 
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+
+#include 
+
 SYSCTL_DECL(_debug_acpi);
 
 int acpi_resume_beep;
@@ -50,7 +72,432 @@
 TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video);
 
 static int intr_model = ACPI_INTR_PIC;
-static struct apm_clone_data acpi_clone;
+static int apm_active;
+static struct clonedevs *apm_clones;
+
+MALLOC_DEFINE(M_APMDEV, "apmdev", "APM device emulation");
+
+static d_open_t		apmopen;
+static d_close_t	apmclose;
+static d_write_t	apmwrite;
+static d_ioctl_t	apmioctl;
+static d_poll_t		apmpoll;
+static d_kqfilter_t	apmkqfilter;
+static void		apmreadfiltdetach(struct knote *kn);
+static int		apmreadfilt(struct knote *kn, long hint);
+static struct filterops	apm_readfiltops = {
+	.f_isfd = 1,
+	.f_detach = apmreadfiltdetach,
+	.f_event = apmreadfilt,
+};
+
+static struct cdevsw apm_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_TRACKCLOSE | D_NEEDMINOR,
+	.d_open =	apmopen,
+	.d_close =	apmclose,
+	.d_write =	apmwrite,
+	.d_ioctl =	apmioctl,
+	.d_poll =	apmpoll,
+	.d_name =	"apm",
+	.d_kqfilter =	apmkqfilter
+};
+
+static int
+acpi_capm_convert_battstate(struct  acpi_battinfo *battp)
+{
+	int	state;
+
+	state = APM_UNKNOWN;
+
+	if (battp->state & ACPI_BATT_STAT_DISCHARG) {
+		if (battp->cap >= 50)
+			state = 0;	/* high */
+		else
+			state = 1;	/* low */
+	}
+	if (battp->state & ACPI_BATT_STAT_CRITICAL)
+		state = 2;		/* critical */
+	if (battp->state & ACPI_BATT_STAT_CHARGING)
+		state = 3;		/* charging */
+
+	/* If still unknown, determine it based on the battery capacity. */
+	if (state == APM_UNKNOWN) {
+		if (battp->cap >= 50)
+			state = 0;	/* high */
+		else
+			state = 1;	/* low */
+	}
+
+	return (state);
+}
+
+static int
+acpi_capm_convert_battflags(struct  acpi_battinfo *battp)
+{
+	int	flags;
+
+	flags = 0;
+
+	if (battp->cap >= 50)
+		flags |= APM_BATT_HIGH;
+	else {
+		if (battp->state & ACPI_BATT_STAT_CRITICAL)
+			flags |= APM_BATT_CRITICAL;
+		else
+			flags |= APM_BATT_LOW;
+	}
+	if (battp->state & ACPI_BATT_STAT_CHARGING)
+		flags |= APM_BATT_CHARGING;
+	if (battp->state == ACPI_BATT_STAT_NOT_PRESENT)
+		flags = APM_BATT_NOT_PRESENT;
+
+	return (flags);
+}
+
+static int
+acpi_capm_get_info(apm_info_t aip)
+{
+	int	acline;
+	struct	acpi_battinfo batt;
+
+	aip->ai_infoversion = 1;
+	aip->ai_major       = 1;
+	aip->ai_minor       = 2;
+	aip->ai_status      = apm_active;
+	aip->ai_capabilities= 0xff00;	/* unknown */
+
+	if (acpi_acad_get_acline(&acline))
+		aip->ai_acline = APM_UNKNOWN;	/* unknown */
+	else
+		aip->ai_acline = acline;	/* on/off */
+
+	if (acpi_battery_get_battinfo(NULL, &batt) != 0) {
+		aip->ai_batt_stat = APM_UNKNOWN;
+		aip->ai_batt_life = APM_UNKNOWN;
+		aip->ai_batt_time = -1;		 /* unknown */
+		aip->ai_batteries = ~0U;	 /* unknown */
+	} else {
+		aip->ai_batt_stat = acpi_capm_convert_battstate(&batt);
+		aip->ai_batt_life = batt.cap;
+		aip->ai_batt_time = (batt.min == -1) ? -1 : batt.min * 60;
+		aip->ai_batteries = acpi_battery_get_units();
+	}
+
+	return (0);
+}
+
+static int
+acpi_capm_get_pwstatus(apm_pwstatus_t app)
+{
+	device_t dev;
+	int	acline, unit, error;
+	struct	acpi_battinfo batt;
+
+	if (app->ap_device != PMDV_ALLDEV &&
+	    (app->ap_device < PMDV_BATT0 || app->ap_device > PMDV_BATT_ALL))
+		return (1);
+
+	if (app->ap_device == PMDV_ALLDEV)
+		error = acpi_battery_get_battinfo(NULL, &batt);
+	else {
+		unit = app->ap_device - PMDV_BATT0;
+		dev = devclass_get_device(devclass_find("battery"), unit);
+		if (dev != NULL)
+			error = acpi_battery_get_battinfo(dev, &batt);
+		else
+			error = ENXIO;
+	}
+	if (error)
+		return (1);
+
+	app->ap_batt_stat = acpi_capm_convert_battstate(&batt);
+	app->ap_batt_flag = acpi_capm_convert_battflags(&batt);
+	app->ap_batt_life = batt.cap;
+	app->ap_batt_time = (batt.min == -1) ? -1 : batt.min * 60;
+
+	if (acpi_acad_get_acline(&acline))
+		app->ap_acline = APM_UNKNOWN;
+	else
+		app->ap_acline = acline;	/* on/off */
+
+	return (0);
+}
+
+/* Create single-use devices for /dev/apm and /dev/apmctl. */
+static void
+apm_clone(void *arg, struct ucred *cred, char *name, int namelen,
+    struct cdev **dev)
+{
+	int ctl_dev, unit;
+
+	if (*dev != NULL)
+		return;
+	if (strcmp(name, "apmctl") == 0)
+		ctl_dev = TRUE;
+	else if (strcmp(name, "apm") == 0)
+		ctl_dev = FALSE;
+	else
+		return;
+
+	/* Always create a new device and unit number. */
+	unit = -1;
+	if (clone_create(&apm_clones, &apm_cdevsw, &unit, dev, 0)) {
+		if (ctl_dev) {
+			*dev = make_dev(&apm_cdevsw, unit,
+			    UID_ROOT, GID_OPERATOR, 0660, "apmctl%d", unit);
+		} else {
+			*dev = make_dev(&apm_cdevsw, unit,
+			    UID_ROOT, GID_OPERATOR, 0664, "apm%d", unit);
+		}
+		if (*dev != NULL) {
+			dev_ref(*dev);
+			(*dev)->si_flags |= SI_CHEAPCLONE;
+		}
+	}
+}
+
+/* Create a struct for tracking per-device suspend notification. */
+static struct apm_clone_data *
+apm_create_clone(struct cdev *dev, struct acpi_softc *acpi_sc)
+{
+	struct apm_clone_data *clone;
+
+	clone = malloc(sizeof(*clone), M_APMDEV, M_WAITOK);
+	clone->cdev = dev;
+	clone->acpi_sc = acpi_sc;
+	clone->notify_status = APM_EV_NONE;
+	bzero(&clone->sel_read, sizeof(clone->sel_read));
+	knlist_init_mtx(&clone->sel_read.si_note, &acpi_mutex);
+
+	/*
+	 * The acpi device is always managed by devd(8) and is considered
+	 * writable (i.e., ack is required to allow suspend to proceed.)
+	 */
+	if (strcmp("acpi", devtoname(dev)) == 0)
+		clone->flags = ACPI_EVF_DEVD | ACPI_EVF_WRITE;
+	else
+		clone->flags = ACPI_EVF_NONE;
+
+	ACPI_LOCK(acpi);
+	STAILQ_INSERT_TAIL(&acpi_sc->apm_cdevs, clone, entries);
+	ACPI_UNLOCK(acpi);
+	return (clone);
+}
+
+static int
+apmopen(struct cdev *dev, int flag, int fmt, struct thread *td)
+{
+	struct	acpi_softc *acpi_sc;
+	struct 	apm_clone_data *clone;
+
+	acpi_sc = devclass_get_softc(devclass_find("acpi"), 0);
+	clone = apm_create_clone(dev, acpi_sc);
+	dev->si_drv1 = clone;
+
+	/* If the device is opened for write, record that. */
+	if ((flag & FWRITE) != 0)
+		clone->flags |= ACPI_EVF_WRITE;
+
+	return (0);
+}
+
+static int
+apmclose(struct cdev *dev, int flag, int fmt, struct thread *td)
+{
+	struct	apm_clone_data *clone;
+	struct	acpi_softc *acpi_sc;
+
+	clone = dev->si_drv1;
+	acpi_sc = clone->acpi_sc;
+
+	/* We are about to lose a reference so check if suspend should occur */
+	if (acpi_sc->acpi_next_sstate != 0 &&
+	    clone->notify_status != APM_EV_ACKED)
+		acpi_AckSleepState(clone, 0);
+
+	/* Remove this clone's data from the list and free it. */
+	ACPI_LOCK(acpi);
+	STAILQ_REMOVE(&acpi_sc->apm_cdevs, clone, apm_clone_data, entries);
+	knlist_destroy(&clone->sel_read.si_note);
+	ACPI_UNLOCK(acpi);
+	free(clone, M_APMDEV);
+	destroy_dev_sched(dev);
+	return (0);
+}
+
+static int
+apmioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
+{
+	int	error;
+	struct	apm_clone_data *clone;
+	struct	acpi_softc *acpi_sc;
+	struct	apm_info info;
+	struct 	apm_event_info *ev_info;
+	apm_info_old_t aiop;
+
+	error = 0;
+	clone = dev->si_drv1;
+	acpi_sc = clone->acpi_sc;
+
+	switch (cmd) {
+	case APMIO_SUSPEND:
+		if ((flag & FWRITE) == 0)
+			return (EPERM);
+		if (acpi_sc->acpi_next_sstate == 0) {
+			if (acpi_sc->acpi_suspend_sx != ACPI_STATE_S5) {
+				error = acpi_ReqSleepState(acpi_sc,
+				    acpi_sc->acpi_suspend_sx);
+			} else {
+				printf(
+			"power off via apm suspend not supported\n");
+				error = ENXIO;
+			}
+		} else
+			error = acpi_AckSleepState(clone, 0);
+		break;
+	case APMIO_STANDBY:
+		if ((flag & FWRITE) == 0)
+			return (EPERM);
+		if (acpi_sc->acpi_next_sstate == 0) {
+			if (acpi_sc->acpi_standby_sx != ACPI_STATE_S5) {
+				error = acpi_ReqSleepState(acpi_sc,
+				    acpi_sc->acpi_standby_sx);
+			} else {
+				printf(
+			"power off via apm standby not supported\n");
+				error = ENXIO;
+			}
+		} else
+			error = acpi_AckSleepState(clone, 0);
+		break;
+	case APMIO_NEXTEVENT:
+		printf("apm nextevent start\n");
+		ACPI_LOCK(acpi);
+		if (acpi_sc->acpi_next_sstate != 0 && clone->notify_status ==
+		    APM_EV_NONE) {
+			ev_info = (struct apm_event_info *)addr;
+			if (acpi_sc->acpi_next_sstate <= ACPI_STATE_S3)
+				ev_info->type = PMEV_STANDBYREQ;
+			else
+				ev_info->type = PMEV_SUSPENDREQ;
+			ev_info->index = 0;
+			clone->notify_status = APM_EV_NOTIFIED;
+			printf("apm event returning %d\n", ev_info->type);
+		} else
+			error = EAGAIN;
+		ACPI_UNLOCK(acpi);
+		break;
+	case APMIO_GETINFO_OLD:
+		if (acpi_capm_get_info(&info))
+			error = ENXIO;
+		aiop = (apm_info_old_t)addr;
+		aiop->ai_major = info.ai_major;
+		aiop->ai_minor = info.ai_minor;
+		aiop->ai_acline = info.ai_acline;
+		aiop->ai_batt_stat = info.ai_batt_stat;
+		aiop->ai_batt_life = info.ai_batt_life;
+		aiop->ai_status = info.ai_status;
+		break;
+	case APMIO_GETINFO:
+		if (acpi_capm_get_info((apm_info_t)addr))
+			error = ENXIO;
+		break;
+	case APMIO_GETPWSTATUS:
+		if (acpi_capm_get_pwstatus((apm_pwstatus_t)addr))
+			error = ENXIO;
+		break;
+	case APMIO_ENABLE:
+		if ((flag & FWRITE) == 0)
+			return (EPERM);
+		apm_active = 1;
+		break;
+	case APMIO_DISABLE:
+		if ((flag & FWRITE) == 0)
+			return (EPERM);
+		apm_active = 0;
+		break;
+	case APMIO_HALTCPU:
+		break;
+	case APMIO_NOTHALTCPU:
+		break;
+	case APMIO_DISPLAY:
+		if ((flag & FWRITE) == 0)
+			return (EPERM);
+		break;
+	case APMIO_BIOS:
+		if ((flag & FWRITE) == 0)
+			return (EPERM);
+		bzero(addr, sizeof(struct apm_bios_arg));
+		break;
+	default:
+		error = EINVAL;
+		break;
+	}
+
+	return (error);
+}
+
+static int
+apmwrite(struct cdev *dev, struct uio *uio, int ioflag)
+{
+	return (uio->uio_resid);
+}
+
+static int
+apmpoll(struct cdev *dev, int events, struct thread *td)
+{
+	struct	apm_clone_data *clone;
+	int revents;
+
+	revents = 0;
+	ACPI_LOCK(acpi);
+	clone = dev->si_drv1;
+	if (clone->acpi_sc->acpi_next_sstate)
+		revents |= events & (POLLIN | POLLRDNORM);
+	else
+		selrecord(td, &clone->sel_read);
+	ACPI_UNLOCK(acpi);
+	return (revents);
+}
+
+static int
+apmkqfilter(struct cdev *dev, struct knote *kn)
+{
+	struct	apm_clone_data *clone;
+
+	ACPI_LOCK(acpi);
+	clone = dev->si_drv1;
+	kn->kn_hook = clone;
+	kn->kn_fop = &apm_readfiltops;
+	knlist_add(&clone->sel_read.si_note, kn, 0);
+	ACPI_UNLOCK(acpi);
+	return (0);
+}
+
+static void
+apmreadfiltdetach(struct knote *kn)
+{
+	struct	apm_clone_data *clone;
+
+	ACPI_LOCK(acpi);
+	clone = kn->kn_hook;
+	knlist_remove(&clone->sel_read.si_note, kn, 0);
+	ACPI_UNLOCK(acpi);
+}
+
+static int
+apmreadfilt(struct knote *kn, long hint)
+{
+	struct	apm_clone_data *clone;
+	int	sleeping;
+
+	ACPI_LOCK(acpi);
+	clone = kn->kn_hook;
+	sleeping = clone->acpi_sc->acpi_next_sstate ? 1 : 0;
+	ACPI_UNLOCK(acpi);
+	return (sleeping);
+}
 
 int
 acpi_machdep_init(device_t dev)
@@ -59,14 +506,11 @@
 
 	sc = devclass_get_softc(devclass_find("acpi"), 0);
 
-	/* Create a fake clone for /dev/acpi. */
+	/* Create a clone for /dev/acpi also. */
 	STAILQ_INIT(&sc->apm_cdevs);
-	acpi_clone.cdev = sc->acpi_dev_t;
-	acpi_clone.acpi_sc = sc;
-	ACPI_LOCK(acpi);
-	STAILQ_INSERT_TAIL(&sc->apm_cdevs, &acpi_clone, entries);
-	ACPI_UNLOCK(acpi);
-	sc->acpi_clone = &acpi_clone;
+	sc->acpi_clone = apm_create_clone(sc->acpi_dev_t, sc);
+	clone_setup(&apm_clones);
+	EVENTHANDLER_REGISTER(dev_clone, apm_clone, 0, 1000);
 	acpi_install_wakeup_handler(sc);
 
 	if (intr_model != ACPI_INTR_PIC)
@@ -100,6 +544,246 @@
 }
 
 /*
+ * Support for mapping ACPI tables during early boot.  Currently this
+ * uses the crashdump map to map each table.  However, the crashdump
+ * map is created in pmap_bootstrap() right after the direct map, so
+ * we should be able to just use pmap_mapbios() here instead.
+ *
+ * This makes the following assumptions about how we use this KVA:
+ * pages 0 and 1 are used to map in the header of each table found via
+ * the RSDT or XSDT and pages 2 to n are used to map in the RSDT or
+ * XSDT.  This has to use 2 pages for the table headers in case a
+ * header spans a page boundary.
+ *
+ * XXX: We don't ensure the table fits in the available address space
+ * in the crashdump map.
+ */
+
+/*
+ * Map some memory using the crashdump map.  'offset' is an offset in
+ * pages into the crashdump map to use for the start of the mapping.
+ */
+static void *
+table_map(vm_paddr_t pa, int offset, vm_offset_t length)
+{
+	vm_offset_t va, off;
+	void *data;
+
+	off = pa & PAGE_MASK;
+	length = roundup(length + off, PAGE_SIZE);
+	pa = pa & PG_FRAME;
+	va = (vm_offset_t)pmap_kenter_temporary(pa, offset) +
+	    (offset * PAGE_SIZE);
+	data = (void *)(va + off);
+	length -= PAGE_SIZE;
+	while (length > 0) {
+		va += PAGE_SIZE;
+		pa += PAGE_SIZE;
+		length -= PAGE_SIZE;
+		pmap_kenter(va, pa);
+		invlpg(va);
+	}
+	return (data);
+}
+
+/* Unmap memory previously mapped with table_map(). */
+static void
+table_unmap(void *data, vm_offset_t length)
+{
+	vm_offset_t va, off;
+
+	va = (vm_offset_t)data;
+	off = va & PAGE_MASK;
+	length = roundup(length + off, PAGE_SIZE);
+	va &= ~PAGE_MASK;
+	while (length > 0) {
+		pmap_kremove(va);
+		invlpg(va);
+		va += PAGE_SIZE;
+		length -= PAGE_SIZE;
+	}
+}
+
+/*
+ * Map a table at a given offset into the crashdump map.  It first
+ * maps the header to determine the table length and then maps the
+ * entire table.
+ */
+static void *
+map_table(vm_paddr_t pa, int offset, const char *sig)
+{
+	ACPI_TABLE_HEADER *header;
+	vm_offset_t length;
+	void *table;
+
+	header = table_map(pa, offset, sizeof(ACPI_TABLE_HEADER));
+	if (strncmp(header->Signature, sig, ACPI_NAME_SIZE) != 0) {
+		table_unmap(header, sizeof(ACPI_TABLE_HEADER));
+		return (NULL);
+	}
+	length = header->Length;
+	table_unmap(header, sizeof(ACPI_TABLE_HEADER));
+	table = table_map(pa, offset, length);
+	if (ACPI_FAILURE(AcpiTbChecksum(table, length))) {
+		if (bootverbose)
+			printf("ACPI: Failed checksum for table %s\n", sig);
+		table_unmap(table, length);
+		return (NULL);
+	}
+	return (table);
+}
+
+/*
+ * See if a given ACPI table is the requested table.  Returns the
+ * length of the able if it matches or zero on failure.
+ */
+static int
+probe_table(vm_paddr_t address, const char *sig)
+{
+	ACPI_TABLE_HEADER *table;
+
+	table = table_map(address, 0, sizeof(ACPI_TABLE_HEADER));
+	if (table == NULL) {
+		if (bootverbose)
+			printf("ACPI: Failed to map table at 0x%jx\n",
+			    (uintmax_t)address);
+		return (0);
+	}
+	if (bootverbose)
+		printf("Table '%.4s' at 0x%jx\n", table->Signature,
+		    (uintmax_t)address);
+
+	if (strncmp(table->Signature, sig, ACPI_NAME_SIZE) != 0) {
+		table_unmap(table, sizeof(ACPI_TABLE_HEADER));
+		return (0);
+	}
+	table_unmap(table, sizeof(ACPI_TABLE_HEADER));
+	return (1);
+}
+
+/*
+ * Try to map a table at a given physical address previously returned
+ * by acpi_find_table().
+ */
+void *
+acpi_map_table(vm_paddr_t pa, const char *sig)
+{
+
+	return (map_table(pa, 0, sig));
+}
+
+/* Unmap a table previously mapped via acpi_map_table(). */
+void
+acpi_unmap_table(void *table)
+{
+	ACPI_TABLE_HEADER *header;
+
+	header = (ACPI_TABLE_HEADER *)table;
+	table_unmap(table, header->Length);
+}
+
+/*
+ * Return the physical address of the requested table or zero if one
+ * is not found.
+ */
+vm_paddr_t
+acpi_find_table(const char *sig)
+{
+	ACPI_PHYSICAL_ADDRESS rsdp_ptr;
+	ACPI_TABLE_RSDP *rsdp;
+	ACPI_TABLE_RSDT *rsdt;
+	ACPI_TABLE_XSDT *xsdt;
+	ACPI_TABLE_HEADER *table;
+	vm_paddr_t addr;
+	int i, count;
+
+	if (resource_disabled("acpi", 0))
+		return (0);
+
+	/*
+	 * Map in the RSDP.  Since ACPI uses AcpiOsMapMemory() which in turn
+	 * calls pmap_mapbios() to find the RSDP, we assume that we can use
+	 * pmap_mapbios() to map the RSDP.
+	 */
+	if ((rsdp_ptr = AcpiOsGetRootPointer()) == 0)
+		return (0);
+	rsdp = pmap_mapbios(rsdp_ptr, sizeof(ACPI_TABLE_RSDP));
+	if (rsdp == NULL) {
+		if (bootverbose)
+			printf("ACPI: Failed to map RSDP\n");
+		return (0);
+	}
+
+	/*
+	 * For ACPI >= 2.0, use the XSDT if it is available.
+	 * Otherwise, use the RSDT.  We map the XSDT or RSDT at page 2
+	 * in the crashdump area.  Pages 0 and 1 are used to map in the
+	 * headers of candidate ACPI tables.
+	 */
+	addr = 0;
+	if (rsdp->Revision >= 2 && rsdp->XsdtPhysicalAddress != 0) {
+		/*
+		 * AcpiOsGetRootPointer only verifies the checksum for
+		 * the version 1.0 portion of the RSDP.  Version 2.0 has
+		 * an additional checksum that we verify first.
+		 */
+		if (AcpiTbChecksum((UINT8 *)rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) {
+			if (bootverbose)
+				printf("ACPI: RSDP failed extended checksum\n");
+			return (0);
+		}
+		xsdt = map_table(rsdp->XsdtPhysicalAddress, 2, ACPI_SIG_XSDT);
+		if (xsdt == NULL) {
+			if (bootverbose)
+				printf("ACPI: Failed to map XSDT\n");
+			return (0);
+		}
+		count = (xsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) /
+		    sizeof(UINT64);

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 20:37:24 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3050F106568D; Fri,  2 Oct 2009 20:37:24 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E8BA810656B2
	for ; Fri,  2 Oct 2009 20:37:23 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D78C98FC17
	for ; Fri,  2 Oct 2009 20:37:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92KbNCA071432
	for ; Fri, 2 Oct 2009 20:37:23 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92KbNFI071430
	for perforce@freebsd.org; Fri, 2 Oct 2009 20:37:23 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Fri, 2 Oct 2009 20:37:23 GMT
Message-Id: <200910022037.n92KbNFI071430@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169158 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 20:37:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=169158

Change 169158 by truncs@aditya on 2009/10/02 20:37:20

	Remove EXT2FS_DEBUG, it is hardly used.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_lookup.c#4 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2fs.h#4 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_lookup.c#4 (text+ko) ====

@@ -166,12 +166,6 @@
 	count -= (uio->uio_offset + count) & (DIRBLKSIZ -1);
 	if (count <= 0)
 		count += DIRBLKSIZ;
-
-#ifdef EXT2FS_DEBUG
-	printf("ext2_readdir: uio_offset = %lld, uio_resid = %d, count = %d\n",
-	    uio->uio_offset, uio->uio_resid, count);
-#endif
-
 	auio = *uio;
 	auio.uio_iov = &aiov;
 	auio.uio_iovcnt = 1;

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2fs.h#4 (text+ko) ====

@@ -40,24 +40,6 @@
 #include 
 
 /*
- * Define EXT2FS_DEBUG to produce debug messages
- */
-#undef EXT2FS_DEBUG
-
-/*
- * Debug code
- */
-#ifdef EXT2FS_DEBUG
-#	define ext2_debug(f, a...)	{ \
-					printf ("EXT2-fs DEBUG (%s, %d): %s:", \
-						__FILE__, __LINE__, __func__); \
-				  	printf (f, ## a); \
-					}
-#else
-#	define ext2_debug(f, a...)	/**/
-#endif
-
-/*
  * Special inode numbers
  */
 #define	EXT2_BAD_INO		 1	/* Bad blocks inode */

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 20:55:44 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 94942106568D; Fri,  2 Oct 2009 20:55:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4085E1065679
	for ; Fri,  2 Oct 2009 20:55:44 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2FCD68FC0C
	for ; Fri,  2 Oct 2009 20:55:44 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92Kth4Z082899
	for ; Fri, 2 Oct 2009 20:55:43 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92KthGa082897
	for perforce@freebsd.org; Fri, 2 Oct 2009 20:55:43 GMT
	(envelope-from scottl@freebsd.org)
Date: Fri, 2 Oct 2009 20:55:43 GMT
Message-Id: <200910022055.n92KthGa082897@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169159 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 20:55:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=169159

Change 169159 by scottl@scottl-y1 on 2009/10/02 20:54:52

	Quick and dirty hack to use the config_intrhook mechanism to
	synchronizing bus scan.  Not sure if it's sufficient as it doesn't
	refcount the scans.  USB is resistant to reliable refcounting,
	unfortunately.

Affected files ...

.. //depot/projects/firewire/sys/dev/usb/controller/usb_controller.c#2 edit
.. //depot/projects/firewire/sys/dev/usb/usb_bus.h#2 edit

Differences ...

==== //depot/projects/firewire/sys/dev/usb/controller/usb_controller.c#2 (text+ko) ====

@@ -67,6 +67,7 @@
 static device_detach_t usb_detach;
 
 static void	usb_attach_sub(device_t, struct usb_bus *);
+static void	usb_bus_config_hook(void *arg);
 
 /* static variables */
 
@@ -78,11 +79,6 @@
     "Debug level");
 #endif
 
-static int usb_no_boot_wait = 0;
-TUNABLE_INT("hw.usb.no_boot_wait", &usb_no_boot_wait);
-SYSCTL_INT(_hw_usb, OID_AUTO, no_boot_wait, CTLFLAG_RDTUN, &usb_no_boot_wait, 0,
-    "No device enumerate waiting at boot.");
-
 static devclass_t usb_devclass;
 
 static device_method_t usb_methods[] = {
@@ -134,11 +130,6 @@
 		return (ENXIO);
 	}
 
-	if (usb_no_boot_wait == 0) {
-		/* delay vfs_mountroot until the bus is explored */
-		bus->bus_roothold = root_mount_hold(device_get_nameunit(dev));
-	}
-
 	usb_attach_sub(dev, bus);
 
 	return (0);			/* return success */
@@ -161,12 +152,6 @@
 	/* Stop power watchdog */
 	usb_callout_drain(&bus->power_wdog);
 
-	/* Let the USB explore process detach all devices. */
-	if (bus->bus_roothold != NULL) {
-		root_mount_rel(bus->bus_roothold);
-		bus->bus_roothold = NULL;
-	}
-
 	USB_BUS_LOCK(bus);
 	if (usb_proc_msignal(&bus->explore_proc,
 	    &bus->detach_msg[0], &bus->detach_msg[1])) {
@@ -239,9 +224,11 @@
 		(udev->hub->explore) (udev);
 		USB_BUS_LOCK(bus);
 	}
-	if (bus->bus_roothold != NULL) {
-		root_mount_rel(bus->bus_roothold);
-		bus->bus_roothold = NULL;
+
+	if (bus->usb_config_hook != NULL) {
+		config_intrhook_disestablish(bus->usb_config_hook);
+		free(bus->usb_config_hook, M_TEMP);
+		bus->usb_config_hook = NULL;
 	}
 }
 
@@ -447,16 +434,31 @@
 		    "process failed.\n");
 	} else {
 		/* Get final attach going */
-		USB_BUS_LOCK(bus);
-		if (usb_proc_msignal(&bus->explore_proc,
-		    &bus->attach_msg[0], &bus->attach_msg[1])) {
-			/* ignore */
-		}
-		USB_BUS_UNLOCK(bus);
+		bus->usb_config_hook = malloc(sizeof(struct intr_config_hook),
+					      M_TEMP, M_ZERO);
+		bus->usb_config_hook->ich_func = usb_bus_config_hook;
+		bus->usb_config_hook->ich_arg = bus;
+		config_intrhook_establish(bus->usb_config_hook);
+	}
+}
+
+static void
+usb_bus_config_hook(void *arg)
+{
+	struct usb_bus *bus;
+
+	bus = (struct usb_bus *)arg;
 
-		/* Do initial explore */
-		usb_needs_explore(bus, 1);
+	USB_BUS_LOCK(bus);
+	bus->buses_to_explore = 0;
+	if (usb_proc_msignal(&bus->explore_proc,
+	    &bus->attach_msg[0], &bus->attach_msg[1])) {
+		/* ignore */
 	}
+	USB_BUS_UNLOCK(bus);
+
+	/* Do initial explore */
+	usb_needs_explore(bus, 1);
 }
 
 SYSUNINIT(usb_bus_unload, SI_SUB_KLD, SI_ORDER_ANY, usb_bus_unload, NULL);

==== //depot/projects/firewire/sys/dev/usb/usb_bus.h#2 (text+ko) ====

@@ -51,7 +51,7 @@
 struct usb_bus {
 	struct usb_bus_stat stats_err;
 	struct usb_bus_stat stats_ok;
-	struct root_hold_token *bus_roothold;
+	struct intr_config_hook *usb_config_hook;
 	/*
 	 * There are two callback processes. One for Giant locked
 	 * callbacks. One for non-Giant locked callbacks. This should

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 21:07:59 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ED24E106568F; Fri,  2 Oct 2009 21:07:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AFD1C106568B
	for ; Fri,  2 Oct 2009 21:07:58 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9CF9D8FC14
	for ; Fri,  2 Oct 2009 21:07:58 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92L7wj9084691
	for ; Fri, 2 Oct 2009 21:07:58 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92L7vQZ084689
	for perforce@freebsd.org; Fri, 2 Oct 2009 21:07:57 GMT
	(envelope-from scottl@freebsd.org)
Date: Fri, 2 Oct 2009 21:07:57 GMT
Message-Id: <200910022107.n92L7vQZ084689@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169160 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 21:07:59 -0000

http://perforce.freebsd.org/chv.cgi?CH=169160

Change 169160 by scottl@scottl-y1 on 2009/10/02 21:07:21

	IFC

Affected files ...

.. //depot/projects/firewire/UPDATING#2 integrate
.. //depot/projects/firewire/bin/sh/parser.c#2 integrate
.. //depot/projects/firewire/bin/sh/sh.1#2 integrate
.. //depot/projects/firewire/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate
.. //depot/projects/firewire/crypto/openssh/ChangeLog#2 integrate
.. //depot/projects/firewire/crypto/openssh/README#2 integrate
.. //depot/projects/firewire/crypto/openssh/README.platform#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth-pam.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth-passwd.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth-sia.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth1.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth2-jpake.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth2-kbdint.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth2-none.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth2-passwd.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth2-pubkey.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/auth2.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/canohost.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/canohost.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/channels.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/clientloop.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/config.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/config.h.in#2 integrate
.. //depot/projects/firewire/crypto/openssh/defines.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/gss-genr.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/includes.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/jpake.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/jpake.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/kex.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/kex.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/kexdhs.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/kexgexs.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/monitor.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/monitor_mm.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/monitor_wrap.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/monitor_wrap.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/daemon.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/openssl-compat.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/port-aix.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/openbsd-compat/port-aix.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/packet.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/packet.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/readconf.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/readconf.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/roaming.h#1 branch
.. //depot/projects/firewire/crypto/openssh/roaming_common.c#1 branch
.. //depot/projects/firewire/crypto/openssh/roaming_dummy.c#1 branch
.. //depot/projects/firewire/crypto/openssh/schnorr.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/schnorr.h#1 branch
.. //depot/projects/firewire/crypto/openssh/servconf.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/serverloop.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/session.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/sftp-client.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/sftp-server.8#2 integrate
.. //depot/projects/firewire/crypto/openssh/sftp-server.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh-agent.1#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh-agent.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh-keygen.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh.1#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh_config#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh_config.5#2 integrate
.. //depot/projects/firewire/crypto/openssh/ssh_namespace.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/sshconnect.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/sshconnect.h#2 integrate
.. //depot/projects/firewire/crypto/openssh/sshconnect2.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/sshd.8#2 integrate
.. //depot/projects/firewire/crypto/openssh/sshd.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/sshd_config#2 integrate
.. //depot/projects/firewire/crypto/openssh/sshd_config.5#2 integrate
.. //depot/projects/firewire/crypto/openssh/sshlogin.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/uuencode.c#2 integrate
.. //depot/projects/firewire/crypto/openssh/version.h#2 integrate
.. //depot/projects/firewire/etc/defaults/rc.conf#2 integrate
.. //depot/projects/firewire/etc/mtree/BSD.usr.dist#2 integrate
.. //depot/projects/firewire/etc/network.subr#2 integrate
.. //depot/projects/firewire/etc/periodic/daily/400.status-disks#2 integrate
.. //depot/projects/firewire/etc/periodic/security/200.chkmounts#2 integrate
.. //depot/projects/firewire/etc/rc.d/defaultroute#2 integrate
.. //depot/projects/firewire/etc/rc.d/faith#2 integrate
.. //depot/projects/firewire/etc/rc.d/ip6addrctl#2 integrate
.. //depot/projects/firewire/etc/rc.d/netif#2 integrate
.. //depot/projects/firewire/etc/rc.d/netoptions#2 integrate
.. //depot/projects/firewire/etc/rc.d/routing#2 integrate
.. //depot/projects/firewire/etc/rc.d/rtadvd#2 integrate
.. //depot/projects/firewire/etc/rc.d/static_arp#2 integrate
.. //depot/projects/firewire/etc/rc.d/stf#2 integrate
.. //depot/projects/firewire/etc/rc.subr#2 integrate
.. //depot/projects/firewire/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate
.. //depot/projects/firewire/lib/libc/gen/Makefile.inc#2 integrate
.. //depot/projects/firewire/lib/libc/gen/Symbol.map#2 integrate
.. //depot/projects/firewire/lib/libc/gen/_pthread_stubs.c#2 integrate
.. //depot/projects/firewire/lib/libc/gen/getpagesizes.3#1 branch
.. //depot/projects/firewire/lib/libc/gen/getpagesizes.c#1 branch
.. //depot/projects/firewire/lib/libc/nls/Makefile.inc#2 integrate
.. //depot/projects/firewire/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch
.. //depot/projects/firewire/lib/libc/stdlib/malloc.3#2 integrate
.. //depot/projects/firewire/lib/libc/stdlib/malloc.c#2 integrate
.. //depot/projects/firewire/lib/libc/sys/fcntl.2#2 integrate
.. //depot/projects/firewire/lib/libc/sys/setfib.2#2 integrate
.. //depot/projects/firewire/lib/libc/sys/stack_protector.c#2 integrate
.. //depot/projects/firewire/lib/libdisk/change.c#2 integrate
.. //depot/projects/firewire/lib/libjail/jail.3#2 integrate
.. //depot/projects/firewire/lib/libradius/radlib.c#2 integrate
.. //depot/projects/firewire/lib/libthr/thread/thr_spec.c#2 integrate
.. //depot/projects/firewire/lib/libthr/thread/thr_umtx.h#2 integrate
.. //depot/projects/firewire/libexec/rpc.rquotad/rquotad.c#2 integrate
.. //depot/projects/firewire/release/Makefile#2 integrate
.. //depot/projects/firewire/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate
.. //depot/projects/firewire/sbin/camcontrol/camcontrol.c#2 integrate
.. //depot/projects/firewire/sbin/geom/class/nop/gnop.8#2 integrate
.. //depot/projects/firewire/sbin/ifconfig/ifconfig.8#2 integrate
.. //depot/projects/firewire/sbin/ipfw/ipfw.8#2 integrate
.. //depot/projects/firewire/sbin/mksnap_ffs/mksnap_ffs.8#2 integrate
.. //depot/projects/firewire/sbin/mount_nfs/mount_nfs.c#2 integrate
.. //depot/projects/firewire/sbin/savecore/savecore.8#2 integrate
.. //depot/projects/firewire/sbin/shutdown/shutdown.c#2 integrate
.. //depot/projects/firewire/secure/libexec/sftp-server/Makefile#2 integrate
.. //depot/projects/firewire/secure/libexec/ssh-keysign/Makefile#2 integrate
.. //depot/projects/firewire/secure/usr.bin/scp/Makefile#2 integrate
.. //depot/projects/firewire/secure/usr.bin/sftp/Makefile#2 integrate
.. //depot/projects/firewire/secure/usr.bin/ssh-add/Makefile#2 integrate
.. //depot/projects/firewire/secure/usr.bin/ssh-agent/Makefile#2 integrate
.. //depot/projects/firewire/secure/usr.bin/ssh-keygen/Makefile#2 integrate
.. //depot/projects/firewire/secure/usr.bin/ssh-keyscan/Makefile#2 integrate
.. //depot/projects/firewire/secure/usr.bin/ssh/Makefile#2 integrate
.. //depot/projects/firewire/secure/usr.sbin/sshd/Makefile#2 integrate
.. //depot/projects/firewire/share/examples/scsi_target/scsi_target.c#2 integrate
.. //depot/projects/firewire/share/man/man4/Makefile#2 integrate
.. //depot/projects/firewire/share/man/man4/acpi_panasonic.4#2 integrate
.. //depot/projects/firewire/share/man/man4/lindev.4#1 branch
.. //depot/projects/firewire/share/man/man4/msk.4#2 integrate
.. //depot/projects/firewire/share/man/man5/procfs.5#2 integrate
.. //depot/projects/firewire/share/man/man5/rc.conf.5#2 integrate
.. //depot/projects/firewire/share/man/man7/tuning.7#2 integrate
.. //depot/projects/firewire/share/man/man9/Makefile#2 integrate
.. //depot/projects/firewire/share/man/man9/VOP_ACCESS.9#2 integrate
.. //depot/projects/firewire/share/man/man9/acl.9#2 integrate
.. //depot/projects/firewire/share/man/man9/fail.9#2 integrate
.. //depot/projects/firewire/share/man/man9/ieee80211.9#2 integrate
.. //depot/projects/firewire/share/man/man9/ieee80211_amrr.9#2 integrate
.. //depot/projects/firewire/share/man/man9/ieee80211_beacon.9#2 integrate
.. //depot/projects/firewire/share/man/man9/ieee80211_bmiss.9#2 integrate
.. //depot/projects/firewire/share/man/man9/ieee80211_crypto.9#2 integrate
.. //depot/projects/firewire/share/man/man9/ieee80211_ddb.9#2 integrate
.. //depot/projects/firewire/share/man/man9/ieee80211_input.9#2 integrate
.. //depot/projects/firewire/share/man/man9/ieee80211_node.9#2 integrate
.. //depot/projects/firewire/share/man/man9/ieee80211_output.9#2 integrate
.. //depot/projects/firewire/share/man/man9/ieee80211_proto.9#2 integrate
.. //depot/projects/firewire/share/man/man9/ieee80211_radiotap.9#2 integrate
.. //depot/projects/firewire/share/man/man9/ieee80211_regdomain.9#2 integrate
.. //depot/projects/firewire/share/man/man9/ieee80211_scan.9#2 integrate
.. //depot/projects/firewire/share/man/man9/ieee80211_vap.9#2 integrate
.. //depot/projects/firewire/share/man/man9/vaccess.9#2 integrate
.. //depot/projects/firewire/share/man/man9/vaccess_acl_nfs4.9#1 branch
.. //depot/projects/firewire/share/misc/bsd-family-tree#2 integrate
.. //depot/projects/firewire/share/misc/iso3166#2 integrate
.. //depot/projects/firewire/share/zoneinfo/asia#2 integrate
.. //depot/projects/firewire/share/zoneinfo/southamerica#2 integrate
.. //depot/projects/firewire/sys/amd64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/firewire/sys/amd64/acpica/madt.c#2 integrate
.. //depot/projects/firewire/sys/amd64/amd64/initcpu.c#2 integrate
.. //depot/projects/firewire/sys/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/firewire/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/firewire/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/firewire/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/firewire/sys/amd64/conf/NOTES#2 integrate
.. //depot/projects/firewire/sys/amd64/include/acpica_machdep.h#2 integrate
.. //depot/projects/firewire/sys/amd64/include/apm_bios.h#1 branch
.. //depot/projects/firewire/sys/amd64/include/cpufunc.h#2 integrate
.. //depot/projects/firewire/sys/amd64/include/param.h#2 integrate
.. //depot/projects/firewire/sys/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/firewire/sys/arm/arm/cpufunc.c#2 integrate
.. //depot/projects/firewire/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/firewire/sys/arm/include/md_var.h#2 integrate
.. //depot/projects/firewire/sys/arm/include/param.h#2 integrate
.. //depot/projects/firewire/sys/arm/xscale/xscalereg.h#2 delete
.. //depot/projects/firewire/sys/arm/xscale/xscalevar.h#2 delete
.. //depot/projects/firewire/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/firewire/sys/bsm/audit_kevents.h#2 integrate
.. //depot/projects/firewire/sys/cam/ata/ata_all.c#2 integrate
.. //depot/projects/firewire/sys/cam/cam_periph.c#2 integrate
.. //depot/projects/firewire/sys/cam/scsi/scsi_target.c#2 integrate
.. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate
.. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate
.. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate
.. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate
.. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate
.. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate
.. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate
.. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate
.. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/firewire/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate
.. //depot/projects/firewire/sys/compat/freebsd32/freebsd32_proto.h#2 integrate
.. //depot/projects/firewire/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate
.. //depot/projects/firewire/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate
.. //depot/projects/firewire/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate
.. //depot/projects/firewire/sys/compat/freebsd32/syscalls.master#2 integrate
.. //depot/projects/firewire/sys/compat/x86bios/x86bios.c#1 branch
.. //depot/projects/firewire/sys/compat/x86bios/x86bios.h#1 branch
.. //depot/projects/firewire/sys/compat/x86bios/x86bios_alloc.c#1 branch
.. //depot/projects/firewire/sys/conf/NOTES#2 integrate
.. //depot/projects/firewire/sys/conf/files#2 integrate
.. //depot/projects/firewire/sys/conf/files.amd64#2 integrate
.. //depot/projects/firewire/sys/conf/files.i386#2 integrate
.. //depot/projects/firewire/sys/conf/files.pc98#2 integrate
.. //depot/projects/firewire/sys/conf/newvers.sh#2 integrate
.. //depot/projects/firewire/sys/conf/options#2 integrate
.. //depot/projects/firewire/sys/contrib/x86emu/x86emu.c#2 integrate
.. //depot/projects/firewire/sys/contrib/x86emu/x86emu_util.c#2 integrate
.. //depot/projects/firewire/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/firewire/sys/dev/acpi_support/acpi_aiboost.c#2 integrate
.. //depot/projects/firewire/sys/dev/acpi_support/acpi_ibm.c#2 integrate
.. //depot/projects/firewire/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/firewire/sys/dev/acpica/acpi_acad.c#2 integrate
.. //depot/projects/firewire/sys/dev/acpica/acpi_video.c#2 integrate
.. //depot/projects/firewire/sys/dev/acpica/acpivar.h#2 integrate
.. //depot/projects/firewire/sys/dev/ae/if_ae.c#2 integrate
.. //depot/projects/firewire/sys/dev/age/if_age.c#2 integrate
.. //depot/projects/firewire/sys/dev/alc/if_alc.c#2 integrate
.. //depot/projects/firewire/sys/dev/ale/if_ale.c#2 integrate
.. //depot/projects/firewire/sys/dev/ata/chipsets/ata-marvell.c#2 integrate
.. //depot/projects/firewire/sys/dev/atkbdc/atkbd.c#2 integrate
.. //depot/projects/firewire/sys/dev/ciss/ciss.c#2 integrate
.. //depot/projects/firewire/sys/dev/ciss/cissreg.h#2 integrate
.. //depot/projects/firewire/sys/dev/ciss/cissvar.h#2 integrate
.. //depot/projects/firewire/sys/dev/de/if_de.c#2 integrate
.. //depot/projects/firewire/sys/dev/de/if_devar.h#2 integrate
.. //depot/projects/firewire/sys/dev/dpms/dpms.c#2 integrate
.. //depot/projects/firewire/sys/dev/drm/r600_blit.c#2 integrate
.. //depot/projects/firewire/sys/dev/drm/radeon_cs.c#2 integrate
.. //depot/projects/firewire/sys/dev/drm/radeon_drv.h#2 integrate
.. //depot/projects/firewire/sys/dev/drm/radeon_irq.c#2 integrate
.. //depot/projects/firewire/sys/dev/drm/radeon_state.c#2 integrate
.. //depot/projects/firewire/sys/dev/fb/s3_pci.c#2 integrate
.. //depot/projects/firewire/sys/dev/fb/vesa.c#2 integrate
.. //depot/projects/firewire/sys/dev/fxp/if_fxp.c#2 integrate
.. //depot/projects/firewire/sys/dev/hwpmc/pmc_events.h#2 integrate
.. //depot/projects/firewire/sys/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/firewire/sys/dev/isp/isp.c#2 integrate
.. //depot/projects/firewire/sys/dev/isp/isp_stds.h#2 integrate
.. //depot/projects/firewire/sys/dev/isp/isp_tpublic.h#2 delete
.. //depot/projects/firewire/sys/dev/isp/ispmbox.h#2 integrate
.. //depot/projects/firewire/sys/dev/jme/if_jme.c#2 integrate
.. //depot/projects/firewire/sys/dev/kbd/kbd.c#2 integrate
.. //depot/projects/firewire/sys/dev/lindev/full.c#1 branch
.. //depot/projects/firewire/sys/dev/lindev/lindev.c#1 branch
.. //depot/projects/firewire/sys/dev/lindev/lindev.h#1 branch
.. //depot/projects/firewire/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/firewire/sys/dev/mii/e1000phyreg.h#2 integrate
.. //depot/projects/firewire/sys/dev/msk/if_msk.c#2 integrate
.. //depot/projects/firewire/sys/dev/msk/if_mskreg.h#2 integrate
.. //depot/projects/firewire/sys/dev/mwl/if_mwl.c#2 integrate
.. //depot/projects/firewire/sys/dev/mxge/if_mxge.c#2 integrate
.. //depot/projects/firewire/sys/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/firewire/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/firewire/sys/dev/pci/pcireg.h#2 integrate
.. //depot/projects/firewire/sys/dev/ppbus/vpo.c#2 integrate
.. //depot/projects/firewire/sys/dev/sound/pci/es137x.c#2 integrate
.. //depot/projects/firewire/sys/dev/sound/pci/es137x.h#2 integrate
.. //depot/projects/firewire/sys/dev/sound/pci/hda/hda_reg.h#2 integrate
.. //depot/projects/firewire/sys/dev/sound/pci/hda/hdac.c#2 integrate
.. //depot/projects/firewire/sys/dev/sound/pci/t4dwave.c#2 integrate
.. //depot/projects/firewire/sys/dev/syscons/scmouse.c#2 integrate
.. //depot/projects/firewire/sys/dev/syscons/scterm-teken.c#2 integrate
.. //depot/projects/firewire/sys/dev/syscons/syscons.c#2 integrate
.. //depot/projects/firewire/sys/dev/syscons/syscons.h#2 integrate
.. //depot/projects/firewire/sys/dev/twa/tw_cl_io.c#2 integrate
.. //depot/projects/firewire/sys/dev/twa/tw_cl_share.h#2 integrate
.. //depot/projects/firewire/sys/dev/twe/twe.c#2 integrate
.. //depot/projects/firewire/sys/dev/twe/twevar.h#2 integrate
.. //depot/projects/firewire/sys/dev/usb/controller/atmegadci.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/controller/ehci.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/controller/ehci_pci.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/controller/usb_controller.c#3 integrate
.. //depot/projects/firewire/sys/dev/usb/net/if_axe.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/net/if_cdce.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/net/if_cdcereg.h#2 integrate
.. //depot/projects/firewire/sys/dev/usb/quirk/usb_quirk.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/u3g.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/uark.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/ubsa.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/ubser.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/uch341.c#1 branch
.. //depot/projects/firewire/sys/dev/usb/serial/uchcom.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/ucycom.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/ufoma.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/uftdi.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/ugensa.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/uipaq.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/umct.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/umodem.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/umoscom.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/uplcom.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/usb_serial.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/usb_serial.h#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/uslcom.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/serial/uvscom.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/storage/umass.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/usb.h#2 integrate
.. //depot/projects/firewire/sys/dev/usb/usb_bus.h#3 integrate
.. //depot/projects/firewire/sys/dev/usb/usb_cdc.h#2 integrate
.. //depot/projects/firewire/sys/dev/usb/usb_device.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/usb_device.h#2 integrate
.. //depot/projects/firewire/sys/dev/usb/usb_hub.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/usb_transfer.c#2 integrate
.. //depot/projects/firewire/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/firewire/sys/fs/fifofs/fifo_vnops.c#2 integrate
.. //depot/projects/firewire/sys/fs/nfs/nfs_commonacl.c#2 integrate
.. //depot/projects/firewire/sys/fs/procfs/procfs.c#2 integrate
.. //depot/projects/firewire/sys/fs/procfs/procfs.h#2 integrate
.. //depot/projects/firewire/sys/fs/procfs/procfs_osrel.c#1 branch
.. //depot/projects/firewire/sys/geom/part/g_part.c#2 integrate
.. //depot/projects/firewire/sys/geom/part/g_part_ebr.c#2 integrate
.. //depot/projects/firewire/sys/i386/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/firewire/sys/i386/acpica/madt.c#2 integrate
.. //depot/projects/firewire/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/firewire/sys/i386/conf/NOTES#2 integrate
.. //depot/projects/firewire/sys/i386/i386/initcpu.c#2 integrate
.. //depot/projects/firewire/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/firewire/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/firewire/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/firewire/sys/i386/i386/vm_machdep.c#2 integrate
.. //depot/projects/firewire/sys/i386/include/acpica_machdep.h#2 integrate
.. //depot/projects/firewire/sys/i386/include/apm_bios.h#2 integrate
.. //depot/projects/firewire/sys/i386/include/cpufunc.h#2 integrate
.. //depot/projects/firewire/sys/i386/include/param.h#2 integrate
.. //depot/projects/firewire/sys/i386/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/firewire/sys/i386/xen/xen_machdep.c#2 integrate
.. //depot/projects/firewire/sys/ia64/include/param.h#2 integrate
.. //depot/projects/firewire/sys/kern/init_main.c#2 integrate
.. //depot/projects/firewire/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/firewire/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/firewire/sys/kern/kern_event.c#2 integrate
.. //depot/projects/firewire/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/firewire/sys/kern/kern_mib.c#2 integrate
.. //depot/projects/firewire/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/firewire/sys/kern/kern_rwlock.c#2 integrate
.. //depot/projects/firewire/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/firewire/sys/kern/kern_sx.c#2 integrate
.. //depot/projects/firewire/sys/kern/kern_umtx.c#2 integrate
.. //depot/projects/firewire/sys/kern/subr_acl_nfs4.c#2 integrate
.. //depot/projects/firewire/sys/kern/subr_acl_posix1e.c#2 integrate
.. //depot/projects/firewire/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/firewire/sys/kern/subr_devstat.c#2 integrate
.. //depot/projects/firewire/sys/kern/subr_smp.c#2 integrate
.. //depot/projects/firewire/sys/kern/syscalls.c#2 integrate
.. //depot/projects/firewire/sys/kern/syscalls.master#2 integrate
.. //depot/projects/firewire/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/firewire/sys/kern/vfs_default.c#2 integrate
.. //depot/projects/firewire/sys/kern/vfs_export.c#2 integrate
.. //depot/projects/firewire/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/firewire/sys/kern/vfs_vnops.c#2 integrate
.. //depot/projects/firewire/sys/mips/include/param.h#2 integrate
.. //depot/projects/firewire/sys/modules/Makefile#2 integrate
.. //depot/projects/firewire/sys/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/firewire/sys/modules/lindev/Makefile#1 branch
.. //depot/projects/firewire/sys/modules/nfslockd/Makefile#2 integrate
.. //depot/projects/firewire/sys/modules/procfs/Makefile#2 integrate
.. //depot/projects/firewire/sys/modules/usb/Makefile#2 integrate
.. //depot/projects/firewire/sys/modules/usb/uch341/Makefile#1 branch
.. //depot/projects/firewire/sys/modules/x86bios/Makefile#1 branch
.. //depot/projects/firewire/sys/modules/x86emu/Makefile#2 delete
.. //depot/projects/firewire/sys/net/flowtable.c#2 integrate
.. //depot/projects/firewire/sys/net/flowtable.h#2 integrate
.. //depot/projects/firewire/sys/net/if.c#2 integrate
.. //depot/projects/firewire/sys/net/if_llatbl.c#2 integrate
.. //depot/projects/firewire/sys/net/route.c#2 integrate
.. //depot/projects/firewire/sys/net80211/ieee80211.h#2 integrate
.. //depot/projects/firewire/sys/net80211/ieee80211_hwmp.c#2 integrate
.. //depot/projects/firewire/sys/net80211/ieee80211_mesh.c#2 integrate
.. //depot/projects/firewire/sys/net80211/ieee80211_mesh.h#2 integrate
.. //depot/projects/firewire/sys/netinet/in.c#2 integrate
.. //depot/projects/firewire/sys/netinet/in_mcast.c#2 integrate
.. //depot/projects/firewire/sys/netinet/in_proto.c#2 integrate
.. //depot/projects/firewire/sys/netinet/sctp_asconf.c#2 integrate
.. //depot/projects/firewire/sys/netinet/sctp_bsd_addr.c#2 integrate
.. //depot/projects/firewire/sys/netinet/sctp_input.c#2 integrate
.. //depot/projects/firewire/sys/netinet/sctp_os_bsd.h#2 integrate
.. //depot/projects/firewire/sys/netinet/sctp_output.c#2 integrate
.. //depot/projects/firewire/sys/netinet/sctp_pcb.c#2 integrate
.. //depot/projects/firewire/sys/netinet/sctp_pcb.h#2 integrate
.. //depot/projects/firewire/sys/netinet/sctp_structs.h#2 integrate
.. //depot/projects/firewire/sys/netinet/sctp_sysctl.c#2 integrate
.. //depot/projects/firewire/sys/netinet/sctp_timer.c#2 integrate
.. //depot/projects/firewire/sys/netinet/sctp_usrreq.c#2 integrate
.. //depot/projects/firewire/sys/netinet/sctputil.c#2 integrate
.. //depot/projects/firewire/sys/netinet6/in6_ifattach.c#2 integrate
.. //depot/projects/firewire/sys/netinet6/sctp6_usrreq.c#2 integrate
.. //depot/projects/firewire/sys/netipsec/xform_esp.c#2 integrate
.. //depot/projects/firewire/sys/nfsserver/nfs_serv.c#2 integrate
.. //depot/projects/firewire/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/firewire/sys/pc98/conf/NOTES#2 integrate
.. //depot/projects/firewire/sys/pci/intpm.c#2 integrate
.. //depot/projects/firewire/sys/powerpc/include/param.h#2 integrate
.. //depot/projects/firewire/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#2 integrate
.. //depot/projects/firewire/sys/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/firewire/sys/sparc64/include/param.h#2 integrate
.. //depot/projects/firewire/sys/sun4v/include/param.h#2 integrate
.. //depot/projects/firewire/sys/sys/ata.h#2 integrate
.. //depot/projects/firewire/sys/sys/event.h#2 integrate
.. //depot/projects/firewire/sys/sys/fcntl.h#2 integrate
.. //depot/projects/firewire/sys/sys/kbio.h#2 integrate
.. //depot/projects/firewire/sys/sys/mman.h#2 integrate
.. //depot/projects/firewire/sys/sys/param.h#2 integrate
.. //depot/projects/firewire/sys/sys/pmc.h#2 integrate
.. //depot/projects/firewire/sys/sys/rwlock.h#2 integrate
.. //depot/projects/firewire/sys/sys/smp.h#2 integrate
.. //depot/projects/firewire/sys/sys/sx.h#2 integrate
.. //depot/projects/firewire/sys/sys/syscall.h#2 integrate
.. //depot/projects/firewire/sys/sys/syscall.mk#2 integrate
.. //depot/projects/firewire/sys/sys/sysproto.h#2 integrate
.. //depot/projects/firewire/sys/sys/systm.h#2 integrate
.. //depot/projects/firewire/sys/sys/vnode.h#2 integrate
.. //depot/projects/firewire/sys/teken/sequences#2 integrate
.. //depot/projects/firewire/sys/teken/teken.c#2 integrate
.. //depot/projects/firewire/sys/teken/teken.h#2 integrate
.. //depot/projects/firewire/sys/teken/teken_demo.c#2 integrate
.. //depot/projects/firewire/sys/teken/teken_scs.h#2 integrate
.. //depot/projects/firewire/sys/teken/teken_stress.c#2 integrate
.. //depot/projects/firewire/sys/teken/teken_subr.h#2 integrate
.. //depot/projects/firewire/sys/teken/teken_subr_compat.h#2 integrate
.. //depot/projects/firewire/sys/ufs/ufs/ufs_gjournal.c#2 integrate
.. //depot/projects/firewire/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/firewire/sys/vm/vm_map.c#2 integrate
.. //depot/projects/firewire/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/firewire/tools/regression/acltools/00.t#2 integrate
.. //depot/projects/firewire/tools/regression/acltools/03.t#1 branch
.. //depot/projects/firewire/tools/regression/acltools/aclfuzzer.sh#1 branch
.. //depot/projects/firewire/tools/regression/acltools/tools-crossfs.test#1 branch
.. //depot/projects/firewire/tools/regression/bin/sh/errors/backquote-error2.0#1 branch
.. //depot/projects/firewire/tools/regression/mmap/Makefile#1 branch
.. //depot/projects/firewire/tools/regression/mmap/mmap.c#1 branch
.. //depot/projects/firewire/tools/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate
.. //depot/projects/firewire/tools/regression/usr.bin/sed/multitest.t#2 integrate
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.1#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.10#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.11#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.12#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.13#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.14#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.15#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.16#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.17#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.18#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.2#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.3#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.4#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.4.1#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.5#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.6#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.7#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.8#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1.9#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/100_9.10#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/101_9.11#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/102_9.12#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/103_9.13#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/104_9.14#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/105_9.15#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/106_9.16#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/107_9.17#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/108_9.18#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/109_9.19#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/10_1.9#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/110_9.20#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/111_9.21#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/112_9.22#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/113_9.23#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/114_9.24#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/115_9.25#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/116_9.26#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/117_9.27#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/118_9.28#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/119_9.29#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/11_1.10#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/120_9.30#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/121_9.31#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/12_1.11#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/13_1.12#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/14_1.13#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/15_1.14#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/16_1.15#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/17_1.16#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/18_1.17#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/19_1.18#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/1_1.1#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.1#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.10#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.11#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.12#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.13#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.14#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.15#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.16#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.17#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.18#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.19#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.2#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.20#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.21#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.22#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.3#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.4#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.5#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.6#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.7#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.8#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2.9#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/20_2.1#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/21_2.2#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/22_2.3#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/23_2.4#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/24_2.5#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/25_2.6#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/26_2.7#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/27_2.8#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/28_2.9#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/29_2.10#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/2_1.2#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/3.1#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/3.2#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/3.3#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/3.4#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/30_2.11#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/31_2.12#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/32_2.13#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/33_2.14#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/34_2.15#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/35_2.16#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/36_2.17#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/37_2.18#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/38_2.19#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/39_2.20#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/3_1.3#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.1#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.2#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.3#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.4#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.5#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.6#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.7#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4.8#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/40_2.21#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/40_3.1#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/41_2.22#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/41_3.2#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/42_3.3#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/43_3.4#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/44_4.1#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/45_4.2#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/46_4.3#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/47_4.4#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/48_4.5#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/49_4.6#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/4_1.4#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.1#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.2#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.3#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.4#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.5#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.6#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.7#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5.8#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/50_4.7#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/51_4.8#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/52_5.1#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/53_5.2#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/54_5.3#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/55_5.4#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/56_5.5#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/57_5.6#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/58_5.7#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/59_5.8#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/5_1.4.1#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/6.1#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/6.2#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/6.3#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/6.4#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/6.5#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/6.6#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/60_6.1#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/61_6.2#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/62_6.3#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/63_6.4#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/64_6.5#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/65_6.6#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/66_7.1#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/67_7.2#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/68_7.3#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/69_7.4#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/6_1.5#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.1#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.2#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.3#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.4#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.5#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.6#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.7#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7.8#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/70_7.5#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/71_7.6#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/72_7.7#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/73_7.8#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/74_8.1#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/75_8.2#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/76_8.3#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/77_8.4#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/78_8.5#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/79_8.6#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/7_1.6#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.1#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.10#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.11#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.12#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.13#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.14#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.15#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.16#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.17#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.18#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.19#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.2#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.20#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.21#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.22#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.23#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.3#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.4#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.5#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.6#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.7#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.8#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8.9#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/80_8.7#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/81_8.8#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/82_8.9#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/83_8.10#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/84_8.11#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/85_8.12#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/86_8.13#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/87_8.14#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/88_8.15#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/89_8.16#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/8_1.7#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.1#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.10#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.11#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.12#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.13#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.14#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.15#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.16#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.17#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.18#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.19#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.2#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.20#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.21#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.22#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.23#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.24#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.25#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.26#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.27#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.28#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.29#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.3#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.30#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.31#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.4#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.5#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.6#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.7#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.8#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9.9#1 branch
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/90_8.17#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/91_9.1#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/92_9.2#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/93_9.3#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/94_9.4#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/95_9.5#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/96_9.6#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/97_9.7#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/98_9.8#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/99_9.9#2 delete
.. //depot/projects/firewire/tools/regression/usr.bin/sed/regress.multitest.out/9_1.8#2 delete
.. //depot/projects/firewire/tools/tools/mwl/mwlstats/mwlstats.c#2 integrate
.. //depot/projects/firewire/tools/tools/nanobsd/nanobsd.sh#2 integrate
.. //depot/projects/firewire/usr.bin/find/find.1#2 integrate
.. //depot/projects/firewire/usr.bin/gcore/elfcore.c#2 integrate
.. //depot/projects/firewire/usr.bin/netstat/inet.c#2 integrate
.. //depot/projects/firewire/usr.bin/sed/compile.c#2 integrate
.. //depot/projects/firewire/usr.sbin/Makefile#2 integrate
.. //depot/projects/firewire/usr.sbin/apm/Makefile#2 integrate
.. //depot/projects/firewire/usr.sbin/crashinfo/crashinfo.8#2 integrate
.. //depot/projects/firewire/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate
.. //depot/projects/firewire/usr.sbin/kbdcontrol/kbdcontrol.c#2 integrate
.. //depot/projects/firewire/usr.sbin/kbdcontrol/kbdmap.5#2 integrate
.. //depot/projects/firewire/usr.sbin/lpr/lp/lp.sh#2 integrate
.. //depot/projects/firewire/usr.sbin/sysinstall/menus.c#2 integrate

Differences ...

==== //depot/projects/firewire/UPDATING#2 (text+ko) ====

@@ -22,6 +22,61 @@
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090926:
+	The rc.d/network_ipv6, IPv6 configuration script has been integrated
+	into rc.d/netif.  The changes are the following:
+
+	1. To use IPv6, simply define $ifconfig_IF_ipv6 like $ifconfig_IF
+	   for IPv4.  For aliases, $ifconfig_IF_aliasN should be used.
+	   Note that both variables need the "inet6" keyword at the head.
+
+	   Do not set $ipv6_network_interfaces manually if you do not
+	   understand what you are doing.  It is not needed in most cases. 
+
+	   $ipv6_ifconfig_IF and $ipv6_ifconfig_IF_aliasN still work, but
+	   they are obsolete.
+
+	2. $ipv6_enable is obsolete.  Use $ipv6_prefer and
+	   "inet6 accept_rtadv" keyword in ifconfig(8) instead.
+
+	   If you define $ipv6_enable=YES, it means $ipv6_prefer=YES and
+	   all configured interfaces have "inet6 accept_rtadv" in the
+	   $ifconfig_IF_ipv6.  These are for backward compatibility.
+
+	3. A new variable $ipv6_prefer has been added.  If NO, IPv6
+	   functionality of interfaces with no corresponding
+	   $ifconfig_IF_ipv6 is disabled by using "inet6 ifdisabled" flag,
+	   and the default address selection policy of ip6addrctl(8) 
+	   is the IPv4-preferred one (see rc.d/ip6addrctl for more details).
+	   Note that if you want to configure IPv6 functionality on the
+	   disabled interfaces after boot, first you need to clear the flag by
+	   using ifconfig(8) like:
+
+		ifconfig em0 inet6 -ifdisabled
+
+	   If YES, the default address selection policy is set as
+	   IPv6-preferred.
+
+	   The default value of $ipv6_prefer is NO.
+
+	4. If your system need to receive Router Advertisement messages,
+	   define "inet6 accept_rtadv" in $ifconfig_IF_ipv6.  The rc(8)
+	   scripts automatically invoke rtsol(8) when the interface becomes
+	   UP.  The Router Advertisement messages are used for SLAAC
+	   (State-Less Address AutoConfiguration).
+
+20090922:
+	802.11s D3.03 support was committed. This is incompatible with the
+	previous code, which was based on D3.0.
+
+20090912:
+	A sysctl variable net.inet6.ip6.accept_rtadv now sets the default value
+	of a per-interface flag ND6_IFF_ACCEPT_RTADV, not a global knob to
+	control whether accepting Router Advertisement messages or not.
+	Also, a per-interface flag ND6_IFF_AUTO_LINKLOCAL has been added and
+	a sysctl variable net.inet6.ip6.auto_linklocal is its default value.
+	The ifconfig(8) utility now supports these flags.
+
 20090910:
 	ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for
 	mount(8) and -a option for df(1) to see them.
@@ -975,4 +1030,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.639 2009/09/14 21:10:40 pjd Exp $
+$FreeBSD: src/UPDATING,v 1.641 2009/09/26 18:59:00 hrs Exp $

==== //depot/projects/firewire/bin/sh/parser.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.63 2009/06/23 20:45:12 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.64 2009/10/01 21:40:08 jilles Exp $");
 
 #include 
 #include 
@@ -82,7 +82,6 @@
 
 
 STATIC struct heredoc *heredoclist;	/* list of here documents to read */
-STATIC int parsebackquote;	/* nonzero if we are inside backquotes */
 STATIC int doprompt;		/* if set, prompt the user */
 STATIC int needprompt;		/* true if interactive and at start of line */
 STATIC int lasttoken;		/* last token read */
@@ -1043,7 +1042,7 @@
 endword:
 	if (syntax == ARISYNTAX)
 		synerror("Missing '))'");
-	if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL)
+	if (syntax != BASESYNTAX && eofmark == NULL)
 		synerror("Unterminated quoted string");
 	if (varnest != 0) {
 		startlinno = plinno;
@@ -1303,7 +1302,6 @@
 
 parsebackq: {
 	struct nodelist **nlpp;
-	int savepbq;
 	union node *n;
 	char *volatile str;
 	struct jmploc jmploc;
@@ -1311,11 +1309,9 @@
 	int savelen;
 	int saveprompt;
 
-	savepbq = parsebackquote;
 	if (setjmp(jmploc.loc)) {
 		if (str)
 			ckfree(str);
-		parsebackquote = 0;
 		handler = savehandler;
 		longjmp(handler->loc, 1);
 	}
@@ -1397,7 +1393,6 @@
 		nlpp = &(*nlpp)->next;
 	*nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist));
 	(*nlpp)->next = NULL;
-	parsebackquote = oldstyle;
 
 	if (oldstyle) {
 		saveprompt = doprompt;
@@ -1433,7 +1428,6 @@
 		str = NULL;
 		INTON;
 	}
-	parsebackquote = savepbq;
 	handler = savehandler;
 	if (arinest || dblquote)
 		USTPUTC(CTLBACKQ | CTLQUOTE, out);

==== //depot/projects/firewire/bin/sh/sh.1#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.130 2009/06/24 22:04:04 jilles Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.131 2009/09/20 21:42:38 jilles Exp $
 .\"
 .Dd May 31, 2009
 .Dt SH 1
@@ -375,6 +375,10 @@
 The word starting with
 .Ql #
 and the rest of the line are ignored.
+.Pp
+.Tn ASCII
+.Dv NUL
+characters (character code 0) are not allowed in shell input.
 .Ss Quoting
 Quoting is used to remove the special meaning of certain characters
 or words to the shell, such as operators, whitespace, keywords,

==== //depot/projects/firewire/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 (text+ko) ====

@@ -535,7 +535,7 @@
 .ad
 .sp .6
 .RS 4n
-Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher2\fR, but this may change in future releases). The value "off" disables integrity
+Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher4\fR, but this may change in future releases). The value "off" disables integrity
 checking on user data. Disabling checksums is NOT a recommended practice.
 .RE
 

==== //depot/projects/firewire/crypto/openssh/ChangeLog#2 (text+ko) ====

@@ -1,3 +1,282 @@
+20090926
+ - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+         [contrib/suse/openssh.spec] Update for release
+ - (djm) [README] update relnotes URL
+ - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere
+ - (djm) Release 5.3p1
+
+20090911
+ - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X
+   10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query).  Patch
+   from jbasney at ncsa uiuc edu.
+
+20090908
+ - (djm) [serverloop.c] Fix test for server-assigned remote forwarding port
+   (-R 0:...); bz#1578, spotted and fix by gavin AT emf.net; ok dtucker@
+
+20090901
+ - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for
+   krb5-config if it's not in the location specified by --with-kerberos5.
+   Patch from jchadima at redhat.
+
+20090829
+ - (dtucker) [README.platform] Add text about development packages, based on
+   text from Chris Pepper in bug #1631.
+
+20090828
+ - dtucker [auth-sia.c] Roll back the change for bug #1241 as it apparently
+   causes problems in some Tru64 configurations.
+ - (djm) [sshd_config.5] downgrade mention of login.conf to be an example
+   and mention PAM as another provider for ChallengeResponseAuthentication;
+   bz#1408; ok dtucker@
+ - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when
+   attempting atomic rename(); ok dtucker@
+ - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables
+   in argv, so pass them in the environment; ok dtucker@
+ - (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on
+    the pty master on Solaris, since it never succeeds and can hang if large
+    amounts of data is sent to the slave (eg a copy-paste).  Based on a patch
+    originally from Doke Scott, ok djm@
+ - (dtucker) [clientloop.c configure.ac defines.h] Make the client's IO buffer
+   size a compile-time option and set it to 64k on Cygwin, since Corinna
+   reports that it makes a significant difference to performance.  ok djm@
+ - (dtucker) [configure.ac] Fix the syntax of the Solaris tcgetattr entry.
+
+20090820
+ - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not
+   using it since the type conflicts can cause problems on FreeBSD.  Patch
+   from Jonathan Chen.
+ - (dtucker) [session.c openbsd-compat/port-aix.h] Bugs #1249 and #1567: move
+   the setpcred call on AIX to immediately before the permanently_set_uid().
+   Ensures that we still have privileges when we call chroot and
+   pam_open_sesson.  Based on a patch from David Leonard.
+
+20090817
+ - (dtucker) [configure.ac] Check for headers before libraries for openssl an
+   zlib, which should make the errors slightly more meaningful on platforms
+   where there's separate "-devel" packages for those.
+ - (dtucker) [sshlogin.c openbsd-compat/port-aix.{c,h}] Bug #1595: make
+   PrintLastLog work on AIX.  Based in part on a patch from Miguel Sanders.
+
+20090729
+ - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error
+   function. Patch from Corinna Vinschen.
+
+20090713
+ - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it
+   fits into 16 bits to work around a bug in glibc's resolver where it masks
+   off the buffer size at 16 bits.  Patch from Hauke Lampe, ok djm jakob.
+
+20090712
+ - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test,
+   prevents configure complaining on older BSDs.
+ - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch
+   from Corinna Vinschen.
+ - (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on
+   logout to after the session close.  Patch from Anicka Bernathova,
+   originally from Andreas Schwab via Novelll ok djm.
+
+20090707
+ - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated
+   scripts and fix usage of eval.  Patch from Corinna Vinschen.
+
+20090705
+ - (dtucker) OpenBSD CVS Sync
+   - andreas@cvs.openbsd.org 2009/06/27 09:29:06
+     [packet.h packet.c]
+     packet_bacup_state() and packet_restore_state() will be used to
+     temporarily save the current state ren resuming a suspended connection.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/06/27 09:32:43
+     [roaming_common.c roaming.h]
+     It may be necessary to retransmit some data when resuming, so add it
+     to a buffer when roaming is enabled.
+     Most of this code was written by Martin Forssen, maf at appgate dot com.
+     ok markus@
+   - andreas@cvs.openbsd.org 2009/06/27 09:35:06
+     [readconf.h readconf.c]
+     Add client option UseRoaming. It doesn't do anything yet but will
+     control whether the client tries to use roaming if enabled on the
+     server. From Martin Forssen.
+     ok markus@
+   - markus@cvs.openbsd.org 2009/06/30 14:54:40
+     [version.h]
+     crank version; ok deraadt
+   - dtucker@cvs.openbsd.org 2009/07/02 02:11:47
+     [ssh.c]
+     allow for long home dir paths (bz #1615).  ok deraadt
+     (based in part on a patch from jchadima at redhat)
+   - stevesk@cvs.openbsd.org 2009/07/05 19:28:33
+     [clientloop.c]
+     only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@
+     ok deraadt@ markus@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 22:30:29 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2B3FE106568F; Fri,  2 Oct 2009 22:30:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E3BBB106568B
	for ; Fri,  2 Oct 2009 22:30:28 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D1C1C8FC19
	for ; Fri,  2 Oct 2009 22:30:28 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92MUS8h091453
	for ; Fri, 2 Oct 2009 22:30:28 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92MUSw7091449
	for perforce@freebsd.org; Fri, 2 Oct 2009 22:30:28 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 2 Oct 2009 22:30:28 GMT
Message-Id: <200910022230.n92MUSw7091449@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169163 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 22:30:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=169163

Change 169163 by trasz@trasz_victim on 2009/10/02 22:29:27

	Move loginclass pointer from process to ucred, where it should
	be in the first place.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/TODO#12 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#14 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#14 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#13 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#62 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#13 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#23 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#35 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#12 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/ucred.h#9 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/TODO#12 (text+ko) ====

@@ -1,6 +1,4 @@
 
- - Why did I put the loginclass pointer into the proc and not into the cred?
-
  - Make the limits lists protected by the subjects lock (e.g. process lock)
    instead of hrl_lock.
 

==== //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#14 (text+ko) ====

@@ -470,6 +470,7 @@
 	p->p_ucred->cr_uidinfo = uifind(0);
 	p->p_ucred->cr_ruidinfo = uifind(0);
 	p->p_ucred->cr_prison = &prison0;
+	p->p_ucred->cr_loginclass = loginclass_find("default");
 #ifdef AUDIT
 	audit_cred_kproc0(p->p_ucred);
 #endif
@@ -478,9 +479,6 @@
 #endif
 	td->td_ucred = crhold(p->p_ucred);
 
-	/* Set default login class. */
-	p->p_loginclass = loginclass_find("default");
-
 	/* Create sigacts. */
 	p->p_sigacts = sigacts_alloc();
 

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#14 (text+ko) ====

@@ -48,7 +48,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -771,7 +770,7 @@
 	hrl_proc_exiting(p);
 
 	/*
-	 * Free credentials, arguments, sigacts and loginclass.
+	 * Free credentials, arguments and sigacts.
 	 */
 	crfree(p->p_ucred);
 	p->p_ucred = NULL;
@@ -779,8 +778,6 @@
 	p->p_args = NULL;
 	sigacts_free(p->p_sigacts);
 	p->p_sigacts = NULL;
-	loginclass_release(p->p_loginclass);
-	p->p_loginclass = NULL;
 
 	/*
 	 * Do any thread-system specific cleanups.

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#13 (text+ko) ====

@@ -52,7 +52,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -484,9 +483,6 @@
 	/* Tell the prison that we exist. */
 	prison_proc_hold(p2->p_ucred->cr_prison);
 
-	/* Loginclass might want to know too. */
-	loginclass_acquire(p2->p_loginclass);
-
 	PROC_UNLOCK(p2);
 
 	/*

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#62 (text+ko) ====

@@ -290,7 +290,7 @@
 		break;
 	case HRL_SUBJECT_TYPE_LOGINCLASS:
 		available = rule->hr_amount -
-		    p->p_loginclass->lc_usage.hu_resources[resource];
+		    cred->cr_loginclass->lc_usage.hu_resources[resource];
 		available = INT64_MAX; /* XXX */
 		break;
 	case HRL_SUBJECT_TYPE_JAIL:
@@ -493,11 +493,11 @@
 		return (error);
 	}
 	p->p_usage.hu_resources[resource] += amount;
-	p->p_loginclass->lc_usage.hu_resources[resource] += amount;
 	cred = p->p_ucred;
 	cred->cr_ruidinfo->ui_usage.hu_resources[resource] += amount;
 	for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
 		pr->pr_usage.hu_resources[resource] += amount;
+	cred->cr_loginclass->lc_usage.hu_resources[resource] += amount;
 	/*
 	 * XXX: Slow.
 	 */
@@ -557,11 +557,11 @@
 		}
 	}
 	p->p_usage.hu_resources[resource] = amount;
-	p->p_loginclass->lc_usage.hu_resources[resource] += diff;
 	cred = p->p_ucred;
 	cred->cr_ruidinfo->ui_usage.hu_resources[resource] += diff;
 	for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
 		pr->pr_usage.hu_resources[resource] += diff;
+	cred->cr_loginclass->lc_usage.hu_resources[resource] += diff;
 	/*
 	 * XXX: Slow.
 	 */
@@ -612,11 +612,11 @@
 	    "%ld for %s (pid %d)", amount, hrl_resource_name(resource),
 	    p->p_usage.hu_resources[resource], p->p_comm, p->p_pid));
 	p->p_usage.hu_resources[resource] -= amount;
-	p->p_loginclass->lc_usage.hu_resources[resource] -= amount;
 	cred = p->p_ucred;
 	cred->cr_ruidinfo->ui_usage.hu_resources[resource] -= amount;
 	for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent)
 		pr->pr_usage.hu_resources[resource] -= amount;
+	cred->cr_loginclass->lc_usage.hu_resources[resource] -= amount;
 	/*
 	 * XXX: Slow.
 	 */
@@ -1235,7 +1235,7 @@
 				break;
 			continue;
 		case HRL_SUBJECT_TYPE_LOGINCLASS:
-			if (p->p_loginclass == rule->hr_subject.hs_loginclass)
+			if (cred->cr_loginclass == rule->hr_subject.hs_loginclass)
 				break;
 			continue;
 		case HRL_SUBJECT_TYPE_JAIL:
@@ -1727,54 +1727,8 @@
 }
 
 /*
- * Called just before loginclass change, to adjust p_limits and lc_usage.
- */
-void
-hrl_proc_loginclass_changing(struct proc *p, struct loginclass *newlc)
-{
-	int error;
-	struct hrl_limit *limit;
-	struct loginclass *lc = p->p_loginclass;
-
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-
-	mtx_lock(&hrl_lock);
-
-	/*
-	 * Remove rules for the old loginclass.
-	 */
-	LIST_FOREACH(limit, &p->p_limits, hl_next) {
-		if (limit->hl_rule->hr_subject_type != HRL_SUBJECT_TYPE_LOGINCLASS)
-			continue;
-
-		LIST_REMOVE(limit, hl_next);
-		hrl_rule_release(limit->hl_rule);
-		uma_zfree(hrl_limit_zone, limit);
-	}
-	
-	/*
-	 * Now add rules for the current loginclass.
-	 */
-	LIST_FOREACH(limit, &newlc->lc_limits, hl_next) {
-		error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule);
-		KASSERT(error == 0, ("XXX: better error handling needed"));
-	}
-
-	mtx_unlock(&hrl_lock);
-
-	/*
-	 * Adjust loginclass resource usage information.
-	 */
-	hrl_usage_subtract(&lc->lc_usage, &p->p_usage);
-	hrl_usage_add(&newlc->lc_usage, &p->p_usage);
-}
-
-/*
  * Called after credentials change, to adjust p_limits.
  *
- * XXX: This should be merged with the routine above, after moving
- * 	the loginclass pointer from 'struct proc' to 'struct ucred'.
- *
  * XXX: What about jails?
  */
 void
@@ -1783,17 +1737,20 @@
 	int error, i;
 	struct hrl_limit *limit;
 	struct uidinfo *olduip, *newuip;
+	struct loginclass *oldlc, *newlc;
 
 	PROC_LOCK_ASSERT(p, MA_OWNED);
 
 	mtx_lock(&hrl_lock);
 
 	/*
-	 * Remove rules for the old user credentials.
+	 * Remove rules for the old user credentials - per-user, per-group
+	 * and per-loginclass.
 	 */
 	LIST_FOREACH(limit, &p->p_limits, hl_next) {
 		if (limit->hl_rule->hr_subject_type != HRL_SUBJECT_TYPE_USER &&
-		    limit->hl_rule->hr_subject_type != HRL_SUBJECT_TYPE_GROUP)
+		    limit->hl_rule->hr_subject_type != HRL_SUBJECT_TYPE_GROUP &&
+		    limit->hl_rule->hr_subject_type != HRL_SUBJECT_TYPE_LOGINCLASS)
 			continue;
 
 		LIST_REMOVE(limit, hl_next);
@@ -1820,6 +1777,14 @@
 		}
 	}
 
+	/*
+	 * Add rules for the current loginclass.
+	 */
+	LIST_FOREACH(limit, &newcred->cr_loginclass->lc_limits, hl_next) {
+		error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule);
+		KASSERT(error == 0, ("XXX: better error handling needed"));
+	}
+
 	mtx_unlock(&hrl_lock);
 
 	/*
@@ -1843,6 +1808,16 @@
 			hrl_usage_add(
 			    &newcred->cr_gidinfos[i]->gi_usage, &p->p_usage);
 	}
+
+	/*
+	 * Adjust loginclass resource usage information.
+	 */
+	newlc = newcred->cr_loginclass;
+	oldlc = p->p_ucred->cr_loginclass;
+	if (newlc != oldlc) {
+		hrl_usage_subtract(&oldlc->lc_usage, &p->p_usage);
+		hrl_usage_add(&newlc->lc_usage, &p->p_usage);
+	}
 }
 
 /*

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#13 (text+ko) ====

@@ -159,7 +159,7 @@
 	struct loginclass *lc;
 
 	PROC_LOCK(p);
-	lc = p->p_loginclass;
+	lc = p->p_ucred->cr_loginclass;
 	loginclass_acquire(lc);
 	PROC_UNLOCK(p);
 
@@ -187,7 +187,8 @@
 	struct proc *p = td->td_proc;
 	int error;
 	char lcname[MAXLOGNAME];
-	struct loginclass *newlc, *oldlc;
+	struct loginclass *newlc;
+	struct ucred *newcred, *oldcred;
 
 	error = priv_check(td, PRIV_PROC_SETLOGINCLASS);
 	if (error)
@@ -196,15 +197,18 @@
 	if (error == ENAMETOOLONG)
 		return (EINVAL);
 
+	newcred = crget();
 	newlc = loginclass_find(lcname);
 
 	PROC_LOCK(p);
-	hrl_proc_loginclass_changing(p, newlc);
-	oldlc = p->p_loginclass;
-	p->p_loginclass = newlc;
+	oldcred = crcopysafe(p, newcred);
+	newcred->cr_loginclass = newlc;
+	hrl_proc_ucred_changing(p, newcred);
+	p->p_ucred = newcred;
 	PROC_UNLOCK(p);
 
-	loginclass_release(oldlc);
+	loginclass_release(oldcred->cr_loginclass);
+	crfree(oldcred);
 
 	return (0);
 }

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#23 (text+ko) ====

@@ -55,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1897,6 +1898,7 @@
 		 */
 		if (cr->cr_prison != NULL)
 			prison_free(cr->cr_prison);
+		loginclass_release(cr->cr_loginclass);
 #ifdef AUDIT
 		audit_cred_destroy(cr);
 #endif
@@ -1938,6 +1940,7 @@
 			gihold(dest->cr_gidinfos[i]);
 	}
 	prison_hold(dest->cr_prison);
+	loginclass_acquire(dest->cr_loginclass);
 #ifdef AUDIT
 	audit_cred_copy(src, dest);
 #endif

==== //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#35 (text+ko) ====

@@ -154,7 +154,6 @@
 
 void	hrl_proc_exiting(struct proc *p);
 
-void	hrl_proc_loginclass_changing(struct proc *p, struct loginclass *newlc);
 void	hrl_proc_ucred_changing(struct proc *p, struct ucred *newcred);
 
 struct hrl_rule	*hrl_rule_alloc(int flags);

==== //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#12 (text+ko) ====

@@ -171,7 +171,6 @@
 struct kdtrace_proc;
 struct kdtrace_thread;
 struct cpuset;
-struct loginclass;
 
 /*
  * Kernel runnable context (thread).
@@ -529,7 +528,6 @@
 	rlim_t		p_cpulimit;	/* (c) Current CPU limit in seconds. */
 	signed char	p_nice;		/* (c) Process "nice" value. */
 	int		p_fibnum;	/* in this routing domain XXX MRT */
-	struct loginclass	*p_loginclass;	/* (c) login class */
 /* End area that is copied on creation. */
 #define	p_endcopy	p_xstat
 

==== //depot/projects/soc2009/trasz_limits/sys/sys/ucred.h#9 (text+ko) ====

@@ -35,6 +35,8 @@
 
 #include 
 
+struct loginclass;
+
 /*
  * Credentials.
  *
@@ -54,7 +56,7 @@
 	struct uidinfo	*cr_uidinfo;	/* per euid resource consumption */
 	struct uidinfo	*cr_ruidinfo;	/* per ruid resource consumption */
 	struct prison	*cr_prison;	/* jail(2) */
-	void		*cr_pspare;	/* general use */
+	struct loginclass	*cr_loginclass; /* login class */
 	u_int		cr_flags;	/* credential flags */
 	void 		*cr_pspare2[2];	/* general use 2 */
 #define	cr_endcopy	cr_label

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 22:34:33 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C3B7D106568F; Fri,  2 Oct 2009 22:34:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 87ACA106566B
	for ; Fri,  2 Oct 2009 22:34:33 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 759898FC0C
	for ; Fri,  2 Oct 2009 22:34:33 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92MYXRh091746
	for ; Fri, 2 Oct 2009 22:34:33 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92MYXBQ091744
	for perforce@freebsd.org; Fri, 2 Oct 2009 22:34:33 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 2 Oct 2009 22:34:33 GMT
Message-Id: <200910022234.n92MYXBQ091744@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169164 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 22:34:34 -0000

http://perforce.freebsd.org/chv.cgi?CH=169164

Change 169164 by trasz@trasz_victim on 2009/10/02 22:33:58

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/parser.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/defaultroute#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/faith#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ip6addrctl#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netoptions#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/routing#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/static_arp#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/stf#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/xscalereg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/xscalevar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#55 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/vm_machdep.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/cpufunc.h#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/xen_machdep.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_main.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exec.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_socket.c#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/acpi/acpi/Makefile#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/flowtable.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/flowtable.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.c#20 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#24 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_ifattach.c#20 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/pmc.h#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_mmap.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/errors/backquote-error2.0#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/mmap/mmap.c#2 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/parser.c#6 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.63 2009/06/23 20:45:12 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.64 2009/10/01 21:40:08 jilles Exp $");
 
 #include 
 #include 
@@ -82,7 +82,6 @@
 
 
 STATIC struct heredoc *heredoclist;	/* list of here documents to read */
-STATIC int parsebackquote;	/* nonzero if we are inside backquotes */
 STATIC int doprompt;		/* if set, prompt the user */
 STATIC int needprompt;		/* true if interactive and at start of line */
 STATIC int lasttoken;		/* last token read */
@@ -1043,7 +1042,7 @@
 endword:
 	if (syntax == ARISYNTAX)
 		synerror("Missing '))'");
-	if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL)
+	if (syntax != BASESYNTAX && eofmark == NULL)
 		synerror("Unterminated quoted string");
 	if (varnest != 0) {
 		startlinno = plinno;
@@ -1303,7 +1302,6 @@
 
 parsebackq: {
 	struct nodelist **nlpp;
-	int savepbq;
 	union node *n;
 	char *volatile str;
 	struct jmploc jmploc;
@@ -1311,11 +1309,9 @@
 	int savelen;
 	int saveprompt;
 
-	savepbq = parsebackquote;
 	if (setjmp(jmploc.loc)) {
 		if (str)
 			ckfree(str);
-		parsebackquote = 0;
 		handler = savehandler;
 		longjmp(handler->loc, 1);
 	}
@@ -1397,7 +1393,6 @@
 		nlpp = &(*nlpp)->next;
 	*nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist));
 	(*nlpp)->next = NULL;
-	parsebackquote = oldstyle;
 
 	if (oldstyle) {
 		saveprompt = doprompt;
@@ -1433,7 +1428,6 @@
 		str = NULL;
 		INTON;
 	}
-	parsebackquote = savepbq;
 	handler = savehandler;
 	if (arinest || dblquote)
 		USTPUTC(CTLBACKQ | CTLQUOTE, out);

==== //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#11 (text+ko) ====

@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/network.subr,v 1.202 2009/09/26 18:59:00 hrs Exp $
+# $FreeBSD: src/etc/network.subr,v 1.203 2009/10/02 02:24:25 hrs Exp $
 #
 
 #
@@ -356,6 +356,16 @@
 	inet6)
 		${SYSCTL_N} net.inet6 > /dev/null 2>&1
 		;;
+	ipx)
+		${SYSCTL_N} net.ipx > /dev/null 2>&1
+		;;
+	atm)
+		if [ -x /sbin/atmconfig ]; then
+			/sbin/atmconfig diag list > /dev/null 2>&1
+		else
+			return 1
+		fi
+		;;
 	*)
 		err 1 "afexists(): Unsupported address family: $_af"
 		;;

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/defaultroute#7 (text+ko) ====

@@ -2,7 +2,7 @@
 #
 # Wait for the default route to be up
 #
-# $FreeBSD: src/etc/rc.d/defaultroute,v 1.8 2009/09/26 19:00:20 hrs Exp $
+# $FreeBSD: src/etc/rc.d/defaultroute,v 1.9 2009/10/02 02:24:25 hrs Exp $
 #
 
 # PROVIDE: defaultroute
@@ -20,6 +20,8 @@
 {
 	local output carrier nocarrier nl
 
+	afexists inet || return 0
+
 	# Return without waiting if we don't have dhcp interfaces or
 	# if none of the dhcp interfaces is plugged in.
 	dhcp_interfaces=`list_net_interfaces dhcp`

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/faith#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: src/etc/rc.d/faith,v 1.1 2009/09/12 22:13:41 hrs Exp $
+# $FreeBSD: src/etc/rc.d/faith,v 1.3 2009/10/02 06:19:34 hrs Exp $
 #
 
 # PROVIDE: faith

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ip6addrctl#4 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.7 2009/09/26 18:59:00 hrs Exp $
+# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.8 2009/10/02 02:24:25 hrs Exp $
 #
 
 # PROVIDE: ip6addrctl
@@ -9,6 +9,7 @@
 # KEYWORD: nojail
 
 . /etc/rc.subr
+. /etc/network.subr
 
 name="ip6addrctl"
 rcvar=`set_rcvar`
@@ -23,6 +24,8 @@
 
 ip6addrctl_prefer_ipv6()
 {
+	afexists inet6 || return 0
+
 	ip6addrctl flush >/dev/null 2>&1
 	ip6addrctl add ::1/128		50	0
 	ip6addrctl add ::/0		40	1
@@ -34,6 +37,8 @@
 
 ip6addrctl_prefer_ipv4()
 {
+	afexists inet6 || return 0
+
 	ip6addrctl flush >/dev/null 2>&1
 	ip6addrctl add ::ffff:0:0/96	50	0
 	ip6addrctl add ::1/128		40	1
@@ -45,30 +50,27 @@
 
 ip6addrctl_start()
 {
-	if ifconfig lo0 inet6 >/dev/null 2>&1; then
-		# We have IPv6 support in kernel.
+	afexists inet6 || return 0
 
-		# install the policy of the address selection algorithm.
-		if [ -f /etc/ip6addrctl.conf ]; then
-			ip6addrctl flush >/dev/null 2>&1
-			ip6addrctl install /etc/ip6addrctl.conf
-			checkyesno ip6addrctl_verbose && ip6addrctl
+	# install the policy of the address selection algorithm.
+	if [ -f /etc/ip6addrctl.conf ]; then
+		ip6addrctl flush >/dev/null 2>&1
+		ip6addrctl install /etc/ip6addrctl.conf
+		checkyesno ip6addrctl_verbose && ip6addrctl
+	else
+		if checkyesno ipv6_prefer; then
+			ip6addrctl_prefer_ipv6
 		else
-			if checkyesno ipv6_prefer; then
-				ip6addrctl_prefer_ipv6
-			else
-				ip6addrctl_prefer_ipv4
-			fi
+			ip6addrctl_prefer_ipv4
 		fi
 	fi
 }
 
 ip6addrctl_stop()
 {
-	if ifconfig lo0 inet6 >/dev/null 2>&1; then
-		# We have IPv6 support in kernel.
-		ip6addrctl flush >/dev/null 2>&1
-	fi
+	afexists inet6 || return 0
+
+	ip6addrctl flush >/dev/null 2>&1
 }
 
 load_rc_config $name

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netoptions#5 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/netoptions,v 1.148 2009/09/30 14:58:10 ume Exp $
+# $FreeBSD: src/etc/rc.d/netoptions,v 1.150 2009/10/02 06:51:39 hrs Exp $
 #
 
 # PROVIDE: netoptions
@@ -26,29 +26,51 @@
 
 netoptions_start()
 {
-	if checkyesno log_in_vain; then
+	local _af
+
+	for _af in inet inet6; do
+		afexists ${_af} && eval netoptions_${_af}
+	done
+	[ -n "${_netoptions_initdone}" ] && echo '.'
+}
+
+netoptions_inet()
+{
+	case ${log_in_vain} in
+	[12])
 		netoptions_init
 		echo -n " log_in_vain=${log_in_vain}"
-		${SYSCTL_W} net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null
-		${SYSCTL_W} net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null
-	fi
+		${SYSCTL_W} net.inet.tcp.log_in_vain=${log_in_vain} >/dev/null
+		${SYSCTL_W} net.inet.udp.log_in_vain=${log_in_vain} >/dev/null
+		;;
+	*)
+		${SYSCTL_W} net.inet.tcp.log_in_vain=0 >/dev/null
+		${SYSCTL_W} net.inet.udp.log_in_vain=0 >/dev/null
+		;;
+	esac
 
 	if checkyesno tcp_extensions; then
+		${SYSCTL_W} net.inet.tcp.rfc1323=1 >/dev/null
+	else
 		netoptions_init
-		echo -n ' rfc1323 extensions=NO'
+		echo -n ' rfc1323 extensions=${tcp_extensions}'
 		${SYSCTL_W} net.inet.tcp.rfc1323=0 >/dev/null
 	fi
 
-	if ! checkyesno tcp_keepalive; then
+	if checkyesno tcp_keepalive; then
+		${SYSCTL_W} net.inet.tcp.always_keepalive=1 >/dev/null
+	else
 		netoptions_init
-		echo -n ' TCP keepalive=NO'
+		echo -n ' TCP keepalive=${tcp_keepalive}'
 		${SYSCTL_W} net.inet.tcp.always_keepalive=0 >/dev/null
 	fi
 
 	if checkyesno tcp_drop_synfin; then
 		netoptions_init
-		echo -n ' drop SYN+FIN packets=YES'
+		echo -n ' drop SYN+FIN packets=${tcp_drop_synfin}'
 		${SYSCTL_W} net.inet.tcp.drop_synfin=1 >/dev/null
+	else
+		${SYSCTL_W} net.inet.tcp.drop_synfin=0 >/dev/null
 	fi
 
 	case ${ip_portrange_first} in
@@ -66,17 +88,17 @@
 		${SYSCTL_W} net.inet.ip.portrange.last=$ip_portrange_last >/dev/null
 		;;
 	esac
+}
 
-	if afexists inet6; then
-		if checkyesno ipv6_ipv4mapping; then
-			${SYSCTL_W} net.inet6.ip6.v6only=0 >/dev/null
-		else
-			echo -n " no-ipv4-mapped-ipv6"
-			${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null
-		fi
+netoptions_inet6()
+{
+	if checkyesno ipv6_ipv4mapping; then
+		netoptions_init
+		echo -n " ipv4-mapped-ipv6=${ipv6_ipv4mapping}"
+		${SYSCTL_W} net.inet6.ip6.v6only=0 >/dev/null
+	else
+		${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null
 	fi
-
-	[ -n "${_netoptions_initdone}" ] && echo '.'
 }
 
 load_rc_config $name

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/routing#6 (text+ko) ====

@@ -2,7 +2,7 @@
 #
 # Configure routing and miscellaneous network tunables
 #
-# $FreeBSD: src/etc/rc.d/routing,v 1.150 2009/09/30 14:58:10 ume Exp $
+# $FreeBSD: src/etc/rc.d/routing,v 1.152 2009/10/02 20:19:53 hrs Exp $
 #
 
 # PROVIDE: routing
@@ -13,87 +13,108 @@
 . /etc/network.subr
 
 name="routing"
-start_cmd="routing_start"
+start_cmd="routing_start doall"
 stop_cmd="routing_stop"
 extra_commands="options static"
-static_cmd="static_start"
-options_cmd="options_start"
+static_cmd="routing_start static"
+options_cmd="routing_start options"
 
-routing_start()
+afcheck()
 {
-	static_start "$@"
-	options_start "$@"
+	case $_af in
+	""|inet|inet6|ipx|atm)
+		;;
+	*)
+		err 1 "Unsupported address family: $_af."
+		;;
+	esac
 }
 
-routing_stop()
+routing_start()
 {
-	static_stop "$@"
-	route -n flush
-	for i in ${ipv6_network_interfaces}; do
-		ifconfig $i inet6 -defaultif
-	done
+	local _cmd _af _a
+	_cmd=$1
+	_af=$2
+
+	afcheck
+
+	case $_af in
+	inet|inet6|ipx|atm)
+		setroutes $_cmd $_af
+		;;
+	"")
+		for _a in inet inet6 ipx atm; do
+			afexists $_a && setroutes $_cmd $_a
+		done
+		;;
+	esac
+	[ -n "${_ropts_initdone}" ] && echo '.'
 }
 
-static_start()
+routing_stop()
 {
-	local _af
+	local _af _a
 	_af=$1
 
-	case ${_af} in
-	inet)
-		do_static inet add
+	afcheck
+
+	case $_af in
+	inet|inet6|ipx|atm)
+		eval static_${_af} delete
+		eval routing_stop_${_af}
 		;;
-	inet6)
-		do_static inet6 add
-		;;
-	atm)
-		do_static atm add
+	"")
+		for _a in inet inet6 ipx atm; do
+			afexists $_a || continue
+			eval static_${_a} delete
+			eval routing_stop_${_a}
+		done
 		;;
-	*)
-		do_static inet add
-		if afexists inet6; then
-			do_static inet6 add
-		fi
-		do_static atm add
-		;;
 	esac
 }
 
-static_stop()
+setroutes()
 {
-	local _af
-	_af=$1
-
-	case ${_af} in
-	inet)
-		do_static inet delete
+	case $1 in
+	static)
+		static_$2 add
 		;;
-	inet6)
-		do_static inet6 delete
+	options)
+		options_$2
 		;;
-	atm)
-		do_static atm delete
-		;;
-	*)
-		do_static inet delete
-		if afexists inet6; then
-			do_static inet6 delete
-		fi
-		do_static atm delete
+	doall)
+		static_$2 add
+		options_$2
 		;;
 	esac
 }
 
-do_static()
+routing_stop_inet()
+{
+	route -n flush -inet
+}
+
+routing_stop_inet6()
+{
+	local i
+
+	route -n flush -inet6
+	for i in ${ipv6_network_interfaces}; do
+		ifconfig $i inet6 -defaultif
+	done
+}
+
+routing_stop_atm()
 {
-	local _af _action
-	_af=$1
-	_action=$2
+	return 0
+}
 
-	eval $1_static $2
+routing_stop_ipx()
+{
+	return 0
 }
 
-inet_static()
+static_inet()
 {
 	local _action
 	_action=$1
@@ -115,7 +136,7 @@
 	fi
 }
 
-inet6_static()
+static_inet6()
 {
 	local _action i
 	_action=$1
@@ -222,9 +243,9 @@
 	esac
 }
 
-atm_static()
+static_atm()
 {
-	local _action i
+	local _action i route_args
 	_action=$1
 
 	if [ -n "${natm_static_routes}" ]; then
@@ -235,6 +256,10 @@
 	fi
 }
 
+static_ipx()
+{
+}
+
 _ropts_initdone=
 ropts_init()
 {
@@ -244,63 +269,89 @@
 	fi
 }
 
-options_start()
+options_inet()
 {
 	if checkyesno icmp_bmcastecho; then
 		ropts_init
 		echo -n ' broadcast ping responses=YES'
-		sysctl net.inet.icmp.bmcastecho=1 >/dev/null
+		${SYSCTL_W} net.inet.icmp.bmcastecho=1 > /dev/null
+	else
+		${SYSCTL_W} net.inet.icmp.bmcastecho=0 > /dev/null
 	fi
 
 	if checkyesno icmp_drop_redirect; then
 		ropts_init
 		echo -n ' ignore ICMP redirect=YES'
-		sysctl net.inet.icmp.drop_redirect=1 >/dev/null
+		${SYSCTL_W} net.inet.icmp.drop_redirect=1 > /dev/null
+	else
+		${SYSCTL_W} net.inet.icmp.drop_redirect=0 > /dev/null
 	fi
 
 	if checkyesno icmp_log_redirect; then
 		ropts_init
 		echo -n ' log ICMP redirect=YES'
-		sysctl net.inet.icmp.log_redirect=1 >/dev/null
+		${SYSCTL_W} net.inet.icmp.log_redirect=1 > /dev/null
+	else
+		${SYSCTL_W} net.inet.icmp.log_redirect=0 > /dev/null
 	fi
 
 	if checkyesno gateway_enable; then
 		ropts_init
 		echo -n ' IPv4 gateway=YES'
-		sysctl net.inet.ip.forwarding=1 >/dev/null
+		${SYSCTL_W} net.inet.ip.forwarding=1 > /dev/null
+	else
+		${SYSCTL_W} net.inet.ip.forwarding=0 > /dev/null
 	fi
 
-	if checkyesno ipv6_gateway_enable; then
-		ropts_init
-		echo -n ' IPv6 gateway=YES'
-		sysctl net.inet6.ip6.forwarding=1 >/dev/null
-	fi
-
 	if checkyesno forward_sourceroute; then
 		ropts_init
 		echo -n ' do source routing=YES'
-		sysctl net.inet.ip.sourceroute=1 >/dev/null
+		${SYSCTL_W} net.inet.ip.sourceroute=1 > /dev/null
+	else
+		${SYSCTL_W} net.inet.ip.sourceroute=0 > /dev/null
 	fi
 
 	if checkyesno accept_sourceroute; then
 		ropts_init
 		echo -n ' accept source routing=YES'
-		sysctl net.inet.ip.accept_sourceroute=1 >/dev/null
+		${SYSCTL_W} net.inet.ip.accept_sourceroute=1 > /dev/null
+	else
+		${SYSCTL_W} net.inet.ip.accept_sourceroute=0 > /dev/null
 	fi
 
-	if checkyesno ipxgateway_enable; then
+	if checkyesno arpproxy_all; then
 		ropts_init
-		echo -n ' IPX gateway=YES'
-		sysctl net.ipx.ipx.ipxforwarding=1 >/dev/null
+		echo -n ' ARP proxyall=YES'
+		${SYSCTL_W} net.link.ether.inet.proxyall=1 > /dev/null
+	else
+		${SYSCTL_W} net.link.ether.inet.proxyall=0 > /dev/null
 	fi
+}
 
-	if checkyesno arpproxy_all; then
+options_inet6()
+{
+	if checkyesno ipv6_gateway_enable; then
 		ropts_init
-		echo -n ' ARP proxyall=YES'
-		sysctl net.link.ether.inet.proxyall=1 >/dev/null
+		echo -n ' IPv6 gateway=YES'
+		${SYSCTL_W} net.inet6.ip6.forwarding=1 > /dev/null
+	else
+		${SYSCTL_W} net.inet6.ip6.forwarding=0 > /dev/null
 	fi
+}
 
-	 [ -n "${_ropts_initdone}" ] && echo '.'
+options_atm()
+{
+}
+
+options_ipx()
+{
+	if checkyesno ipxgateway_enable; then
+		ropts_init
+		echo -n ' IPX gateway=YES'
+		${SYSCTL_W} net.ipx.ipx.ipxforwarding=1 > /dev/null
+	else
+		${SYSCTL_W} net.ipx.ipx.ipxforwarding=0 > /dev/null
+	fi
 }
 
 load_rc_config $name

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/static_arp#2 (text+ko) ====

@@ -26,7 +26,7 @@
 #
 # Configure static ARP table
 #
-# $FreeBSD: src/etc/rc.d/static_arp,v 1.2 2009/08/25 20:05:51 delphij Exp $
+# $FreeBSD: src/etc/rc.d/static_arp,v 1.4 2009/10/02 06:19:34 hrs Exp $
 #
 
 # PROVIDE: static_arp
@@ -34,6 +34,7 @@
 # KEYWORD: nojail
 
 . /etc/rc.subr
+. /etc/network.subr
 
 name="static_arp"
 start_cmd="static_arp_start"

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/stf#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: src/etc/rc.d/stf,v 1.1 2009/09/12 22:13:41 hrs Exp $
+# $FreeBSD: src/etc/rc.d/stf,v 1.3 2009/10/02 06:19:34 hrs Exp $
 #
 
 # PROVIDE: stf

==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc.c#7 (text+ko) ====

@@ -45,7 +45,7 @@
  * Created      : 30/01/97
  */
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.27 2009/07/21 08:29:19 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.28 2009/10/02 11:10:05 rpaulo Exp $");
 
 #include 
 #include 
@@ -83,15 +83,6 @@
 #include 
 #endif
 
-#if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
-    defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342)
-#include 
-#endif
-
-#if defined(PERFCTRS)
-struct arm_pmc_funcs *arm_pmc;
-#endif
-
 /* PRIMARY CACHE VARIABLES */
 int	arm_picache_size;
 int	arm_picache_line_size;
@@ -1128,10 +1119,6 @@
 			: "r" (BCUCTL_E0|BCUCTL_E1|BCUCTL_EV));
 
 		cpufuncs = xscale_cpufuncs;
-#if defined(PERFCTRS)
-		xscale_pmu_init();
-#endif
-
 		/*
 		 * i80200 errata: Step-A0 and A1 have a bug where
 		 * D$ dirty bits are not cleared on "invalidate by
@@ -1165,10 +1152,6 @@
 			       PMNC_CC_IF));
 
 		cpufuncs = xscale_cpufuncs;
-#if defined(PERFCTRS)
-		xscale_pmu_init();
-#endif
-
 		cpu_reset_needs_v4_MMU_disable = 1;	/* XScale needs it */
 		get_cachetype_cp15();
 		pmap_pte_init_xscale();
@@ -1179,10 +1162,6 @@
 #if defined(CPU_XSCALE_81342)
 	if (cputype == CPU_ID_81342) {
 		cpufuncs = xscalec3_cpufuncs;
-#if defined(PERFCTRS)
-		xscale_pmu_init();
-#endif
-
 		cpu_reset_needs_v4_MMU_disable = 1;	/* XScale needs it */
 		get_cachetype_cp15();
 		pmap_pte_init_xscale();
@@ -1196,10 +1175,6 @@
 	    (cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA210) {
 
 		cpufuncs = xscale_cpufuncs;
-#if defined(PERFCTRS)
-		xscale_pmu_init();
-#endif
-
 		cpu_reset_needs_v4_MMU_disable = 1;	/* XScale needs it */
 		get_cachetype_cp15();
 		pmap_pte_init_xscale();
@@ -1215,10 +1190,6 @@
             cputype == CPU_ID_IXP425_266 || cputype == CPU_ID_IXP435) {
 
 		cpufuncs = xscale_cpufuncs;
-#if defined(PERFCTRS)
-		xscale_pmu_init();
-#endif
-
 		cpu_reset_needs_v4_MMU_disable = 1;	/* XScale needs it */
 		get_cachetype_cp15();
 		pmap_pte_init_xscale();

==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#55 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1473 2009/09/28 07:32:11 thompsa Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1474 2009/10/02 12:47:01 nyan Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -2668,12 +2668,12 @@
 vm/vm_unix.c			standard
 vm/vm_zeroidle.c		standard
 vm/vnode_pager.c		standard
-xdr/xdr.c			optional krpc | nfslockd | nfsclient | nfsserver
-xdr/xdr_array.c			optional krpc | nfslockd | nfsclient | nfsserver
-xdr/xdr_mbuf.c			optional krpc | nfslockd | nfsclient | nfsserver
-xdr/xdr_mem.c			optional krpc | nfslockd | nfsclient | nfsserver
-xdr/xdr_reference.c		optional krpc | nfslockd | nfsclient | nfsserver
-xdr/xdr_sizeof.c		optional krpc | nfslockd | nfsclient | nfsserver
+xdr/xdr.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
+xdr/xdr_array.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
+xdr/xdr_mbuf.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
+xdr/xdr_mem.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
+xdr/xdr_reference.c		optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
+xdr/xdr_sizeof.c		optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
 #
 gnu/fs/xfs/xfs_alloc.c		optional xfs \
 	compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" \

==== //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/vm_machdep.c#9 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.297 2009/07/29 08:49:58 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.298 2009/10/01 22:05:38 kmacy Exp $");
 
 #include "opt_isa.h"
 #include "opt_npx.h"
@@ -270,11 +270,7 @@
 	/*
 	 * XXX XEN need to check on PSL_USER is handled
 	 */
-#ifdef XEN
-	td2->td_md.md_saved_flags = 0;
-#else	
 	td2->td_md.md_saved_flags = PSL_KERNEL | PSL_I;
-#endif
 	/*
 	 * Now, cpu_switch() can schedule the new process.
 	 * pcb_esp is loaded pointing to the cpu_switch() stack frame
@@ -446,11 +442,7 @@
 
 	/* Setup to release spin count in fork_exit(). */
 	td->td_md.md_spinlock_count = 1;
-#ifdef XEN	
-	td->td_md.md_saved_flags = 0;	
-#else
 	td->td_md.md_saved_flags = PSL_KERNEL | PSL_I;
-#endif
 }
 
 /*

==== //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/cpufunc.h#9 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.156 2009/09/30 16:34:50 avg Exp $
+ * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.157 2009/10/01 22:05:38 kmacy Exp $
  */
 
 /*
@@ -49,8 +49,8 @@
 extern void xen_load_cr3(u_int data);
 extern void xen_tlb_flush(void);
 extern void xen_invlpg(u_int addr);
-extern int xen_save_and_cli(void);
-extern void xen_restore_flags(u_int eflags);
+extern void write_eflags(u_int eflags);
+extern u_int read_eflags(void);
 #endif
 
 struct region_descriptor;
@@ -293,7 +293,11 @@
 }
 
 static __inline u_int
+#ifdef XEN
+_read_eflags(void)
+#else	
 read_eflags(void)
+#endif
 {
 	u_int	ef;
 
@@ -335,7 +339,11 @@
 }
 
 static __inline void
+#ifdef XEN
+_write_eflags(u_int ef)
+#else
 write_eflags(u_int ef)
+#endif
 {
 	__asm __volatile("pushl %0; popfl" : : "r" (ef));
 }
@@ -653,23 +661,15 @@
 {
 	register_t eflags;
 
-#ifdef XEN
-	eflags = xen_save_and_cli();
-#else 	
 	eflags = read_eflags();
 	disable_intr();
-#endif	
 	return (eflags);
 }
 
 static __inline void
 intr_restore(register_t eflags)
 {
-#ifdef XEN
-	xen_restore_flags(eflags);
-#else
 	write_eflags(eflags);
-#endif
 }
 
 #else /* !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */

==== //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/xen_machdep.c#11 (text+ko) ====

@@ -31,11 +31,12 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/i386/xen/xen_machdep.c,v 1.19 2009/04/01 17:06:28 dfr Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/xen/xen_machdep.c,v 1.20 2009/10/01 22:05:38 kmacy Exp $");
 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -101,6 +102,7 @@
 void
 ni_cli(void)
 {
+	CTR0(KTR_SPARE2, "ni_cli disabling interrupts");
 	__asm__("pushl %edx;"
 		"pushl %eax;"
 		);
@@ -345,33 +347,53 @@
 	PANIC_IF(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
 }
 
-void
-xen_restore_flags(u_int eflags)
+#ifdef KTR
+static __inline u_int
+rebp(void)
 {
-	if (eflags > 1)
-		eflags = ((eflags & PSL_I) == 0);
+	u_int	data;
 
-	__restore_flags(eflags);
+	__asm __volatile("movl 4(%%ebp),%0" : "=r" (data));	
+	return (data);
 }
+#endif
 
-int
-xen_save_and_cli(void)
+u_int
+read_eflags(void)
 {
-	int eflags;
-	
-	__save_and_cli(eflags);
+        vcpu_info_t *_vcpu;
+	u_int eflags;
+
+	eflags = _read_eflags();
+        _vcpu = &HYPERVISOR_shared_info->vcpu_info[smp_processor_id()]; 
+	if (_vcpu->evtchn_upcall_mask)
+		eflags &= ~PSL_I;
+
 	return (eflags);
 }
 
 void
+write_eflags(u_int eflags)
+{
+	u_int intr;
+
+	CTR2(KTR_SPARE2, "%x xen_restore_flags eflags %x", rebp(), eflags);
+	intr = ((eflags & PSL_I) == 0);
+	__restore_flags(intr);
+	_write_eflags(eflags);
+}
+
+void
 xen_cli(void)
 {
+	CTR1(KTR_SPARE2, "%x xen_cli disabling interrupts", rebp());
 	__cli();
 }
 
 void
 xen_sti(void)
 {
+	CTR1(KTR_SPARE2, "%x xen_sti enabling interrupts", rebp());
 	__sti();
 }
 

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_main.c#11 (text+ko) ====

@@ -42,7 +42,7 @@
  */

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 22:34:34 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2277B1065758; Fri,  2 Oct 2009 22:34:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AC0711065670
	for ; Fri,  2 Oct 2009 22:34:33 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9A04E8FC1A
	for ; Fri,  2 Oct 2009 22:34:33 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92MYXB8091751
	for ; Fri, 2 Oct 2009 22:34:33 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92MYXeK091749
	for perforce@freebsd.org; Fri, 2 Oct 2009 22:34:33 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 2 Oct 2009 22:34:33 GMT
Message-Id: <200910022234.n92MYXeK091749@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169165 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 22:34:34 -0000

http://perforce.freebsd.org/chv.cgi?CH=169165

Change 169165 by trasz@trasz_victim on 2009/10/02 22:34:12

	IFC.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/etc/rc.d/routing#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exec.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_socket.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/mmap/mmap.c#2 integrate

Differences ...

==== //depot/projects/soc2009/trasz_limits/etc/rc.d/routing#5 (text+ko) ====

@@ -2,7 +2,7 @@
 #
 # Configure routing and miscellaneous network tunables
 #
-# $FreeBSD: src/etc/rc.d/routing,v 1.151 2009/10/02 02:28:59 hrs Exp $
+# $FreeBSD: src/etc/rc.d/routing,v 1.152 2009/10/02 20:19:53 hrs Exp $
 #
 
 # PROVIDE: routing
@@ -13,26 +13,80 @@
 . /etc/network.subr
 
 name="routing"
-start_cmd="routing_start"
+start_cmd="routing_start doall"
 stop_cmd="routing_stop"
 extra_commands="options static"
-static_cmd="static_start"
-options_cmd="options_start"
+static_cmd="routing_start static"
+options_cmd="routing_start options"
+
+afcheck()
+{
+	case $_af in
+	""|inet|inet6|ipx|atm)
+		;;
+	*)
+		err 1 "Unsupported address family: $_af."
+		;;
+	esac
+}
 
 routing_start()
 {
-	static_start "$@"
-	options_start "$@"
+	local _cmd _af _a
+	_cmd=$1
+	_af=$2
+
+	afcheck
+
+	case $_af in
+	inet|inet6|ipx|atm)
+		setroutes $_cmd $_af
+		;;
+	"")
+		for _a in inet inet6 ipx atm; do
+			afexists $_a && setroutes $_cmd $_a
+		done
+		;;
+	esac
+	[ -n "${_ropts_initdone}" ] && echo '.'
 }
 
 routing_stop()
 {
-	local _af
+	local _af _a
+	_af=$1
+
+	afcheck
+
+	case $_af in
+	inet|inet6|ipx|atm)
+		eval static_${_af} delete
+		eval routing_stop_${_af}
+		;;
+	"")
+		for _a in inet inet6 ipx atm; do
+			afexists $_a || continue
+			eval static_${_a} delete
+			eval routing_stop_${_a}
+		done
+		;;
+	esac
+}
 
-	static_stop "$@"
-	for _af in inet inet6; do
-		afexists ${_af} && eval routing_stop_${_af}
-	done
+setroutes()
+{
+	case $1 in
+	static)
+		static_$2 add
+		;;
+	options)
+		options_$2
+		;;
+	doall)
+		static_$2 add
+		options_$2
+		;;
+	esac
 }
 
 routing_stop_inet()
@@ -50,47 +104,16 @@
 	done
 }
 
-static_start()
+routing_stop_atm()
 {
-	local _af
-	_af=$1
-
-	case ${_af} in
-	inet|inet6|atm)
-		do_static add ${_af}
-		;;
-	"")
-		do_static add inet inet6 atm
-		;;
-	esac
+	return 0
 }
 
-static_stop()
+routing_stop_ipx()
 {
-	local _af
-	_af=$1
-
-	case ${_af} in
-	inet|inet6|atm)
-		do_static delete ${_af}
-		;;
-	"")
-		do_static delete inet inet6 atm
-		;;
-	esac
+	return 0
 }
 
-do_static()
-{
-	local _af _action
-	_action=$1
-
-	shift
-	for _af in "$@"; do
-		afexists ${_af} && eval static_${_af} ${_action}
-	done
-}
-
 static_inet()
 {
 	local _action
@@ -233,6 +256,10 @@
 	fi
 }
 
+static_ipx()
+{
+}
+
 _ropts_initdone=
 ropts_init()
 {
@@ -242,16 +269,6 @@
 	fi
 }
 
-options_start()
-{
-	local _af
-
-	for _af in inet inet6 ipx; do
-		afexists ${_af} && eval options_${_af}
-	done
-	 [ -n "${_ropts_initdone}" ] && echo '.'
-}
-
 options_inet()
 {
 	if checkyesno icmp_bmcastecho; then
@@ -322,6 +339,10 @@
 	fi
 }
 
+options_atm()
+{
+}
+
 options_ipx()
 {
 	if checkyesno ipxgateway_enable; then

==== //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#15 (text+ko) ====

@@ -42,7 +42,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.305 2009/10/01 10:53:12 avg Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.306 2009/10/02 17:48:51 bz Exp $");
 
 #include "opt_ddb.h"
 #include "opt_init_path.h"
@@ -510,6 +510,11 @@
 	pmap_pinit0(vmspace_pmap(&vmspace0));
 	p->p_vmspace = &vmspace0;
 	vmspace0.vm_refcnt = 1;
+
+	/*
+	 * proc0 is not expected to enter usermode, so there is no special
+	 * handling for sv_minuser here, like is done for exec_new_vmspace().
+	 */
 	vm_map_init(&vmspace0.vm_map, p->p_sysent->sv_minuser,
 	    p->p_sysent->sv_maxuser);
 	vmspace0.vm_map.pmap = vmspace_pmap(&vmspace0);

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_exec.c#8 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.338 2009/09/09 10:52:36 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.339 2009/10/02 17:48:51 bz Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_kdtrace.h"
@@ -122,6 +122,11 @@
 SYSCTL_ULONG(_kern, OID_AUTO, ps_arg_cache_limit, CTLFLAG_RW, 
     &ps_arg_cache_limit, 0, "");
 
+static int map_at_zero = 0;
+TUNABLE_INT("security.bsd.map_at_zero", &map_at_zero);
+SYSCTL_INT(_security_bsd, OID_AUTO, map_at_zero, CTLFLAG_RW, &map_at_zero, 0,
+    "Permit processes to map an object at virtual address 0.");
+
 static int
 sysctl_kern_ps_strings(SYSCTL_HANDLER_ARGS)
 {
@@ -1002,7 +1007,7 @@
 	int error;
 	struct proc *p = imgp->proc;
 	struct vmspace *vmspace = p->p_vmspace;
-	vm_offset_t stack_addr;
+	vm_offset_t sv_minuser, stack_addr;
 	vm_map_t map;
 	u_long ssiz;
 
@@ -1018,13 +1023,17 @@
 	 * not disrupted
 	 */
 	map = &vmspace->vm_map;
-	if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv->sv_minuser &&
+	if (map_at_zero)
+		sv_minuser = sv->sv_minuser;
+	else
+		sv_minuser = MAX(sv->sv_minuser, PAGE_SIZE);
+	if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv_minuser &&
 	    vm_map_max(map) == sv->sv_maxuser) {
 		shmexit(vmspace);
 		pmap_remove_pages(vmspace_pmap(vmspace));
 		vm_map_remove(map, vm_map_min(map), vm_map_max(map));
 	} else {
-		error = vmspace_exec(p, sv->sv_minuser, sv->sv_maxuser);
+		error = vmspace_exec(p, sv_minuser, sv->sv_maxuser);
 		if (error)
 			return (error);
 		vmspace = p->p_vmspace;

==== //depot/projects/soc2009/trasz_limits/sys/kern/uipc_socket.c#11 (text+ko) ====

@@ -95,7 +95,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.344 2009/09/15 22:23:45 andre Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.345 2009/10/02 21:31:15 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -970,9 +970,6 @@
 	 * must use a signed comparison of space and resid.  On the other
 	 * hand, a negative resid causes us to loop sending 0-length
 	 * segments to the protocol.
-	 *
-	 * Also check to make sure that MSG_EOR isn't used on SOCK_STREAM
-	 * type sockets since that's an error.
 	 */
 	if (resid < 0) {
 		error = EINVAL;

==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#8 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.235 2009/09/27 14:49:51 simon Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.236 2009/10/02 17:51:46 bz Exp $");
 
 #include "opt_compat.h"
 #include "opt_hwpmc_hooks.h"
@@ -97,14 +97,6 @@
     "Maximum number of memory-mapped files per process");
 
 /*
- * 'mmap_zero' determines whether or not MAP_FIXED mmap() requests for
- * virtual address zero are permitted.
- */
-static int mmap_zero;
-SYSCTL_INT(_security_bsd, OID_AUTO, mmap_zero, CTLFLAG_RW, &mmap_zero, 0,
-    "Processes may map an object at virtual address zero");
-
-/*
  * Set the maximum number of vm_map_entry structures per process.  Roughly
  * speaking vm_map_entry structures are tiny, so allowing them to eat 1/100
  * of our KVM malloc space still results in generous limits.  We want a
@@ -277,13 +269,6 @@
 		if (addr & PAGE_MASK)
 			return (EINVAL);
 
-		/*
-		 * Mapping to address zero is only permitted if
-		 * mmap_zero is enabled.
-		 */
-		if (addr == 0 && !mmap_zero)
-			return (EINVAL);
-
 		/* Address range must be all in user VM space. */
 		if (addr < vm_map_min(&vms->vm_map) ||
 		    addr + size > vm_map_max(&vms->vm_map))

==== //depot/projects/soc2009/trasz_limits/tools/regression/mmap/mmap.c#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/tools/regression/mmap/mmap.c,v 1.1 2009/09/27 21:03:33 bz Exp $
+ * $FreeBSD: src/tools/regression/mmap/mmap.c,v 1.2 2009/10/02 17:53:48 bz Exp $
  */
 
 #include 
@@ -36,7 +36,7 @@
 
 const struct tests {
 	void	*addr;
-	int	ok[2];	/* Depending on security.bsd.mmap_zero {0, !=0}. */
+	int	ok[2];	/* Depending on security.bsd.map_at_zero {0, !=0}. */
 } tests[] = {
 	{ (void *)0,			{ 0, 1 } }, /* Test sysctl. */
 	{ (void *)1,			{ 0, 0 } },
@@ -54,37 +54,37 @@
 {
 	void *p;
 	size_t len;
-	int i, error, mib[3], mmap_zero;
+	int i, error, mib[3], map_at_zero;
 
 	error = 0;
 
-	/* Get the current sysctl value of security.bsd.mmap_zero. */
+	/* Get the current sysctl value of security.bsd.map_at_zero. */
 	len = sizeof(mib) / sizeof(*mib);
-	if (sysctlnametomib("security.bsd.mmap_zero", mib, &len) == -1)
-		err(1, "sysctlnametomib(security.bsd.mmap_zero)");
+	if (sysctlnametomib("security.bsd.map_at_zero", mib, &len) == -1)
+		err(1, "sysctlnametomib(security.bsd.map_at_zero)");
 
-	len = sizeof(mmap_zero);
-	if (sysctl(mib, 3, &mmap_zero, &len, NULL, 0) == -1)
-		err(1, "sysctl(security.bsd.mmap_zero)");
+	len = sizeof(map_at_zero);
+	if (sysctl(mib, 3, &map_at_zero, &len, NULL, 0) == -1)
+		err(1, "sysctl(security.bsd.map_at_zero)");
 
 	/* Normalize to 0 or 1 for array access. */
-	mmap_zero = !!mmap_zero;
+	map_at_zero = !!map_at_zero;
 
 	for (i=0; i < (sizeof(tests) / sizeof(*tests)); i++) {
 		p = mmap((void *)tests[i].addr, PAGE_SIZE,
 		    PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_FIXED,
 		    -1, 0);
 		if (p == MAP_FAILED) {
-			if (tests[i].ok[mmap_zero] != 0)
+			if (tests[i].ok[map_at_zero] != 0)
 				error++;
 			warnx("%s: mmap(%p, ...) failed.",
-			    (tests[i].ok[mmap_zero] == 0) ? "OK " : "ERR",
+			    (tests[i].ok[map_at_zero] == 0) ? "OK " : "ERR",
 			     tests[i].addr);
 		} else {
-			if (tests[i].ok[mmap_zero] != 1)
+			if (tests[i].ok[map_at_zero] != 1)
 				error++;
 			warnx("%s: mmap(%p, ...) succeeded: p=%p",
-			    (tests[i].ok[mmap_zero] == 1) ? "OK " : "ERR",
+			    (tests[i].ok[map_at_zero] == 1) ? "OK " : "ERR",
 			    tests[i].addr, p);
 		}
 	}

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 22:40:41 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E59721065670; Fri,  2 Oct 2009 22:40:40 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A93E31065697
	for ; Fri,  2 Oct 2009 22:40:40 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F3FD8FC17
	for ; Fri,  2 Oct 2009 22:40:40 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92MeefJ092273
	for ; Fri, 2 Oct 2009 22:40:40 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92MeeN7092271
	for perforce@freebsd.org; Fri, 2 Oct 2009 22:40:40 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 2 Oct 2009 22:40:40 GMT
Message-Id: <200910022240.n92MeeN7092271@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169167 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 22:40:41 -0000

http://perforce.freebsd.org/chv.cgi?CH=169167

Change 169167 by trasz@trasz_victim on 2009/10/02 22:39:44

	Remove file that is no longer relevant.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/MILESTONES#4 delete

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Oct  2 22:44:45 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6130D106568B; Fri,  2 Oct 2009 22:44:45 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 25A031065670
	for ; Fri,  2 Oct 2009 22:44:45 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 142B58FC16
	for ; Fri,  2 Oct 2009 22:44:45 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n92MiiMa092503
	for ; Fri, 2 Oct 2009 22:44:44 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n92MiiFF092500
	for perforce@freebsd.org; Fri, 2 Oct 2009 22:44:44 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 2 Oct 2009 22:44:44 GMT
Message-Id: <200910022244.n92MiiFF092500@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169168 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 02 Oct 2009 22:44:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=169168

Change 169168 by trasz@trasz_victim on 2009/10/02 22:44:39

	Fix mismerges.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/rpc/xdr.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#13 edit
.. //depot/projects/soc2009/trasz_limits/sys/netipsec/key.h#3 integrate

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/rpc/xdr.h#3 (text+ko) ====

@@ -1,112 +1,70 @@
 /*
- * CDDL HEADER START
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+ * unrestricted use provided that this legend is included on all tape
+ * media and as a part of the software program in whole or part.  Users
+ * may copy or modify Sun RPC without charge, but are not authorized
+ * to license or distribute it to anyone else except as part of a product or
+ * program developed by the user.
  *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
  *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
+ * Sun RPC is provided with no support and without any obligation on the
+ * part of Sun Microsystems, Inc. to assist in its use, correction,
+ * modification or enhancement.
  *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
+ * OR ANY PART THEREOF.
  *
- * CDDL HEADER END
+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ * or profits or other special, indirect and consequential damages, even if
+ * Sun has been advised of the possibility of such damages.
  *
- * $FreeBSD: src/sys/cddl/compat/opensolaris/rpc/xdr.h,v 1.4 2008/04/22 07:42:59 jb Exp $
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Avenue
+ * Mountain View, California  94043
  */
-/*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
 
-/*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-/*
- * Portions of this source code were derived from Berkeley 4.3 BSD
- * under license from the Regents of the University of California.
- */
-
 #ifndef	_OPENSOLARIS_RPC_XDR_H_
 #define	_OPENSOLARIS_RPC_XDR_H_
 
 #include_next 
 
 #ifndef _KERNEL
-#include_next 
 
-/*
- * Strangely, my glibc version (2.3.6) doesn't have xdr_control(), so
- * we have to hack it in here (source taken from OpenSolaris).
- * By the way, it is assumed the xdrmem implementation is used.
- */
-
-#undef xdr_control
-#define xdr_control(a,b,c) xdrmem_control(a,b,c)
+#include 
 
 /*
- * These are the request arguments to XDR_CONTROL.
+ * Taken from sys/xdr/xdr_mem.c.
  *
- * XDR_PEEK - returns the contents of the next XDR unit on the XDR stream.
- * XDR_SKIPBYTES - skips the next N bytes in the XDR stream.
- * XDR_RDMAGET - for xdr implementation over RDMA, gets private flags from
- *		 the XDR stream being moved over RDMA
- * XDR_RDMANOCHUNK - for xdr implementaion over RDMA, sets private flags in
- *                   the XDR stream moving over RDMA.
+ * FreeBSD's userland XDR doesn't implement control method (only the kernel),
+ * but OpenSolaris nvpair still depend on it, so we have to implement it here.
  */
-#define XDR_PEEK      2
-#define XDR_SKIPBYTES 3
-#define XDR_RDMAGET   4
-#define XDR_RDMASET   5
-
-/* FIXME: probably doesn't work */
 static __inline bool_t
 xdrmem_control(XDR *xdrs, int request, void *info)
 {
 	xdr_bytesrec *xptr;
-	int32_t *int32p;
-	int len;
 
 	switch (request) {
-
 	case XDR_GET_BYTES_AVAIL:
 		xptr = (xdr_bytesrec *)info;
 		xptr->xc_is_last_record = TRUE;
 		xptr->xc_num_avail = xdrs->x_handy;
 		return (TRUE);
-
-	case XDR_PEEK:
-		/*
-		 * Return the next 4 byte unit in the XDR stream.
-		 */
-		if (xdrs->x_handy < sizeof (int32_t))
-			return (FALSE);
-		int32p = (int32_t *)info;
-		*int32p = (int32_t)ntohl((uint32_t)
-		    (*((int32_t *)(xdrs->x_private))));
-		return (TRUE);
-
-	case XDR_SKIPBYTES:
-		/*
-		 * Skip the next N bytes in the XDR stream.
-		 */
-		int32p = (int32_t *)info;
-		len = RNDUP((int)(*int32p));
-		if ((xdrs->x_handy -= len) < 0)
-			return (FALSE);
-		xdrs->x_private += len;
-		return (TRUE);
-
+	default:
+		assert(!"unexpected request");
 	}
 	return (FALSE);
 }
+
+#undef XDR_CONTROL
+#define	XDR_CONTROL(xdrs, req, op)					\
+	(((xdrs)->x_ops->x_control == NULL) ?				\
+	    xdrmem_control((xdrs), (req), (op)) :			\
+	    (*(xdrs)->x_ops->x_control)(xdrs, req, op))   
+
 #endif	/* !_KERNEL */
 
 #endif	/* !_OPENSOLARIS_RPC_XDR_H_ */

==== //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#10 (text+ko) ====

@@ -32,9 +32,6 @@
 #
 # env		"GENERIC.env"
 
-options		IPSEC
-device		crypto
-
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 
 options 	SCHED_ULE		# ULE scheduler
@@ -78,7 +75,6 @@
 options 	MAC			# TrustedBSD MAC Framework
 options		FLOWTABLE		# per-cpu routing cache
 #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
-options		ACPI_DEBUG
 
 # Debugging for use in -current
 options 	KDB			# Enable kernel debugger support.

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#13 (text+ko) ====

@@ -50,7 +50,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

==== //depot/projects/soc2009/trasz_limits/sys/netipsec/key.h#3 (text+ko) ====

@@ -112,8 +112,6 @@
 	key_portfromsaddr((struct sockaddr *)(saddr))
 #endif
 
-extern in_addr_t key_find_src(const in_addr_t *dst);
-
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_IPSEC_SA);
 MALLOC_DECLARE(M_IPSEC_SAH);

From owner-p4-projects@FreeBSD.ORG  Sat Oct  3 02:35:59 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 69DC910656A5; Sat,  3 Oct 2009 02:35:59 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 047941065693
	for ; Sat,  3 Oct 2009 02:35:59 +0000 (UTC)
	(envelope-from yohanes@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E5F828FC1B
	for ; Sat,  3 Oct 2009 02:35:58 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n932Zvo4026098
	for ; Sat, 3 Oct 2009 02:35:57 GMT
	(envelope-from yohanes@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n932ZvIp026096
	for perforce@freebsd.org; Sat, 3 Oct 2009 02:35:57 GMT
	(envelope-from yohanes@FreeBSD.org)
Date: Sat, 3 Oct 2009 02:35:57 GMT
Message-Id: <200910030235.n932ZvIp026096@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	yohanes@FreeBSD.org using -f
From: Yohanes Nugroho 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169170 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 03 Oct 2009 02:35:59 -0000

http://perforce.freebsd.org/chv.cgi?CH=169170

Change 169170 by yohanes@econa on 2009/10/03 02:35:46

	not stopping DMA, using interrupt for cleanup

Affected files ...

.. //depot/projects/str91xx/src/sys/arm/conf/CNS11XXNAS#4 edit
.. //depot/projects/str91xx/src/sys/arm/econa/econa_machdep.c#4 edit
.. //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#5 edit
.. //depot/projects/str91xx/src/sys/arm/econa/timer.c#4 edit

Differences ...

==== //depot/projects/str91xx/src/sys/arm/conf/CNS11XXNAS#4 (text+ko) ====

@@ -52,7 +52,8 @@
 #options		COMPAT_FREEBSD7	
 
 
-options 	SCHED_ULE		#ULE scheduler
+#options 	SCHED_ULE		#ULE scheduler
+options 	SCHED_4BSD		#4BSD scheduler
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 #options 	GEOM_PART_EBR
 #options 	GEOM_PART_EBR_COMPAT
@@ -106,7 +107,7 @@
 #options 	ARM_USE_SMALL_ALLOC
 
 device		usb
-options 	USB_DEBUG
+#options 	USB_DEBUG
 device		ohci
 device		ehci
 device		umass

==== //depot/projects/str91xx/src/sys/arm/econa/econa_machdep.c#4 (text+ko) ====

@@ -201,7 +201,7 @@
 	boot_arg1 = arg;
 	boot_arg2 = arg2;
 	boothowto = RB_VERBOSE;
-	//boothowto |=  RB_SINGLE;
+	boothowto |=  RB_SINGLE;
 
 	set_cpufuncs();
 	lastaddr = fake_preload_metadata();

==== //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#5 (text+ko) ====

@@ -79,6 +79,7 @@
 	struct mtx sc_mtx;		/* global mutex */
 	struct mtx sc_mtx_tx;		/* tx mutex */
 	struct mtx sc_mtx_rx;		/* rx mutex */
+	struct mtx sc_mtx_cleanup;	/* rx mutex */
 
 	bus_dma_tag_t	sc_parent_tag;	/* parent bus DMA tag */
 
@@ -86,11 +87,13 @@
 	device_t miibus;		/* My child miibus */
 	void *intrhand;			/* Interrupt handle */
 	void *intrhand_qf;			/* Interrupt handle: queue full */
+	void *intrhand_tx;			/* Interrupt handle: queue full */
 	void *intrhand_status;			/* Interrupt handle */
 
-	struct resource *irq_res_rec;	/* IRQ resource */
-	struct resource *irq_res_qf;	/* IRQ resource */
-	struct resource *irq_res_status;	/* IRQ resource */
+	struct resource *irq_res_tx;	/* transmit */
+	struct resource *irq_res_rec;	/* receive */
+	struct resource *irq_res_qf;	/* queue full */
+	struct resource *irq_res_status;	/* status */
 
 	struct resource	*mem_res;	/* Memory resource */
 
@@ -131,6 +134,7 @@
 
 	struct taskqueue *sc_tq;
 	struct task	sc_intr_task;
+	struct task	sc_cleanup_task;
 	struct task	sc_tx_task;
 
 };
@@ -212,6 +216,14 @@
 	mtx_init(&_sc->sc_mtx_tx, device_get_nameunit(_sc->dev), \
 	    "ECE TX Lock", MTX_DEF)
 
+
+#define ECE_CLEANUPLOCK(_sc)		mtx_lock(&(_sc)->sc_mtx_cleanup)
+#define	ECE_CLEANUPUNLOCK(_sc)		mtx_unlock(&(_sc)->sc_mtx_cleanup)
+#define ECE_CLEANUPLOCK_INIT(_sc) \
+	mtx_init(&_sc->sc_mtx_cleanup, device_get_nameunit(_sc->dev), \
+	    "ECE cleanup Lock", MTX_DEF)
+
+
 #define ECE_RXLOCK(_sc)		mtx_lock(&(_sc)->sc_mtx_rx)
 #define	ECE_RXUNLOCK(_sc)		mtx_unlock(&(_sc)->sc_mtx_rx)
 #define ECE_RXLOCK_INIT(_sc) \
@@ -221,6 +233,7 @@
 #define ECE_LOCK_DESTROY(_sc)	mtx_destroy(&_sc->sc_mtx);
 #define ECE_TXLOCK_DESTROY(_sc)	mtx_destroy(&_sc->sc_mtx_tx);
 #define ECE_RXLOCK_DESTROY(_sc)	mtx_destroy(&_sc->sc_mtx_rx);
+#define ECE_CLEANUPLOCK_DESTROY(_sc)	mtx_destroy(&_sc->sc_mtx_cleanup);
 
 #define ECE_ASSERT_LOCKED(_sc)	mtx_assert(&_sc->sc_mtx, MA_OWNED);
 #define ECE_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED);
@@ -271,9 +284,13 @@
 
 static void	ece_intr_task(void *arg, int pending __unused);
 static void	ece_tx_task(void *arg, int pending __unused);
+static void	ece_cleanup_task(void *arg, int pending __unused);
 
 static int ece_allocate_dma(struct ece_softc *sc);
 
+static void ece_intr_tx(void *xsc);
+
+
 static inline int
 phy_read(struct ece_softc *sc, int phy, int reg)
 {
@@ -289,6 +306,7 @@
 		
 	for (ii = 0; ii < 0x1000; ii++) {
 		status = RD4(sc, PHY_CONTROL);
+		DELAY(1);
 		if (status & (0x1 << 15)) {
 			/* clear the rw_ok status, and clear other bits value */
 			WR4(sc, PHY_CONTROL, (0x1 << 15));
@@ -393,6 +411,13 @@
 	if (sc->irq_res_rec == NULL)
 		goto out;
 
+	//
+	rid = 1; /*TSTC: Fm-Switch-Tx-Complete*/
+	sc->irq_res_tx = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_ACTIVE);
+	if (sc->irq_res_tx == NULL)
+		goto out;
+
 	rid = 0;
 	sc->irq_res_status = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_ACTIVE);
@@ -488,6 +513,7 @@
 
 	TASK_INIT(&sc->sc_intr_task, 0, ece_intr_task, sc);
 	TASK_INIT(&sc->sc_tx_task, 1, ece_tx_task, ifp);
+	TASK_INIT(&sc->sc_cleanup_task, 2, ece_cleanup_task, sc);
 	sc->sc_tq = taskqueue_create_fast("ece_taskq", M_WAITOK,
 	    taskqueue_thread_enqueue, &sc->sc_tq);
 	if (sc->sc_tq == NULL) {
@@ -517,6 +543,7 @@
 		ECE_LOCK_DESTROY(sc);
 		goto out;
 	}
+
 	err = bus_setup_intr(dev, sc->irq_res_qf, INTR_TYPE_NET | INTR_MPSAFE,
 	    NULL,ece_intr_qf,  sc, &sc->intrhand_qf);
 
@@ -525,8 +552,21 @@
 		ECE_LOCK_DESTROY(sc);
 		goto out;
 	}
+
+
+	err = bus_setup_intr(dev, sc->irq_res_tx, INTR_TYPE_NET | INTR_MPSAFE,
+	    NULL,ece_intr_tx,  sc, &sc->intrhand_tx);
+
+	if (err) {
+		ether_ifdetach(ifp);
+		ECE_LOCK_DESTROY(sc);
+		goto out;
+	}
+
+
 	ECE_TXLOCK_INIT(sc);
 	ECE_RXLOCK_INIT(sc);
+	ECE_CLEANUPLOCK_INIT(sc);
 
 	DEBUG_TRACE;
 
@@ -1652,9 +1692,69 @@
 	taskqueue_enqueue(sc->sc_tq, &sc->sc_intr_task);
 }
 
+static void
+ece_cleanup_locked(struct ece_softc *sc)
+{
+	//printf("cleaning up\n");
+	int desc_idx;
+	eth_tx_desc_t *desc;
+	int start = sc->curr_tx_mbuf - 1;
+	if (start<0) start = ECE_MAX_TX_BUFFERS-1;
+	
+	desc_idx = sc->sent_position[start];
+	while (desc_idx!=-1) {
+		//bus_dmamap_sync(sc->dmatag_ring_tx, sc->dmap_tx[desc_idx],  BUS_DMASYNC_PREREAD);
+		desc = (eth_tx_desc_t *)&(sc->desc_tx[desc_idx]);
+		if (desc->cown != 0) {
+			if (sc->buffer_tx[start]) {
+				//printf("freeing\n");
+				m_freem(sc->buffer_tx[start]);
+				sc->buffer_tx[start] = 0;
 
+			}
+			sc->sent_position[start] = -1;
+			start--;
+			if (start<0) start = ECE_MAX_TX_BUFFERS-1;
+			desc_idx = sc->sent_position[start];
+		} else {
+			break;
+		}
+	}
+	
+}
+
+static void
+ece_cleanup_task(void *arg, int pending __unused)
+{
+//	printf("ECE INTR TASK");
+	struct ece_softc *sc = arg;
+	//struct ifnet *ifp = sc->ifp;
+	//printf("cleanup task called\n");
+	ECE_CLEANUPLOCK(sc);
+	//printf("inside lock\n");
+	ece_cleanup_locked(sc);
+	ECE_CLEANUPUNLOCK(sc);
+}
 
+
 static void
+ece_intr_tx(void *xsc)
+{
+	struct ece_softc *sc = xsc;
+	struct ifnet *ifp = sc->ifp;
+	//printf("data sent");
+	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
+		printf("should not happen, stopping dma");
+		/*this should not happen, stop DMA*/
+		WR4(sc, FS_DMA_CONTROL, 0);
+		return;
+	}
+	taskqueue_enqueue(sc->sc_tq, &sc->sc_cleanup_task);
+}
+
+
+
+static void
 ece_intr_qf(void *xsc)
 {
 	struct ece_softc *sc = xsc;
@@ -1706,7 +1806,7 @@
 	int seg;
 	int nsegs;
 	int desc_no;
-	int desc_idx;
+	//int desc_idx;
 	int start;
 	eth_tx_desc_t *desc = 0;
 
@@ -1767,6 +1867,7 @@
 		desc->ico = 0;
 		desc->tco = 0;
 		desc->uco = 0;
+		desc->interrupt = 1;
 
 #if 0
 		if (csum_flags) {
@@ -1783,7 +1884,7 @@
 		}
 
 		//desc->cown = 0;
-		desc->interrupt = 0;
+		//sc->interrupt = 0;
 		
 		desc++;
 		sc->desc_curr_tx = (sc->desc_curr_tx+1) % ECE_MAX_TX_BUFFERS;
@@ -1796,7 +1897,7 @@
 	for (seg = 0; seg < nsegs; seg++) {
 		desc->cown = 0;
 		desc++;
-		bus_dmamap_sync(sc->dmatag_ring_tx, sc->dmap_tx[desc_no],  BUS_DMASYNC_PREWRITE);
+		//bus_dmamap_sync(sc->dmatag_ring_tx, sc->dmap_tx[desc_no],  BUS_DMASYNC_PREWRITE);
 		desc_no = (desc_no+1) % ECE_MAX_TX_BUFFERS;
 		if (desc_no==0) {
 			desc = (eth_tx_desc_t *)&(sc->desc_tx[0]);
@@ -1806,24 +1907,6 @@
 
 	bus_dmamap_sync(sc->dmatag_ring_tx, mapp,    BUS_DMASYNC_PREWRITE);
 
-	if (start<0) start = ECE_MAX_TX_BUFFERS-1;
-	
-	desc_idx = sc->sent_position[start];
-	while (desc_idx!=-1) {
-		//bus_dmamap_sync(sc->dmatag_ring_tx, sc->dmap_tx[desc_idx],  BUS_DMASYNC_PREREAD);
-		desc = (eth_tx_desc_t *)&(sc->desc_tx[desc_idx]);
-		if (desc->cown != 0) {
-			if (sc->buffer_tx[start]) {
-				m_freem(sc->buffer_tx[start]);
-				sc->buffer_tx[start] = 0;
-
-			}
-			sc->sent_position[start] = -1;
-			start--;
-			if (start<0) start = ECE_MAX_TX_BUFFERS-1;
-			desc_idx = sc->sent_position[start];
-		}
-	}
 	return (0);
 }
 
@@ -1845,7 +1928,7 @@
 	    IFF_DRV_RUNNING)
 		return;
 
-	WR4(sc, TS_DMA_CONTROL, 0);
+	//WR4(sc, TS_DMA_CONTROL, 0);
 	for (;;) {
 		/* Get packet from the queue */
 		IF_DEQUEUE(&ifp->if_snd, m0);
@@ -2032,7 +2115,7 @@
 	if (phy>0) return 0;
 	//printf("read reg %d phy %d\n", reg, phy);
 	sc = device_get_softc(dev);
-
+	
 	return phy_read(sc, phy, reg);
 
 }

==== //depot/projects/str91xx/src/sys/arm/econa/timer.c#4 (text+ko) ====

@@ -51,7 +51,7 @@
 unsigned int AHB_clock;
 unsigned int APB_clock;
 
-unsigned long gettimeoffset(void);
+
 void timer_enable(void);
 unsigned int str9100_timer_disable(void);
 unsigned int read_timer_counter(void);
@@ -358,50 +358,6 @@
 
 
 
-unsigned long 
-gettimeoffset(void)
-{
-	unsigned int ticks1, ticks2;
-	unsigned int interrupt_status;
-	u_int savedints;
-	savedints = disable_interrupts(I32_bit);
-
-
-	/*
-	 * Get the current number of ticks.  Note that there is a race
-	 * condition between us reading the timer and checking for
-	 * an interrupt.  We get around this by ensuring that the
-	 * counter has not reloaded between our two reads.
-	 */
-	ticks2 = read_timer_counter();
-	do {
-		ticks1 = ticks2;
-		interrupt_status = read_timer_interrupt_status();
-		ticks2 = read_timer_counter();
-	} while (ticks2 > ticks1);
-
-	/*
-	 * Number of ticks since last interrupt.
-	 */
-	ticks1 = timer_counter - ticks2;
-
-	/*
-	 * Interrupt pending?  If so, we've reloaded once already.
-	 */
-	if (interrupt_status &
-	    ((1 << TIMER1_MATCH1_INTR_BIT_INDEX) ||
-	     (1 << TIMER1_MATCH2_INTR_BIT_INDEX) ||
-	     (1 << TIMER1_OVERFLOW_INTR_BIT_INDEX))) {
-		ticks1 += timer_counter;
-	}
-	restore_interrupts(savedints);
-	/*
-	 * Convert the ticks to usecs
-	 */
-	return TICKS2USECS(ticks1);
-}
-
-
 
 static unsigned 
 ec_timer_get_timecount(struct timecounter *a)
@@ -427,9 +383,9 @@
 {
 	sys_clock = 100000000;
 
-	printf("System clock %08x",  (*(unsigned int *)(0x77000008)));
+	printf("System clock %08x\n",  (*(unsigned int *)(0x77000008)));
 
-	printf("Reset conf %08x",  (*(unsigned int *)(0x77000014)));
+	printf("Reset conf %08x\n",  (*(unsigned int *)(0x77000014)));
 
 
 	switch (((*(unsigned int *)(0x77000014)) >> 6) & 0x3) {

From owner-p4-projects@FreeBSD.ORG  Sat Oct  3 08:16:13 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 81CB2106568B; Sat,  3 Oct 2009 08:16:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 36F7F1065670
	for ; Sat,  3 Oct 2009 08:16:12 +0000 (UTC)
	(envelope-from bz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 245FA8FC14
	for ; Sat,  3 Oct 2009 08:16:12 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n938GBS7066311
	for ; Sat, 3 Oct 2009 08:16:11 GMT
	(envelope-from bz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n938G9MG066309
	for perforce@freebsd.org; Sat, 3 Oct 2009 08:16:09 GMT
	(envelope-from bz@freebsd.org)
Date: Sat, 3 Oct 2009 08:16:09 GMT
Message-Id: <200910030816.n938G9MG066309@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bz@freebsd.org using -f
From: "Bjoern A. Zeeb" 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169172 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 03 Oct 2009 08:16:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=169172

Change 169172 by bz@bz_dumpster on 2009/10/03 08:15:14

	IFC @169171

Affected files ...

.. //depot/projects/s390/Makefile.inc1#30 integrate
.. //depot/projects/s390/ObsoleteFiles.inc#10 integrate
.. //depot/projects/s390/UPDATING#23 integrate
.. //depot/projects/s390/bin/chmod/chmod.c#7 integrate
.. //depot/projects/s390/bin/cp/utils.c#11 integrate
.. //depot/projects/s390/bin/getfacl/getfacl.1#8 integrate
.. //depot/projects/s390/bin/getfacl/getfacl.c#7 integrate
.. //depot/projects/s390/bin/ls/print.c#10 integrate
.. //depot/projects/s390/bin/mv/mv.c#6 integrate
.. //depot/projects/s390/bin/setfacl/mask.c#3 integrate
.. //depot/projects/s390/bin/setfacl/merge.c#3 integrate
.. //depot/projects/s390/bin/setfacl/remove.c#3 integrate
.. //depot/projects/s390/bin/setfacl/setfacl.1#7 integrate
.. //depot/projects/s390/bin/setfacl/setfacl.c#6 integrate
.. //depot/projects/s390/bin/setfacl/setfacl.h#4 integrate
.. //depot/projects/s390/bin/sh/eval.c#11 integrate
.. //depot/projects/s390/bin/sh/exec.c#10 integrate
.. //depot/projects/s390/bin/sh/exec.h#6 integrate
.. //depot/projects/s390/bin/sh/mknodes.c#5 integrate
.. //depot/projects/s390/bin/sh/nodes.c.pat#7 integrate
.. //depot/projects/s390/bin/sh/parser.c#8 integrate
.. //depot/projects/s390/bin/sh/sh.1#13 integrate
.. //depot/projects/s390/cddl/compat/opensolaris/include/assert.h#1 branch
.. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zdb/zdb.c#3 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/head/assert.h#3 delete
.. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#3 integrate
.. //depot/projects/s390/contrib/ee/ee.c#2 integrate
.. //depot/projects/s390/contrib/gdtoa/gdtoaimp.h#7 integrate
.. //depot/projects/s390/contrib/gdtoa/misc.c#3 integrate
.. //depot/projects/s390/contrib/traceroute/as.c#2 integrate
.. //depot/projects/s390/contrib/traceroute/as.h#2 integrate
.. //depot/projects/s390/contrib/traceroute/traceroute.c#7 integrate
.. //depot/projects/s390/crypto/openssh/ChangeLog#9 integrate
.. //depot/projects/s390/crypto/openssh/README#8 integrate
.. //depot/projects/s390/crypto/openssh/README.platform#4 integrate
.. //depot/projects/s390/crypto/openssh/auth-pam.c#10 integrate
.. //depot/projects/s390/crypto/openssh/auth-passwd.c#7 integrate
.. //depot/projects/s390/crypto/openssh/auth-sia.c#5 integrate
.. //depot/projects/s390/crypto/openssh/auth1.c#7 integrate
.. //depot/projects/s390/crypto/openssh/auth2-jpake.c#2 integrate
.. //depot/projects/s390/crypto/openssh/auth2-kbdint.c#6 integrate
.. //depot/projects/s390/crypto/openssh/auth2-none.c#5 integrate
.. //depot/projects/s390/crypto/openssh/auth2-passwd.c#4 integrate
.. //depot/projects/s390/crypto/openssh/auth2-pubkey.c#4 integrate
.. //depot/projects/s390/crypto/openssh/auth2.c#10 integrate
.. //depot/projects/s390/crypto/openssh/canohost.c#10 integrate
.. //depot/projects/s390/crypto/openssh/canohost.h#5 integrate
.. //depot/projects/s390/crypto/openssh/channels.c#11 integrate
.. //depot/projects/s390/crypto/openssh/clientloop.c#9 integrate
.. //depot/projects/s390/crypto/openssh/config.h#9 integrate
.. //depot/projects/s390/crypto/openssh/config.h.in#3 integrate
.. //depot/projects/s390/crypto/openssh/defines.h#9 integrate
.. //depot/projects/s390/crypto/openssh/gss-genr.c#5 integrate
.. //depot/projects/s390/crypto/openssh/includes.h#8 integrate
.. //depot/projects/s390/crypto/openssh/jpake.c#2 integrate
.. //depot/projects/s390/crypto/openssh/jpake.h#2 integrate
.. //depot/projects/s390/crypto/openssh/kex.c#8 integrate
.. //depot/projects/s390/crypto/openssh/kex.h#8 integrate
.. //depot/projects/s390/crypto/openssh/kexdhs.c#5 integrate
.. //depot/projects/s390/crypto/openssh/kexgexs.c#5 integrate
.. //depot/projects/s390/crypto/openssh/monitor.c#11 integrate
.. //depot/projects/s390/crypto/openssh/monitor_mm.c#5 integrate
.. //depot/projects/s390/crypto/openssh/monitor_wrap.c#9 integrate
.. //depot/projects/s390/crypto/openssh/monitor_wrap.h#7 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#6 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#3 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/daemon.c#5 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/getrrsetbyname.c#5 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/openssl-compat.c#3 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/openssl-compat.h#4 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/port-aix.c#6 integrate
.. //depot/projects/s390/crypto/openssh/openbsd-compat/port-aix.h#7 integrate
.. //depot/projects/s390/crypto/openssh/packet.c#10 integrate
.. //depot/projects/s390/crypto/openssh/packet.h#6 integrate
.. //depot/projects/s390/crypto/openssh/readconf.c#9 integrate
.. //depot/projects/s390/crypto/openssh/readconf.h#8 integrate
.. //depot/projects/s390/crypto/openssh/roaming.h#1 branch
.. //depot/projects/s390/crypto/openssh/roaming_common.c#1 branch
.. //depot/projects/s390/crypto/openssh/roaming_dummy.c#1 branch
.. //depot/projects/s390/crypto/openssh/schnorr.c#2 integrate
.. //depot/projects/s390/crypto/openssh/schnorr.h#1 branch
.. //depot/projects/s390/crypto/openssh/servconf.c#9 integrate
.. //depot/projects/s390/crypto/openssh/serverloop.c#10 integrate
.. //depot/projects/s390/crypto/openssh/session.c#12 integrate
.. //depot/projects/s390/crypto/openssh/sftp-client.c#8 integrate
.. //depot/projects/s390/crypto/openssh/sftp-server.8#4 integrate
.. //depot/projects/s390/crypto/openssh/sftp-server.c#8 integrate
.. //depot/projects/s390/crypto/openssh/ssh-agent.1#7 integrate
.. //depot/projects/s390/crypto/openssh/ssh-agent.c#10 integrate
.. //depot/projects/s390/crypto/openssh/ssh-keygen.c#9 integrate
.. //depot/projects/s390/crypto/openssh/ssh.1#9 integrate
.. //depot/projects/s390/crypto/openssh/ssh.c#9 integrate
.. //depot/projects/s390/crypto/openssh/ssh_config#11 integrate
.. //depot/projects/s390/crypto/openssh/ssh_config.5#11 integrate
.. //depot/projects/s390/crypto/openssh/ssh_namespace.h#4 integrate
.. //depot/projects/s390/crypto/openssh/sshconnect.c#10 integrate
.. //depot/projects/s390/crypto/openssh/sshconnect.h#4 integrate
.. //depot/projects/s390/crypto/openssh/sshconnect2.c#10 integrate
.. //depot/projects/s390/crypto/openssh/sshd.8#11 integrate
.. //depot/projects/s390/crypto/openssh/sshd.c#12 integrate
.. //depot/projects/s390/crypto/openssh/sshd_config#11 integrate
.. //depot/projects/s390/crypto/openssh/sshd_config.5#11 integrate
.. //depot/projects/s390/crypto/openssh/sshlogin.c#7 integrate
.. //depot/projects/s390/crypto/openssh/uuencode.c#5 integrate
.. //depot/projects/s390/crypto/openssh/version.h#11 integrate
.. //depot/projects/s390/crypto/openssl/crypto/pqueue/pqueue.c#2 integrate
.. //depot/projects/s390/crypto/openssl/crypto/pqueue/pqueue.h#2 integrate
.. //depot/projects/s390/crypto/openssl/ssl/d1_both.c#3 integrate
.. //depot/projects/s390/crypto/openssl/ssl/d1_pkt.c#3 integrate
.. //depot/projects/s390/etc/Makefile#20 integrate
.. //depot/projects/s390/etc/defaults/periodic.conf#10 integrate
.. //depot/projects/s390/etc/defaults/rc.conf#21 integrate
.. //depot/projects/s390/etc/inetd.conf#8 integrate
.. //depot/projects/s390/etc/mtree/BSD.local.dist#10 delete
.. //depot/projects/s390/etc/mtree/BSD.usr.dist#14 integrate
.. //depot/projects/s390/etc/mtree/BSD.x11-4.dist#9 delete
.. //depot/projects/s390/etc/mtree/BSD.x11.dist#3 delete
.. //depot/projects/s390/etc/mtree/Makefile#4 integrate
.. //depot/projects/s390/etc/network.subr#11 integrate
.. //depot/projects/s390/etc/periodic/daily/400.status-disks#2 integrate
.. //depot/projects/s390/etc/periodic/security/200.chkmounts#5 integrate
.. //depot/projects/s390/etc/rc.d/Makefile#15 integrate
.. //depot/projects/s390/etc/rc.d/NETWORKING#10 integrate
.. //depot/projects/s390/etc/rc.d/addswap#6 integrate
.. //depot/projects/s390/etc/rc.d/auto_linklocal#2 delete
.. //depot/projects/s390/etc/rc.d/defaultroute#5 integrate
.. //depot/projects/s390/etc/rc.d/devd#8 integrate
.. //depot/projects/s390/etc/rc.d/faith#1 branch
.. //depot/projects/s390/etc/rc.d/ip6addrctl#3 integrate
.. //depot/projects/s390/etc/rc.d/ipsec#9 integrate
.. //depot/projects/s390/etc/rc.d/mroute6d#4 integrate
.. //depot/projects/s390/etc/rc.d/netif#9 integrate
.. //depot/projects/s390/etc/rc.d/netoptions#4 integrate
.. //depot/projects/s390/etc/rc.d/network_ipv6#8 delete
.. //depot/projects/s390/etc/rc.d/ppp#4 integrate
.. //depot/projects/s390/etc/rc.d/route6d#6 integrate
.. //depot/projects/s390/etc/rc.d/routed#8 integrate
.. //depot/projects/s390/etc/rc.d/routing#5 integrate
.. //depot/projects/s390/etc/rc.d/rtadvd#7 integrate
.. //depot/projects/s390/etc/rc.d/static_arp#1 branch
.. //depot/projects/s390/etc/rc.d/stf#1 branch
.. //depot/projects/s390/etc/rc.d/sysctl#8 integrate
.. //depot/projects/s390/etc/rc.d/wpa_supplicant#4 integrate
.. //depot/projects/s390/etc/rc.subr#13 integrate
.. //depot/projects/s390/gnu/usr.bin/groff/tmac/mdoc.local#14 integrate
.. //depot/projects/s390/gnu/usr.bin/patch/common.h#4 integrate
.. //depot/projects/s390/gnu/usr.bin/patch/pch.c#3 integrate
.. //depot/projects/s390/lib/Makefile#19 integrate
.. //depot/projects/s390/lib/libarchive/archive_read.c#8 integrate
.. //depot/projects/s390/lib/libarchive/archive_read_support_format_iso9660.c#9 integrate
.. //depot/projects/s390/lib/libarchive/test/test_compat_zip.c#3 integrate
.. //depot/projects/s390/lib/libarchive/test/test_read_format_isojoliet_bz2.c#3 integrate
.. //depot/projects/s390/lib/libarchive/test/test_read_format_isorr_bz2.c#4 integrate
.. //depot/projects/s390/lib/libc/Versions.def#3 integrate
.. //depot/projects/s390/lib/libc/db/hash/hash.c#5 integrate
.. //depot/projects/s390/lib/libc/gen/Makefile.inc#15 integrate
.. //depot/projects/s390/lib/libc/gen/Symbol.map#6 integrate
.. //depot/projects/s390/lib/libc/gen/_pthread_stubs.c#7 integrate
.. //depot/projects/s390/lib/libc/gen/getpagesizes.3#1 branch
.. //depot/projects/s390/lib/libc/gen/getpagesizes.c#1 branch
.. //depot/projects/s390/lib/libc/locale/ctype.3#6 integrate
.. //depot/projects/s390/lib/libc/locale/digittoint.3#4 integrate
.. //depot/projects/s390/lib/libc/locale/isalnum.3#6 integrate
.. //depot/projects/s390/lib/libc/locale/isalpha.3#6 integrate
.. //depot/projects/s390/lib/libc/locale/isascii.3#4 integrate
.. //depot/projects/s390/lib/libc/locale/isblank.3#7 integrate
.. //depot/projects/s390/lib/libc/locale/iscntrl.3#7 integrate
.. //depot/projects/s390/lib/libc/locale/isdigit.3#6 integrate
.. //depot/projects/s390/lib/libc/locale/isgraph.3#6 integrate
.. //depot/projects/s390/lib/libc/locale/isideogram.3#2 integrate
.. //depot/projects/s390/lib/libc/locale/islower.3#6 integrate
.. //depot/projects/s390/lib/libc/locale/isphonogram.3#2 integrate
.. //depot/projects/s390/lib/libc/locale/isprint.3#6 integrate
.. //depot/projects/s390/lib/libc/locale/ispunct.3#6 integrate
.. //depot/projects/s390/lib/libc/locale/isrune.3#2 integrate
.. //depot/projects/s390/lib/libc/locale/isspace.3#6 integrate
.. //depot/projects/s390/lib/libc/locale/isspecial.3#2 integrate
.. //depot/projects/s390/lib/libc/locale/isupper.3#6 integrate
.. //depot/projects/s390/lib/libc/locale/isxdigit.3#6 integrate
.. //depot/projects/s390/lib/libc/locale/toascii.3#3 integrate
.. //depot/projects/s390/lib/libc/locale/tolower.3#6 integrate
.. //depot/projects/s390/lib/libc/locale/toupper.3#6 integrate
.. //depot/projects/s390/lib/libc/net/getifaddrs.c#3 integrate
.. //depot/projects/s390/lib/libc/nls/Makefile.inc#6 integrate
.. //depot/projects/s390/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch
.. //depot/projects/s390/lib/libc/posix1e/acl_calc_mask.c#4 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_support.c#5 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_to_text.c#4 integrate
.. //depot/projects/s390/lib/libc/regex/engine.c#5 integrate
.. //depot/projects/s390/lib/libc/regex/grot/tests#3 integrate
.. //depot/projects/s390/lib/libc/stdio/fopen.3#8 integrate
.. //depot/projects/s390/lib/libc/stdlib/malloc.3#11 integrate
.. //depot/projects/s390/lib/libc/stdlib/malloc.c#15 integrate
.. //depot/projects/s390/lib/libc/stdlib/ptsname.3#3 integrate
.. //depot/projects/s390/lib/libc/stdtime/localtime.c#8 integrate
.. //depot/projects/s390/lib/libc/stdtime/strptime.c#9 integrate
.. //depot/projects/s390/lib/libc/sys/fcntl.2#8 integrate
.. //depot/projects/s390/lib/libc/sys/intro.2#10 integrate
.. //depot/projects/s390/lib/libc/sys/kqueue.2#8 integrate
.. //depot/projects/s390/lib/libc/sys/setfib.2#3 integrate
.. //depot/projects/s390/lib/libc/sys/stack_protector.c#3 integrate
.. //depot/projects/s390/lib/libdevinfo/devinfo.h#4 integrate
.. //depot/projects/s390/lib/libdisk/change.c#6 integrate
.. //depot/projects/s390/lib/libjail/jail.3#2 integrate
.. //depot/projects/s390/lib/libkvm/kvm_proc.c#12 integrate
.. //depot/projects/s390/lib/libpam/modules/pam_lastlog/pam_lastlog.c#6 integrate
.. //depot/projects/s390/lib/libpmc/pmc.3#6 integrate
.. //depot/projects/s390/lib/libpmc/pmc.atom.3#3 integrate
.. //depot/projects/s390/lib/libpmc/pmc.core.3#3 integrate
.. //depot/projects/s390/lib/libpmc/pmc.core2.3#4 integrate
.. //depot/projects/s390/lib/libpmc/pmc.iaf.3#3 integrate
.. //depot/projects/s390/lib/libpmc/pmc.k7.3#2 integrate
.. //depot/projects/s390/lib/libpmc/pmc.k8.3#2 integrate
.. //depot/projects/s390/lib/libpmc/pmc.p4.3#2 integrate
.. //depot/projects/s390/lib/libpmc/pmc.p5.3#2 integrate
.. //depot/projects/s390/lib/libpmc/pmc.p6.3#2 integrate
.. //depot/projects/s390/lib/libpmc/pmc_capabilities.3#2 integrate
.. //depot/projects/s390/lib/libpmc/pmc_read.3#2 integrate
.. //depot/projects/s390/lib/libradius/libradius.3#5 integrate
.. //depot/projects/s390/lib/libradius/radlib.c#4 integrate
.. //depot/projects/s390/lib/libradius/radlib.h#4 integrate
.. //depot/projects/s390/lib/libradius/radlib_private.h#3 integrate
.. //depot/projects/s390/lib/libstand/net.c#4 integrate
.. //depot/projects/s390/lib/libstand/nfs.c#7 integrate
.. //depot/projects/s390/lib/libstand/rpc.c#4 integrate
.. //depot/projects/s390/lib/libthr/thread/thr_spec.c#5 integrate
.. //depot/projects/s390/lib/libthr/thread/thr_umtx.h#4 integrate
.. //depot/projects/s390/libexec/Makefile#13 integrate
.. //depot/projects/s390/libexec/rpc.rquotad/rquotad.c#6 integrate
.. //depot/projects/s390/release/Makefile#26 integrate
.. //depot/projects/s390/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate
.. //depot/projects/s390/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate
.. //depot/projects/s390/release/picobsd/bridge/crunch.conf#8 integrate
.. //depot/projects/s390/release/scripts/lib32-make.sh#2 integrate
.. //depot/projects/s390/release/scripts/mm-mtree.sh#1 branch
.. //depot/projects/s390/release/scripts/package-split.py#6 integrate
.. //depot/projects/s390/sbin/camcontrol/camcontrol.8#7 integrate
.. //depot/projects/s390/sbin/camcontrol/camcontrol.c#10 integrate
.. //depot/projects/s390/sbin/geom/class/label/glabel.8#4 integrate
.. //depot/projects/s390/sbin/geom/class/mirror/geom_mirror.c#5 integrate
.. //depot/projects/s390/sbin/geom/class/mirror/gmirror.8#5 integrate
.. //depot/projects/s390/sbin/geom/class/nop/gnop.8#4 integrate
.. //depot/projects/s390/sbin/geom/core/geom.c#7 integrate
.. //depot/projects/s390/sbin/ifconfig/Makefile#7 integrate
.. //depot/projects/s390/sbin/ifconfig/af_inet6.c#4 integrate
.. //depot/projects/s390/sbin/ifconfig/af_nd6.c#1 branch
.. //depot/projects/s390/sbin/ifconfig/ifconfig.8#14 integrate
.. //depot/projects/s390/sbin/ifconfig/ifgif.c#2 integrate
.. //depot/projects/s390/sbin/ipfw/ipfw.8#19 integrate
.. //depot/projects/s390/sbin/mksnap_ffs/mksnap_ffs.8#6 integrate
.. //depot/projects/s390/sbin/mount/mount.8#13 integrate
.. //depot/projects/s390/sbin/mount/mount.c#15 integrate
.. //depot/projects/s390/sbin/mount_nfs/mount_nfs.c#12 integrate
.. //depot/projects/s390/sbin/route/route.8#5 integrate
.. //depot/projects/s390/sbin/route/route.c#11 integrate
.. //depot/projects/s390/sbin/savecore/savecore.8#8 integrate
.. //depot/projects/s390/sbin/savecore/savecore.c#7 integrate
.. //depot/projects/s390/sbin/shutdown/shutdown.c#4 integrate
.. //depot/projects/s390/secure/libexec/sftp-server/Makefile#7 integrate
.. //depot/projects/s390/secure/libexec/ssh-keysign/Makefile#5 integrate
.. //depot/projects/s390/secure/usr.bin/scp/Makefile#5 integrate
.. //depot/projects/s390/secure/usr.bin/sftp/Makefile#6 integrate
.. //depot/projects/s390/secure/usr.bin/ssh-add/Makefile#5 integrate
.. //depot/projects/s390/secure/usr.bin/ssh-agent/Makefile#5 integrate
.. //depot/projects/s390/secure/usr.bin/ssh-keygen/Makefile#5 integrate
.. //depot/projects/s390/secure/usr.bin/ssh-keyscan/Makefile#4 integrate
.. //depot/projects/s390/secure/usr.bin/ssh/Makefile#10 integrate
.. //depot/projects/s390/secure/usr.sbin/sshd/Makefile#13 integrate
.. //depot/projects/s390/share/colldef/Makefile#9 integrate
.. //depot/projects/s390/share/colldef/la_LN.ISO8859-13.src#1 branch
.. //depot/projects/s390/share/colldef/lt_LT.ISO8859-13.src#2 delete
.. //depot/projects/s390/share/examples/cvsup/stable-supfile#7 integrate
.. //depot/projects/s390/share/examples/scsi_target/scsi_target.c#7 integrate
.. //depot/projects/s390/share/examples/scsi_target/scsi_target.h#4 integrate
.. //depot/projects/s390/share/man/man4/Makefile#24 integrate
.. //depot/projects/s390/share/man/man4/acpi_panasonic.4#2 integrate
.. //depot/projects/s390/share/man/man4/ahci.4#2 integrate
.. //depot/projects/s390/share/man/man4/dpms.4#1 branch
.. //depot/projects/s390/share/man/man4/ed.4#7 integrate
.. //depot/projects/s390/share/man/man4/inet6.4#5 integrate
.. //depot/projects/s390/share/man/man4/ip6.4#5 integrate
.. //depot/projects/s390/share/man/man4/ips.4#3 integrate
.. //depot/projects/s390/share/man/man4/lindev.4#1 branch
.. //depot/projects/s390/share/man/man4/man4.i386/Makefile#11 integrate
.. //depot/projects/s390/share/man/man4/man4.i386/dpms.4#2 delete
.. //depot/projects/s390/share/man/man4/mfi.4#4 integrate
.. //depot/projects/s390/share/man/man4/msk.4#3 integrate
.. //depot/projects/s390/share/man/man4/pts.4#4 integrate
.. //depot/projects/s390/share/man/man4/pty.4#7 integrate
.. //depot/projects/s390/share/man/man4/syscons.4#10 integrate
.. //depot/projects/s390/share/man/man4/textdump.4#4 integrate
.. //depot/projects/s390/share/man/man4/urtw.4#3 integrate
.. //depot/projects/s390/share/man/man4/zyd.4#3 integrate
.. //depot/projects/s390/share/man/man5/device.hints.5#7 integrate
.. //depot/projects/s390/share/man/man5/make.conf.5#17 integrate
.. //depot/projects/s390/share/man/man5/procfs.5#8 integrate
.. //depot/projects/s390/share/man/man5/rc.conf.5#23 integrate
.. //depot/projects/s390/share/man/man5/tmpfs.5#2 integrate
.. //depot/projects/s390/share/man/man7/tuning.7#14 integrate
.. //depot/projects/s390/share/man/man9/Makefile#17 integrate
.. //depot/projects/s390/share/man/man9/VOP_ACCESS.9#9 integrate
.. //depot/projects/s390/share/man/man9/acl.9#7 integrate
.. //depot/projects/s390/share/man/man9/fail.9#2 integrate
.. //depot/projects/s390/share/man/man9/ieee80211.9#3 integrate
.. //depot/projects/s390/share/man/man9/ieee80211_amrr.9#2 integrate
.. //depot/projects/s390/share/man/man9/ieee80211_beacon.9#2 integrate
.. //depot/projects/s390/share/man/man9/ieee80211_bmiss.9#2 integrate
.. //depot/projects/s390/share/man/man9/ieee80211_crypto.9#3 integrate
.. //depot/projects/s390/share/man/man9/ieee80211_ddb.9#2 integrate
.. //depot/projects/s390/share/man/man9/ieee80211_input.9#3 integrate
.. //depot/projects/s390/share/man/man9/ieee80211_node.9#3 integrate
.. //depot/projects/s390/share/man/man9/ieee80211_output.9#3 integrate
.. //depot/projects/s390/share/man/man9/ieee80211_proto.9#3 integrate
.. //depot/projects/s390/share/man/man9/ieee80211_radiotap.9#4 integrate
.. //depot/projects/s390/share/man/man9/ieee80211_regdomain.9#2 integrate
.. //depot/projects/s390/share/man/man9/ieee80211_scan.9#2 integrate
.. //depot/projects/s390/share/man/man9/ieee80211_vap.9#2 integrate
.. //depot/projects/s390/share/man/man9/kproc.9#2 integrate
.. //depot/projects/s390/share/man/man9/kthread.9#7 integrate
.. //depot/projects/s390/share/man/man9/sglist.9#2 integrate
.. //depot/projects/s390/share/man/man9/vaccess.9#5 integrate
.. //depot/projects/s390/share/man/man9/vaccess_acl_nfs4.9#1 branch
.. //depot/projects/s390/share/misc/bsd-family-tree#18 integrate
.. //depot/projects/s390/share/misc/iso3166#9 integrate
.. //depot/projects/s390/share/mklocale/Makefile#9 integrate
.. //depot/projects/s390/share/mklocale/la_LN.ISO8859-13.src#1 branch
.. //depot/projects/s390/share/mklocale/lt_LT.ISO8859-13.src#2 delete
.. //depot/projects/s390/share/monetdef/Makefile#9 integrate
.. //depot/projects/s390/share/monetdef/lv_LV.ISO8859-13.src#1 branch
.. //depot/projects/s390/share/monetdef/zh_CN.GB18030.src#2 integrate
.. //depot/projects/s390/share/monetdef/zh_CN.GB2312.src#2 integrate
.. //depot/projects/s390/share/msgdef/Makefile#10 integrate
.. //depot/projects/s390/share/msgdef/lv_LV.ISO8859-13.src#1 branch
.. //depot/projects/s390/share/msgdef/lv_LV.UTF-8.src#1 branch
.. //depot/projects/s390/share/numericdef/Makefile#9 integrate
.. //depot/projects/s390/share/timedef/Makefile#10 integrate
.. //depot/projects/s390/share/timedef/hi_IN.ISCII-DEV.src#3 integrate
.. //depot/projects/s390/share/timedef/ja_JP.UTF-8.src#3 integrate
.. //depot/projects/s390/share/timedef/lv_LV.ISO8859-13.src#1 branch
.. //depot/projects/s390/share/timedef/lv_LV.UTF-8.src#1 branch
.. //depot/projects/s390/share/zoneinfo/africa#9 integrate
.. //depot/projects/s390/share/zoneinfo/asia#12 integrate
.. //depot/projects/s390/share/zoneinfo/australasia#9 integrate
.. //depot/projects/s390/share/zoneinfo/europe#9 integrate
.. //depot/projects/s390/share/zoneinfo/leapseconds#7 integrate
.. //depot/projects/s390/share/zoneinfo/southamerica#12 integrate
.. //depot/projects/s390/sys/amd64/acpica/acpi_machdep.c#8 integrate
.. //depot/projects/s390/sys/amd64/acpica/madt.c#7 integrate
.. //depot/projects/s390/sys/amd64/amd64/elf_machdep.c#8 integrate
.. //depot/projects/s390/sys/amd64/amd64/identcpu.c#11 integrate
.. //depot/projects/s390/sys/amd64/amd64/initcpu.c#10 integrate
.. //depot/projects/s390/sys/amd64/amd64/local_apic.c#11 integrate
.. //depot/projects/s390/sys/amd64/amd64/machdep.c#11 integrate
.. //depot/projects/s390/sys/amd64/amd64/msi.c#5 integrate
.. //depot/projects/s390/sys/amd64/amd64/pmap.c#12 integrate
.. //depot/projects/s390/sys/amd64/amd64/trap.c#10 integrate
.. //depot/projects/s390/sys/amd64/conf/GENERIC#14 integrate
.. //depot/projects/s390/sys/amd64/conf/NOTES#8 integrate
.. //depot/projects/s390/sys/amd64/include/_align.h#1 branch
.. //depot/projects/s390/sys/amd64/include/acpica_machdep.h#4 integrate
.. //depot/projects/s390/sys/amd64/include/apm_bios.h#1 branch
.. //depot/projects/s390/sys/amd64/include/cpufunc.h#7 integrate
.. //depot/projects/s390/sys/amd64/include/param.h#9 integrate
.. //depot/projects/s390/sys/amd64/include/specialreg.h#10 integrate
.. //depot/projects/s390/sys/amd64/linux32/linux32_proto.h#5 integrate
.. //depot/projects/s390/sys/amd64/linux32/linux32_sysvec.c#10 integrate
.. //depot/projects/s390/sys/amd64/pci/pci_cfgreg.c#8 integrate
.. //depot/projects/s390/sys/arm/arm/cpufunc.c#8 integrate
.. //depot/projects/s390/sys/arm/arm/identcpu.c#7 integrate
.. //depot/projects/s390/sys/arm/arm/undefined.c#6 integrate
.. //depot/projects/s390/sys/arm/arm/vm_machdep.c#8 integrate
.. //depot/projects/s390/sys/arm/conf/CAMBRIA#5 integrate
.. //depot/projects/s390/sys/arm/conf/SHEEVAPLUG#1 branch
.. //depot/projects/s390/sys/arm/include/_align.h#1 branch
.. //depot/projects/s390/sys/arm/include/md_var.h#5 integrate
.. //depot/projects/s390/sys/arm/include/param.h#9 integrate
.. //depot/projects/s390/sys/arm/mv/common.c#6 integrate
.. //depot/projects/s390/sys/arm/mv/discovery/db78xxx.c#5 integrate
.. //depot/projects/s390/sys/arm/mv/kirkwood/db88f6xxx.c#5 integrate
.. //depot/projects/s390/sys/arm/mv/kirkwood/files.db88f6xxx#2 integrate
.. //depot/projects/s390/sys/arm/mv/kirkwood/files.kirkwood#1 branch
.. //depot/projects/s390/sys/arm/mv/kirkwood/files.sheevaplug#1 branch
.. //depot/projects/s390/sys/arm/mv/kirkwood/sheevaplug.c#1 branch
.. //depot/projects/s390/sys/arm/mv/kirkwood/std.db88f6xxx#2 integrate
.. //depot/projects/s390/sys/arm/mv/kirkwood/std.kirkwood#1 branch
.. //depot/projects/s390/sys/arm/mv/kirkwood/std.sheevaplug#1 branch
.. //depot/projects/s390/sys/arm/mv/mv_machdep.c#6 integrate
.. //depot/projects/s390/sys/arm/mv/mvreg.h#6 integrate
.. //depot/projects/s390/sys/arm/mv/mvvar.h#4 integrate
.. //depot/projects/s390/sys/arm/mv/orion/db88f5xxx.c#5 integrate
.. //depot/projects/s390/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate
.. //depot/projects/s390/sys/arm/xscale/xscalereg.h#2 delete
.. //depot/projects/s390/sys/arm/xscale/xscalevar.h#2 delete
.. //depot/projects/s390/sys/boot/forth/loader.conf#15 integrate
.. //depot/projects/s390/sys/boot/i386/libi386/pxe.c#5 integrate
.. //depot/projects/s390/sys/boot/pc98/Makefile.inc#5 integrate
.. //depot/projects/s390/sys/bsm/audit_kevents.h#8 integrate
.. //depot/projects/s390/sys/cam/ata/ata_all.c#2 integrate
.. //depot/projects/s390/sys/cam/ata/ata_all.h#2 integrate
.. //depot/projects/s390/sys/cam/ata/ata_da.c#2 integrate
.. //depot/projects/s390/sys/cam/ata/ata_xpt.c#2 integrate
.. //depot/projects/s390/sys/cam/cam_periph.c#18 integrate
.. //depot/projects/s390/sys/cam/cam_xpt.c#15 integrate
.. //depot/projects/s390/sys/cam/cam_xpt_internal.h#2 integrate
.. //depot/projects/s390/sys/cam/scsi/scsi_cd.c#21 integrate
.. //depot/projects/s390/sys/cam/scsi/scsi_da.c#26 integrate
.. //depot/projects/s390/sys/cam/scsi/scsi_target.c#15 integrate
.. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate
.. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate
.. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate
.. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/proc.h#3 integrate
.. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/vfs.h#3 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#3 integrate
.. //depot/projects/s390/sys/compat/freebsd32/freebsd32_misc.c#12 integrate
.. //depot/projects/s390/sys/compat/freebsd32/freebsd32_proto.h#12 integrate
.. //depot/projects/s390/sys/compat/freebsd32/freebsd32_syscall.h#12 integrate
.. //depot/projects/s390/sys/compat/freebsd32/freebsd32_syscalls.c#12 integrate
.. //depot/projects/s390/sys/compat/freebsd32/freebsd32_sysent.c#12 integrate
.. //depot/projects/s390/sys/compat/freebsd32/syscalls.master#12 integrate
.. //depot/projects/s390/sys/compat/ia32/ia32_sysvec.c#7 integrate
.. //depot/projects/s390/sys/compat/linprocfs/linprocfs.c#20 integrate
.. //depot/projects/s390/sys/compat/linux/linux_ioctl.c#20 integrate
.. //depot/projects/s390/sys/compat/linux/linux_misc.c#19 integrate
.. //depot/projects/s390/sys/compat/svr4/svr4_proto.h#5 integrate
.. //depot/projects/s390/sys/compat/x86bios/x86bios.c#1 branch
.. //depot/projects/s390/sys/compat/x86bios/x86bios.h#1 branch
.. //depot/projects/s390/sys/compat/x86bios/x86bios_alloc.c#1 branch
.. //depot/projects/s390/sys/conf/NOTES#28 integrate
.. //depot/projects/s390/sys/conf/files#30 integrate
.. //depot/projects/s390/sys/conf/files.amd64#13 integrate
.. //depot/projects/s390/sys/conf/files.i386#19 integrate
.. //depot/projects/s390/sys/conf/files.ia64#18 integrate
.. //depot/projects/s390/sys/conf/files.pc98#20 integrate
.. //depot/projects/s390/sys/conf/files.powerpc#17 integrate
.. //depot/projects/s390/sys/conf/files.sparc64#18 integrate
.. //depot/projects/s390/sys/conf/newvers.sh#11 integrate
.. //depot/projects/s390/sys/conf/options#25 integrate
.. //depot/projects/s390/sys/conf/options.amd64#9 integrate
.. //depot/projects/s390/sys/conf/options.arm#8 integrate
.. //depot/projects/s390/sys/contrib/altq/altq/altq_subr.c#9 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/acpica_prep.sh#8 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/changes.txt#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/common/dmtable.c#3 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslcompiler.h#6 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslcompiler.l#6 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslcompiler.y#6 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/compiler/asldefine.h#4 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslfiles.c#6 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslglobal.h#6 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslload.c#6 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/compiler/asllookup.c#6 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslmain.c#6 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslmap.c#6 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslstubs.c#6 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/compiler/asltypes.h#6 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/events/evgpe.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/executer/exfield.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/executer/exutils.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/acconfig.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/acdebug.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/acglobal.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/achware.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/acinterp.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/aclocal.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/acmacros.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/acobject.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/acparser.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/acpixf.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/acpredef.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/actbl.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/actbl1.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/actbl2.h#1 branch
.. //depot/projects/s390/sys/contrib/dev/acpica/include/actypes.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/acutils.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/include/amlcode.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch
.. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/parser/psloop.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/parser/psxface.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/utilities/utids.c#1 branch
.. //depot/projects/s390/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate
.. //depot/projects/s390/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate
.. //depot/projects/s390/sys/contrib/pf/net/pf_if.c#6 integrate
.. //depot/projects/s390/sys/contrib/x86emu/x86emu.c#1 branch
.. //depot/projects/s390/sys/contrib/x86emu/x86emu.h#1 branch
.. //depot/projects/s390/sys/contrib/x86emu/x86emu_regs.h#1 branch
.. //depot/projects/s390/sys/contrib/x86emu/x86emu_util.c#1 branch
.. //depot/projects/s390/sys/ddb/db_ps.c#13 integrate
.. //depot/projects/s390/sys/dev/aac/aac.c#21 integrate
.. //depot/projects/s390/sys/dev/aac/aacvar.h#14 integrate
.. //depot/projects/s390/sys/dev/acpi_support/acpi_aiboost.c#3 integrate
.. //depot/projects/s390/sys/dev/acpi_support/acpi_ibm.c#6 integrate
.. //depot/projects/s390/sys/dev/acpica/acpi.c#22 integrate
.. //depot/projects/s390/sys/dev/acpica/acpi_acad.c#10 integrate
.. //depot/projects/s390/sys/dev/acpica/acpi_battery.c#10 integrate
.. //depot/projects/s390/sys/dev/acpica/acpi_cpu.c#10 integrate
.. //depot/projects/s390/sys/dev/acpica/acpi_dock.c#4 integrate
.. //depot/projects/s390/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate
.. //depot/projects/s390/sys/dev/acpica/acpi_thermal.c#9 integrate
.. //depot/projects/s390/sys/dev/acpica/acpi_video.c#5 integrate
.. //depot/projects/s390/sys/dev/acpica/acpivar.h#15 integrate
.. //depot/projects/s390/sys/dev/adb/adb_bus.c#5 integrate
.. //depot/projects/s390/sys/dev/ae/if_ae.c#5 integrate
.. //depot/projects/s390/sys/dev/age/if_age.c#6 integrate
.. //depot/projects/s390/sys/dev/agp/agp_i810.c#4 integrate
.. //depot/projects/s390/sys/dev/ahci/ahci.c#2 integrate
.. //depot/projects/s390/sys/dev/ahci/ahci.h#2 integrate
.. //depot/projects/s390/sys/dev/alc/if_alc.c#2 integrate
.. //depot/projects/s390/sys/dev/ale/if_ale.c#4 integrate
.. //depot/projects/s390/sys/dev/amdtemp/amdtemp.c#3 integrate
.. //depot/projects/s390/sys/dev/amr/amr.c#19 integrate
.. //depot/projects/s390/sys/dev/asmc/asmc.c#4 integrate
.. //depot/projects/s390/sys/dev/asmc/asmcvar.h#3 integrate
.. //depot/projects/s390/sys/dev/ata/ata-all.c#20 integrate
.. //depot/projects/s390/sys/dev/ata/ata-disk.c#20 integrate
.. //depot/projects/s390/sys/dev/ata/ata-dma.c#15 integrate
.. //depot/projects/s390/sys/dev/ata/ata-raid.c#17 integrate
.. //depot/projects/s390/sys/dev/ata/chipsets/ata-acerlabs.c#4 integrate
.. //depot/projects/s390/sys/dev/ata/chipsets/ata-marvell.c#6 integrate
.. //depot/projects/s390/sys/dev/ath/ah_osdep.c#6 integrate
.. //depot/projects/s390/sys/dev/ath/ath_hal/ah.c#5 integrate
.. //depot/projects/s390/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate
.. //depot/projects/s390/sys/dev/ath/ath_hal/ah_regdomain.c#4 integrate
.. //depot/projects/s390/sys/dev/ath/if_ath.c#15 integrate
.. //depot/projects/s390/sys/dev/atkbdc/atkbd.c#5 integrate
.. //depot/projects/s390/sys/dev/atkbdc/psm.c#9 integrate
.. //depot/projects/s390/sys/dev/bce/if_bce.c#7 integrate
.. //depot/projects/s390/sys/dev/bktr/bktr_os.c#13 integrate
.. //depot/projects/s390/sys/dev/ciss/ciss.c#18 integrate
.. //depot/projects/s390/sys/dev/ciss/cissreg.h#6 integrate
.. //depot/projects/s390/sys/dev/ciss/cissvar.h#7 integrate
.. //depot/projects/s390/sys/dev/coretemp/coretemp.c#3 integrate
.. //depot/projects/s390/sys/dev/cxgb/cxgb_main.c#6 integrate
.. //depot/projects/s390/sys/dev/cxgb/cxgb_sge.c#6 integrate
.. //depot/projects/s390/sys/dev/de/if_de.c#5 integrate
.. //depot/projects/s390/sys/dev/de/if_devar.h#3 integrate
.. //depot/projects/s390/sys/dev/dpms/dpms.c#1 branch
.. //depot/projects/s390/sys/dev/drm/drmP.h#15 integrate
.. //depot/projects/s390/sys/dev/drm/drm_bufs.c#7 integrate
.. //depot/projects/s390/sys/dev/drm/drm_drv.c#8 integrate
.. //depot/projects/s390/sys/dev/drm/drm_fops.c#5 integrate
.. //depot/projects/s390/sys/dev/drm/drm_pciids.h#8 integrate
.. //depot/projects/s390/sys/dev/drm/drm_sysctl.c#7 integrate
.. //depot/projects/s390/sys/dev/drm/r600_blit.c#1 branch
.. //depot/projects/s390/sys/dev/drm/r600_cp.c#3 integrate
.. //depot/projects/s390/sys/dev/drm/radeon_cp.c#14 integrate
.. //depot/projects/s390/sys/dev/drm/radeon_cs.c#1 branch
.. //depot/projects/s390/sys/dev/drm/radeon_drm.h#11 integrate
.. //depot/projects/s390/sys/dev/drm/radeon_drv.h#14 integrate
.. //depot/projects/s390/sys/dev/drm/radeon_irq.c#10 integrate
.. //depot/projects/s390/sys/dev/drm/radeon_state.c#11 integrate
.. //depot/projects/s390/sys/dev/e1000/if_em.c#6 integrate
.. //depot/projects/s390/sys/dev/e1000/if_igb.c#7 integrate
.. //depot/projects/s390/sys/dev/ep/if_ep.c#13 integrate
.. //depot/projects/s390/sys/dev/ep/if_epreg.h#5 integrate
.. //depot/projects/s390/sys/dev/fb/s3_pci.c#7 integrate
.. //depot/projects/s390/sys/dev/fb/vesa.c#1 branch
.. //depot/projects/s390/sys/dev/fb/vesa.h#1 branch
.. //depot/projects/s390/sys/dev/fb/vga.c#13 integrate
.. //depot/projects/s390/sys/dev/firewire/fwcrom.c#7 integrate
.. //depot/projects/s390/sys/dev/firewire/fwdev.c#13 integrate
.. //depot/projects/s390/sys/dev/fxp/if_fxp.c#20 integrate
.. //depot/projects/s390/sys/dev/hptiop/hptiop.c#2 integrate
.. //depot/projects/s390/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate
.. //depot/projects/s390/sys/dev/hwpmc/hwpmc_core.c#4 integrate
.. //depot/projects/s390/sys/dev/hwpmc/pmc_events.h#5 integrate
.. //depot/projects/s390/sys/dev/ichwd/ichwd.c#5 integrate
.. //depot/projects/s390/sys/dev/if_ndis/if_ndis.c#9 integrate
.. //depot/projects/s390/sys/dev/iir/iir.c#9 integrate
.. //depot/projects/s390/sys/dev/ips/ips_pci.c#8 integrate
.. //depot/projects/s390/sys/dev/isp/isp.c#15 integrate
.. //depot/projects/s390/sys/dev/isp/isp_freebsd.c#12 integrate
.. //depot/projects/s390/sys/dev/isp/isp_stds.h#3 integrate
.. //depot/projects/s390/sys/dev/isp/isp_tpublic.h#8 delete
.. //depot/projects/s390/sys/dev/isp/ispmbox.h#10 integrate
.. //depot/projects/s390/sys/dev/ixgbe/ixgbe.c#5 integrate
.. //depot/projects/s390/sys/dev/jme/if_jme.c#5 integrate
.. //depot/projects/s390/sys/dev/kbd/kbd.c#10 integrate
.. //depot/projects/s390/sys/dev/lindev/full.c#1 branch
.. //depot/projects/s390/sys/dev/lindev/lindev.c#1 branch
.. //depot/projects/s390/sys/dev/lindev/lindev.h#1 branch
.. //depot/projects/s390/sys/dev/mfi/mfi.c#5 integrate
.. //depot/projects/s390/sys/dev/mge/if_mge.c#5 integrate
.. //depot/projects/s390/sys/dev/mii/e1000phy.c#11 integrate
.. //depot/projects/s390/sys/dev/mii/e1000phyreg.h#6 integrate
.. //depot/projects/s390/sys/dev/mlx/mlx.c#11 integrate
.. //depot/projects/s390/sys/dev/mmc/mmc.c#8 integrate
.. //depot/projects/s390/sys/dev/mpt/mpt_raid.c#7 integrate
.. //depot/projects/s390/sys/dev/msk/if_msk.c#6 integrate
.. //depot/projects/s390/sys/dev/msk/if_mskreg.h#4 integrate
.. //depot/projects/s390/sys/dev/mwl/if_mwl.c#2 integrate
.. //depot/projects/s390/sys/dev/mxge/if_mxge.c#5 integrate
.. //depot/projects/s390/sys/dev/mxge/if_mxge_var.h#5 integrate
.. //depot/projects/s390/sys/dev/null/null.c#10 integrate
.. //depot/projects/s390/sys/dev/pccbb/pccbb.c#16 integrate
.. //depot/projects/s390/sys/dev/pci/pci.c#21 integrate
.. //depot/projects/s390/sys/dev/pci/pci_user.c#10 integrate
.. //depot/projects/s390/sys/dev/pci/pcireg.h#13 integrate
.. //depot/projects/s390/sys/dev/pci/pcivar.h#11 integrate
.. //depot/projects/s390/sys/dev/ppbus/vpo.c#13 integrate
.. //depot/projects/s390/sys/dev/pst/pst-iop.c#8 integrate
.. //depot/projects/s390/sys/dev/pty/pty.c#1 branch
.. //depot/projects/s390/sys/dev/re/if_re.c#11 integrate
.. //depot/projects/s390/sys/dev/rp/rp.c#11 integrate
.. //depot/projects/s390/sys/dev/rp/rp_pci.c#8 integrate
.. //depot/projects/s390/sys/dev/siis/siis.c#2 integrate
.. //depot/projects/s390/sys/dev/snp/snp.c#15 integrate
.. //depot/projects/s390/sys/dev/sound/pci/es137x.c#10 integrate
.. //depot/projects/s390/sys/dev/sound/pci/es137x.h#3 integrate
.. //depot/projects/s390/sys/dev/sound/pci/hda/hda_reg.h#2 integrate
.. //depot/projects/s390/sys/dev/sound/pci/hda/hdac.c#8 integrate
.. //depot/projects/s390/sys/dev/sound/pci/hda/hdac_private.h#3 integrate
.. //depot/projects/s390/sys/dev/sound/pci/hda/hdac_reg.h#2 integrate
.. //depot/projects/s390/sys/dev/sound/pci/t4dwave.c#10 integrate
.. //depot/projects/s390/sys/dev/sound/usb/uaudio.c#8 integrate
.. //depot/projects/s390/sys/dev/syscons/daemon/daemon_saver.c#7 integrate
.. //depot/projects/s390/sys/dev/syscons/scmouse.c#10 integrate
.. //depot/projects/s390/sys/dev/syscons/scterm-teken.c#4 integrate
.. //depot/projects/s390/sys/dev/syscons/scvesactl.c#7 integrate
.. //depot/projects/s390/sys/dev/syscons/scvgarndr.c#7 integrate
.. //depot/projects/s390/sys/dev/syscons/scvidctl.c#7 integrate
.. //depot/projects/s390/sys/dev/syscons/syscons.c#20 integrate
.. //depot/projects/s390/sys/dev/syscons/syscons.h#9 integrate
.. //depot/projects/s390/sys/dev/syscons/teken/Makefile#2 delete
.. //depot/projects/s390/sys/dev/syscons/teken/gensequences#2 delete
.. //depot/projects/s390/sys/dev/syscons/teken/sequences#3 delete
.. //depot/projects/s390/sys/dev/syscons/teken/teken.c#4 delete
.. //depot/projects/s390/sys/dev/syscons/teken/teken.h#4 delete
.. //depot/projects/s390/sys/dev/syscons/teken/teken_demo.c#3 delete
.. //depot/projects/s390/sys/dev/syscons/teken/teken_scs.h#2 delete
.. //depot/projects/s390/sys/dev/syscons/teken/teken_stress.c#3 delete
.. //depot/projects/s390/sys/dev/syscons/teken/teken_subr.h#3 delete
.. //depot/projects/s390/sys/dev/syscons/teken/teken_subr_compat.h#3 delete
.. //depot/projects/s390/sys/dev/syscons/teken/teken_wcwidth.h#2 delete
.. //depot/projects/s390/sys/dev/twa/tw_cl_io.c#4 integrate
.. //depot/projects/s390/sys/dev/twa/tw_cl_share.h#4 integrate
.. //depot/projects/s390/sys/dev/twe/twe.c#9 integrate
.. //depot/projects/s390/sys/dev/twe/twevar.h#4 integrate
.. //depot/projects/s390/sys/dev/txp/if_txp.c#13 integrate
.. //depot/projects/s390/sys/dev/uart/uart_bus.h#6 integrate
.. //depot/projects/s390/sys/dev/uart/uart_core.c#7 integrate
.. //depot/projects/s390/sys/dev/uart/uart_tty.c#10 integrate
.. //depot/projects/s390/sys/dev/usb/controller/atmegadci.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/controller/ehci.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/controller/ehci_pci.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/controller/usb_controller.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/input/ukbd.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/misc/ufm.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/net/if_aue.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/net/if_axe.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/net/if_cdce.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/net/if_cdcereg.h#3 integrate
.. //depot/projects/s390/sys/dev/usb/net/usb_ethernet.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/quirk/usb_quirk.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/u3g.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/uark.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/ubsa.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/ubser.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/uch341.c#1 branch
.. //depot/projects/s390/sys/dev/usb/serial/uchcom.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/ucycom.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/ufoma.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/uftdi.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/ugensa.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/uipaq.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/umct.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/umodem.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/umoscom.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/uplcom.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/usb_serial.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/usb_serial.h#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/uslcom.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/uvisor.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/serial/uvscom.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/storage/umass.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/storage/urio.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/usb.h#10 integrate
.. //depot/projects/s390/sys/dev/usb/usb_bus.h#3 integrate
.. //depot/projects/s390/sys/dev/usb/usb_busdma.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/usb_cdc.h#3 integrate
.. //depot/projects/s390/sys/dev/usb/usb_compat_linux.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/usb_dev.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/usb_device.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/usb_device.h#3 integrate
.. //depot/projects/s390/sys/dev/usb/usb_handle_request.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/usb_hub.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/usb_process.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/usb_process.h#3 integrate
.. //depot/projects/s390/sys/dev/usb/usb_transfer.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/usbdevs#23 integrate
.. //depot/projects/s390/sys/dev/usb/wlan/if_rum.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/wlan/if_rumreg.h#2 integrate
.. //depot/projects/s390/sys/dev/usb/wlan/if_upgt.c#2 integrate
.. //depot/projects/s390/sys/dev/usb/wlan/if_urtw.c#2 integrate
.. //depot/projects/s390/sys/dev/usb/wlan/if_zyd.c#3 integrate
.. //depot/projects/s390/sys/dev/wi/if_wi.c#20 integrate
.. //depot/projects/s390/sys/dev/xen/blkback/blkback.c#4 integrate
.. //depot/projects/s390/sys/dev/xen/blkfront/blkfront.c#6 integrate
.. //depot/projects/s390/sys/dev/xen/console/console.c#6 integrate
.. //depot/projects/s390/sys/dev/xen/netback/netback.c#4 integrate
.. //depot/projects/s390/sys/fs/fifofs/fifo_vnops.c#18 integrate
.. //depot/projects/s390/sys/fs/msdosfs/msdosfs_conv.c#8 integrate
.. //depot/projects/s390/sys/fs/nfs/nfs_commonacl.c#2 integrate
.. //depot/projects/s390/sys/fs/nfsclient/nfs_clnode.c#2 integrate
.. //depot/projects/s390/sys/fs/nfsclient/nfs_clport.c#2 integrate
.. //depot/projects/s390/sys/fs/nfsclient/nfs_clvnops.c#2 integrate
.. //depot/projects/s390/sys/fs/procfs/procfs.c#10 integrate
.. //depot/projects/s390/sys/fs/procfs/procfs.h#5 integrate
.. //depot/projects/s390/sys/fs/procfs/procfs_osrel.c#1 branch
.. //depot/projects/s390/sys/fs/pseudofs/pseudofs_vncache.c#12 integrate
.. //depot/projects/s390/sys/fs/pseudofs/pseudofs_vnops.c#15 integrate
.. //depot/projects/s390/sys/geom/geom_dev.c#21 integrate
.. //depot/projects/s390/sys/geom/geom_disk.c#23 integrate
.. //depot/projects/s390/sys/geom/geom_io.c#21 integrate
.. //depot/projects/s390/sys/geom/geom_vfs.c#8 integrate
.. //depot/projects/s390/sys/geom/mirror/g_mirror_ctl.c#4 integrate
.. //depot/projects/s390/sys/geom/multipath/g_multipath.c#2 integrate
.. //depot/projects/s390/sys/geom/part/g_part.c#6 integrate
.. //depot/projects/s390/sys/geom/part/g_part_ebr.c#2 integrate
.. //depot/projects/s390/sys/geom/stripe/g_stripe.c#5 integrate
.. //depot/projects/s390/sys/i386/acpica/acpi_machdep.c#15 integrate
.. //depot/projects/s390/sys/i386/acpica/madt.c#7 integrate
.. //depot/projects/s390/sys/i386/bios/smapi.c#6 integrate
.. //depot/projects/s390/sys/i386/bios/smbios.c#6 integrate
.. //depot/projects/s390/sys/i386/bios/vpd.c#6 integrate
.. //depot/projects/s390/sys/i386/conf/GENERIC#24 integrate
.. //depot/projects/s390/sys/i386/conf/NOTES#22 integrate
.. //depot/projects/s390/sys/i386/cpufreq/hwpstate.c#3 integrate
.. //depot/projects/s390/sys/i386/i386/elf_machdep.c#12 integrate
.. //depot/projects/s390/sys/i386/i386/identcpu.c#18 integrate
.. //depot/projects/s390/sys/i386/i386/initcpu.c#15 integrate
.. //depot/projects/s390/sys/i386/i386/local_apic.c#11 integrate
.. //depot/projects/s390/sys/i386/i386/machdep.c#19 integrate
.. //depot/projects/s390/sys/i386/i386/msi.c#5 integrate
.. //depot/projects/s390/sys/i386/i386/pmap.c#23 integrate
.. //depot/projects/s390/sys/i386/i386/trap.c#20 integrate
.. //depot/projects/s390/sys/i386/i386/vm_machdep.c#18 integrate
.. //depot/projects/s390/sys/i386/ibcs2/ibcs2_proto.h#6 integrate
.. //depot/projects/s390/sys/i386/include/_align.h#1 branch
.. //depot/projects/s390/sys/i386/include/acpica_machdep.h#6 integrate
.. //depot/projects/s390/sys/i386/include/apm_bios.h#3 integrate
.. //depot/projects/s390/sys/i386/include/cpufunc.h#11 integrate
.. //depot/projects/s390/sys/i386/include/param.h#12 integrate
.. //depot/projects/s390/sys/i386/include/pc/vesa.h#4 delete
.. //depot/projects/s390/sys/i386/include/pcpu.h#9 integrate
.. //depot/projects/s390/sys/i386/include/pmap.h#12 integrate
.. //depot/projects/s390/sys/i386/include/specialreg.h#13 integrate
.. //depot/projects/s390/sys/i386/include/xen/xen-os.h#4 integrate
.. //depot/projects/s390/sys/i386/isa/dpms.c#2 delete
.. //depot/projects/s390/sys/i386/isa/vesa.c#13 delete
.. //depot/projects/s390/sys/i386/linux/linux_proto.h#8 integrate
.. //depot/projects/s390/sys/i386/linux/linux_sysvec.c#19 integrate
.. //depot/projects/s390/sys/i386/pci/pci_cfgreg.c#12 integrate
.. //depot/projects/s390/sys/i386/xen/locore.s#3 integrate
.. //depot/projects/s390/sys/i386/xen/pmap.c#5 integrate
.. //depot/projects/s390/sys/i386/xen/xen_machdep.c#6 integrate
.. //depot/projects/s390/sys/ia64/include/_align.h#1 branch
.. //depot/projects/s390/sys/ia64/include/param.h#12 integrate
.. //depot/projects/s390/sys/isa/isahint.c#6 integrate
.. //depot/projects/s390/sys/kern/imgact_elf.c#17 integrate
.. //depot/projects/s390/sys/kern/init_main.c#19 integrate
.. //depot/projects/s390/sys/kern/init_sysent.c#18 integrate
.. //depot/projects/s390/sys/kern/kern_conf.c#19 integrate
.. //depot/projects/s390/sys/kern/kern_cons.c#3 integrate
.. //depot/projects/s390/sys/kern/kern_descrip.c#24 integrate
.. //depot/projects/s390/sys/kern/kern_event.c#16 integrate
.. //depot/projects/s390/sys/kern/kern_exec.c#22 integrate
.. //depot/projects/s390/sys/kern/kern_exit.c#25 integrate
.. //depot/projects/s390/sys/kern/kern_fork.c#22 integrate
.. //depot/projects/s390/sys/kern/kern_jail.c#17 integrate
.. //depot/projects/s390/sys/kern/kern_kthread.c#9 integrate
.. //depot/projects/s390/sys/kern/kern_linker.c#18 integrate
.. //depot/projects/s390/sys/kern/kern_lock.c#16 integrate
.. //depot/projects/s390/sys/kern/kern_mib.c#12 integrate
.. //depot/projects/s390/sys/kern/kern_mutex.c#17 integrate
.. //depot/projects/s390/sys/kern/kern_proc.c#25 integrate
.. //depot/projects/s390/sys/kern/kern_rwlock.c#7 integrate
.. //depot/projects/s390/sys/kern/kern_shutdown.c#15 integrate
.. //depot/projects/s390/sys/kern/kern_sig.c#22 integrate
.. //depot/projects/s390/sys/kern/kern_subr.c#16 integrate
.. //depot/projects/s390/sys/kern/kern_sx.c#9 integrate
.. //depot/projects/s390/sys/kern/kern_thr.c#13 integrate
.. //depot/projects/s390/sys/kern/kern_thread.c#22 integrate
.. //depot/projects/s390/sys/kern/kern_timeout.c#11 integrate
.. //depot/projects/s390/sys/kern/kern_umtx.c#10 integrate
.. //depot/projects/s390/sys/kern/kern_uuid.c#11 integrate
.. //depot/projects/s390/sys/kern/sched_ule.c#19 integrate
.. //depot/projects/s390/sys/kern/subr_acl_nfs4.c#2 integrate
.. //depot/projects/s390/sys/kern/subr_acl_posix1e.c#4 integrate
.. //depot/projects/s390/sys/kern/subr_bus.c#22 integrate
.. //depot/projects/s390/sys/kern/subr_devstat.c#8 integrate
.. //depot/projects/s390/sys/kern/subr_sglist.c#2 integrate
.. //depot/projects/s390/sys/kern/subr_smp.c#14 integrate
.. //depot/projects/s390/sys/kern/subr_witness.c#24 integrate
.. //depot/projects/s390/sys/kern/sys_generic.c#14 integrate
.. //depot/projects/s390/sys/kern/sys_pipe.c#20 integrate
.. //depot/projects/s390/sys/kern/syscalls.c#18 integrate
.. //depot/projects/s390/sys/kern/syscalls.master#20 integrate
.. //depot/projects/s390/sys/kern/tty.c#21 integrate
.. //depot/projects/s390/sys/kern/tty_pts.c#9 integrate
.. //depot/projects/s390/sys/kern/tty_pty.c#17 delete
.. //depot/projects/s390/sys/kern/tty_ttydisc.c#5 integrate
.. //depot/projects/s390/sys/kern/uipc_domain.c#10 integrate
.. //depot/projects/s390/sys/kern/uipc_mqueue.c#8 integrate
.. //depot/projects/s390/sys/kern/uipc_socket.c#20 integrate
.. //depot/projects/s390/sys/kern/uipc_syscalls.c#19 integrate
.. //depot/projects/s390/sys/kern/vfs_aio.c#20 integrate
.. //depot/projects/s390/sys/kern/vfs_default.c#19 integrate
.. //depot/projects/s390/sys/kern/vfs_export.c#14 integrate
.. //depot/projects/s390/sys/kern/vfs_subr.c#26 integrate
.. //depot/projects/s390/sys/kern/vfs_syscalls.c#23 integrate
.. //depot/projects/s390/sys/kern/vfs_vnops.c#20 integrate
.. //depot/projects/s390/sys/mips/include/_align.h#1 branch
.. //depot/projects/s390/sys/mips/include/param.h#4 integrate
.. //depot/projects/s390/sys/modules/Makefile#27 integrate
.. //depot/projects/s390/sys/modules/acpi/acpi/Makefile#6 integrate
.. //depot/projects/s390/sys/modules/dpms/Makefile#2 integrate
.. //depot/projects/s390/sys/modules/drm/radeon/Makefile#5 integrate
.. //depot/projects/s390/sys/modules/dtrace/lockstat/Makefile#2 integrate
.. //depot/projects/s390/sys/modules/lindev/Makefile#1 branch
.. //depot/projects/s390/sys/modules/nfslockd/Makefile#2 integrate
.. //depot/projects/s390/sys/modules/procfs/Makefile#6 integrate
.. //depot/projects/s390/sys/modules/pty/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb/Makefile#8 integrate
.. //depot/projects/s390/sys/modules/usb/uch341/Makefile#1 branch
.. //depot/projects/s390/sys/modules/vesa/Makefile#2 integrate
.. //depot/projects/s390/sys/modules/x86bios/Makefile#1 branch
.. //depot/projects/s390/sys/net/bpf.c#19 integrate
.. //depot/projects/s390/sys/net/bridgestp.c#8 integrate
.. //depot/projects/s390/sys/net/flowtable.c#3 integrate
.. //depot/projects/s390/sys/net/flowtable.h#3 integrate
.. //depot/projects/s390/sys/net/if.c#24 integrate
.. //depot/projects/s390/sys/net/if_arp.h#5 integrate
.. //depot/projects/s390/sys/net/if_bridge.c#9 integrate
.. //depot/projects/s390/sys/net/if_ef.c#15 integrate
.. //depot/projects/s390/sys/net/if_llatbl.c#5 integrate
.. //depot/projects/s390/sys/net/if_llatbl.h#4 integrate
.. //depot/projects/s390/sys/net/if_var.h#13 integrate
.. //depot/projects/s390/sys/net/if_vlan.c#15 integrate
.. //depot/projects/s390/sys/net/route.c#17 integrate
.. //depot/projects/s390/sys/net/route.h#12 integrate
.. //depot/projects/s390/sys/net/rtsock.c#17 integrate
.. //depot/projects/s390/sys/net/vnet.c#2 integrate
.. //depot/projects/s390/sys/net80211/ieee80211.h#8 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_action.c#2 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_dfs.c#3 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_hwmp.c#2 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_mesh.c#2 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_mesh.h#2 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_proto.h#9 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_sta.c#7 integrate
.. //depot/projects/s390/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#6 integrate
.. //depot/projects/s390/sys/netgraph/ng_gif.c#11 integrate
.. //depot/projects/s390/sys/netinet/if_ether.c#18 integrate
.. //depot/projects/s390/sys/netinet/if_ether.h#7 integrate
.. //depot/projects/s390/sys/netinet/in.c#15 integrate
.. //depot/projects/s390/sys/netinet/in.h#16 integrate
.. //depot/projects/s390/sys/netinet/in_mcast.c#6 integrate
.. //depot/projects/s390/sys/netinet/in_pcb.c#19 integrate
.. //depot/projects/s390/sys/netinet/in_proto.c#14 integrate
.. //depot/projects/s390/sys/netinet/ip_divert.c#18 integrate
.. //depot/projects/s390/sys/netinet/ip_divert.h#2 integrate
.. //depot/projects/s390/sys/netinet/ip_fastfwd.c#9 integrate
.. //depot/projects/s390/sys/netinet/ip_fw.h#13 integrate
.. //depot/projects/s390/sys/netinet/ip_mroute.c#19 integrate
.. //depot/projects/s390/sys/netinet/ip_output.c#20 integrate
.. //depot/projects/s390/sys/netinet/ipfw/ip_fw2.c#2 integrate
.. //depot/projects/s390/sys/netinet/ipfw/ip_fw_pfil.c#2 integrate
.. //depot/projects/s390/sys/netinet/raw_ip.c#19 integrate
.. //depot/projects/s390/sys/netinet/sctp_asconf.c#3 integrate
.. //depot/projects/s390/sys/netinet/sctp_bsd_addr.c#3 integrate
.. //depot/projects/s390/sys/netinet/sctp_indata.c#5 integrate
.. //depot/projects/s390/sys/netinet/sctp_input.c#6 integrate
.. //depot/projects/s390/sys/netinet/sctp_os_bsd.h#8 integrate
.. //depot/projects/s390/sys/netinet/sctp_output.c#8 integrate
.. //depot/projects/s390/sys/netinet/sctp_pcb.c#6 integrate
.. //depot/projects/s390/sys/netinet/sctp_pcb.h#4 integrate
.. //depot/projects/s390/sys/netinet/sctp_structs.h#4 integrate
.. //depot/projects/s390/sys/netinet/sctp_sysctl.c#7 integrate
.. //depot/projects/s390/sys/netinet/sctp_timer.c#6 integrate
.. //depot/projects/s390/sys/netinet/sctp_usrreq.c#6 integrate
.. //depot/projects/s390/sys/netinet/sctputil.c#7 integrate
.. //depot/projects/s390/sys/netinet/tcp_subr.c#26 integrate
.. //depot/projects/s390/sys/netinet/tcp_timer.c#15 integrate
.. //depot/projects/s390/sys/netinet/tcp_timer.h#8 integrate
.. //depot/projects/s390/sys/netinet/tcp_timewait.c#5 integrate
.. //depot/projects/s390/sys/netinet/tcp_usrreq.c#14 integrate
.. //depot/projects/s390/sys/netinet/tcp_var.h#17 integrate
.. //depot/projects/s390/sys/netinet6/icmp6.c#15 integrate
.. //depot/projects/s390/sys/netinet6/in6.c#15 integrate
.. //depot/projects/s390/sys/netinet6/in6_ifattach.c#14 integrate
.. //depot/projects/s390/sys/netinet6/in6_proto.c#10 integrate
.. //depot/projects/s390/sys/netinet6/in6_src.c#11 integrate
.. //depot/projects/s390/sys/netinet6/ip6_input.c#17 integrate
.. //depot/projects/s390/sys/netinet6/ip6_output.c#17 integrate
.. //depot/projects/s390/sys/netinet6/nd6.c#17 integrate
.. //depot/projects/s390/sys/netinet6/nd6.h#9 integrate
.. //depot/projects/s390/sys/netinet6/nd6_nbr.c#14 integrate
.. //depot/projects/s390/sys/netinet6/nd6_rtr.c#13 integrate
.. //depot/projects/s390/sys/netinet6/sctp6_usrreq.c#4 integrate
.. //depot/projects/s390/sys/netipsec/ipsec.h#11 integrate
.. //depot/projects/s390/sys/netipsec/key.c#13 integrate
.. //depot/projects/s390/sys/netipsec/xform_esp.c#12 integrate
.. //depot/projects/s390/sys/netipsec/xform_ipip.c#13 integrate
.. //depot/projects/s390/sys/netsmb/smb_dev.c#13 integrate
.. //depot/projects/s390/sys/nfsclient/bootp_subr.c#13 integrate
.. //depot/projects/s390/sys/nfsclient/nfs_node.c#14 integrate
.. //depot/projects/s390/sys/nfsclient/nfs_vfsops.c#19 integrate
.. //depot/projects/s390/sys/nfsclient/nfs_vnops.c#24 integrate
.. //depot/projects/s390/sys/nfsserver/nfs_serv.c#22 integrate
.. //depot/projects/s390/sys/opencrypto/cryptodev.c#15 integrate
.. //depot/projects/s390/sys/pc98/cbus/fdc.c#6 integrate
.. //depot/projects/s390/sys/pc98/conf/GENERIC#21 integrate
.. //depot/projects/s390/sys/pc98/conf/NOTES#14 integrate
.. //depot/projects/s390/sys/pc98/include/_align.h#1 branch
.. //depot/projects/s390/sys/pc98/include/pc/vesa.h#2 delete
.. //depot/projects/s390/sys/pci/if_rlreg.h#19 integrate
.. //depot/projects/s390/sys/pci/intpm.c#8 integrate
.. //depot/projects/s390/sys/pci/intpmreg.h#3 integrate
.. //depot/projects/s390/sys/powerpc/conf/GENERIC#21 integrate
.. //depot/projects/s390/sys/powerpc/include/_align.h#1 branch
.. //depot/projects/s390/sys/powerpc/include/param.h#10 integrate
.. //depot/projects/s390/sys/rpc/clnt_dg.c#4 integrate
.. //depot/projects/s390/sys/rpc/clnt_rc.c#5 integrate
.. //depot/projects/s390/sys/rpc/clnt_vc.c#5 integrate
.. //depot/projects/s390/sys/rpc/rpc_generic.c#3 integrate
.. //depot/projects/s390/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#3 integrate
.. //depot/projects/s390/sys/rpc/svc_dg.c#4 integrate
.. //depot/projects/s390/sys/rpc/svc_generic.c#4 integrate
.. //depot/projects/s390/sys/rpc/svc_vc.c#4 integrate
.. //depot/projects/s390/sys/security/audit/audit_bsm_token.c#7 integrate
.. //depot/projects/s390/sys/sparc64/conf/GENERIC#22 integrate
.. //depot/projects/s390/sys/sparc64/include/_align.h#1 branch
.. //depot/projects/s390/sys/sparc64/include/param.h#9 integrate
.. //depot/projects/s390/sys/sparc64/pci/ofw_pci.h#9 integrate
.. //depot/projects/s390/sys/sparc64/pci/psycho.c#19 integrate
.. //depot/projects/s390/sys/sparc64/pci/schizo.c#5 integrate
.. //depot/projects/s390/sys/sparc64/sparc64/jbusppm.c#3 integrate
.. //depot/projects/s390/sys/sun4v/include/_align.h#1 branch
.. //depot/projects/s390/sys/sun4v/include/param.h#4 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Oct  3 21:01:08 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 583F01065692; Sat,  3 Oct 2009 21:01:08 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1AC31106568B
	for ; Sat,  3 Oct 2009 21:01:08 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 089CA8FC12
	for ; Sat,  3 Oct 2009 21:01:08 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n93L17xS072893
	for ; Sat, 3 Oct 2009 21:01:07 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n93L17Ih072891
	for perforce@freebsd.org; Sat, 3 Oct 2009 21:01:07 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 3 Oct 2009 21:01:07 GMT
Message-Id: <200910032101.n93L17Ih072891@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169183 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 03 Oct 2009 21:01:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=169183

Change 169183 by hselasky@hselasky_laptop001 on 2009/10/03 21:00:51

	
	Mount Root Patch
	- This patch allows for late root device discovery. Instead of
	  giving up at the first try, the system keeps trying for 3
	  minutes to mount root. If CTRL+C is pressed during this time
	  a mount-root menu will be shown. Else after 3 minutes the
	  mount-root menu will be shown and then a panic will happen
	  like before.
	- Clean up old mount root hold mechanism which did not
	  work like expected.

Affected files ...

.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#10 edit
.. //depot/projects/usb/src/sys/dev/pccbb/pccbb.c#15 edit
.. //depot/projects/usb/src/sys/dev/pccbb/pccbb_pci.c#12 edit
.. //depot/projects/usb/src/sys/dev/pccbb/pccbbvar.h#9 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#16 edit
.. //depot/projects/usb/src/sys/geom/journal/g_journal.c#13 edit
.. //depot/projects/usb/src/sys/geom/journal/g_journal.h#3 edit
.. //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#8 edit
.. //depot/projects/usb/src/sys/geom/mirror/g_mirror.h#3 edit
.. //depot/projects/usb/src/sys/geom/part/g_part.c#20 edit
.. //depot/projects/usb/src/sys/geom/raid3/g_raid3.c#8 edit
.. //depot/projects/usb/src/sys/geom/raid3/g_raid3.h#3 edit
.. //depot/projects/usb/src/sys/kern/kern_cons.c#4 edit
.. //depot/projects/usb/src/sys/kern/vfs_mount.c#30 edit
.. //depot/projects/usb/src/sys/sys/systm.h#20 edit

Differences ...

==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#10 (text+ko) ====

@@ -3058,7 +3058,6 @@
 		destroy_dev(zfsdev);
 }
 
-static struct root_hold_token *zfs_root_token;
 struct proc *zfsproc;
 
 uint_t zfs_fsyncer_key;
@@ -3071,8 +3070,6 @@
 
 	switch (type) {
 	case MOD_LOAD:
-		zfs_root_token = root_mount_hold("ZFS");
-
 		mutex_init(&zfs_share_lock, NULL, MUTEX_DEFAULT, NULL);
 
 		spa_init(FREAD | FWRITE);
@@ -3083,7 +3080,6 @@
 		tsd_create(&rrw_tsd_key, NULL);
 
 		printf("ZFS storage pool version " SPA_VERSION_STRING "\n");
-		root_mount_rel(zfs_root_token);
 
 		zfsdev_init();
 		break;

==== //depot/projects/usb/src/sys/dev/pccbb/pccbb.c#15 (text+ko) ====

@@ -500,15 +500,6 @@
 		mtx_unlock(&Giant);
 
 		/*
-		 * First time through we need to tell mountroot that we're
-		 * done.
-		 */
-		if (sc->sc_root_token) {
-			root_mount_rel(sc->sc_root_token);
-			sc->sc_root_token = NULL;
-		}
-
-		/*
 		 * Wait until it has been 250ms since the last time we
 		 * get an interrupt.  We handle the rest of the interrupt
 		 * at the top of the loop.  Although we clear the bit in the

==== //depot/projects/usb/src/sys/dev/pccbb/pccbb_pci.c#12 (text+ko) ====

@@ -439,7 +439,6 @@
 		device_printf(brdev, "unable to create event thread.\n");
 		panic("cbb_create_event_thread");
 	}
-	sc->sc_root_token = root_mount_hold(device_get_nameunit(sc->dev));
 	return (0);
 err:
 	if (sc->irq_res)

==== //depot/projects/usb/src/sys/dev/pccbb/pccbbvar.h#9 (text+ko) ====

@@ -88,7 +88,6 @@
 	struct proc	*event_thread;
 	void (*chipinit)(struct cbb_softc *);
 	int	powerintr;
-	struct root_hold_token *sc_root_token;
 };
 
 /* result of detect_card */

==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#33 (text+ko) ====

@@ -78,11 +78,6 @@
     "Debug level");
 #endif
 
-static int usb_no_boot_wait = 0;
-TUNABLE_INT("hw.usb.no_boot_wait", &usb_no_boot_wait);
-SYSCTL_INT(_hw_usb, OID_AUTO, no_boot_wait, CTLFLAG_RDTUN, &usb_no_boot_wait, 0,
-    "No device enumerate waiting at boot.");
-
 static devclass_t usb_devclass;
 
 static device_method_t usb_methods[] = {
@@ -134,11 +129,6 @@
 		return (ENXIO);
 	}
 
-	if (usb_no_boot_wait == 0) {
-		/* delay vfs_mountroot until the bus is explored */
-		bus->bus_roothold = root_mount_hold(device_get_nameunit(dev));
-	}
-
 	usb_attach_sub(dev, bus);
 
 	return (0);			/* return success */
@@ -161,12 +151,6 @@
 	/* Stop power watchdog */
 	usb_callout_drain(&bus->power_wdog);
 
-	/* Let the USB explore process detach all devices. */
-	if (bus->bus_roothold != NULL) {
-		root_mount_rel(bus->bus_roothold);
-		bus->bus_roothold = NULL;
-	}
-
 	USB_BUS_LOCK(bus);
 	if (usb_proc_msignal(&bus->explore_proc,
 	    &bus->detach_msg[0], &bus->detach_msg[1])) {
@@ -239,10 +223,6 @@
 		(udev->hub->explore) (udev);
 		USB_BUS_LOCK(bus);
 	}
-	if (bus->bus_roothold != NULL) {
-		root_mount_rel(bus->bus_roothold);
-		bus->bus_roothold = NULL;
-	}
 }
 
 /*------------------------------------------------------------------------*

==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#33 (text+ko) ====

@@ -67,6 +67,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -328,6 +329,9 @@
 {
 	DPRINTFN(2, "polling\n");
 
+	if (kdb_active == 0)
+		return;		/* Only poll if KDB is active */
+
 	while (sc->sc_inputs == 0) {
 
 		usbd_transfer_poll(sc->sc_xfer, UKBD_N_TRANSFER);

==== //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#13 (text+ko) ====

@@ -1300,7 +1300,10 @@
 static void
 ucom_cnprobe(struct consdev  *cp)
 {
-	cp->cn_pri = CN_NORMAL;
+	if (ucom_cons_unit != -1)
+		cp->cn_pri = CN_NORMAL;
+	else
+		cp->cn_pri = CN_DEAD;
 }
 
 static void

==== //depot/projects/usb/src/sys/dev/usb/usb_bus.h#16 (text+ko) ====

@@ -51,7 +51,6 @@
 struct usb_bus {
 	struct usb_bus_stat stats_err;
 	struct usb_bus_stat stats_ok;
-	struct root_hold_token *bus_roothold;
 	/*
 	 * There are two callback processes. One for Giant locked
 	 * callbacks. One for non-Giant locked callbacks. This should

==== //depot/projects/usb/src/sys/geom/journal/g_journal.c#13 (text+ko) ====

@@ -2108,12 +2108,6 @@
 	g_topology_unlock();
 	last_write = time_second;
 
-	if (sc->sc_rootmount != NULL) {
-		GJ_DEBUG(1, "root_mount_rel %p", sc->sc_rootmount);
-		root_mount_rel(sc->sc_rootmount);
-		sc->sc_rootmount = NULL;
-	}
-
 	for (;;) {
 		/* Get first request from the queue. */
 		mtx_lock(&sc->sc_mtx);
@@ -2311,9 +2305,6 @@
 		sc->sc_inactive.jj_queue = NULL;
 		sc->sc_active.jj_queue = NULL;
 
-		sc->sc_rootmount = root_mount_hold("GJOURNAL");
-		GJ_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount);
-
 		callout_init(&sc->sc_callout, CALLOUT_MPSAFE);
 		if (md->md_type != GJ_TYPE_COMPLETE) {
 			/*
@@ -2445,12 +2436,6 @@
 
 	g_topology_unlock();
 
-	if (sc->sc_rootmount != NULL) {
-		GJ_DEBUG(1, "root_mount_rel %p", sc->sc_rootmount);
-		root_mount_rel(sc->sc_rootmount);
-		sc->sc_rootmount = NULL;
-	}
-
 	callout_drain(&sc->sc_callout);
 	mtx_lock(&sc->sc_mtx);
 	wakeup(sc);

==== //depot/projects/usb/src/sys/geom/journal/g_journal.h#3 (text+ko) ====

@@ -163,8 +163,6 @@
 
 	struct callout	 sc_callout;
 	struct proc	*sc_worker;
-
-	struct root_hold_token *sc_rootmount;
 };
 #define	sc_dprovider	sc_dconsumer->provider
 #define	sc_jprovider	sc_jconsumer->provider

==== //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#8 (text+ko) ====

@@ -1726,13 +1726,6 @@
 static int
 g_mirror_try_destroy(struct g_mirror_softc *sc)
 {
-
-	if (sc->sc_rootmount != NULL) {
-		G_MIRROR_DEBUG(1, "root_mount_rel[%u] %p", __LINE__,
-		    sc->sc_rootmount);
-		root_mount_rel(sc->sc_rootmount);
-		sc->sc_rootmount = NULL;
-	}
 	g_topology_lock();
 	if (!g_mirror_can_destroy(sc)) {
 		g_topology_unlock();
@@ -2190,10 +2183,6 @@
 			 */
 			callout_drain(&sc->sc_callout);
 			sc->sc_flags |= G_MIRROR_DEVICE_FLAG_DESTROY;
-			G_MIRROR_DEBUG(1, "root_mount_rel[%u] %p", __LINE__,
-			    sc->sc_rootmount);
-			root_mount_rel(sc->sc_rootmount);
-			sc->sc_rootmount = NULL;
 			return;
 		} else {
 			return;
@@ -2217,10 +2206,6 @@
 			if (ndisks == 0) {
 				/* No valid disks found, destroy device. */
 				sc->sc_flags |= G_MIRROR_DEVICE_FLAG_DESTROY;
-				G_MIRROR_DEBUG(1, "root_mount_rel[%u] %p",
-				    __LINE__, sc->sc_rootmount);
-				root_mount_rel(sc->sc_rootmount);
-				sc->sc_rootmount = NULL;
 				return;
 			}
 		} else {
@@ -2374,12 +2359,6 @@
 			 */
 			if (sc->sc_provider == NULL)
 				g_mirror_launch_provider(sc);
-			if (sc->sc_rootmount != NULL) {
-				G_MIRROR_DEBUG(1, "root_mount_rel[%u] %p",
-				    __LINE__, sc->sc_rootmount);
-				root_mount_rel(sc->sc_rootmount);
-				sc->sc_rootmount = NULL;
-			}
 		}
 		/*
 		 * Genid should be bumped immediately, so do it here.
@@ -2907,8 +2886,6 @@
 	G_MIRROR_DEBUG(1, "Device %s created (%u components, id=%u).",
 	    sc->sc_name, sc->sc_ndisks, sc->sc_id);
 
-	sc->sc_rootmount = root_mount_hold("GMIRROR");
-	G_MIRROR_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount);
 	/*
 	 * Run timeout.
 	 */

==== //depot/projects/usb/src/sys/geom/mirror/g_mirror.h#3 (text+ko) ====

@@ -207,8 +207,6 @@
 	struct mtx	sc_events_mtx;
 
 	struct callout	sc_callout;
-
-	struct root_hold_token *sc_rootmount;
 };
 #define	sc_name	sc_geom->name
 

==== //depot/projects/usb/src/sys/geom/part/g_part.c#20 (text+ko) ====

@@ -1448,7 +1448,6 @@
 	struct g_geom *gp;
 	struct g_part_entry *entry;
 	struct g_part_table *table;
-	struct root_hold_token *rht;
 	int attr, depth;
 	int error;
 
@@ -1470,7 +1469,6 @@
 		return (NULL);
 	}
 
-	rht = root_mount_hold(mp->name);
 	g_topology_unlock();
 
 	/*
@@ -1515,13 +1513,11 @@
 			g_part_new_provider(gp, table, entry);
 	}
 
-	root_mount_rel(rht);
 	g_access(cp, -1, 0, 0);
 	return (gp);
 
  fail:
 	g_topology_lock();
-	root_mount_rel(rht);
 	g_access(cp, -1, 0, 0);
 	g_part_wither(gp, error);
 	return (NULL);

==== //depot/projects/usb/src/sys/geom/raid3/g_raid3.c#8 (text+ko) ====

@@ -1974,13 +1974,6 @@
 	g_topology_assert_not();
 	sx_assert(&sc->sc_lock, SX_XLOCKED);
 
-	if (sc->sc_rootmount != NULL) {
-		G_RAID3_DEBUG(1, "root_mount_rel[%u] %p", __LINE__,
-		    sc->sc_rootmount);
-		root_mount_rel(sc->sc_rootmount);
-		sc->sc_rootmount = NULL;
-	}
-
 	g_topology_lock();
 	if (!g_raid3_can_destroy(sc)) {
 		g_topology_unlock();
@@ -2464,10 +2457,6 @@
 				 * Timeout expired, so destroy device.
 				 */
 				sc->sc_flags |= G_RAID3_DEVICE_FLAG_DESTROY;
-				G_RAID3_DEBUG(1, "root_mount_rel[%u] %p",
-				    __LINE__, sc->sc_rootmount);
-				root_mount_rel(sc->sc_rootmount);
-				sc->sc_rootmount = NULL;
 			}
 			return;
 		}
@@ -2610,12 +2599,6 @@
 		}
 		if (sc->sc_provider == NULL)
 			g_raid3_launch_provider(sc);
-		if (sc->sc_rootmount != NULL) {
-			G_RAID3_DEBUG(1, "root_mount_rel[%u] %p", __LINE__,
-			    sc->sc_rootmount);
-			root_mount_rel(sc->sc_rootmount);
-			sc->sc_rootmount = NULL;
-		}
 		break;
 	case G_RAID3_DEVICE_STATE_COMPLETE:
 		/*
@@ -2643,12 +2626,6 @@
 		}
 		if (sc->sc_provider == NULL)
 			g_raid3_launch_provider(sc);
-		if (sc->sc_rootmount != NULL) {
-			G_RAID3_DEBUG(1, "root_mount_rel[%u] %p", __LINE__,
-			    sc->sc_rootmount);
-			root_mount_rel(sc->sc_rootmount);
-			sc->sc_rootmount = NULL;
-		}
 		break;
 	default:
 		KASSERT(1 == 0, ("Wrong device state (%s, %s).", sc->sc_name,
@@ -3193,9 +3170,6 @@
 	G_RAID3_DEBUG(1, "Device %s created (%u components, id=%u).",
 	    sc->sc_name, sc->sc_ndisks, sc->sc_id);
 
-	sc->sc_rootmount = root_mount_hold("GRAID3");
-	G_RAID3_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount);
-
 	/*
 	 * Run timeout.
 	 */

==== //depot/projects/usb/src/sys/geom/raid3/g_raid3.h#3 (text+ko) ====

@@ -240,8 +240,6 @@
 	struct mtx	sc_events_mtx;
 
 	struct callout	sc_callout;
-
-	struct root_hold_token *sc_rootmount;
 };
 #define	sc_name	sc_geom->name
 

==== //depot/projects/usb/src/sys/kern/kern_cons.c#4 (text+ko) ====

@@ -353,8 +353,10 @@
 
 	if (cn_mute)
 		return (-1);
-	while ((c = cncheckc()) == -1)
-		;
+	while ((c = cncheckc()) == -1) {
+		if (!kdb_active)
+			pause("WKEY", hz / 100);	/* give USB a chance */
+	}
 	if (c == '\r')
 		c = '\n';		/* console input is always ICRNL */
 	return (c);
@@ -369,6 +371,7 @@
 
 	if (cn_mute)
 		return (-1);
+
 	STAILQ_FOREACH(cnd, &cn_devlist, cnd_next) {
 		cn = cnd->cnd_cn;
 		if (!kdb_active || !(cn->cn_flags & CN_FLAG_NODEBUG)) {

==== //depot/projects/usb/src/sys/kern/vfs_mount.c#30 (text+ko) ====

@@ -58,6 +58,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -76,7 +77,7 @@
 static int	vfs_domount(struct thread *td, const char *fstype,
 		    char *fspath, int fsflags, void *fsdata);
 static int	vfs_mountroot_ask(void);
-static int	vfs_mountroot_try(const char *mountfrom, const char *options);
+static int	vfs_mountroot_try(const char *mountfrom, const char *options, int asked);
 static void	free_mntarg(struct mntarg *ma);
 
 static int	usermount = 0;
@@ -1344,82 +1345,9 @@
  *
  */
 
-struct root_hold_token {
-	const char			*who;
-	LIST_ENTRY(root_hold_token)	list;
-};
-
-static LIST_HEAD(, root_hold_token)	root_holds =
-    LIST_HEAD_INITIALIZER(&root_holds);
-
 static int root_mount_complete;
 
 /*
- * Hold root mount.
- */
-struct root_hold_token *
-root_mount_hold(const char *identifier)
-{
-	struct root_hold_token *h;
-
-	if (root_mounted())
-		return (NULL);
-
-	h = malloc(sizeof *h, M_DEVBUF, M_ZERO | M_WAITOK);
-	h->who = identifier;
-	mtx_lock(&mountlist_mtx);
-	LIST_INSERT_HEAD(&root_holds, h, list);
-	mtx_unlock(&mountlist_mtx);
-	return (h);
-}
-
-/*
- * Release root mount.
- */
-void
-root_mount_rel(struct root_hold_token *h)
-{
-
-	if (h == NULL)
-		return;
-	mtx_lock(&mountlist_mtx);
-	LIST_REMOVE(h, list);
-	wakeup(&root_holds);
-	mtx_unlock(&mountlist_mtx);
-	free(h, M_DEVBUF);
-}
-
-/*
- * Wait for all subsystems to release root mount.
- */
-static void
-root_mount_prepare(void)
-{
-	struct root_hold_token *h;
-	struct timeval lastfail;
-	int curfail = 0;
-
-	for (;;) {
-		DROP_GIANT();
-		g_waitidle();
-		PICKUP_GIANT();
-		mtx_lock(&mountlist_mtx);
-		if (LIST_EMPTY(&root_holds)) {
-			mtx_unlock(&mountlist_mtx);
-			break;
-		}
-		if (ppsratecheck(&lastfail, &curfail, 1)) {
-			printf("Root mount waiting for:");
-			LIST_FOREACH(h, &root_holds, list)
-				printf(" %s", h->who);
-			printf("\n");
-		}
-		msleep(&root_holds, &mountlist_mtx, PZERO | PDROP, "roothold",
-		    hz);
-	}
-}
-
-/*
  * Root was mounted, share the good news.
  */
 static void
@@ -1452,27 +1380,6 @@
 	return (root_mount_complete);
 }
 
-/*
- * Wait until root is mounted.
- */
-void
-root_mount_wait(void)
-{
-
-	/*
-	 * Panic on an obvious deadlock - the function can't be called from
-	 * a thread which is doing the whole SYSINIT stuff.
-	 */
-	KASSERT(curthread->td_proc->p_pid != 0,
-	    ("root_mount_wait: cannot be called from the swapper thread"));
-	mtx_lock(&mountlist_mtx);
-	while (!root_mount_complete) {
-		msleep(&root_mount_complete, &mountlist_mtx, PZERO, "rootwait",
-		    hz);
-	}
-	mtx_unlock(&mountlist_mtx);
-}
-
 static void
 set_rootvnode()
 {
@@ -1644,24 +1551,23 @@
 vfs_mountroot(void)
 {
 	char *cp, *options;
-	int error, i, asked = 0;
+	int error, i, t, asked = 0;
 
 	options = NULL;
 
-	root_mount_prepare();
-
 	mount_zone = uma_zcreate("Mountpoints", sizeof(struct mount),
 	    NULL, NULL, mount_init, mount_fini,
 	    UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
 	devfs_first();
 
+repeat:
 	/*
 	 * We are booted with instructions to prompt for the root filesystem.
 	 */
 	if (boothowto & RB_ASKNAME) {
 		if (!vfs_mountroot_ask())
 			goto mounted;
-		asked = 1;
+		asked++;
 	}
 
 	options = getenv("vfs.root.mountfrom.options");
@@ -1671,7 +1577,7 @@
 	 * booted with instructions to use it.
 	 */
 	if (ctrootdevname != NULL && (boothowto & RB_DFLTROOT)) {
-		if (!vfs_mountroot_try(ctrootdevname, options))
+		if (!vfs_mountroot_try(ctrootdevname, options, asked))
 			goto mounted;
 		ctrootdevname = NULL;
 	}
@@ -1683,7 +1589,7 @@
 	 */
 	if (boothowto & RB_CDROM) {
 		for (i = 0; cdrom_rootdevnames[i] != NULL; i++) {
-			if (!vfs_mountroot_try(cdrom_rootdevnames[i], options))
+			if (!vfs_mountroot_try(cdrom_rootdevnames[i], options, asked))
 				goto mounted;
 		}
 	}
@@ -1695,7 +1601,7 @@
 	 */
 	cp = getenv("vfs.root.mountfrom");
 	if (cp != NULL) {
-		error = vfs_mountroot_try(cp, options);
+		error = vfs_mountroot_try(cp, options, asked);
 		freeenv(cp);
 		if (!error)
 			goto mounted;
@@ -1704,22 +1610,39 @@
 	/*
 	 * Try values that may have been computed by code during boot
 	 */
-	if (!vfs_mountroot_try(rootdevnames[0], options))
+	if (!vfs_mountroot_try(rootdevnames[0], options, asked))
 		goto mounted;
-	if (!vfs_mountroot_try(rootdevnames[1], options))
+	if (!vfs_mountroot_try(rootdevnames[1], options, asked))
 		goto mounted;
 
 	/*
 	 * If we (still) have a compiled-in default, try it.
 	 */
 	if (ctrootdevname != NULL)
-		if (!vfs_mountroot_try(ctrootdevname, options))
+		if (!vfs_mountroot_try(ctrootdevname, options, asked))
 			goto mounted;
+
+	asked ++;
+
+	t = 16;
+	i = -1;
+	while (t-- && (i == -1)) {
+		pause("WKEY", hz / 16);		/* give USB a chance */
+		i = cncheckc();
+	}
+
 	/*
 	 * Everything so far has failed, prompt on the console if we haven't
 	 * already tried that.
 	 */
-	if (!asked)
+	if (i == 'C')		/* XXX also check for CTRL pressed */
+		if (!vfs_mountroot_ask())
+			goto mounted;
+
+	if (asked < (3 * 60))	/* Wait a maximum of 3 minutes */
+		goto repeat;
+
+	if (i != 'C')
 		if (!vfs_mountroot_ask())
 			goto mounted;
 
@@ -1780,7 +1703,7 @@
  * Mount (mountfrom) as the root filesystem.
  */
 static int
-vfs_mountroot_try(const char *mountfrom, const char *options)
+vfs_mountroot_try(const char *mountfrom, const char *options, int asked)
 {
 	struct mount	*mp;
 	struct mntarg	*ma;
@@ -1799,7 +1722,7 @@
 
 	if (mountfrom == NULL)
 		return (error);		/* don't complain */
-	printf("Trying to mount root from %s\n", mountfrom);
+	printf("Trying to mount root from %s. Press CTRL+C to abort.\n", mountfrom);
 
 	/* parse vfs name and path */
 	vfsname = malloc(MFSNAMELEN, M_MOUNT, M_WAITOK);
@@ -1847,7 +1770,7 @@
 		devfs_fixup(curthread);
 	}
 
-	if (error != 0 ) {
+	if ((error != 0) && (asked == 0)) {
 		printf("ROOT MOUNT ERROR: %s\n", errmsg);
 		printf("If you have invalid mount options, reboot, and ");
 		printf("first try the following from\n");
@@ -1875,6 +1798,7 @@
 	char *options;
 
 	for(;;) {
+		printf("\n");
 		printf("Loader variables:\n");
 		printf("vfs.root.mountfrom=");
 		mountfrom = getenv("vfs.root.mountfrom");
@@ -1908,7 +1832,7 @@
 			g_dev_print();
 			continue;
 		}
-		if (!vfs_mountroot_try(name, NULL))
+		if (!vfs_mountroot_try(name, NULL, 0))
 			return (0);
 	}
 }

==== //depot/projects/usb/src/sys/sys/systm.h#20 (text+ko) ====

@@ -333,15 +333,8 @@
 /* XXX: Should be void nanodelay(u_int nsec); */
 void	DELAY(int usec);
 
-/* Root mount holdback API */
-struct root_hold_token;
-
-struct root_hold_token *root_mount_hold(const char *identifier);
-void root_mount_rel(struct root_hold_token *h);
-void root_mount_wait(void);
 int root_mounted(void);
 
-
 /*
  * Unit number allocation API. (kern/subr_unit.c)
  */

From owner-p4-projects@FreeBSD.ORG  Sat Oct  3 23:31:53 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3B65F1065676; Sat,  3 Oct 2009 23:31:53 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D9F27106566B
	for ; Sat,  3 Oct 2009 23:31:52 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C8F8A8FC08
	for ; Sat,  3 Oct 2009 23:31:52 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n93NVqYL086204
	for ; Sat, 3 Oct 2009 23:31:52 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n93NVqtX086202
	for perforce@freebsd.org; Sat, 3 Oct 2009 23:31:52 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sat, 3 Oct 2009 23:31:52 GMT
Message-Id: <200910032331.n93NVqtX086202@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 169185 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 03 Oct 2009 23:31:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=169185

Change 169185 by rene@rene_self on 2009/10/03 23:31:21

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#16 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#18 integrate
.. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#13 integrate
.. //depot/projects/docproj_nl/www/share/sgml/notices.xml#4 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#16 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -678,8 +678,8 @@
     When &man.portsnap.8; successfully completes
       a fetch operation, the Ports Collection and
       subsequent patches exist on the local system that have passed
-      verification.  The updated files may be installed by
-      typing:
+      verification.  The first time portsnap is executed,
+      use extract to install the updated files:
 
     &prompt.root; portsnap extract
 /usr/ports/.cvsignore
@@ -695,11 +695,17 @@
 /usr/ports/Mk/bsd.cmake.mk
 ...
 
+    For subsequent runs of portsnap fetch,
+      update should be used instead:
+
+    &prompt.root; portsnap update
+
     The process is now complete, and applications may be
       installed or upgraded using the updated Ports Collection.
 
-    To run both processes consecutively, issue the following
-      command:
+    The fetch and extract or
+      update operations may be run consecutively, as
+      shown in the following example:
 
     &prompt.root; portsnap fetch update
       

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#18 (text+ko) ====

@@ -1,7 +1,7 @@
 

==== //depot/projects/docproj_nl/www/share/sgml/advisories.xml#13 (text+ko) ====

@@ -2,7 +2,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/advisories.xml,v 1.231 2009/07/29 00:50:20 simon Exp $
+      $FreeBSD: www/share/sgml/advisories.xml,v 1.233 2009/10/02 20:27:31 simon Exp $
     
   
 
@@ -10,6 +10,22 @@
     2009
 
     
+      10
+
+      
+	2
+
+	
+	  FreeBSD-SA-09:14.devfs
+	
+
+	
+	  FreeBSD-SA-09:13.pipe
+	
+      
+    
+
+    
       7
 
       

==== //depot/projects/docproj_nl/www/share/sgml/notices.xml#4 (text+ko) ====

@@ -2,7 +2,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/notices.xml,v 1.14 2009/06/24 05:45:57 cperciva Exp $
+      $FreeBSD: www/share/sgml/notices.xml,v 1.15 2009/10/02 20:15:49 simon Exp $
     
   
 
@@ -10,6 +10,18 @@
     2009
 
     
+      10
+
+      
+	2
+
+	
+	  FreeBSD-EN-09:05.null
+	
+      
+    
+
+    
       6