From owner-p4-projects@FreeBSD.ORG Sun Jun 11 08:13:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6835416A420; Sun, 11 Jun 2006 08:13:38 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2949916A418 for ; Sun, 11 Jun 2006 08:13:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D386043D4C for ; Sun, 11 Jun 2006 08:13:37 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5B8BSFA046861 for ; Sun, 11 Jun 2006 08:11:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5B8BS1D046858 for perforce@freebsd.org; Sun, 11 Jun 2006 08:11:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 11 Jun 2006 08:11:28 GMT Message-Id: <200606110811.k5B8BS1D046858@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 98972 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, 11 Jun 2006 08:13:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=98972 Change 98972 by hselasky@hselasky_mini_itx on 2006/06/11 08:10:48 Bugfix: Make sure that the "ucom_open()" function does not return when "ttysleep()" times out. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ucom.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ucom.c#5 (text+ko) ==== @@ -262,7 +262,7 @@ */ error = ttysleep(tp, tp, PCATCH | TTIPRI, "ucomsd", hz); - if (error) { + if (error && (error != EWOULDBLOCK)) { return error; } From owner-p4-projects@FreeBSD.ORG Sun Jun 11 08:16:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27FC316A474; Sun, 11 Jun 2006 08:16:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 03F7316A418 for ; Sun, 11 Jun 2006 08:16:43 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30A6143D53 for ; Sun, 11 Jun 2006 08:16:42 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5B8EWB7046930 for ; Sun, 11 Jun 2006 08:14:32 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5B8EW79046927 for perforce@freebsd.org; Sun, 11 Jun 2006 08:14:32 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 11 Jun 2006 08:14:32 GMT Message-Id: <200606110814.k5B8EW79046927@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 98973 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, 11 Jun 2006 08:16:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=98973 Change 98973 by hselasky@hselasky_mini_itx on 2006/06/11 08:13:50 Improve handling of "clear-stall". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#7 (text+ko) ==== @@ -157,6 +157,7 @@ tr_transferred: tr_setup: if (sc->sc_flags & ULPT_FLAG_WRITE_STALL) { + usbd_transfer_start(sc->sc_xfer[4]); return; } if (usb_cdev_get_data(&(sc->sc_cdev), xfer->buffer, @@ -219,6 +220,7 @@ tr_setup: if (sc->sc_flags & ULPT_FLAG_READ_STALL) { + usbd_transfer_start(sc->sc_xfer[5]); return; } From owner-p4-projects@FreeBSD.ORG Sun Jun 11 08:25:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1BD416A420; Sun, 11 Jun 2006 08:25:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D70916A41A for ; Sun, 11 Jun 2006 08:25:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C88C43D45 for ; Sun, 11 Jun 2006 08:25:54 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5B8NiUG047341 for ; Sun, 11 Jun 2006 08:23:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5B8NiSo047338 for perforce@freebsd.org; Sun, 11 Jun 2006 08:23:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 11 Jun 2006 08:23:44 GMT Message-Id: <200606110823.k5B8NiSo047338@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 98974 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, 11 Jun 2006 08:25:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=98974 Change 98974 by hselasky@hselasky_mini_itx on 2006/06/11 08:22:50 Improve handling of "clear-stall". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ums.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ums.c#5 (text+ko) ==== @@ -110,7 +110,7 @@ #define UMS_FLAG_T_AXIS 0x0008 #define UMS_FLAG_SBU 0x0010 /* spurious button up events */ #define UMS_FLAG_SELECT 0x0020 /* select is waiting */ -#define UMS_FLAG_PIPE_ERROR 0x0040 /* set if transfer error */ +#define UMS_FLAG_INTR_STALL 0x0040 /* set if transfer error */ #define UMS_FLAG_WAIT_USB 0x0080 /* device is waiting for callbacks */ #define UMS_FLAG_WAIT_CO 0x0100 /* device is waiting for callbacks */ #define UMS_FLAG_GONE 0x0200 /* device is gone */ @@ -152,40 +152,29 @@ } static void -ums_clear_stall_callback(struct usbd_xfer *xfer1) +ums_clear_stall_callback(struct usbd_xfer *xfer) { - usb_device_request_t *req = xfer1->buffer; - struct ums_softc *sc = xfer1->priv_sc; - struct usbd_xfer *xfer0 = sc->sc_xfer[0]; + struct ums_softc *sc = xfer->priv_sc; - USBD_CHECK_STATUS(xfer1); + USBD_CHECK_STATUS(xfer); tr_setup: - - /* setup a CLEAR STALL packet */ - - req->bmRequestType = UT_WRITE_ENDPOINT; - req->bRequest = UR_CLEAR_FEATURE; - USETW(req->wValue, UF_ENDPOINT_HALT); - req->wIndex[0] = xfer0->pipe->edesc->bEndpointAddress; - req->wIndex[1] = 0; - USETW(req->wLength, 0); - - usbd_start_hardware(xfer1); + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, sc->sc_xfer[0]); return; - tr_error: tr_transferred: + usbd_clear_stall_tr_transferred(xfer, sc->sc_xfer[0]); - sc->sc_flags &= ~UMS_FLAG_PIPE_ERROR; + sc->sc_flags &= ~UMS_FLAG_INTR_STALL; + usbd_transfer_start(sc->sc_xfer[0]); + return; - if (xfer1->error != USBD_CANCELLED) { - - xfer0->pipe->clearstall = 0; - xfer0->pipe->toggle_next = 0; - - usbd_transfer_start(xfer0); - } + tr_error: + /* bomb out */ + sc->sc_flags &= ~UMS_FLAG_INTR_STALL; + DPRINTF(0, "clear stall failed, error=%s!\n", + usbd_errstr(xfer->error)); return; } @@ -294,18 +283,21 @@ } tr_setup: - USBD_IF_POLL(&sc->sc_rdq_free, m); + if (sc->sc_flags & UMS_FLAG_INTR_STALL) { + usbd_transfer_start(sc->sc_xfer[1]); + } else { + USBD_IF_POLL(&sc->sc_rdq_free, m); - if (m && (!(sc->sc_flags & UMS_FLAG_PIPE_ERROR))) { - usbd_start_hardware(xfer); + if (m) { + usbd_start_hardware(xfer); + } } return; tr_error: if (xfer->error != USBD_CANCELLED) { /* start clear stall */ - sc->sc_flags |= UMS_FLAG_PIPE_ERROR; - + sc->sc_flags |= UMS_FLAG_INTR_STALL; usbd_transfer_start(sc->sc_xfer[1]); } return; From owner-p4-projects@FreeBSD.ORG Sun Jun 11 08:28:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBD3116A519; Sun, 11 Jun 2006 08:28:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98A7216A503 for ; Sun, 11 Jun 2006 08:28:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 623A043D46 for ; Sun, 11 Jun 2006 08:28:58 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5B8QnMS047492 for ; Sun, 11 Jun 2006 08:26:49 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5B8QmdK047489 for perforce@freebsd.org; Sun, 11 Jun 2006 08:26:48 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 11 Jun 2006 08:26:48 GMT Message-Id: <200606110826.k5B8QmdK047489@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 98975 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, 11 Jun 2006 08:28:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=98975 Change 98975 by hselasky@hselasky_mini_itx on 2006/06/11 08:26:43 Improve "clear-stall" handling. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhid.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhid.c#5 (text+ko) ==== @@ -116,7 +116,7 @@ u_int8_t sc_wakeup_detach; u_int8_t sc_flags; #define UHID_FLAG_IMMED 0x01 /* set if read should be immediate */ -#define UHID_FLAG_INTR_STALLED 0x02 /* set if interrup transfer stalled */ +#define UHID_FLAG_INTR_STALL 0x02 /* set if interrupt transfer stalled */ #define UHID_FLAG_STATIC_DESC 0x04 /* set if report descriptors are static */ #define UHID_FLAG_COMMAND_ERR 0x08 /* set if control transfer had an error */ #define UHID_FLAG_WAIT_USB 0x10 /* set if should wait for USB */ @@ -147,17 +147,22 @@ } tr_setup: - USBD_IF_POLL(&(sc->sc_cdev.sc_rdq_free), m); + if (sc->sc_flags & UHID_FLAG_INTR_STALL) { + usbd_transfer_start(sc->sc_xfer[1]); + } else { + USBD_IF_POLL(&(sc->sc_cdev.sc_rdq_free), m); - if ((!(sc->sc_flags & (UHID_FLAG_INTR_STALLED))) && m) { - xfer->length = sc->sc_isize; - usbd_start_hardware(xfer); + if (m) { + xfer->length = sc->sc_isize; + usbd_start_hardware(xfer); + } } return; tr_error: if (xfer->error != USBD_CANCELLED) { /* try to clear stall first */ + sc->sc_flags |= UHID_FLAG_INTR_STALL; usbd_transfer_start(sc->sc_xfer[1]); } return; @@ -171,20 +176,19 @@ tr_setup: /* start clear stall */ - sc->sc_flags |= UHID_FLAG_INTR_STALLED; usbd_clear_stall_tr_setup(xfer, sc->sc_xfer[0]); return; tr_transferred: usbd_clear_stall_tr_transferred(xfer, sc->sc_xfer[0]); - sc->sc_flags &= ~UHID_FLAG_INTR_STALLED; + sc->sc_flags &= ~UHID_FLAG_INTR_STALL; usbd_transfer_start(sc->sc_xfer[0]); return; tr_error: /* bomb out */ - sc->sc_flags &= ~UHID_FLAG_INTR_STALLED; + sc->sc_flags &= ~UHID_FLAG_INTR_STALL; usb_cdev_put_data_error(&(sc->sc_cdev)); return; } From owner-p4-projects@FreeBSD.ORG Sun Jun 11 14:59:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F21916A476; Sun, 11 Jun 2006 14:59:49 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B34916A46F for ; Sun, 11 Jun 2006 14:59:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1BD943D60 for ; Sun, 11 Jun 2006 14:59:43 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5BEvXZk089594 for ; Sun, 11 Jun 2006 14:57:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5BEvXDb089591 for perforce@freebsd.org; Sun, 11 Jun 2006 14:57:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 11 Jun 2006 14:57:33 GMT Message-Id: <200606111457.k5BEvXDb089591@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 98986 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, 11 Jun 2006 14:59:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=98986 Change 98986 by hselasky@hselasky_mini_itx on 2006/06/11 14:56:42 Remove misleading comment. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#8 (text+ko) ==== @@ -684,10 +684,6 @@ USB_CDEV_FLAG_WAKEUP_RD_IMMED| USB_CDEV_FLAG_WAKEUP_WR_IMMED); - /* make the buffers one byte larger than maximum so - * that one can detect too large read/writes and - * short transfers: - */ error = usb_cdev_attach(&(sc->sc_cdev), sc, &(sc->sc_mtx), p_buf, UID_ROOT, GID_OPERATOR, 0644, ULPT_BSIZE, ULPT_IFQ_MAXLEN, From owner-p4-projects@FreeBSD.ORG Sun Jun 11 15:53:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B741116A420; Sun, 11 Jun 2006 15:53:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7970516A41F for ; Sun, 11 Jun 2006 15:53:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C4F143D53 for ; Sun, 11 Jun 2006 15:53:54 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5BFphwf093550 for ; Sun, 11 Jun 2006 15:51:43 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5BFphIF093547 for perforce@freebsd.org; Sun, 11 Jun 2006 15:51:43 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 11 Jun 2006 15:51:43 GMT Message-Id: <200606111551.k5BFphIF093547@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 98989 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, 11 Jun 2006 15:53:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=98989 Change 98989 by hselasky@hselasky_mini_itx on 2006/06/11 15:50:48 Finished reworking "uplcom.c". Had to change alot. Please test! Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#4 (text+ko) ==== @@ -1,0 +1,1237 @@ +/* $NetBSD: uplcom.c,v 1.21 2001/11/13 06:24:56 lukem Exp $ */ + +/*- + * Copyright (c) 2001-2003, 2005 Shunsuke Akiyama . + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 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) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/*- + * Copyright (c) 2001 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Ichiro FUKUHARA (ichiro@ichiro.org). + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * This driver supports several USB-to-RS232 serial adapters driven by + * Prolific PL-2303, PL-2303X and probably PL-2303HX USB-to-RS232 + * bridge chip. The adapters are sold under many different brand + * names. + * + * Datasheets are available at Prolific www site at + * http://www.prolific.com.tw. The datasheets don't contain full + * programming information for the chip. + * + * PL-2303HX is probably programmed the same as PL-2303X. + * + * There are several differences between PL-2303 and PL-2303(H)X. + * PL-2303(H)X can do higher bitrate in bulk mode, has _probably_ + * different command for controlling CRTSCTS and needs special + * sequence of commands for initialization which aren't also + * documented in the datasheet. + */ + +#include "opt_uplcom.h" /* XXX remove this */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include "usbdevs.h" + +__FBSDID("$FreeBSD: src/sys/dev/usb/uplcom.c $"); + +#ifdef USB_DEBUG +#define DPRINTF(n,fmt,...) \ + do { if (uplcom_debug > (n)) { \ + printf("%s: " fmt, __FUNCTION__,## __VA_ARGS__); } } while (0) + +static int uplcom_debug = 0; +SYSCTL_NODE(_hw_usb, OID_AUTO, uplcom, CTLFLAG_RW, 0, "USB uplcom"); +SYSCTL_INT(_hw_usb_uplcom, OID_AUTO, debug, CTLFLAG_RW, + &uplcom_debug, 0, "uplcom debug level"); +#else +#define DPRINTF(...) +#endif + +#define UPLCOM_MODVER 1 /* module version */ + +#define UPLCOM_CONFIG_INDEX 0 +#define UPLCOM_IFACE_INDEX 0 +#define UPLCOM_SECOND_IFACE_INDEX 1 +#define UPLCOM_INTR_SIZE 64 /* bytes */ + +#ifndef UPLCOM_INTR_INTERVAL +#define UPLCOM_INTR_INTERVAL 0 /* default */ +#endif + +/* + * These are the maximum number of bytes transferred per frame. + * The output buffer size cannot be increased due to the size encoding. + */ +#define UPLCOM_IBUFSIZE 256 +#define UPLCOM_OBUFSIZE 256 +#define UPLCOM_N_DATA_TRANSFER 7 +#define UPLCOM_N_INTR_TRANSFER 2 + +#define UPLCOM_SET_REQUEST 0x01 +#define UPLCOM_SET_CRTSCTS 0x41 +#define UPLCOM_SET_CRTSCTS_PL2303X 0x61 +#define RSAQ_STATUS_CTS 0x80 +#define RSAQ_STATUS_DSR 0x02 +#define RSAQ_STATUS_DCD 0x01 + +#define TYPE_PL2303 0 +#define TYPE_PL2303X 1 + +struct uplcom_softc { + struct ucom_softc sc_ucom; + usb_cdc_line_state_t sc_line_state; /* current line state */ + + struct usbd_xfer * sc_xfer_intr[UPLCOM_N_INTR_TRANSFER]; + struct usbd_xfer * sc_xfer_data[UPLCOM_N_DATA_TRANSFER]; + + u_int16_t sc_flag; +#define UPLCOM_FLAG_WAIT_USB_1 0x0001 +#define UPLCOM_FLAG_WAIT_USB_2 0x0002 +#define UPLCOM_FLAG_SET_LS 0x0004 +#define UPLCOM_FLAG_SET_BREAK 0x0008 +#define UPLCOM_FLAG_SET_LC 0x0010 +#define UPLCOM_FLAG_SET_CRTSCTS 0x0020 +#define UPLCOM_FLAG_INTR_STALL 0x0040 +#define UPLCOM_FLAG_READ_STALL 0x0080 +#define UPLCOM_FLAG_WRITE_STALL 0x0100 + + u_int8_t sc_dtr; /* current DTR state */ + u_int8_t sc_rts; /* current RTS state */ + u_int8_t sc_break; /* current BREAK state */ + u_int8_t sc_lsr; /* local status register */ + u_int8_t sc_msr; /* uplcom status register */ + u_int8_t sc_chiptype; /* type of chip */ + u_int8_t sc_ctrl_iface_no; + u_int8_t sc_ctrl_iface_index; + u_int8_t sc_data_iface_no; + u_int8_t sc_data_iface_index; + u_int8_t sc_crtscts; + + u_int8_t sc_wakeup_detach; /* dummy */ +}; + +static const struct uplcom_product * +uplcom_find_up(struct usb_attach_arg *uaa); + +static void +uplcom_detach_complete_1(struct usbd_memory_info *info); + +static void +uplcom_detach_complete_2(struct usbd_memory_info *info); + +static usbd_status +uplcom_reset(struct uplcom_softc *sc, struct usbd_device *udev); + +static int +uplcom_pl2303x_init(struct usbd_device *udev); + +static void +uplcom_set_dtr(struct ucom_softc *ucom, u_int8_t onoff); + +static void +uplcom_set_rts(struct ucom_softc *ucom, u_int8_t onoff); + +static void +uplcom_set_break(struct ucom_softc *sc, u_int8_t onoff); + +static int +uplcom_param(struct ucom_softc *ucom, struct termios *t); + +static int +uplcom_open(struct ucom_softc *ucom); + +static void +uplcom_close(struct ucom_softc *ucom); + +static void +uplcom_start_read(struct ucom_softc *ucom); + +static void +uplcom_stop_read(struct ucom_softc *ucom); + +static void +uplcom_start_write(struct ucom_softc *ucom); + +static void +uplcom_stop_write(struct ucom_softc *ucom); + +static void +uplcom_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr); + +static int +uplcom_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, int flag, + struct thread *td); +static void +uplcom_set_line_state_callback(struct usbd_xfer *xfer); + +static void +uplcom_set_break_callback(struct usbd_xfer *xfer); + +static void +uplcom_set_line_coding_callback(struct usbd_xfer *xfer); + +static void +uplcom_intr_callback(struct usbd_xfer *xfer); + +static void +uplcom_intr_clear_stall_callback(struct usbd_xfer *xfer); + +static void +uplcom_write_callback(struct usbd_xfer *xfer); + +static void +uplcom_write_clear_stall_callback(struct usbd_xfer *xfer); + +static void +uplcom_read_callback(struct usbd_xfer *xfer); + +static void +uplcom_read_clear_stall_callback(struct usbd_xfer *xfer); + +static device_probe_t uplcom_probe; +static device_attach_t uplcom_attach; +static device_detach_t uplcom_detach; + +static const struct usbd_config uplcom_config_data[UPLCOM_N_DATA_TRANSFER] = { + + [0] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_OUT, + .bufsize = UPLCOM_OBUFSIZE, + .flags = 0, + .callback = &uplcom_write_callback, + }, + + [1] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .bufsize = UPLCOM_IBUFSIZE, + .flags = USBD_SHORT_XFER_OK, + .callback = &uplcom_read_callback, + }, + + [2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &uplcom_write_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &uplcom_read_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [4] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &uplcom_set_line_state_callback, + .timeout = 1000, /* 1 second */ + }, + + [5] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &uplcom_set_break_callback, + .timeout = 1000, /* 1 second */ + }, + + [6] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t) + sizeof(usb_cdc_line_state_t), + .callback = &uplcom_set_line_coding_callback, + .timeout = 1000, /* 1 second */ + }, +}; + +static const struct usbd_config uplcom_config_intr[UPLCOM_N_INTR_TRANSFER] = { + [0] = { + .type = UE_INTERRUPT, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .flags = USBD_SHORT_XFER_OK, + .bufsize = UPLCOM_INTR_SIZE, + .callback = &uplcom_intr_callback, + }, + + [1] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &uplcom_intr_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, +}; + +struct ucom_callback uplcom_callback = { + .ucom_get_status = &uplcom_get_status, + .ucom_set_dtr = &uplcom_set_dtr, + .ucom_set_rts = &uplcom_set_rts, + .ucom_set_break = &uplcom_set_break, + .ucom_param = &uplcom_param, + .ucom_open = &uplcom_open, + .ucom_close = &uplcom_close, + .ucom_ioctl = &uplcom_ioctl, + .ucom_start_read = &uplcom_start_read, + .ucom_stop_read = &uplcom_stop_read, + .ucom_start_write = &uplcom_start_write, + .ucom_stop_write = &uplcom_stop_write, +}; + +static const struct uplcom_product { + u_int16_t vendor; + u_int16_t product; + u_int16_t release; /* the highest release value accepted, + * 0xFFFF means any value, first match + * wins + */ + u_int8_t chiptype; +} uplcom_products [] = { + /* I/O DATA USB-RSAQ */ + { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBRSAQ, 0xFFFF, TYPE_PL2303 }, + /* I/O DATA USB-RSAQ2 */ + { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ2, 0xFFFF, TYPE_PL2303 }, + /* I/O DATA USB-RSAQ3 */ + { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ3, 0xFFFF, TYPE_PL2303X }, + /* PLANEX USB-RS232 URS-03 */ + { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A, 0xFFFF, TYPE_PL2303 }, + /* ST Lab USB-SERIAL-4 */ + { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303, 0x0300, TYPE_PL2303X }, + /* IOGEAR/ATEN UC-232A (also ST Lab USB-SERIAL-1) */ + { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303, 0xFFFF, TYPE_PL2303 }, + /* TDK USB-PHS Adapter UHA6400 */ + { USB_VENDOR_TDK, USB_PRODUCT_TDK_UHA6400, 0xFFFF, TYPE_PL2303 }, + /* RATOC REX-USB60 */ + { USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60, 0xFFFF, TYPE_PL2303 }, + /* ELECOM UC-SGT */ + { USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT, 0xFFFF, TYPE_PL2303 }, + { USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT0, 0xFFFF, TYPE_PL2303 }, + /* Sony Ericsson USB Cable */ + { USB_VENDOR_SONYERICSSON, USB_PRODUCT_SONYERICSSON_DCU10, 0xFFFF,TYPE_PL2303 }, + /* SOURCENEXT KeikaiDenwa 8 */ + { USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8, 0xFFFF, TYPE_PL2303 }, + /* SOURCENEXT KeikaiDenwa 8 with charger */ + { USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG, + 0xFFFF, TYPE_PL2303 }, + /* HAL Corporation Crossam2+USB */ + { USB_VENDOR_HAL, USB_PRODUCT_HAL_IMR001, 0xFFFF, TYPE_PL2303 }, + /* Sitecom USB to Serial */ + { USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_SERIAL, 0xFFFF, TYPE_PL2303 }, + /* Tripp-Lite U209-000-R */ + { USB_VENDOR_TRIPPLITE, USB_PRODUCT_TRIPPLITE_U209, 0xFFFF, TYPE_PL2303X }, + { 0, 0 } +}; + +static device_method_t uplcom_methods[] = { + DEVMETHOD(device_probe, uplcom_probe), + DEVMETHOD(device_attach, uplcom_attach), + DEVMETHOD(device_detach, uplcom_detach), + { 0, 0 } +}; + +static driver_t uplcom_driver = { + .name = "ucom", + .methods = uplcom_methods, + .size = sizeof (struct uplcom_softc), +}; + +DRIVER_MODULE(uplcom, uhub, uplcom_driver, ucom_devclass, usbd_driver_load, 0); +MODULE_DEPEND(uplcom, usb, 1, 1, 1); +MODULE_DEPEND(uplcom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); +MODULE_VERSION(uplcom, UPLCOM_MODVER); + +static const struct uplcom_product * +uplcom_find_up(struct usb_attach_arg *uaa) +{ + const struct uplcom_product *up = uplcom_products; + + if (uaa->iface == NULL) { + while(up->product) { + if ((up->vendor == uaa->vendor) && + (up->product == uaa->product) && + (up->release <= uaa->release)) { + return up; + } + up++; + } + } + return NULL; +} + +static int +uplcom_probe(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + + DPRINTF(10, "\n"); + + return (uplcom_find_up(uaa) ? UMATCH_VENDOR_PRODUCT : UMATCH_NONE); +} + +static int +uplcom_attach(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + const struct uplcom_product *up = uplcom_find_up(uaa); + struct uplcom_softc *sc = device_get_softc(dev); + struct usbd_interface *iface; + usb_interface_descriptor_t *id; + u_int16_t isize; + int error; + + DPRINTF(10, "\n"); + + if (sc == NULL) { + return ENOMEM; + } + + usbd_set_desc(dev, uaa->device); + + DPRINTF(0, "sc = %p\n", sc); + + sc->sc_chiptype = up->chiptype; + + DPRINTF(0, "chiptype: %s\n", + (sc->sc_chiptype == TYPE_PL2303X) ? + "2303X" : "2303"); + + /* configure the chip */ + + error = usbd_set_config_index(uaa->device, UPLCOM_CONFIG_INDEX, 1); + + if (error) { + device_printf(dev, "failed to set configuration, " + "error=%s\n", usbd_errstr(error)); + goto detach; + } + + /* + * USB-RSAQ1 has two interface + * + * USB-RSAQ1 | USB-RSAQ2 + * -----------------+----------------- + * Interface 0 |Interface 0 + * Interrupt(0x81) | Interrupt(0x81) + * -----------------+ BulkIN(0x02) + * Interface 1 | BulkOUT(0x83) + * BulkIN(0x02) | + * BulkOUT(0x83) | + */ + iface = usbd_get_iface(uaa->device, UPLCOM_IFACE_INDEX); + + if (iface == NULL) { + DPRINTF(0, "no interface (1)!\n"); + goto detach; + } + + id = usbd_get_interface_descriptor(iface); + + if (id == NULL) { + DPRINTF(0, "no interface descriptor (1)!\n"); + goto detach; + } + + sc->sc_ctrl_iface_no = id->bInterfaceNumber; + sc->sc_ctrl_iface_index = UPLCOM_IFACE_INDEX; + + iface = usbd_get_iface(uaa->device, UPLCOM_SECOND_IFACE_INDEX); + + if (iface) { + id = usbd_get_interface_descriptor(iface); + + if (id == NULL) { + device_printf(dev, "no interface descriptor (2)!\n"); + goto detach; + } + + sc->sc_data_iface_no = id->bInterfaceNumber; + sc->sc_data_iface_index = UPLCOM_SECOND_IFACE_INDEX; + } else { + sc->sc_data_iface_no = sc->sc_ctrl_iface_no; + sc->sc_data_iface_index = sc->sc_ctrl_iface_index; + } + + error = usbd_transfer_setup(uaa->device, sc->sc_data_iface_index, + sc->sc_xfer_data, uplcom_config_data, + UPLCOM_N_DATA_TRANSFER, + sc, &Giant, &(uplcom_detach_complete_1)); + if (error) { + DPRINTF(0, "one or more missing data " + "pipes, error=%s\n", usbd_errstr(error)); + goto detach; + } + + sc->sc_flag |= UPLCOM_FLAG_WAIT_USB_1; + + error = usbd_transfer_setup(uaa->device, sc->sc_ctrl_iface_index, + sc->sc_xfer_intr, uplcom_config_intr, + UPLCOM_N_INTR_TRANSFER, + sc, &Giant, &(uplcom_detach_complete_2)); + if (error) { + DPRINTF(0, "no interrupt pipe, error=%s\n", + usbd_errstr(error)); + goto detach; + } + + sc->sc_flag |= UPLCOM_FLAG_WAIT_USB_2; + + isize = UGETW(sc->sc_xfer_intr[0]->pipe->edesc->wMaxPacketSize); + + if (isize > UPLCOM_INTR_SIZE) { + DPRINTF(0, "cannot handle an interrupt " + "packet of %d bytes\n", isize); + goto detach; + } + + /* set transfer length */ + sc->sc_xfer_intr[0]->length = isize; + + sc->sc_dtr = -1; + sc->sc_rts = -1; + sc->sc_break = -1; + + sc->sc_ucom.sc_parent = sc; + sc->sc_ucom.sc_portno = 0; + sc->sc_ucom.sc_callback = &uplcom_callback; + + error = uplcom_reset(sc, uaa->device); + + if (error) { + device_printf(dev, "reset failed, error=%s\n", + usbd_errstr(error)); + goto detach; + } + + error = ucom_attach(&(sc->sc_ucom), dev); + + if (error) { + goto detach; + } + + /* do the initialization during attach + * so that the system does not sleep + * during open: + */ + if (sc->sc_chiptype == TYPE_PL2303X) { + if (uplcom_pl2303x_init(uaa->device)) { + device_printf(dev, "init failed!\n"); + goto detach; + } + } + return 0; + + detach: + uplcom_detach(dev); + return ENXIO; +} + +static void +uplcom_detach_complete_1(struct usbd_memory_info *info) +{ + struct uplcom_softc *sc = info->priv_sc; + + mtx_lock(&Giant); + + if (sc->sc_flag & UPLCOM_FLAG_WAIT_USB_1) { + sc->sc_flag &= ~UPLCOM_FLAG_WAIT_USB_1; + wakeup(&(sc->sc_wakeup_detach)); + } + + mtx_unlock(&Giant); + + return; +} + +static void +uplcom_detach_complete_2(struct usbd_memory_info *info) +{ + struct uplcom_softc *sc = info->priv_sc; + + mtx_lock(&Giant); + + if (sc->sc_flag & UPLCOM_FLAG_WAIT_USB_2) { + sc->sc_flag &= ~UPLCOM_FLAG_WAIT_USB_2; + wakeup(&(sc->sc_wakeup_detach)); + } + + mtx_unlock(&Giant); + + return; +} + +static int +uplcom_detach(device_t dev) +{ + struct uplcom_softc *sc = device_get_softc(dev); + int error; + + DPRINTF(0, "sc=%p\n", sc); + + ucom_detach(&(sc->sc_ucom)); + + usbd_transfer_unsetup(sc->sc_xfer_intr, UPLCOM_N_INTR_TRANSFER); + + usbd_transfer_unsetup(sc->sc_xfer_data, UPLCOM_N_DATA_TRANSFER); + + /* wait for callbacks to finish */ + + while (sc->sc_flag & (UPLCOM_FLAG_WAIT_USB_1|UPLCOM_FLAG_WAIT_USB_2)) { + + error = msleep(&(sc->sc_wakeup_detach), &Giant, + PRIBIO, "uplcom_sync", 0); + } + + return 0; +} + +static usbd_status +uplcom_reset(struct uplcom_softc *sc, struct usbd_device *udev) +{ + usb_device_request_t req; + + req.bmRequestType = UT_WRITE_VENDOR_DEVICE; + req.bRequest = UPLCOM_SET_REQUEST; + USETW(req.wValue, 0); + USETW(req.wIndex, sc->sc_data_iface_no); + USETW(req.wLength, 0); + + return usbd_do_request(udev, &req, NULL); +} + +struct pl2303x_init { + uint8_t req_type; + uint8_t request; + uint16_t value; + uint16_t index; + uint16_t length; +}; + +static const struct pl2303x_init pl2303x[] = { + { UT_READ_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 0x8484, 0, 0 }, + { UT_WRITE_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 0x0404, 0, 0 }, + { UT_READ_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 0x8484, 0, 0 }, + { UT_READ_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 0x8383, 0, 0 }, + { UT_READ_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 0x8484, 0, 0 }, + { UT_WRITE_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 0x0404, 1, 0 }, + { UT_READ_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 0x8484, 0, 0 }, + { UT_READ_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 0x8383, 0, 0 }, + { UT_WRITE_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 0, 1, 0 }, + { UT_WRITE_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 1, 0, 0 }, + { UT_WRITE_VENDOR_DEVICE, UPLCOM_SET_REQUEST, 2, 0x44, 0 } +}; +#define N_PL2302X_INIT (sizeof(pl2303x)/sizeof(pl2303x[0])) + +static int +uplcom_pl2303x_init(struct usbd_device *udev) +{ + usb_device_request_t req; + usbd_status err; + int i; + + for (i = 0; i < N_PL2302X_INIT; i++) { + req.bmRequestType = pl2303x[i].req_type; + req.bRequest = pl2303x[i].request; + USETW(req.wValue, pl2303x[i].value); + USETW(req.wIndex, pl2303x[i].index); + USETW(req.wLength, pl2303x[i].length); + + err = usbd_do_request(udev, &req, NULL); + if (err) { + DPRINTF(0, "error=%s\n", usbd_errstr(err)); + return EIO; + } + } + return 0; +} + +static void +uplcom_set_dtr(struct ucom_softc *ucom, u_int8_t onoff) +{ + struct uplcom_softc *sc = ucom->sc_parent; + + DPRINTF(0, "onoff = %d\n", onoff); + + if (sc->sc_dtr != onoff) { + sc->sc_dtr = onoff; + sc->sc_flag |= UPLCOM_FLAG_SET_LS; + usbd_transfer_start(sc->sc_xfer_data[4]); + } + return; +} + +static void +uplcom_set_rts(struct ucom_softc *ucom, u_int8_t onoff) +{ + struct uplcom_softc *sc = ucom->sc_parent; + + DPRINTF(0, "onoff = %d\n", onoff); + + if (sc->sc_rts != onoff) { + sc->sc_rts = onoff; + sc->sc_flag |= UPLCOM_FLAG_SET_LS; + usbd_transfer_start(sc->sc_xfer_data[4]); + } + return; +} + +static void +uplcom_set_break(struct ucom_softc *ucom, u_int8_t onoff) +{ + struct uplcom_softc *sc = ucom->sc_parent; + + DPRINTF(0, "onoff = %d\n", onoff); + + sc->sc_break = onoff; + sc->sc_flag |= UPLCOM_FLAG_SET_BREAK; + usbd_transfer_start(sc->sc_xfer_data[5]); + return; +} + +static const int32_t uplcom_rates[] = { + 75, 150, 300, 600, 1200, 1800, 2400, 3600, 4800, 7200, 9600, 14400, + 19200, 28800, 38400, 57600, 115200, + /* + * Higher speeds are probably possible. PL2303X supports up to + * 6Mb and can set any rate + */ + 230400, 460800, 614400, 921600, 1228800 +}; +#define N_UPLCOM_RATES (sizeof(uplcom_rates)/sizeof(uplcom_rates[0])) + +static int +uplcom_param(struct ucom_softc *ucom, struct termios *t) +{ + struct uplcom_softc *sc = ucom->sc_parent; + u_int32_t i; + + DPRINTF(0, "sc = %p\n", sc); + + /* check requested baud rate */ + + for (i = 0; ; i++) { + + if (i < N_UPLCOM_RATES) { + if (uplcom_rates[i] == t->c_ospeed) { + break; + } + } else { + DPRINTF(0, "invalid baud rate (%d)\n", t->c_ospeed); + return EIO; + } + } + + USETDW(sc->sc_line_state.dwDTERate, t->c_ospeed); + + sc->sc_line_state.bCharFormat = (t->c_cflag & CSTOPB) ? + UCDC_STOP_BIT_2 : UCDC_STOP_BIT_1; + + sc->sc_line_state.bParityType = (t->c_cflag & PARENB) ? + ((t->c_cflag & PARODD) ? + UCDC_PARITY_ODD : UCDC_PARITY_EVEN) : UCDC_PARITY_NONE; + + switch (t->c_cflag & CSIZE) { + case CS5: + sc->sc_line_state.bDataBits = 5; + break; + case CS6: + sc->sc_line_state.bDataBits = 6; + break; + case CS7: + sc->sc_line_state.bDataBits = 7; + break; + case CS8: + sc->sc_line_state.bDataBits = 8; + break; + } + + sc->sc_crtscts = (t->c_cflag & CRTSCTS) ? 1 : 0; + + sc->sc_flag |= (UPLCOM_FLAG_SET_LC|UPLCOM_FLAG_SET_CRTSCTS); + usbd_transfer_start(sc->sc_xfer_data[6]); + return 0; +} + +static int +uplcom_open(struct ucom_softc *ucom) +{ + struct uplcom_softc *sc = ucom->sc_parent; + + DPRINTF(0, "sc=%p\n", sc); + + usbd_transfer_start(sc->sc_xfer_intr[0]); + + return (0); +} + +static void +uplcom_close(struct ucom_softc *ucom) +{ + struct uplcom_softc *sc = ucom->sc_parent; + + DPRINTF(0, "sc=%p\n", sc); + + usbd_transfer_stop(sc->sc_xfer_intr[0]); + + return; +} + +static void +uplcom_start_read(struct ucom_softc *ucom) +{ + struct uplcom_softc *sc = ucom->sc_parent; + usbd_transfer_start(sc->sc_xfer_data[1]); + return; +} + +static void +uplcom_stop_read(struct ucom_softc *ucom) +{ + struct uplcom_softc *sc = ucom->sc_parent; + usbd_transfer_stop(sc->sc_xfer_data[3]); + usbd_transfer_stop(sc->sc_xfer_data[1]); + return; +} + +static void +uplcom_start_write(struct ucom_softc *ucom) +{ + struct uplcom_softc *sc = ucom->sc_parent; + usbd_transfer_start(sc->sc_xfer_data[0]); + return; +} + +static void +uplcom_stop_write(struct ucom_softc *ucom) +{ + struct uplcom_softc *sc = ucom->sc_parent; + usbd_transfer_stop(sc->sc_xfer_data[2]); + usbd_transfer_stop(sc->sc_xfer_data[0]); + return; +} + +static void +uplcom_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr) +{ + struct uplcom_softc *sc = ucom->sc_parent; + + DPRINTF(0, "\n"); + + if (lsr) { + *lsr = sc->sc_lsr; + } + + if (msr) { + *msr = sc->sc_msr; + } + return; +} + +static int +uplcom_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, int flag, + struct thread *td) +{ + int error = ENOTTY; + + /* TODO: */ + + DPRINTF(0, "cmd = 0x%08lx\n", cmd); + + switch (cmd) { + case TIOCNOTTY: + case TIOCMGET: + case TIOCMSET: + case USB_GET_CM_OVER_DATA: + case USB_SET_CM_OVER_DATA: + break; + + default: + DPRINTF(0, "unknown command\n"); + error = ENOTTY; + break; + } + + return error; +} + +static void +uplcom_set_line_state_callback(struct usbd_xfer *xfer) +{ + usb_device_request_t *req = xfer->buffer; + struct uplcom_softc *sc = xfer->priv_sc; + u_int16_t temp; + + USBD_CHECK_STATUS(xfer); + + tr_error: + DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); + + tr_setup: + tr_transferred: + if (sc->sc_flag & UPLCOM_FLAG_SET_LS) { + sc->sc_flag &= ~UPLCOM_FLAG_SET_LS; + + temp = ((sc->sc_dtr ? UCDC_LINE_DTR : 0) | + (sc->sc_rts ? UCDC_LINE_RTS : 0)); + + req->bmRequestType = UT_WRITE_CLASS_INTERFACE; + req->bRequest = UCDC_SET_CONTROL_LINE_STATE; + USETW(req->wValue, temp); + USETW(req->wIndex, sc->sc_data_iface_no); + USETW(req->wLength, 0); + + usbd_start_hardware(xfer); + } + return; +} + +static void +uplcom_set_break_callback(struct usbd_xfer *xfer) +{ + usb_device_request_t *req = xfer->buffer; + struct uplcom_softc *sc = xfer->priv_sc; + u_int16_t temp; + + USBD_CHECK_STATUS(xfer); + + tr_error: + DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); + + tr_setup: + tr_transferred: + if (sc->sc_flag & UPLCOM_FLAG_SET_BREAK) { + sc->sc_flag &= ~UPLCOM_FLAG_SET_BREAK; + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 11 17:07:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF3FA16A473; Sun, 11 Jun 2006 17:07:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C676816A420 for ; Sun, 11 Jun 2006 17:07:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DAAB43D46 for ; Sun, 11 Jun 2006 17:07:26 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5BH5F8U077248 for ; Sun, 11 Jun 2006 17:05:15 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5BH5FhU077245 for perforce@freebsd.org; Sun, 11 Jun 2006 17:05:15 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 11 Jun 2006 17:05:15 GMT Message-Id: <200606111705.k5BH5FhU077245@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 98992 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, 11 Jun 2006 17:07:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=98992 Change 98992 by hselasky@hselasky_mini_itx on 2006/06/11 17:05:05 Include "sys/taskqueue.h" in case the other includes do not. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/umodem.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/umodem.c#5 (text+ko) ==== @@ -82,6 +82,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Sun Jun 11 18:27:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9A0516A479; Sun, 11 Jun 2006 18:27:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9437916A41A for ; Sun, 11 Jun 2006 18:27:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CFE943D48 for ; Sun, 11 Jun 2006 18:27:06 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5BIOtAm046088 for ; Sun, 11 Jun 2006 18:24:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5BIOsWx046084 for perforce@freebsd.org; Sun, 11 Jun 2006 18:24:54 GMT (envelope-from jb@freebsd.org) Date: Sun, 11 Jun 2006 18:24:54 GMT Message-Id: <200606111824.k5BIOsWx046084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98996 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, 11 Jun 2006 18:27:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=98996 Change 98996 by jb@jb_freebsd2 on 2006/06/11 18:24:43 Process control definitions required by DTrace for extended ptrace calls in lieu if having a full-featured procfs like Solaris has. Affected files ... .. //depot/projects/dtrace/src/sys/sys/pcontrol.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jun 11 18:31:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC87116A41B; Sun, 11 Jun 2006 18:31:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3AB616A418 for ; Sun, 11 Jun 2006 18:31:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FEBF43D46 for ; Sun, 11 Jun 2006 18:31:12 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5BIT1c4048384 for ; Sun, 11 Jun 2006 18:29:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5BIT0Zd048381 for perforce@freebsd.org; Sun, 11 Jun 2006 18:29:00 GMT (envelope-from jb@freebsd.org) Date: Sun, 11 Jun 2006 18:29:00 GMT Message-Id: <200606111829.k5BIT0Zd048381@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98997 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, 11 Jun 2006 18:31:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=98997 Change 98997 by jb@jb_freebsd2 on 2006/06/11 18:28:17 This is the start of a process control library for FreeBSD which will be functionally equivalent to the Solaris one, but with the control via extended ptrace() calls rather than messing with procfs like Solaris does. This is just work-in-progress at the moment. I'm adding it because it's needed to build DTrace. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libproc/Makefile#1 add .. //depot/projects/dtrace/src/cddl/lib/libproc/Pcontrol.c#1 add .. //depot/projects/dtrace/src/cddl/lib/libproc/Pcontrol.h#1 add .. //depot/projects/dtrace/src/cddl/lib/libproc/Psymtab.c#1 add .. //depot/projects/dtrace/src/cddl/lib/libproc/Putil.c#1 add .. //depot/projects/dtrace/src/cddl/lib/libproc/Putil.h#1 add .. //depot/projects/dtrace/src/cddl/lib/libproc/libproc.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jun 11 19:22:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 399A516A41A; Sun, 11 Jun 2006 19:22:18 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F0A8916A420 for ; Sun, 11 Jun 2006 19:22:17 +0000 (UTC) (envelope-from hugo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A8C643D45 for ; Sun, 11 Jun 2006 19:22:17 +0000 (GMT) (envelope-from hugo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5BJK6nJ051844 for ; Sun, 11 Jun 2006 19:20:06 GMT (envelope-from hugo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5BJK5Zp051841 for perforce@freebsd.org; Sun, 11 Jun 2006 19:20:05 GMT (envelope-from hugo@FreeBSD.org) Date: Sun, 11 Jun 2006 19:20:05 GMT Message-Id: <200606111920.k5BJK5Zp051841@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hugo@FreeBSD.org using -f From: Hugo Meiland To: Perforce Change Reviews Cc: Subject: PERFORCE change 99000 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, 11 Jun 2006 19:22:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=99000 Change 99000 by hugo@hugo_server2.meiland.nl on 2006/06/11 19:19:25 mount code for nnpfs filesystem Affected files ... .. //depot/projects/arla/src/sbin/mount_nnpfs/Makefile#1 add .. //depot/projects/arla/src/sbin/mount_nnpfs/mount_locl.h#1 add .. //depot/projects/arla/src/sbin/mount_nnpfs/mount_nnpfs.8#1 add .. //depot/projects/arla/src/sbin/mount_nnpfs/mount_nnpfs.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jun 11 19:27:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68B4616A474; Sun, 11 Jun 2006 19:27:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2BB1716A46F for ; Sun, 11 Jun 2006 19:27:25 +0000 (UTC) (envelope-from hugo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B383D43D5A for ; Sun, 11 Jun 2006 19:27:24 +0000 (GMT) (envelope-from hugo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5BJPDLc052221 for ; Sun, 11 Jun 2006 19:25:13 GMT (envelope-from hugo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5BJPDXB052218 for perforce@freebsd.org; Sun, 11 Jun 2006 19:25:13 GMT (envelope-from hugo@FreeBSD.org) Date: Sun, 11 Jun 2006 19:25:13 GMT Message-Id: <200606111925.k5BJPDXB052218@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hugo@FreeBSD.org using -f From: Hugo Meiland To: Perforce Change Reviews Cc: Subject: PERFORCE change 99001 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, 11 Jun 2006 19:27:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=99001 Change 99001 by hugo@hugo_server2.meiland.nl on 2006/06/11 19:24:17 mod of copied Makefile; old owner removed... Affected files ... .. //depot/projects/arla/src/sys/modules/nnpfs/Makefile#2 edit Differences ... ==== //depot/projects/arla/src/sys/modules/nnpfs/Makefile#2 (text+ko) ==== @@ -1,4 +1,3 @@ -# $FreeBSD: src/sys/modules/nwfs/Makefile,v 1.15 2006/01/26 19:21:27 alc Exp $ .PATH: ${.CURDIR}/../../fs/nnpfs From owner-p4-projects@FreeBSD.ORG Sun Jun 11 19:40:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FE1B16A476; Sun, 11 Jun 2006 19:40:46 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AC7B16A474 for ; Sun, 11 Jun 2006 19:40:46 +0000 (UTC) (envelope-from hugo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37E9F43DA6 for ; Sun, 11 Jun 2006 19:40:42 +0000 (GMT) (envelope-from hugo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5BJcUku052866 for ; Sun, 11 Jun 2006 19:38:30 GMT (envelope-from hugo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5BJcUJK052863 for perforce@freebsd.org; Sun, 11 Jun 2006 19:38:30 GMT (envelope-from hugo@FreeBSD.org) Date: Sun, 11 Jun 2006 19:38:30 GMT Message-Id: <200606111938.k5BJcUJK052863@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hugo@FreeBSD.org using -f From: Hugo Meiland To: Perforce Change Reviews Cc: Subject: PERFORCE change 99003 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, 11 Jun 2006 19:40:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=99003 Change 99003 by hugo@hugo_server2.meiland.nl on 2006/06/11 19:37:47 add nnpfs to Makefile, for i386 only now... Affected files ... .. //depot/projects/arla/sys/modules/Makefile#2 edit Differences ... ==== //depot/projects/arla/sys/modules/Makefile#2 (text+ko) ==== @@ -164,6 +164,7 @@ ${_ncp} \ ${_ncv} \ ${_ndis} \ + ${_nnpfs} \ netgraph \ nfsclient \ nfsserver \ @@ -362,6 +363,7 @@ .if ${MK_NCP} != "no" _ncp= ncp .endif +_nnpfs= nnpfs _ncv= ncv _ndis= ndis _nsp= nsp From owner-p4-projects@FreeBSD.ORG Sun Jun 11 19:54:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB8D316A473; Sun, 11 Jun 2006 19:54:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B7CE716A41F for ; Sun, 11 Jun 2006 19:54:00 +0000 (UTC) (envelope-from hugo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7038343D45 for ; Sun, 11 Jun 2006 19:54:00 +0000 (GMT) (envelope-from hugo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5BJpn5w053599 for ; Sun, 11 Jun 2006 19:51:49 GMT (envelope-from hugo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5BJpmBD053596 for perforce@freebsd.org; Sun, 11 Jun 2006 19:51:48 GMT (envelope-from hugo@FreeBSD.org) Date: Sun, 11 Jun 2006 19:51:48 GMT Message-Id: <200606111951.k5BJpmBD053596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hugo@FreeBSD.org using -f From: Hugo Meiland To: Perforce Change Reviews Cc: Subject: PERFORCE change 99006 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, 11 Jun 2006 19:54:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=99006 Change 99006 by hugo@hugo_server2.meiland.nl on 2006/06/11 19:51:30 have mount_nnpfs build during the makeworld Affected files ... .. //depot/projects/arla/src/sbin/Makefile#2 edit Differences ... ==== //depot/projects/arla/src/sbin/Makefile#2 (text+ko) ==== @@ -57,6 +57,7 @@ mount_msdosfs \ mount_nfs \ mount_nfs4 \ + mount_nnpfs \ mount_ntfs \ mount_nullfs \ mount_std \ From owner-p4-projects@FreeBSD.ORG Sun Jun 11 21:27:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5891516A479; Sun, 11 Jun 2006 21:27:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 29E6416A46F for ; Sun, 11 Jun 2006 21:27:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67BA343D6E for ; Sun, 11 Jun 2006 21:27:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5BLOnNV068386 for ; Sun, 11 Jun 2006 21:24:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5BLOl6C068382 for perforce@freebsd.org; Sun, 11 Jun 2006 21:24:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 11 Jun 2006 21:24:47 GMT Message-Id: <200606112124.k5BLOl6C068382@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 99012 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, 11 Jun 2006 21:27:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=99012 Change 99012 by rwatson@rwatson_fledge on 2006/06/11 21:24:43 Correct syntax error that prevents www.trustedbsd.org from building. Stick applied to: deker Affected files ... .. //depot/projects/trustedbsd/www/sebsd.page#5 edit Differences ... ==== //depot/projects/trustedbsd/www/sebsd.page#5 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/sebsd.page#4 $ + $P4: //depot/projects/trustedbsd/www/sebsd.page#5 $ @@ -62,8 +62,7 @@ to the kernel and run in enforcing mode using a sample policy; many but not all relevant userland applications have been updated to properly interact with FLASK - security contexts, including the login program. -

+ security contexts, including the login program.

McAfee Research, now SPARTA ISSO, now provides a source tarball and CVSUP source distribution of From owner-p4-projects@FreeBSD.ORG Sun Jun 11 22:07:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64C3916A41F; Sun, 11 Jun 2006 22:07:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2695516A41A for ; Sun, 11 Jun 2006 22:07:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E44B043D46 for ; Sun, 11 Jun 2006 22:07:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5BM5gSk071322 for ; Sun, 11 Jun 2006 22:05:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5BM5ffp071319 for perforce@freebsd.org; Sun, 11 Jun 2006 22:05:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 11 Jun 2006 22:05:41 GMT Message-Id: <200606112205.k5BM5ffp071319@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 99015 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, 11 Jun 2006 22:07:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=99015 Change 99015 by rwatson@rwatson_fledge on 2006/06/11 22:04:45 Give news page its own role, rather than assigning a role of home. Affected files ... .. //depot/projects/trustedbsd/www/news.page#6 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#6 (text+ko) ==== @@ -30,12 +30,12 @@ SUCH DAMAGE. --> - + News - $P4: //depot/projects/trustedbsd/www/news.page#5 $ + $P4: //depot/projects/trustedbsd/www/news.page#6 $ From owner-p4-projects@FreeBSD.ORG Sun Jun 11 22:10:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75E9816A46F; Sun, 11 Jun 2006 22:10:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32BFD16A41B for ; Sun, 11 Jun 2006 22:10:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 397C143D45 for ; Sun, 11 Jun 2006 22:09:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5BM7juR071411 for ; Sun, 11 Jun 2006 22:07:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5BM7iMs071408 for perforce@freebsd.org; Sun, 11 Jun 2006 22:07:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 11 Jun 2006 22:07:44 GMT Message-Id: <200606112207.k5BM7iMs071408@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 99016 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, 11 Jun 2006 22:10:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=99016 Change 99016 by rwatson@rwatson_fledge on 2006/06/11 22:06:49 Engage in some advertising activities on the TrustedBSD.org page to help pay for the cost of hardware, bandwidth, etc. Affected files ... .. //depot/projects/trustedbsd/www/sidebar.xml#6 edit Differences ... ==== //depot/projects/trustedbsd/www/sidebar.xml#6 (text+ko) ==== @@ -15,6 +15,25 @@

  • SEDarwin
  • UFS2
    • +



    +
    + + +
    @@ -32,6 +51,63 @@
  • SEDarwin
  • UFS2
    • +



    +
    + + + + +
    +
    + +
    +



    +
    + + +
    @@ -39,6 +115,57 @@
  • Documentation
  • Implementation Papers
    • +



    +
    + + + + + + +
    @@ -46,5 +173,63 @@
  • TrustedBSD Mailing Lists
  • POSIX.1e Mailing Lists
    • +



    +
    + + +
    +
    + +
    +



    +
    + + + + +
    + From owner-p4-projects@FreeBSD.ORG Mon Jun 12 03:38:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CC0E16A46F; Mon, 12 Jun 2006 03:38:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2897D16A41A for ; Mon, 12 Jun 2006 03:38:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6EA243D48 for ; Mon, 12 Jun 2006 03:38:51 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5C3acHM098572 for ; Mon, 12 Jun 2006 03:36:38 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5C3acVj098569 for perforce@freebsd.org; Mon, 12 Jun 2006 03:36:38 GMT (envelope-from imp@freebsd.org) Date: Mon, 12 Jun 2006 03:36:38 GMT Message-Id: <200606120336.k5C3acVj098569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99030 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, 12 Jun 2006 03:38:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=99030 Change 99030 by imp@imp_harmony on 2006/06/12 03:36:28 IFC @99029 Affected files ... .. //depot/projects/arm/src/sys/arm/arm/pmap.c#19 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#10 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbus.c#8 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbus_cis.c#6 integrate .. //depot/projects/arm/src/sys/dev/cm/if_cm_isa.c#3 integrate .. //depot/projects/arm/src/sys/dev/cm/smc90cx6.c#3 integrate .. //depot/projects/arm/src/sys/dev/cm/smc90cx6reg.h#2 integrate .. //depot/projects/arm/src/sys/dev/cm/smc90cx6var.h#3 integrate .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/spin.h#3 integrate .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_trans.c#4 integrate .. //depot/projects/arm/src/sys/net/if.c#10 integrate Differences ... ==== //depot/projects/arm/src/sys/arm/arm/pmap.c#19 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.61 2006/06/10 05:20:18 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.63 2006/06/11 04:53:06 alc Exp $"); #include #include #include @@ -413,7 +413,6 @@ static vm_paddr_t pmap_kernel_l2ptp_phys; static struct vm_object pvzone_obj; static int pv_entry_count=0, pv_entry_max=0, pv_entry_high_water=0; -int pmap_pagedaemon_waken = 0; /* * This list exists for the benefit of pmap_map_chunk(). It keeps track @@ -2262,7 +2261,6 @@ { pmap_t pm; struct pcb *pcb; - int s; pm = vmspace_pmap(td->td_proc->p_vmspace); pcb = td->td_pcb; @@ -2306,8 +2304,6 @@ cpu_domains(pcb->pcb_dacr); cpu_setttb(pcb->pcb_pagedir); - - splx(s); } critical_exit(); } @@ -2738,7 +2734,6 @@ pmap_growkernel(vm_offset_t addr) { pmap_t kpm = pmap_kernel(); - int s; if (addr <= pmap_curmaxkvaddr) return; /* we are OK */ @@ -2747,8 +2742,6 @@ * whoops! we need to add kernel PTPs */ - s = splhigh(); /* to be safe */ - /* Map 1MB at a time */ for (; pmap_curmaxkvaddr < addr; pmap_curmaxkvaddr += L1_S_SIZE) pmap_grow_l2_bucket(kpm, pmap_curmaxkvaddr); @@ -3826,11 +3819,8 @@ pv_entry_t ret_value; pv_entry_count++; - if ((pv_entry_count > pv_entry_high_water) && - (pmap_pagedaemon_waken == 0)) { - pmap_pagedaemon_waken = 1; - wakeup (&vm_pages_needed); - } + if (pv_entry_count > pv_entry_high_water) + pagedaemon_wakeup(); ret_value = uma_zalloc(pvzone, M_NOWAIT); return ret_value; } @@ -4396,13 +4386,10 @@ { pv_entry_t pv; int loops = 0; - int s; if (m->flags & PG_FICTITIOUS) return (FALSE); - s = splvm(); - /* * Not found, check current mappings returning immediately */ @@ -4410,14 +4397,12 @@ pv; pv = TAILQ_NEXT(pv, pv_list)) { if (pv->pv_pmap == pmap) { - splx(s); return (TRUE); } loops++; if (loops >= 16) break; } - splx(s); return (FALSE); } ==== //depot/projects/arm/src/sys/dev/acpica/acpi.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.225 2006/06/10 08:04:38 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.226 2006/06/11 20:31:41 njl Exp $"); #include "opt_acpi.h" #include @@ -522,6 +522,9 @@ OID_AUTO, "s4bios", CTLFLAG_RW, &sc->acpi_s4bios, 0, "S4BIOS mode"); SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "verbose", CTLFLAG_RW, &sc->acpi_verbose, 0, "verbose mode"); + SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "disable_on_reboot", CTLFLAG_RW, + &sc->acpi_do_disable, 0, "Disable ACPI when rebooting/halting system"); /* * Default to 1 second before sleeping to give some machines time to @@ -1630,13 +1633,15 @@ static void acpi_shutdown_final(void *arg, int howto) { - ACPI_STATUS status; + struct acpi_softc *sc; + ACPI_STATUS status; /* * XXX Shutdown code should only run on the BSP (cpuid 0). * Some chipsets do not power off the system correctly if called from * an AP. */ + sc = arg; if ((howto & RB_POWEROFF) != 0) { status = AcpiEnterSleepStatePrep(ACPI_STATE_S5); if (ACPI_FAILURE(status)) { @@ -1653,7 +1658,8 @@ DELAY(1000000); printf("ACPI power-off failed - timeout\n"); } - } else if ((howto & RB_AUTOBOOT) != 0 && AcpiGbl_FADT->ResetRegSup) { + } else if ((howto & RB_HALT) == 0 && AcpiGbl_FADT->ResetRegSup) { + /* Reboot using the reset register. */ status = AcpiHwLowLevelWrite( AcpiGbl_FADT->ResetRegister.RegisterBitWidth, AcpiGbl_FADT->ResetValue, &AcpiGbl_FADT->ResetRegister); @@ -1663,7 +1669,11 @@ DELAY(1000000); printf("ACPI reset failed - timeout\n"); } - } else if (panicstr == NULL) { + } else if (sc->acpi_do_disable && panicstr == NULL) { + /* + * Only disable ACPI if the user requested. On some systems, writing + * the disable value to SMI_CMD hangs the system. + */ printf("Shutting down ACPI\n"); AcpiTerminate(); } ==== //depot/projects/arm/src/sys/dev/cardbus/cardbus.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.61 2006/01/20 22:00:50 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.62 2006/06/12 03:17:24 imp Exp $"); #include #include @@ -192,11 +192,8 @@ dinfo->pci.cfg.dev = child; resource_list_init(&dinfo->pci.resources); device_set_ivars(child, dinfo); - if (cardbus_do_cis(cbdev, child) != 0) { - DEVPRINTF((cbdev, "Can't parse cis\n")); - pci_freecfg((struct pci_devinfo *)dinfo); - continue; - } + if (cardbus_do_cis(cbdev, child) != 0) + DEVPRINTF((cbdev, "Warning: Bogus CIS ignored\n")); pci_cfg_save(dinfo->pci.cfg.dev, &dinfo->pci, 0); pci_cfg_restore(dinfo->pci.cfg.dev, &dinfo->pci); pci_add_resources(cbdev, child, 1, dinfo->mprefetchable); ==== //depot/projects/arm/src/sys/dev/cardbus/cardbus_cis.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.58 2006/01/03 03:36:17 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.60 2006/06/12 03:28:42 imp Exp $"); /* * CIS Handling for the Cardbus Bus @@ -597,7 +597,9 @@ bzero(tupledata, MAXTUPLESIZE); expect_linktarget = TRUE; if ((start = pci_read_config(child, PCIR_CIS, 4)) == 0) { - device_printf(cbdev, "CIS pointer is 0!\n"); + if (cardbus_cis_debug) + device_printf(cbdev, + "Warning: CIS pointer 0 (no CIS present)\n"); return (ENXIO); } if (cardbus_cis_debug) @@ -639,7 +641,6 @@ int cardbus_do_cis(device_t cbdev, device_t child) { - int ret; struct tuple_callbacks init_callbacks[] = { MAKETUPLE(LONGLINK_CB, unhandled), MAKETUPLE(INDIRECT, unhandled), @@ -656,8 +657,5 @@ MAKETUPLE(GENERIC, generic), }; - ret = cardbus_parse_cis(cbdev, child, init_callbacks, NULL); - if (ret < 0) - return (ret); - return 0; + return (cardbus_parse_cis(cbdev, child, init_callbacks, NULL)); } ==== //depot/projects/arm/src/sys/dev/cm/if_cm_isa.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: if_bah_zbus.c,v 1.6 2000/01/23 21:06:12 aymeric Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cm/if_cm_isa.c,v 1.8 2005/09/19 03:10:15 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cm/if_cm_isa.c,v 1.9 2006/06/11 22:25:01 fjoe Exp $"); /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -48,10 +48,13 @@ #include #include +#include +#include #include #include +#include #include static int cm_isa_probe (device_t); @@ -62,20 +65,35 @@ device_t dev; { struct cm_softc *sc = device_get_softc(dev); - int error; + int rid; + + rid = 0; + sc->port_res = bus_alloc_resource( + dev, SYS_RES_IOPORT, &rid, 0ul, ~0ul, CM_IO_PORTS, RF_ACTIVE); + if (sc->port_res == NULL) + return (ENOENT); - bzero(sc, sizeof(struct cm_softc)); + if (GETREG(CMSTAT) == 0xff) { + cm_release_resources(dev); + return (ENXIO); + } - error = cm_probe(dev); - if (error == 0) - goto end; + rid = 0; + sc->mem_res = bus_alloc_resource( + dev, SYS_RES_MEMORY, &rid, 0ul, ~0ul, CM_MEM_SIZE, RF_ACTIVE); + if (sc->mem_res == NULL) { + cm_release_resources(dev); + return (ENOENT); + } -end: - if (error == 0) - error = cm_alloc_irq(dev, 0); + rid = 0; + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); + if (sc->irq_res == NULL) { + cm_release_resources(dev); + return (ENOENT); + } - cm_release_resources(dev); - return (error); + return (0); } static int @@ -85,18 +103,25 @@ struct cm_softc *sc = device_get_softc(dev); int error; - cm_alloc_port(dev, sc->port_rid, sc->port_used); - cm_alloc_memory(dev, sc->mem_rid, sc->mem_used); - cm_alloc_irq(dev, sc->irq_rid); + /* init mtx and setup interrupt */ + mtx_init(&sc->sc_mtx, device_get_nameunit(dev), + MTX_NETWORK_LOCK, MTX_DEF); + error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, + cmintr, sc, &sc->irq_handle); + if (error) + goto err; + + /* attach */ + error = cm_attach(dev); + if (error) + goto err; - error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET, - cmintr, sc, &sc->irq_handle); - if (error) { - cm_release_resources(dev); - return (error); - } + return 0; - return cm_attach(dev); +err: + mtx_destroy(&sc->sc_mtx); + cm_release_resources(dev); + return (error); } static int @@ -104,19 +129,23 @@ { struct cm_softc *sc = device_get_softc(dev); struct ifnet *ifp = sc->sc_ifp; - int s; - cm_stop(sc); + /* stop and detach */ + CM_LOCK(sc); + cm_stop_locked(sc); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; + CM_UNLOCK(sc); - s = splimp(); + callout_drain(&sc->sc_recon_ch); arc_ifdetach(ifp); - splx(s); + /* teardown interrupt, destroy mtx and release resources */ bus_teardown_intr(dev, sc->irq_res, sc->irq_handle); + mtx_destroy(&sc->sc_mtx); if_free(ifp); cm_release_resources(dev); + bus_generic_detach(dev); return (0); } ==== //depot/projects/arm/src/sys/dev/cm/smc90cx6.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.16 2005/08/09 10:19:44 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.17 2006/06/11 22:25:01 fjoe Exp $"); /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -62,10 +62,6 @@ #include #include -#if __FreeBSD_version < 500000 -#include -#endif - #include #include #include @@ -87,25 +83,6 @@ /* for watchdog timer. This should be more than enough. */ #define ARCTIMEOUT (5*IFNET_SLOWHZ) -/* short notation */ - -#define GETREG(off) \ - bus_space_read_1(rman_get_bustag((sc)->port_res), \ - rman_get_bushandle((sc)->port_res), \ - (off)) -#define PUTREG(off, value) \ - bus_space_write_1(rman_get_bustag((sc)->port_res), \ - rman_get_bushandle((sc)->port_res), \ - (off), (value)) -#define GETMEM(off) \ - bus_space_read_1(rman_get_bustag((sc)->mem_res), \ - rman_get_bushandle((sc)->mem_res), \ - (off)) -#define PUTMEM(off, value) \ - bus_space_write_1(rman_get_bustag((sc)->mem_res), \ - rman_get_bushandle((sc)->mem_res), \ - (off), (value)) - devclass_t cm_devclass; /* @@ -134,7 +111,7 @@ * case 2: set IFF_DRV_OACTIVE to stop arc_output from filling us. * case 1: start tx * - * tint clears IFF_OCATIVE, decrements and checks tx_fillcount + * tint clears IFF_OACTIVE, decrements and checks tx_fillcount * case 1: start tx on tx_act ^ 1, softcall cm_start * case 0: softcall cm_start * @@ -142,105 +119,17 @@ */ void cm_init(void *); -void cm_reset(struct cm_softc *); +static void cm_init_locked(struct cm_softc *); +static void cm_reset_locked(struct cm_softc *); void cm_start(struct ifnet *); +void cm_start_locked(struct ifnet *); int cm_ioctl(struct ifnet *, unsigned long, caddr_t); void cm_watchdog(struct ifnet *); -void cm_srint(void *vsc); -static void cm_tint(struct cm_softc *, int); -void cm_reconwatch(void *); +void cm_srint_locked(void *vsc); +static void cm_tint_locked(struct cm_softc *, int); +void cm_reconwatch_locked(void *); -int -cm_probe(dev) - device_t dev; -{ - int error; - struct cm_softc *sc = device_get_softc(dev); - - error = cm_alloc_port(dev, 0, CM_IO_PORTS); - if (error) - return error; - - if (GETREG(CMSTAT) == 0xff) - return ENXIO; - - error = cm_alloc_memory(dev, 0, 0x800); - if (error) - return error; - - return 0; -} - /* - * Allocate a port resource with the given resource id. - */ -int -cm_alloc_port(dev, rid, size) - device_t dev; - int rid; - int size; -{ - struct cm_softc *sc = device_get_softc(dev); - struct resource *res; - - res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, - 0ul, ~0ul, size, RF_ACTIVE); - if (res) { - sc->port_rid = rid; - sc->port_res = res; - sc->port_used = size; - return (0); - } else { - return (ENOENT); - } -} - -/* - * Allocate a memory resource with the given resource id. - */ -int -cm_alloc_memory(dev, rid, size) - device_t dev; - int rid; - int size; -{ - struct cm_softc *sc = device_get_softc(dev); - struct resource *res; - - res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, - 0ul, ~0ul, size, RF_ACTIVE); - if (res) { - sc->mem_rid = rid; - sc->mem_res = res; - sc->mem_used = size; - return (0); - } else { - return (ENOENT); - } -} - -/* - * Allocate an irq resource with the given resource id. - */ -int -cm_alloc_irq(dev, rid) - device_t dev; - int rid; -{ - struct cm_softc *sc = device_get_softc(dev); - struct resource *res; - - res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (res) { - sc->irq_rid = rid; - sc->irq_res = res; - return (0); - } else { - return (ENOENT); - } -} - -/* * Release all resources */ void @@ -249,26 +138,26 @@ { struct cm_softc *sc = device_get_softc(dev); - if (sc->port_res) { + if (sc->port_res != NULL) { bus_deactivate_resource(dev, SYS_RES_IOPORT, - sc->port_rid, sc->port_res); + 0, sc->port_res); bus_release_resource(dev, SYS_RES_IOPORT, - sc->port_rid, sc->port_res); - sc->port_res = 0; + 0, sc->port_res); + sc->port_res = NULL; } - if (sc->mem_res) { + if (sc->mem_res != NULL) { bus_deactivate_resource(dev, SYS_RES_MEMORY, - sc->mem_rid, sc->mem_res); + 0, sc->mem_res); bus_release_resource(dev, SYS_RES_MEMORY, - sc->mem_rid, sc->mem_res); - sc->mem_res = 0; + 0, sc->mem_res); + sc->mem_res = NULL; } - if (sc->irq_res) { + if (sc->irq_res != NULL) { bus_deactivate_resource(dev, SYS_RES_IRQ, - sc->irq_rid, sc->irq_res); + 0, sc->irq_res); bus_release_resource(dev, SYS_RES_IRQ, - sc->irq_rid, sc->irq_res); - sc->irq_res = 0; + 0, sc->irq_res); + sc->irq_res = NULL; } } @@ -278,29 +167,22 @@ { struct cm_softc *sc = device_get_softc(dev); struct ifnet *ifp; - int s; u_int8_t linkaddress; ifp = sc->sc_ifp = if_alloc(IFT_ARCNET); - if (ifp == NULL) { + if (ifp == NULL) return (ENOSPC); - } - s = splhigh(); - /* * read the arcnet address from the board */ - GETREG(CMRESET); do { DELAY(200); } while (!(GETREG(CMSTAT) & CM_POR)); - linkaddress = GETMEM(CMMACOFF); /* clear the int mask... */ - sc->sc_intmask = 0; PUTREG(CMSTAT, 0); @@ -308,13 +190,10 @@ PUTREG(CMCMD, CM_CLR(CLR_POR|CLR_RECONFIG)); sc->sc_recontime = sc->sc_reconcount = 0; - /* and reenable kernel int level */ - splx(s); - /* * set interface to stopped condition (reset) */ - cm_stop(sc); + cm_stop_locked(sc); ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); @@ -326,7 +205,7 @@ /* XXX IFQ_SET_READY(&ifp->if_snd); */ ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; ifp->if_timer = 0; - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NEEDSGIANT; + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX; arc_ifattach(ifp, linkaddress); @@ -336,11 +215,7 @@ (void (*)(void *))cm_start, ifp); #endif -#if __FreeBSD_version < 500000 - callout_init(&sc->sc_recon_ch); -#else - callout_init(&sc->sc_recon_ch, 0); -#endif + callout_init_mtx(&sc->sc_recon_ch, &sc->sc_mtx, 0); if_printf(ifp, "link addr 0x%02x (%d)\n", linkaddress, linkaddress); return 0; @@ -355,28 +230,30 @@ void *xsc; { struct cm_softc *sc = (struct cm_softc *)xsc; - struct ifnet *ifp; - int s; + + CM_LOCK(sc); + cm_init_locked(sc); + CM_UNLOCK(sc); +} - ifp = sc->sc_ifp; +static void +cm_init_locked(struct cm_softc *sc) +{ + struct ifnet *ifp = sc->sc_ifp; if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { - s = splimp(); ifp->if_drv_flags |= IFF_DRV_RUNNING; - cm_reset(sc); - cm_start(ifp); - splx(s); + cm_reset_locked(sc); } } /* * Reset the interface... * - * this assumes that it is called inside a critical section... - * + * Assumes that it is called with sc_mtx held */ void -cm_reset(sc) +cm_reset_locked(sc) struct cm_softc *sc; { struct ifnet *ifp; @@ -444,14 +321,14 @@ ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - cm_start(ifp); + cm_start_locked(ifp); } /* * Take interface offline */ void -cm_stop(sc) +cm_stop_locked(sc) struct cm_softc *sc; { /* Stop the interrupts */ @@ -464,24 +341,32 @@ sc->sc_ifp->if_timer = 0; } +void +cm_start(struct ifnet *ifp) +{ + struct cm_softc *sc = ifp->if_softc; + + CM_LOCK(sc); + cm_start_locked(ifp); + CM_UNLOCK(sc); +} + /* * Start output on interface. Get another datagram to send * off the interface queue, and copy it to the * interface becore starting the output * - * this assumes that it is called inside a critical section... - * XXX hm... does it still? - * + * Assumes that sc_mtx is held */ void -cm_start(ifp) +cm_start_locked(ifp) struct ifnet *ifp; { struct cm_softc *sc = ifp->if_softc; - struct mbuf *m,*mp; + struct mbuf *m, *mp; int cm_ram_ptr; - int len, tlen, offset, s, buffer; + int len, tlen, offset, buffer; #ifdef CMTIMINGS u_long copystart, lencopy, perbyte; #endif @@ -493,18 +378,12 @@ if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) return; - s = splimp(); - - if (sc->sc_tx_fillcount >= 2) { - splx(s); + if (sc->sc_tx_fillcount >= 2) return; - } m = arc_frag_next(ifp); buffer = sc->sc_tx_act ^ 1; - splx(s); - if (m == 0) return; @@ -569,9 +448,6 @@ sc->sc_broadcast[buffer] = (m->m_flags & M_BCAST) != 0; sc->sc_retransmits[buffer] = (m->m_flags & M_BCAST) ? 1 : 5; - /* actually transmit the packet */ - s = splimp(); - if (++sc->sc_tx_fillcount > 1) { /* * We are filled up to the rim. No more bufs for the moment, @@ -596,7 +472,6 @@ ifp->if_timer = ARCTIMEOUT; } - splx(s); m_freem(m); /* @@ -605,20 +480,30 @@ * the hardware retries till shutdown. * This is integrated now in the code above. */ +} + +#ifdef CMSOFTCOPY +void +cm_srint(void *vsc) +{ + struct cm_softc *sc = (struct cm_softc *)vsc; - return; + CM_LOCK(sc); + cm_srint_locked(vsc); + CM_UNLOCK(sc); } +#endif /* * Arcnet interface receiver soft interrupt: * get the stuff out of any filled buffer we find. */ void -cm_srint(vsc) +cm_srint_locked(vsc) void *vsc; { struct cm_softc *sc = (struct cm_softc *)vsc; - int buffer, len, offset, s, type; + int buffer, len, offset, type; int cm_ram_ptr; struct mbuf *m; struct arc_header *ah; @@ -626,9 +511,7 @@ ifp = sc->sc_ifp; - s = splimp(); buffer = sc->sc_rx_act ^ 1; - splx(s); /* Allocate header mbuf */ MGETHDR(m, M_DONTWAIT, MT_DATA); @@ -695,7 +578,9 @@ rman_get_bustag(sc->mem_res), rman_get_bushandle(sc->mem_res), cm_ram_ptr + offset, mtod(m, u_char *) + 2, len); + CM_UNLOCK(sc); arc_input(ifp, m); + CM_LOCK(sc); m = NULL; ifp->if_ipackets++; @@ -707,8 +592,6 @@ /* mark buffer as invalid by source id 0 */ PUTMEM(buffer << 9, 0); - s = splimp(); - if (--sc->sc_rx_fillcount == 2 - 1) { /* was off, restart it on buffer just emptied */ @@ -723,11 +606,10 @@ if_printf(ifp, "srint: restarted rx on buf %d\n", buffer); #endif } - splx(s); } __inline static void -cm_tint(sc, isr) +cm_tint_locked(sc, isr) struct cm_softc *sc; int isr; { @@ -807,7 +689,7 @@ softintr_schedule(sc->sc_txcookie); #else /* call it directly */ - cm_start(ifp); + cm_start_locked(ifp); #endif } @@ -825,10 +707,15 @@ int buffer; u_long newsec; + CM_LOCK(sc); + isr = GETREG(CMSTAT); maskedisr = isr & sc->sc_intmask; - if (!maskedisr) + if (!maskedisr || (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { + CM_UNLOCK(sc); return; + } + do { #if defined(CM_DEBUG) && (CM_DEBUG > 1) @@ -881,7 +768,7 @@ } sc->sc_recontime = newsec; callout_reset(&sc->sc_recon_ch, 15 * hz, - cm_reconwatch, (void *)sc); + cm_reconwatch_locked, (void *)sc); } if (maskedisr & CM_RI) { @@ -936,12 +823,12 @@ softintr_schedule(sc->sc_rxcookie); #else /* this one does the copy here */ - cm_srint(sc); + cm_srint_locked(sc); #endif } } if (maskedisr & CM_TA) { - cm_tint(sc, isr); + cm_tint_locked(sc, isr); } isr = GETREG(CMSTAT); maskedisr = isr & sc->sc_intmask; @@ -950,10 +837,11 @@ if_printf(ifp, "intr (exit): status 0x%02x, intmask 0x%02x\n", isr, sc->sc_intmask); #endif + CM_UNLOCK(sc); } void -cm_reconwatch(arg) +cm_reconwatch_locked(arg) void *arg; { struct cm_softc *sc = arg; @@ -981,13 +869,12 @@ struct cm_softc *sc; struct ifaddr *ifa; struct ifreq *ifr; - int s, error; + int error; error = 0; sc = ifp->if_softc; ifa = (struct ifaddr *)data; ifr = (struct ifreq *)data; - s = splimp(); #if defined(CM_DEBUG) && (CM_DEBUG > 2) if_printf(ifp, "ioctl() called, cmd = 0x%lx\n", command); @@ -1003,13 +890,14 @@ break; case SIOCSIFFLAGS: + CM_LOCK(sc); if ((ifp->if_flags & IFF_UP) == 0 && (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) { /* * If interface is marked down and it is running, * then stop it. */ - cm_stop(sc); + cm_stop_locked(sc); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; } else if ((ifp->if_flags & IFF_UP) != 0 && (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { @@ -1017,8 +905,9 @@ * If interface is marked up and it is stopped, then * start it. */ - cm_init(sc); + cm_init_locked(sc); } + CM_UNLOCK(sc); break; default: @@ -1026,7 +915,6 @@ break; } - splx(s); return (error); } @@ -1040,16 +928,14 @@ * Only thing we do is disable transmitter. We'll get a transmit timeout, * and the int handler will have to decide not to retransmit (in case * retransmission is implemented). - * - * This one assumes being called inside splimp() */ - void cm_watchdog(ifp) struct ifnet *ifp; { struct cm_softc *sc = ifp->if_softc; + CM_LOCK(sc); PUTREG(CMCMD, CM_TXDIS); - return; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 12 05:25:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC5AA16A476; Mon, 12 Jun 2006 05:25:12 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9009316A46F for ; Mon, 12 Jun 2006 05:25:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4927243D78 for ; Mon, 12 Jun 2006 05:25:04 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5C5MpSL021419 for ; Mon, 12 Jun 2006 05:22:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5C5MoPh021416 for perforce@freebsd.org; Mon, 12 Jun 2006 05:22:50 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 12 Jun 2006 05:22:50 GMT Message-Id: <200606120522.k5C5MoPh021416@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 99035 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, 12 Jun 2006 05:25:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=99035 Change 99035 by hselasky@hselasky_mini_itx on 2006/06/12 05:22:47 Compilation fix for FreeBSD-6. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#4 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include #include ==== //depot/projects/usb/src/sys/dev/usb/uvscom.c#4 (text+ko) ==== @@ -1,0 +1,985 @@ +/* $NetBSD: usb/uvscom.c,v 1.1 2002/03/19 15:08:42 augustss Exp $ */ +/*- + * Copyright (c) 2001-2003, 2005 Shunsuke Akiyama . + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 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) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +/* + * uvscom: SUNTAC Slipper U VS-10U driver. + * Slipper U is a PC Card to USB converter for data communication card + * adapter. It supports DDI Pocket's Air H" C@rd, C@rd H" 64, NTT's P-in, + * P-in m@ater and various data communication card adapters. + */ + +#include "opt_uvscom.h" /* XXX remove this */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include "usbdevs.h" + +__FBSDID("$FreeBSD: src/sys/dev/usb/uvscom.c $"); + +#ifdef USB_DEBUG +#define DPRINTF(n,fmt,...) \ + do { if (uvscom_debug > (n)) { \ + printf("%s: " fmt, __FUNCTION__,## __VA_ARGS__); } } while (0) + +static int uvscom_debug = 0; +SYSCTL_NODE(_hw_usb, OID_AUTO, uvscom, CTLFLAG_RW, 0, "USB uvscom"); +SYSCTL_INT(_hw_usb_uvscom, OID_AUTO, debug, CTLFLAG_RW, + &uvscom_debug, 0, "uvscom debug level"); +#else +#define DPRINTF(...) +#endif + +#define UVSCOM_MODVER 1 /* module version */ + +#define UVSCOM_CONFIG_INDEX 0 +#define UVSCOM_IFACE_INDEX 0 + +#ifndef UVSCOM_INTR_INTERVAL +#define UVSCOM_INTR_INTERVAL 0 /* default */ +#endif + +#define UVSCOM_UNIT_WAIT 5 + +/* Request */ +#define UVSCOM_SET_SPEED 0x10 +#define UVSCOM_LINE_CTL 0x11 +#define UVSCOM_SET_PARAM 0x12 +#define UVSCOM_READ_STATUS 0xd0 +#define UVSCOM_SHUTDOWN 0xe0 + +/* UVSCOM_SET_SPEED parameters */ +#define UVSCOM_SPEED_150BPS 0x00 +#define UVSCOM_SPEED_300BPS 0x01 +#define UVSCOM_SPEED_600BPS 0x02 +#define UVSCOM_SPEED_1200BPS 0x03 +#define UVSCOM_SPEED_2400BPS 0x04 +#define UVSCOM_SPEED_4800BPS 0x05 +#define UVSCOM_SPEED_9600BPS 0x06 +#define UVSCOM_SPEED_19200BPS 0x07 +#define UVSCOM_SPEED_38400BPS 0x08 +#define UVSCOM_SPEED_57600BPS 0x09 +#define UVSCOM_SPEED_115200BPS 0x0a + +/* UVSCOM_LINE_CTL parameters */ +#define UVSCOM_BREAK 0x40 +#define UVSCOM_RTS 0x02 +#define UVSCOM_DTR 0x01 +#define UVSCOM_LINE_INIT 0x08 + +/* UVSCOM_SET_PARAM parameters */ +#define UVSCOM_DATA_MASK 0x03 +#define UVSCOM_DATA_BIT_8 0x03 +#define UVSCOM_DATA_BIT_7 0x02 +#define UVSCOM_DATA_BIT_6 0x01 +#define UVSCOM_DATA_BIT_5 0x00 + +#define UVSCOM_STOP_MASK 0x04 +#define UVSCOM_STOP_BIT_2 0x04 +#define UVSCOM_STOP_BIT_1 0x00 + +#define UVSCOM_PARITY_MASK 0x18 +#define UVSCOM_PARITY_EVEN 0x18 +#if 0 +#define UVSCOM_PARITY_UNK 0x10 +#endif +#define UVSCOM_PARITY_ODD 0x08 +#define UVSCOM_PARITY_NONE 0x00 + +/* Status bits */ +#define UVSCOM_TXRDY 0x04 +#define UVSCOM_RXRDY 0x01 + +#define UVSCOM_DCD 0x08 +#define UVSCOM_NOCARD 0x04 +#define UVSCOM_DSR 0x02 +#define UVSCOM_CTS 0x01 +#define UVSCOM_USTAT_MASK (UVSCOM_NOCARD | UVSCOM_DSR | UVSCOM_CTS) + +struct uvscom_softc { + struct ucom_softc sc_ucom; + struct __callout sc_watchdog; + + u_int16_t sc_line_ctrl; /* line control register */ + u_int16_t sc_line_speed; /* line speed */ + u_int16_t sc_line_param; /* line parameters */ + + u_int8_t sc_iface_no; /* interface number */ + u_int8_t sc_iface_index; /* interface index */ + u_int8_t sc_dtr; /* current DTR state */ + u_int8_t sc_rts; /* current RTS state */ + u_int8_t sc_lsr; /* local status register */ + u_int8_t sc_msr; /* uvscom status register */ + + + XXX: + int sc_iface_number;/* interface number */ + + usbd_interface_handle sc_intr_iface; /* interrupt interface */ + int sc_intr_number; /* interrupt number */ + usbd_pipe_handle sc_intr_pipe; /* interrupt pipe */ + u_int8_t *sc_intr_buf; /* interrupt buffer */ + int sc_isize; + + + u_int8_t sc_unit_status; /* unit status */ + + struct task sc_task; +}; + +/* + * These are the maximum number of bytes transferred per frame. + * The output buffer size cannot be increased due to the size encoding. + */ +#define UVSCOM_IBUFSIZE 512 +#define UVSCOM_OBUFSIZE 64 + +#ifndef UVSCOM_DEFAULT_OPKTSIZE +#define UVSCOM_DEFAULT_OPKTSIZE 8 +#endif + +#define UVSCOM_N_TRANSFER X + +static const struct usbd_config umodem_config_data[UVSCOM_N_TRANSFER] = { + + [0] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_OUT, + .bufsize = UVSCOM_OBUFSIZE, + .flags = 0, + .callback = &umodem_write_callback, + }, + + [1] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .bufsize = UVSCOM_IBUFSIZE, + .flags = USBD_SHORT_XFER_OK, + .callback = &umodem_read_callback, + }, + + [2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &umodem_write_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &umodem_read_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [4] = { + .type = UE_INTERRUPT, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .flags = USBD_SHORT_XFER_OK, + .bufsize = XXX, + .callback = &umodem_intr_callback, + }, + + [5] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &umodem_intr_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [6] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t) + 2, + .callback = &uvscom_read_status_callback, + .timeout = 1000, /* 1 second */ + }, + + [7] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &uvscom_shutdown_callback, + .timeout = 1000, /* 1 second */ + }, + + [8] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &uvscom_set_line_callback, + .timeout = 1000, /* 1 second */ + }, + + [9] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &uvscom_set_line_coding_callback, + .timeout = 1000, /* 1 second */ + }, + + + + +XXX +}; + +static const struct ucom_callback uvscom_callback = { + .ucom_get_status = &uvscom_get_status, + .ucom_set_dtr = &uvscom_set_dtr, + .ucom_set_rts = &uvscom_set_rts, + .ucom_break = &uvscom_set_break, + .ucom_param = &uvscom_param, + .ucom_ioctl = &uvscom_ioctl, + .ucom_open = &uvscom_open, + .ucom_close = &uvscom_close, + .ucom_start_read = &uvscom_start_read, + .ucom_stop_read = &uvscom_stop_read, + .ucom_start_write = &uvscom_start_write, + .ucom_stop_write = &uvscom_stop_write, +}; + +static const struct usb_devno uvscom_devs [] = { + /* SUNTAC U-Cable type A4 */ + { USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_AS144L4 }, + /* SUNTAC U-Cable type D2 */ + { USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_DS96L }, + /* SUNTAC Ir-Trinity */ + { USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_IS96U }, + /* SUNTAC U-Cable type P1 */ + { USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_PS64P1 }, + /* SUNTAC Slipper U */ + { USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_VS10U }, +}; + +static device_probe_t uvscom_match; +static device_attach_t uvscom_attach; +static device_detach_t uvscom_detach; + +static device_method_t uvscom_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, uvscom_match), + DEVMETHOD(device_attach, uvscom_attach), + DEVMETHOD(device_detach, uvscom_detach), + { 0, 0 } +}; + +static driver_t uvscom_driver = { + "ucom", + uvscom_methods, + sizeof (struct uvscom_softc) +}; + +DRIVER_MODULE(uvscom, uhub, uvscom_driver, ucom_devclass, usbd_driver_load, 0); +MODULE_DEPEND(uvscom, usb, 1, 1, 1); +MODULE_DEPEND(uvscom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); +MODULE_VERSION(uvscom, UVSCOM_MODVER); + +static int uvscomobufsiz = UVSCOM_DEFAULT_OPKTSIZE; +static int uvscominterval = UVSCOM_INTR_INTERVAL; + +remove: + +static int +sysctl_hw_usb_uvscom_opktsize(SYSCTL_HANDLER_ARGS) +{ + int err, val; + + val = uvscomobufsiz; + err = sysctl_handle_int(oidp, &val, sizeof(val), req); + if (err != 0 || req->newptr == NULL) + return (err); + if (0 < val && val <= UVSCOM_OBUFSIZE) + uvscomobufsiz = val; + else + err = EINVAL; + + return (err); +} + +static int +sysctl_hw_usb_uvscom_interval(SYSCTL_HANDLER_ARGS) +{ + int err, val; + + val = uvscominterval; + err = sysctl_handle_int(oidp, &val, sizeof(val), req); + if (err != 0 || req->newptr == NULL) + return (err); + if (0 < val && val <= 1000) + uvscominterval = val; + else + err = EINVAL; + + return (err); +} + +SYSCTL_PROC(_hw_usb_uvscom, OID_AUTO, opktsize, CTLTYPE_INT | CTLFLAG_RW, + 0, sizeof(int), sysctl_hw_usb_uvscom_opktsize, + "I", "uvscom output packet size"); +SYSCTL_PROC(_hw_usb_uvscom, OID_AUTO, interval, CTLTYPE_INT | CTLFLAG_RW, + 0, sizeof(int), sysctl_hw_usb_uvscom_interval, + "I", "uvscom interrpt pipe interval"); + +static int +uvscom_probe(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + + if (uaa->iface) { + return UMATCH_NONE; + } + + return (usb_lookup(uvscom_devs, uaa->vendor, uaa->product) ? + UMATCH_VENDOR_PRODUCT : UMATCH_NONE); +} + +static int +uvscom_attach(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct uvscom_softc *sc = device_get_softc(dev); + usb_interface_descriptor_t *id; + struct usbd_interface *iface; + u_int16_t isize; + int error; + + if (sc == NULL) { + return ENOMEM; + } + + usbd_set_desc(dev, uaa->device); + + DPRINTF(0, "sc=%p\n", sc); + + __callout_init_mtx(&(sc->sc_watchdog), &Giant, + CALLOUT_RETURNUNLOCKED); + + /* configure the device */ + + error = usbd_set_config_index(uaa->device, UVSCOM_CONFIG_INDEX, 1); + if (error) { + device_printf(dev, "failed to set configuration, " + "error=%s\n", usbd_errstr(error)); + goto detach; + } + + iface = usbd_get_iface(uaa->device, UVSCOM_IFACE_INDEX); + + if (iface == NULL) { + DPRINTF(0, "no interface\n"); + goto detach; + } + + id = usbd_get_interface_descriptor(iface); + + if (id == NULL) { + DPRINTF(0, "no interface descriptor\n"); + goto detach; + } + + sc->sc_iface_no = id->bInterfaceNumber; + sc->sc_iface_index = UVSCOM_IFACE_INDEX; + + error = usbd_transfer_setup(uaa->device, sc->sc_iface_index, + sc->sc_xfer, uvscom_config, + UVSCOM_N_TRANSFER, + sc, &Giant, &(uvscom_detach_complete)); + if (error) { + DPRINTF(0, "could not allocate all USB transfers!\n"); + goto detach; + } + + sc->sc_flag |= UVSCOM_FLAG_WAIT_USB; + +isize = UGETW(sc->sc_xfer[->wMaxPacketSize) + + if (isize > UPLCOM_INTR_SIZE) { + DPRINTF(0, "cannot handle an interrupt " + "packet of %d bytes\n", isize); + goto detach; + } + + /* set transfer length */ + sc->sc_xfer_intr[0]->length = isize; + + sc->sc_dtr = -1; + sc->sc_rts = -1; + sc->sc_break = -1; + sc->sc_line_ctrl = UVSCOM_LINE_INIT; + + ucom->sc_parent = sc; + ucom->sc_portno = 0; + ucom->sc_callback = &uvscom_callback; + + error = ucom_attach(&(sc->sc_ucom), dev); + + if (error) { + goto detach; + } + + /* start interrupt pipe */ + + usbd_transfer_start(sc->sc_xfer[4]); + + /* start watchdog (returns unlocked) */ + + mtx_lock(&Giant); + + uvscom_watchdog(sc); + + return 0; + + detach: + uvscom_detach(dev); + return ENXIO; +} + +#if 0 +{ + UCOM_UNK_PORTNO; + /* bulkin, bulkout set above */ + ucom->sc_ibufsize = UVSCOM_IBUFSIZE; + ucom->sc_obufsize = uvscomobufsiz; + ucom->sc_ibufsizepad = UVSCOM_IBUFSIZE; + ucom->sc_opkthdrlen = 0; + } +#endif + +static int +uvscom_detach(device_t dev) +{ + struct umodem_softc *sc = device_get_softc(dev); + int error; + + DPRINTF(0, "sc=%p\n", sc); + + __callout_stop(&(sc->sc_watchdog)); + + /* stop interrupt pipe */ + + if (sc->sc_xfer[4]) { + usbd_transfer_stop(sc->sc_xfer[4]); + } + + ucom_detach(&(sc->sc_ucom)); + + usbd_transfer_unsetup(sc->sc_xfer, UVSCOM_N_TRANSFER); + + /* wait for callbacks to finish */ + + while (sc->sc_flag & UMODEM_FLAG_WAIT_USB) { + + error = msleep(&(sc->sc_wakeup_detach), &Giant, + PRIBIO, "uvscom_sync", 0); + } + + return 0; +} + +static void +uvscom_watchdog(void *arg) +{ + struct uvscom_softc *sc = arg; + + mtx_assert(&Giant, MA_OWNED); + + usbd_transfer_start(sc->sc_xfer[6]); + + __callout_reset(&(sc->sc_watchdog), hz, + &(uvscom_watchdog), sc); + + mtx_unlock(&Giant); + + return; +} + +static void +uvscom_read_status_callback(struct usbd_xfer *xfer) +{ + usb_device_request_t *req = xfer->buffer; + struct uvscom_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_error: + DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); + + tr_transferred: + return; + + tr_setup: + req->bmRequestType = UT_READ_VENDOR_DEVICE; + req->bRequest = UVSCOM_READ_STATUS; + USETW(req->wValue, 0); + USETW(req->wIndex, 0); + USETW(req->wLength, 2); + usbd_start_hardware(xfer); + return; +} + +static usbd_status +uvscom_readstat(struct uvscom_softc *sc) +{ + usbd_transfer_start(sc->sc_xfer[6]); + return USBD_NORMAL_COMPLETION; +} + +static void +uvscom_shutdown_callback(struct usbd_xfer *xfer) +{ + usb_device_request_t *req = xfer->buffer; + struct uvscom_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_error: + DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); + + tr_transferred: + return; + + tr_setup: + req->bmRequestType = UT_WRITE_VENDOR_DEVICE; + req->bRequest = UVSCOM_SHUTDOWN; + USETW(req->wValue, 0); + USETW(req->wIndex, 0); + USETW(req->wLength, 0); + usbd_start_hardware(xfer); + return; +} + +static void +uvscom_shutdown(struct uvscom_softc *sc) +{ + usbd_transfer_start(sc->sc_xfer[7]); + return; +} + +static void +uvscom_set_line_callback(struct usbd_xfer *xfer) +{ + usb_device_request_t *req = xfer->buffer; + struct uvscom_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_error: + DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); + + tr_transferred: + tr_setup: + if (sc->sc_flag & UVSCOM_FLAG_SET_LINE) { + sc->sc_flag &= ~UVSCOM_FLAG_SET_LINE; + + req->bmRequestType = UT_WRITE_VENDOR_DEVICE; + req->bRequest = UVSCOM_LINE_CTL; + USETW(req->wValue, sc->sc_line_ctrl); + USETW(req->wIndex, 0); + USETW(req->wLength, 0); + + usbd_start_hardware(xfer); + } + return; +} + +static void +uvscom_set_line_coding_callback(struct usbd_xfer *xfer) +{ + usb_device_request_t *req = xfer->buffer; + struct uvscom_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_error: + DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); + + tr_transferred: + tr_setup: + if (sc->sc_flag & UVSCOM_FLAG_SET_LINE_SPEED) { + sc->sc_flag &= ~UVSCOM_FLAG_SET_LINE_SPEED; + + req->bmRequestType = UT_WRITE_VENDOR_DEVICE; + req->bRequest = UVSCOM_SET_SPEED; + USETW(req->wValue, sc->sc_line_speed); + USETW(req->wIndex, 0); + USETW(req->wLength, 0); + usbd_start_hardware(xfer); + return; + } + if (sc->sc_flag & UVSCOM_FLAG_SET_LINE_PARM) { + sc->sc_flag &= ~UVSCOM_FLAG_SET_LINE_PARM; + + req->bmRequestType = UT_WRITE_VENDOR_DEVICE; + req->bRequest = UVSCOM_SET_PARAM; + USETW(req->wValue, sc->sc_line_parm); + USETW(req->wIndex, 0); + USETW(req->wLength, 0); + usbd_start_hardware(xfer); + return; + } + return; +} + +static void +uvscom_set_dtr(struct uvscom_softc *sc, u_int8_t onoff) +{ + DPRINTF(0, "onoff = %d\n", onoff); + + if (sc->sc_dtr != onoff) { + sc->sc_dtr = onoff; + + if (onoff) + sc->sc_line_ctrl |= UVSCOM_DTR; + else + sc->sc_line_ctrl &= ~UVSCOM_DTR; + + sc->sc_flag |= UVSCOM_FLAG_SET_LINE; + usbd_transfer_start(sc->sc_xfer[8]); + } + return; +} + +static void +uvscom_set_rts(struct uvscom_softc *sc, u_int8_t onoff) +{ + DPRINTF(0, "onoff = %d\n", onoff); + + if (sc->sc_rts != onoff) { + sc->sc_rts = onoff; + + if (onoff) + sc->sc_line_ctrl |= UVSCOM_RTS; + else + sc->sc_line_ctrl &= ~UVSCOM_RTS; + + sc->sc_flag |= UVSCOM_FLAG_SET_LINE; + usbd_transfer_start(sc->sc_xfer[8]); + } + return; +} + +static void +uvscom_set_break(struct uvscom_softc *sc, u_int8_t onoff) +{ + DPRINTF(0, "onoff = %d\n", onoff); + + if (onoff) + sc->sc_line_ctrl |= UVSCOM_BREAK; + else + sc->sc_line_ctrl &= ~UVSCOM_BREAK; + + sc->sc_flag |= UVSCOM_FLAG_SET_LINE; + usbd_transfer_start(sc->sc_xfer[8]); + return; +} + +static int +uvscom_param(struct ucom_softc *ucom, struct termios *t) +{ + struct uvscom_softc *sc = ucom->sc_parent; + + DPRINTF(0, "\n"); + + switch (t->c_ospeed) { + case B150: + sc->sc_line_speed = UVSCOM_SPEED_150BPS; + break; + case B300: + sc->sc_line_speed = UVSCOM_SPEED_300BPS; + break; + case B600: + sc->sc_line_speed = UVSCOM_SPEED_600BPS; + break; + case B1200: + sc->sc_line_speed = UVSCOM_SPEED_1200BPS; + break; + case B2400: + sc->sc_line_speed = UVSCOM_SPEED_2400BPS; + break; + case B4800: + sc->sc_line_speed = UVSCOM_SPEED_4800BPS; + break; + case B9600: + sc->sc_line_speed = UVSCOM_SPEED_9600BPS; + break; + case B19200: + sc->sc_line_speed = UVSCOM_SPEED_19200BPS; + break; + case B38400: + sc->sc_line_speed = UVSCOM_SPEED_38400BPS; + break; + case B57600: + sc->sc_line_speed = UVSCOM_SPEED_57600BPS; + break; + case B115200: + sc->sc_line_speed = UVSCOM_SPEED_115200BPS; + break; + default: + return (EIO); + } + + sc->sc_line_parm = 0; /* reset */ + + sc->sc_line_parm |= ((t->c_cflag & CSTOPB) ? + UVSCOM_STOP_BIT_2 : UVSCOM_STOP_BIT_1); + + sc->sc_line_parm |= ((t->c_cflag & PARENB) ? + ((t->c_cflag & PARODD) ? + UVSCOM_PARITY_ODD : + UVSCOM_PARITY_EVEN) : + UVSCOM_PARITY_NONE); + + switch (t->c_cflag & CSIZE) { + case CS5: + sc->sc_line_parm |= UVSCOM_DATA_BIT_5; + break; + case CS6: + sc->sc_line_parm |= UVSCOM_DATA_BIT_6; + break; + case CS7: + sc->sc_line_parm |= UVSCOM_DATA_BIT_7; + break; + case CS8: + sc->sc_line_parm |= UVSCOM_DATA_BIT_8; + break; + default: + return EIO; + } + + sc->sc_flag |= (UVSCOM_FLAG_SET_LINE_SPEED| + UVSCOM_FLAG_SET_LINE_PARM); + + usbd_transfer_start(sc->sc_xfer[9]); + + return; +} + +static int +uvscom_open(struct ucom_softc *ucom) +{ + struct uvscom_softc *sc = ucom->sc_parent; + int err; + int i; + + if (sc->sc_ucom.sc_dying) + return (ENXIO); + + DPRINTF(("uvscom_open: sc = %p\n", sc)); + + /* change output packet size */ + sc->sc_ucom.sc_obufsize = uvscomobufsiz; + + + sc->sc_intr_buf = malloc(sc->sc_isize, M_USBDEV, M_WAITOK); + err = usbd_open_pipe_intr(sc->sc_ucom.sc_iface, + sc->sc_intr_number, + USBD_SHORT_XFER_OK, + &sc->sc_intr_pipe, + sc, + sc->sc_intr_buf, + sc->sc_isize, + uvscom_intr, + uvscominterval); + if (err) { + printf("%s: cannot open interrupt pipe (addr %d)\n", + USBDEVNAME(sc->sc_ucom.sc_dev), + sc->sc_intr_number); + return (ENXIO); + } + } else { + DPRINTF(("uvscom_open: did not open interrupt pipe.\n")); + } + + if ((sc->sc_unit_status & UVSCOM_USTAT_MASK) == 0) { + /* unit is not ready */ + + for (i = UVSCOM_UNIT_WAIT; i > 0; --i) { + tsleep(&err, TTIPRI, "uvsop", hz); /* XXX */ + if (ISSET(sc->sc_unit_status, UVSCOM_USTAT_MASK)) + break; + } + if (i == 0) { + DPRINTF(("%s: unit is not ready\n", + USBDEVNAME(sc->sc_ucom.sc_dev))); + return (ENXIO); + } + + /* check PC Card was inserted */ + if (ISSET(sc->sc_unit_status, UVSCOM_NOCARD)) { + DPRINTF(("%s: no card\n", + USBDEVNAME(sc->sc_ucom.sc_dev))); + return (ENXIO); + } + } + + return (0); +} + +static void +uvscom_close(struct ucom_softc *ucom) +{ + struct uvscom_softc *sc = ucom->sc_parent; + int err; + + if (sc->sc_ucom.sc_dying) + return; + + DPRINTF(("uvscom_close: close\n")); + + uvscom_shutdown(sc); + + if (sc->sc_intr_pipe != NULL) { + err = usbd_abort_pipe(sc->sc_intr_pipe); + if (err) + printf("%s: abort interrupt pipe failed: %s\n", + USBDEVNAME(sc->sc_ucom.sc_dev), + usbd_errstr(err)); + err = usbd_close_pipe(sc->sc_intr_pipe); + if (err) + printf("%s: close interrupt pipe failed: %s\n", + USBDEVNAME(sc->sc_ucom.sc_dev), + usbd_errstr(err)); + free(sc->sc_intr_buf, M_USBDEV); + sc->sc_intr_pipe = NULL; + } +} + +static void +uvscom_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) +{ + struct uvscom_softc *sc = priv; + u_int8_t *buf = sc->sc_intr_buf; + u_int8_t pstatus; + + if (sc->sc_ucom.sc_dying) + return; + + if (status != USBD_NORMAL_COMPLETION) { + if (status == USBD_NOT_STARTED || status == USBD_CANCELLED) + return; + + printf("%s: uvscom_intr: abnormal status: %s\n", + USBDEVNAME(sc->sc_ucom.sc_dev), + usbd_errstr(status)); + usbd_clear_endpoint_stall_async(sc->sc_intr_pipe); + return; + } + + DPRINTFN(2, ("%s: uvscom status = %02x %02x\n", + USBDEVNAME(sc->sc_ucom.sc_dev), buf[0], buf[1])); + + sc->sc_lsr = sc->sc_msr = 0; + sc->sc_unit_status = buf[1]; + + pstatus = buf[0]; + if (ISSET(pstatus, UVSCOM_TXRDY)) + SET(sc->sc_lsr, ULSR_TXRDY); + if (ISSET(pstatus, UVSCOM_RXRDY)) + SET(sc->sc_lsr, ULSR_RXRDY); + + pstatus = buf[1]; + if (ISSET(pstatus, UVSCOM_CTS)) + SET(sc->sc_msr, SER_CTS); + if (ISSET(pstatus, UVSCOM_DSR)) + SET(sc->sc_msr, SER_DSR); + if (ISSET(pstatus, UVSCOM_DCD)) + SET(sc->sc_msr, SER_DCD); + + if (sc->sc_flag & UVSCOM_FLAG_OPEN) { + ucom_status_change(&(sc->sc_ucom)); + } + return; +} + +static void +uvscom_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr) +{ + struct uvscom_softc *sc = ucom->sc_parent; + + if (lsr != NULL) + *lsr = sc->sc_lsr; + if (msr != NULL) + *msr = sc->sc_msr; +} + +#if 0 /* TODO */ +static int +uvscom_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, int flag, + usb_proc_ptr p) +{ + struct uvscom_softc *sc = ucom->sc_parent; + int error = 0; + + if (sc->sc_ucom.sc_dying) + return (EIO); + + DPRINTF(("uvscom_ioctl: cmd = 0x%08lx\n", cmd)); + + switch (cmd) { + case TIOCNOTTY: + case TIOCMGET: + case TIOCMSET: + break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 12 05:28:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B96016A41F; Mon, 12 Jun 2006 05:28:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4607116A418 for ; Mon, 12 Jun 2006 05:28:37 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from mail43.e.nsc.no (mail43.e.nsc.no [193.213.115.43]) by mx1.FreeBSD.org (Postfix) with ESMTP id A641A43D45 for ; Mon, 12 Jun 2006 05:28:36 +0000 (GMT) (envelope-from hselasky@c2i.net) Received: from Unknown-00-c0-9f-49-78-d8.lan (ti131310a080-15519.bb.online.no [85.165.252.159]) by mail43.nsc.no (8.13.6/8.13.5) with ESMTP id k5C5SYau021039 for ; Mon, 12 Jun 2006 07:28:34 +0200 (CEST) From: Hans Petter Selasky To: Perforce Change Reviews Date: Mon, 12 Jun 2006 07:28:38 +0200 User-Agent: KMail/1.7 References: <200606120522.k5C5MoPh021416@repoman.freebsd.org> In-Reply-To: <200606120522.k5C5MoPh021416@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200606120728.39146.hselasky@c2i.net> Cc: Subject: Re: PERFORCE change 99035 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, 12 Jun 2006 05:28:37 -0000 On Monday 12 June 2006 07:22, Hans Petter Selasky wrote: > http://perforce.freebsd.org/chv.cgi?CH=99035 > > Change 99035 by hselasky@hselasky_mini_itx on 2006/06/12 05:22:47 > > Compilation fix for FreeBSD-6. > > Affected files ... > > .. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#4 edit > .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#4 edit It was not the meaning to commit "uvscom.c". --HPS From owner-p4-projects@FreeBSD.ORG Mon Jun 12 06:56:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E94A716A46F; Mon, 12 Jun 2006 06:56:06 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7B7B16A41B for ; Mon, 12 Jun 2006 06:56:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A8A043D46 for ; Mon, 12 Jun 2006 06:56:06 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5C6rrnl026322 for ; Mon, 12 Jun 2006 06:53:53 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5C6rqUC026319 for perforce@freebsd.org; Mon, 12 Jun 2006 06:53:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 12 Jun 2006 06:53:52 GMT Message-Id: <200606120653.k5C6rqUC026319@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 99038 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, 12 Jun 2006 06:56:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=99038 Change 99038 by hselasky@hselasky_mini_itx on 2006/06/12 06:53:02 Finished reworking "uvscom.c". Please test! Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uvscom.c#5 (text+ko) ==== @@ -134,13 +134,38 @@ #define UVSCOM_CTS 0x01 #define UVSCOM_USTAT_MASK (UVSCOM_NOCARD | UVSCOM_DSR | UVSCOM_CTS) +/* + * These are the maximum number of bytes transferred per frame. + * The output buffer size cannot be increased due to the size encoding. + */ +#define UVSCOM_IBUFSIZE 512 /* bytes */ +#define UVSCOM_OBUFSIZE 64 /* bytes */ +#define UVSCOM_INTR_SIZE 64 /* bytes */ + +#ifndef UVSCOM_DEFAULT_OPKTSIZE +#define UVSCOM_DEFAULT_OPKTSIZE 8 +#endif + +#define UVSCOM_N_TRANSFER 10 + struct uvscom_softc { struct ucom_softc sc_ucom; struct __callout sc_watchdog; + struct usbd_xfer * sc_xfer[UVSCOM_N_TRANSFER]; + u_int16_t sc_line_ctrl; /* line control register */ u_int16_t sc_line_speed; /* line speed */ u_int16_t sc_line_param; /* line parameters */ + u_int16_t sc_flag; +#define UVSCOM_FLAG_WAIT_USB 0x0001 +#define UVSCOM_FLAG_WRITE_STALL 0x0002 +#define UVSCOM_FLAG_READ_STALL 0x0004 +#define UVSCOM_FLAG_INTR_STALL 0x0008 +#define UVSCOM_FLAG_OPEN 0x0010 +#define UVSCOM_FLAG_SET_LINE 0x0020 +#define UVSCOM_FLAG_SET_LINE_SPEED 0x0040 +#define UVSCOM_FLAG_SET_LINE_PARM 0x0080 u_int8_t sc_iface_no; /* interface number */ u_int8_t sc_iface_index; /* interface index */ @@ -148,37 +173,89 @@ u_int8_t sc_rts; /* current RTS state */ u_int8_t sc_lsr; /* local status register */ u_int8_t sc_msr; /* uvscom status register */ + u_int8_t sc_unit_status; /* unit status */ + u_int8_t sc_wakeup_detach; /* dummy */ +}; - XXX: - int sc_iface_number;/* interface number */ +static device_probe_t uvscom_probe; +static device_attach_t uvscom_attach; +static device_detach_t uvscom_detach; + +static void +uvscom_detach_complete(struct usbd_memory_info *info); + +static void +uvscom_watchdog(void *arg); + +static void +uvscom_write_callback(struct usbd_xfer *xfer); + +static void +uvscom_write_clear_stall_callback(struct usbd_xfer *xfer); + +static void +uvscom_read_callback(struct usbd_xfer *xfer); + +static void +uvscom_read_clear_stall_callback(struct usbd_xfer *xfer); + +static void +uvscom_intr_callback(struct usbd_xfer *xfer); + +static void +uvscom_intr_clear_stall_callback(struct usbd_xfer *xfer); + +static void +uvscom_read_status_callback(struct usbd_xfer *xfer); + +static void +uvscom_shutdown_callback(struct usbd_xfer *xfer); + +static void +uvscom_set_line_callback(struct usbd_xfer *xfer); + +static void +uvscom_set_line_coding_callback(struct usbd_xfer *xfer); + +static void +uvscom_set_dtr(struct ucom_softc *ucom, u_int8_t onoff); + +static void +uvscom_set_rts(struct ucom_softc *ucom, u_int8_t onoff); + +static void +uvscom_set_break(struct ucom_softc *ucom, u_int8_t onoff); + +static int +uvscom_param(struct ucom_softc *ucom, struct termios *t); + +static int +uvscom_open(struct ucom_softc *ucom); - usbd_interface_handle sc_intr_iface; /* interrupt interface */ - int sc_intr_number; /* interrupt number */ - usbd_pipe_handle sc_intr_pipe; /* interrupt pipe */ - u_int8_t *sc_intr_buf; /* interrupt buffer */ - int sc_isize; +static void +uvscom_close(struct ucom_softc *ucom); +static void +uvscom_start_read(struct ucom_softc *ucom); - u_int8_t sc_unit_status; /* unit status */ +static void +uvscom_stop_read(struct ucom_softc *ucom); - struct task sc_task; -}; +static void +uvscom_start_write(struct ucom_softc *ucom); -/* - * These are the maximum number of bytes transferred per frame. - * The output buffer size cannot be increased due to the size encoding. - */ -#define UVSCOM_IBUFSIZE 512 -#define UVSCOM_OBUFSIZE 64 +static void +uvscom_stop_write(struct ucom_softc *ucom); -#ifndef UVSCOM_DEFAULT_OPKTSIZE -#define UVSCOM_DEFAULT_OPKTSIZE 8 -#endif +static void +uvscom_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr); -#define UVSCOM_N_TRANSFER X +static int +uvscom_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, int fflag, + struct thread *td); -static const struct usbd_config umodem_config_data[UVSCOM_N_TRANSFER] = { +static const struct usbd_config uvscom_config[UVSCOM_N_TRANSFER] = { [0] = { .type = UE_BULK, @@ -186,7 +263,7 @@ .direction = UE_DIR_OUT, .bufsize = UVSCOM_OBUFSIZE, .flags = 0, - .callback = &umodem_write_callback, + .callback = &uvscom_write_callback, }, [1] = { @@ -195,7 +272,7 @@ .direction = UE_DIR_IN, .bufsize = UVSCOM_IBUFSIZE, .flags = USBD_SHORT_XFER_OK, - .callback = &umodem_read_callback, + .callback = &uvscom_read_callback, }, [2] = { @@ -203,7 +280,7 @@ .endpoint = 0x00, /* Control pipe */ .direction = -1, .bufsize = sizeof(usb_device_request_t), - .callback = &umodem_write_clear_stall_callback, + .callback = &uvscom_write_clear_stall_callback, .timeout = 1000, /* 1 second */ }, @@ -212,7 +289,7 @@ .endpoint = 0x00, /* Control pipe */ .direction = -1, .bufsize = sizeof(usb_device_request_t), - .callback = &umodem_read_clear_stall_callback, + .callback = &uvscom_read_clear_stall_callback, .timeout = 1000, /* 1 second */ }, @@ -221,8 +298,8 @@ .endpoint = -1, /* any */ .direction = UE_DIR_IN, .flags = USBD_SHORT_XFER_OK, - .bufsize = XXX, - .callback = &umodem_intr_callback, + .bufsize = UVSCOM_INTR_SIZE, + .callback = &uvscom_intr_callback, }, [5] = { @@ -230,7 +307,7 @@ .endpoint = 0x00, /* Control pipe */ .direction = -1, .bufsize = sizeof(usb_device_request_t), - .callback = &umodem_intr_clear_stall_callback, + .callback = &uvscom_intr_clear_stall_callback, .timeout = 1000, /* 1 second */ }, @@ -269,26 +346,21 @@ .callback = &uvscom_set_line_coding_callback, .timeout = 1000, /* 1 second */ }, - - - - -XXX }; static const struct ucom_callback uvscom_callback = { - .ucom_get_status = &uvscom_get_status, - .ucom_set_dtr = &uvscom_set_dtr, - .ucom_set_rts = &uvscom_set_rts, - .ucom_break = &uvscom_set_break, - .ucom_param = &uvscom_param, - .ucom_ioctl = &uvscom_ioctl, - .ucom_open = &uvscom_open, - .ucom_close = &uvscom_close, - .ucom_start_read = &uvscom_start_read, - .ucom_stop_read = &uvscom_stop_read, - .ucom_start_write = &uvscom_start_write, - .ucom_stop_write = &uvscom_stop_write, + .ucom_get_status = &uvscom_get_status, + .ucom_set_dtr = &uvscom_set_dtr, + .ucom_set_rts = &uvscom_set_rts, + .ucom_set_break = &uvscom_set_break, + .ucom_param = &uvscom_param, + .ucom_ioctl = &uvscom_ioctl, + .ucom_open = &uvscom_open, + .ucom_close = &uvscom_close, + .ucom_start_read = &uvscom_start_read, + .ucom_stop_read = &uvscom_stop_read, + .ucom_start_write = &uvscom_start_write, + .ucom_stop_write = &uvscom_stop_write, }; static const struct usb_devno uvscom_devs [] = { @@ -304,22 +376,17 @@ { USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_VS10U }, }; -static device_probe_t uvscom_match; -static device_attach_t uvscom_attach; -static device_detach_t uvscom_detach; - static device_method_t uvscom_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, uvscom_match), - DEVMETHOD(device_attach, uvscom_attach), - DEVMETHOD(device_detach, uvscom_detach), - { 0, 0 } + DEVMETHOD(device_probe, uvscom_probe), + DEVMETHOD(device_attach, uvscom_attach), + DEVMETHOD(device_detach, uvscom_detach), + { 0, 0 } }; static driver_t uvscom_driver = { - "ucom", - uvscom_methods, - sizeof (struct uvscom_softc) + .name = "ucom", + .methods = uvscom_methods, + .size = sizeof (struct uvscom_softc), }; DRIVER_MODULE(uvscom, uhub, uvscom_driver, ucom_devclass, usbd_driver_load, 0); @@ -327,53 +394,7 @@ MODULE_DEPEND(uvscom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); MODULE_VERSION(uvscom, UVSCOM_MODVER); -static int uvscomobufsiz = UVSCOM_DEFAULT_OPKTSIZE; -static int uvscominterval = UVSCOM_INTR_INTERVAL; - -remove: - static int -sysctl_hw_usb_uvscom_opktsize(SYSCTL_HANDLER_ARGS) -{ - int err, val; - - val = uvscomobufsiz; - err = sysctl_handle_int(oidp, &val, sizeof(val), req); - if (err != 0 || req->newptr == NULL) - return (err); - if (0 < val && val <= UVSCOM_OBUFSIZE) - uvscomobufsiz = val; - else - err = EINVAL; - - return (err); -} - -static int -sysctl_hw_usb_uvscom_interval(SYSCTL_HANDLER_ARGS) -{ - int err, val; - - val = uvscominterval; - err = sysctl_handle_int(oidp, &val, sizeof(val), req); - if (err != 0 || req->newptr == NULL) - return (err); - if (0 < val && val <= 1000) - uvscominterval = val; - else - err = EINVAL; - - return (err); -} - -SYSCTL_PROC(_hw_usb_uvscom, OID_AUTO, opktsize, CTLTYPE_INT | CTLFLAG_RW, - 0, sizeof(int), sysctl_hw_usb_uvscom_opktsize, - "I", "uvscom output packet size"); -SYSCTL_PROC(_hw_usb_uvscom, OID_AUTO, interval, CTLTYPE_INT | CTLFLAG_RW, - 0, sizeof(int), sysctl_hw_usb_uvscom_interval, - "I", "uvscom interrpt pipe interval"); - -static int uvscom_probe(device_t dev) { struct usb_attach_arg *uaa = device_get_ivars(dev); @@ -444,25 +465,25 @@ sc->sc_flag |= UVSCOM_FLAG_WAIT_USB; -isize = UGETW(sc->sc_xfer[->wMaxPacketSize) + + isize = UGETW(sc->sc_xfer[4]->pipe->edesc->wMaxPacketSize); - if (isize > UPLCOM_INTR_SIZE) { + if (isize > UVSCOM_INTR_SIZE) { DPRINTF(0, "cannot handle an interrupt " "packet of %d bytes\n", isize); goto detach; } - /* set transfer length */ - sc->sc_xfer_intr[0]->length = isize; + /* set interrupt transfer length */ + sc->sc_xfer[4]->length = isize; sc->sc_dtr = -1; sc->sc_rts = -1; - sc->sc_break = -1; sc->sc_line_ctrl = UVSCOM_LINE_INIT; - ucom->sc_parent = sc; - ucom->sc_portno = 0; - ucom->sc_callback = &uvscom_callback; + sc->sc_ucom.sc_parent = sc; + sc->sc_ucom.sc_portno = 0; + sc->sc_ucom.sc_callback = &uvscom_callback; error = ucom_attach(&(sc->sc_ucom), dev); @@ -487,21 +508,27 @@ return ENXIO; } -#if 0 +static void +uvscom_detach_complete(struct usbd_memory_info *info) { - UCOM_UNK_PORTNO; - /* bulkin, bulkout set above */ - ucom->sc_ibufsize = UVSCOM_IBUFSIZE; - ucom->sc_obufsize = uvscomobufsiz; - ucom->sc_ibufsizepad = UVSCOM_IBUFSIZE; - ucom->sc_opkthdrlen = 0; - } -#endif + struct uvscom_softc *sc = info->priv_sc; + + mtx_lock(&Giant); + + if (sc->sc_flag & UVSCOM_FLAG_WAIT_USB) { + sc->sc_flag &= ~UVSCOM_FLAG_WAIT_USB; + wakeup(&(sc->sc_wakeup_detach)); + } + + mtx_unlock(&Giant); + + return; +} static int uvscom_detach(device_t dev) { - struct umodem_softc *sc = device_get_softc(dev); + struct uvscom_softc *sc = device_get_softc(dev); int error; DPRINTF(0, "sc=%p\n", sc); @@ -520,7 +547,7 @@ /* wait for callbacks to finish */ - while (sc->sc_flag & UMODEM_FLAG_WAIT_USB) { + while (sc->sc_flag & UVSCOM_FLAG_WAIT_USB) { error = msleep(&(sc->sc_wakeup_detach), &Giant, PRIBIO, "uvscom_sync", 0); @@ -547,10 +574,191 @@ } static void +uvscom_write_callback(struct usbd_xfer *xfer) +{ + struct uvscom_softc *sc = xfer->priv_sc; + u_int32_t actlen; + + USBD_CHECK_STATUS(xfer); + +tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flag |= UVSCOM_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer[2]); + } + return; + +tr_setup: +tr_transferred: + if (sc->sc_flag & UVSCOM_FLAG_WRITE_STALL) { + usbd_transfer_start(sc->sc_xfer[2]); + return; + } + + if(ucom_get_data(&(sc->sc_ucom), xfer->buffer, UVSCOM_OBUFSIZE, &actlen)) { + + xfer->length = actlen; + + usbd_start_hardware(xfer); + } + return; +} + +static void +uvscom_write_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct uvscom_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, sc->sc_xfer[0]); + return; + + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, sc->sc_xfer[0]); + sc->sc_flag &= ~UVSCOM_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer[0]); + return; + + tr_error: + sc->sc_flag &= ~UVSCOM_FLAG_WRITE_STALL; + DPRINTF(0, "clear stall failed, error=%s\n", + usbd_errstr(xfer->error)); + return; +} + +static void +uvscom_read_callback(struct usbd_xfer *xfer) +{ + struct uvscom_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flag |= UVSCOM_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer[3]); + } + return; + + tr_transferred: + ucom_put_data(&(sc->sc_ucom), xfer->buffer, xfer->actlen); + + tr_setup: + if (sc->sc_flag & UVSCOM_FLAG_READ_STALL) { + usbd_transfer_start(sc->sc_xfer[3]); + } else { + usbd_start_hardware(xfer); + } + return; +} + +static void +uvscom_read_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct uvscom_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, sc->sc_xfer[1]); + return; + + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, sc->sc_xfer[1]); + sc->sc_flag &= ~UVSCOM_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer[1]); + return; + + tr_error: + sc->sc_flag &= ~UVSCOM_FLAG_READ_STALL; + DPRINTF(0, "clear stall failed, error=%s\n", + usbd_errstr(xfer->error)); + return; +} + +static void +uvscom_intr_callback(struct usbd_xfer *xfer) +{ + struct uvscom_softc *sc = xfer->priv_sc; + u_int8_t *buf = xfer->buffer; + + USBD_CHECK_STATUS(xfer); + + tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flag |= UVSCOM_FLAG_INTR_STALL; + usbd_transfer_start(sc->sc_xfer[5]); + } + return; + + tr_transferred: + if (xfer->actlen >= 2) { + sc->sc_lsr = 0; + sc->sc_msr = 0; + sc->sc_unit_status = buf[1]; + + if (buf[0] & UVSCOM_TXRDY) { + sc->sc_lsr |= ULSR_TXRDY; + } + if (buf[0] & UVSCOM_RXRDY) { + sc->sc_lsr |= ULSR_RXRDY; + } + if (buf[1] & UVSCOM_CTS) { + sc->sc_msr |= SER_CTS; + } + if (buf[1] & UVSCOM_DSR) { + sc->sc_msr |= SER_DSR; + } + if (buf[1] & UVSCOM_DCD) { + sc->sc_msr |= SER_DCD; + } + + if (sc->sc_flag & UVSCOM_FLAG_OPEN) { + ucom_status_change(&(sc->sc_ucom)); + } + } + tr_setup: + if (sc->sc_flag & UVSCOM_FLAG_INTR_STALL) { + usbd_transfer_start(sc->sc_xfer[5]); + } else { + usbd_start_hardware(xfer); + } + return; +} + +static void +uvscom_intr_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct uvscom_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, sc->sc_xfer[4]); + return; + + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, sc->sc_xfer[4]); + sc->sc_flag &= ~UVSCOM_FLAG_INTR_STALL; + usbd_transfer_start(sc->sc_xfer[4]); + return; + + tr_error: + sc->sc_flag &= ~UVSCOM_FLAG_INTR_STALL; + DPRINTF(0, "clear stall failed, error=%s\n", + usbd_errstr(xfer->error)); + return; +} + +static void uvscom_read_status_callback(struct usbd_xfer *xfer) { usb_device_request_t *req = xfer->buffer; - struct uvscom_softc *sc = xfer->priv_sc; USBD_CHECK_STATUS(xfer); @@ -570,18 +778,10 @@ return; } -static usbd_status -uvscom_readstat(struct uvscom_softc *sc) -{ - usbd_transfer_start(sc->sc_xfer[6]); - return USBD_NORMAL_COMPLETION; -} - static void uvscom_shutdown_callback(struct usbd_xfer *xfer) { usb_device_request_t *req = xfer->buffer; - struct uvscom_softc *sc = xfer->priv_sc; USBD_CHECK_STATUS(xfer); @@ -602,13 +802,6 @@ } static void -uvscom_shutdown(struct uvscom_softc *sc) -{ - usbd_transfer_start(sc->sc_xfer[7]); - return; -} - -static void uvscom_set_line_callback(struct usbd_xfer *xfer) { usb_device_request_t *req = xfer->buffer; @@ -664,7 +857,7 @@ req->bmRequestType = UT_WRITE_VENDOR_DEVICE; req->bRequest = UVSCOM_SET_PARAM; - USETW(req->wValue, sc->sc_line_parm); + USETW(req->wValue, sc->sc_line_param); USETW(req->wIndex, 0); USETW(req->wLength, 0); usbd_start_hardware(xfer); @@ -674,8 +867,10 @@ } static void -uvscom_set_dtr(struct uvscom_softc *sc, u_int8_t onoff) +uvscom_set_dtr(struct ucom_softc *ucom, u_int8_t onoff) { + struct uvscom_softc *sc = ucom->sc_parent; + DPRINTF(0, "onoff = %d\n", onoff); if (sc->sc_dtr != onoff) { @@ -693,8 +888,10 @@ } static void -uvscom_set_rts(struct uvscom_softc *sc, u_int8_t onoff) +uvscom_set_rts(struct ucom_softc *ucom, u_int8_t onoff) { + struct uvscom_softc *sc = ucom->sc_parent; + DPRINTF(0, "onoff = %d\n", onoff); if (sc->sc_rts != onoff) { @@ -712,8 +909,10 @@ } static void -uvscom_set_break(struct uvscom_softc *sc, u_int8_t onoff) +uvscom_set_break(struct ucom_softc *ucom, u_int8_t onoff) { + struct uvscom_softc *sc = ucom->sc_parent; + DPRINTF(0, "onoff = %d\n", onoff); if (onoff) @@ -771,12 +970,12 @@ return (EIO); } - sc->sc_line_parm = 0; /* reset */ + sc->sc_line_param = 0; /* reset */ - sc->sc_line_parm |= ((t->c_cflag & CSTOPB) ? + sc->sc_line_param |= ((t->c_cflag & CSTOPB) ? UVSCOM_STOP_BIT_2 : UVSCOM_STOP_BIT_1); - sc->sc_line_parm |= ((t->c_cflag & PARENB) ? + sc->sc_line_param |= ((t->c_cflag & PARENB) ? ((t->c_cflag & PARODD) ? UVSCOM_PARITY_ODD : UVSCOM_PARITY_EVEN) : @@ -784,16 +983,16 @@ switch (t->c_cflag & CSIZE) { case CS5: - sc->sc_line_parm |= UVSCOM_DATA_BIT_5; + sc->sc_line_param |= UVSCOM_DATA_BIT_5; break; case CS6: - sc->sc_line_parm |= UVSCOM_DATA_BIT_6; + sc->sc_line_param |= UVSCOM_DATA_BIT_6; break; case CS7: - sc->sc_line_parm |= UVSCOM_DATA_BIT_7; + sc->sc_line_param |= UVSCOM_DATA_BIT_7; break; case CS8: - sc->sc_line_parm |= UVSCOM_DATA_BIT_8; + sc->sc_line_param |= UVSCOM_DATA_BIT_8; break; default: return EIO; @@ -804,143 +1003,73 @@ usbd_transfer_start(sc->sc_xfer[9]); - return; + return 0; } static int uvscom_open(struct ucom_softc *ucom) { struct uvscom_softc *sc = ucom->sc_parent; - int err; - int i; - if (sc->sc_ucom.sc_dying) - return (ENXIO); + DPRINTF(0, "sc = %p\n", sc); - DPRINTF(("uvscom_open: sc = %p\n", sc)); + sc->sc_flag |= UVSCOM_FLAG_OPEN; - /* change output packet size */ - sc->sc_ucom.sc_obufsize = uvscomobufsiz; + /* check if PC card was inserted */ - - sc->sc_intr_buf = malloc(sc->sc_isize, M_USBDEV, M_WAITOK); - err = usbd_open_pipe_intr(sc->sc_ucom.sc_iface, - sc->sc_intr_number, - USBD_SHORT_XFER_OK, - &sc->sc_intr_pipe, - sc, - sc->sc_intr_buf, - sc->sc_isize, - uvscom_intr, - uvscominterval); - if (err) { - printf("%s: cannot open interrupt pipe (addr %d)\n", - USBDEVNAME(sc->sc_ucom.sc_dev), - sc->sc_intr_number); - return (ENXIO); - } - } else { - DPRINTF(("uvscom_open: did not open interrupt pipe.\n")); + if (sc->sc_unit_status & UVSCOM_NOCARD) { + DPRINTF(0, "no PC card!\n"); + return ENXIO; } - if ((sc->sc_unit_status & UVSCOM_USTAT_MASK) == 0) { - /* unit is not ready */ - - for (i = UVSCOM_UNIT_WAIT; i > 0; --i) { - tsleep(&err, TTIPRI, "uvsop", hz); /* XXX */ - if (ISSET(sc->sc_unit_status, UVSCOM_USTAT_MASK)) - break; - } - if (i == 0) { - DPRINTF(("%s: unit is not ready\n", - USBDEVNAME(sc->sc_ucom.sc_dev))); - return (ENXIO); - } - - /* check PC Card was inserted */ - if (ISSET(sc->sc_unit_status, UVSCOM_NOCARD)) { - DPRINTF(("%s: no card\n", - USBDEVNAME(sc->sc_ucom.sc_dev))); - return (ENXIO); - } - } - - return (0); + return 0; } static void uvscom_close(struct ucom_softc *ucom) { struct uvscom_softc *sc = ucom->sc_parent; - int err; - if (sc->sc_ucom.sc_dying) - return; + DPRINTF(0, "sc=%p\n", sc); - DPRINTF(("uvscom_close: close\n")); + usbd_transfer_start(sc->sc_xfer[7]); - uvscom_shutdown(sc); + sc->sc_flag &= ~UVSCOM_FLAG_OPEN; - if (sc->sc_intr_pipe != NULL) { - err = usbd_abort_pipe(sc->sc_intr_pipe); - if (err) - printf("%s: abort interrupt pipe failed: %s\n", - USBDEVNAME(sc->sc_ucom.sc_dev), - usbd_errstr(err)); - err = usbd_close_pipe(sc->sc_intr_pipe); - if (err) - printf("%s: close interrupt pipe failed: %s\n", - USBDEVNAME(sc->sc_ucom.sc_dev), - usbd_errstr(err)); - free(sc->sc_intr_buf, M_USBDEV); - sc->sc_intr_pipe = NULL; - } + return; } static void -uvscom_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) +uvscom_start_read(struct ucom_softc *ucom) { - struct uvscom_softc *sc = priv; - u_int8_t *buf = sc->sc_intr_buf; - u_int8_t pstatus; + struct uvscom_softc *sc = ucom->sc_parent; + usbd_transfer_start(sc->sc_xfer[1]); + return; +} - if (sc->sc_ucom.sc_dying) - return; +static void +uvscom_stop_read(struct ucom_softc *ucom) +{ + struct uvscom_softc *sc = ucom->sc_parent; + usbd_transfer_stop(sc->sc_xfer[3]); + usbd_transfer_stop(sc->sc_xfer[1]); + return; +} - if (status != USBD_NORMAL_COMPLETION) { - if (status == USBD_NOT_STARTED || status == USBD_CANCELLED) - return; +static void +uvscom_start_write(struct ucom_softc *ucom) +{ + struct uvscom_softc *sc = ucom->sc_parent; + usbd_transfer_start(sc->sc_xfer[0]); + return; +} - printf("%s: uvscom_intr: abnormal status: %s\n", - USBDEVNAME(sc->sc_ucom.sc_dev), - usbd_errstr(status)); - usbd_clear_endpoint_stall_async(sc->sc_intr_pipe); - return; - } - - DPRINTFN(2, ("%s: uvscom status = %02x %02x\n", - USBDEVNAME(sc->sc_ucom.sc_dev), buf[0], buf[1])); - - sc->sc_lsr = sc->sc_msr = 0; - sc->sc_unit_status = buf[1]; - - pstatus = buf[0]; - if (ISSET(pstatus, UVSCOM_TXRDY)) - SET(sc->sc_lsr, ULSR_TXRDY); - if (ISSET(pstatus, UVSCOM_RXRDY)) - SET(sc->sc_lsr, ULSR_RXRDY); - - pstatus = buf[1]; - if (ISSET(pstatus, UVSCOM_CTS)) - SET(sc->sc_msr, SER_CTS); - if (ISSET(pstatus, UVSCOM_DSR)) - SET(sc->sc_msr, SER_DSR); - if (ISSET(pstatus, UVSCOM_DCD)) - SET(sc->sc_msr, SER_DCD); - - if (sc->sc_flag & UVSCOM_FLAG_OPEN) { - ucom_status_change(&(sc->sc_ucom)); - } +static void +uvscom_stop_write(struct ucom_softc *ucom) +{ + struct uvscom_softc *sc = ucom->sc_parent; + usbd_transfer_stop(sc->sc_xfer[2]); + usbd_transfer_stop(sc->sc_xfer[0]); return; } @@ -949,37 +1078,33 @@ { struct uvscom_softc *sc = ucom->sc_parent; - if (lsr != NULL) - *lsr = sc->sc_lsr; - if (msr != NULL) - *msr = sc->sc_msr; + if (lsr) { + *lsr = sc->sc_lsr; + } + if (msr) { + *msr = sc->sc_msr; + } + return; } -#if 0 /* TODO */ static int -uvscom_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, int flag, - usb_proc_ptr p) +uvscom_ioctl(struct ucom_softc *ucom, u_long cmd, caddr_t data, int fflag, + struct thread *td) { - struct uvscom_softc *sc = ucom->sc_parent; - int error = 0; + int error = ENOTTY; - if (sc->sc_ucom.sc_dying) - return (EIO); - - DPRINTF(("uvscom_ioctl: cmd = 0x%08lx\n", cmd)); + DPRINTF(0, "cmd = 0x%08lx\n", cmd); switch (cmd) { case TIOCNOTTY: case TIOCMGET: case TIOCMSET: - break; + break; default: - DPRINTF(("uvscom_ioctl: unknown\n")); - error = ENOTTY; - break; + DPRINTF(0, "unknown\n"); + error = ENOTTY; + break; } - - return (error); + return error; } -#endif From owner-p4-projects@FreeBSD.ORG Mon Jun 12 07:50:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D710A16A473; Mon, 12 Jun 2006 07:50:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6893416A41F for ; Mon, 12 Jun 2006 07:50:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19DE443D48 for ; Mon, 12 Jun 2006 07:50:14 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5C7m0TV029660 for ; Mon, 12 Jun 2006 07:48:00 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5C7m0RN029656 for perforce@freebsd.org; Mon, 12 Jun 2006 07:48:00 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 12 Jun 2006 07:48:00 GMT Message-Id: <200606120748.k5C7m0RN029656@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 99040 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, 12 Jun 2006 07:50:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=99040 Change 99040 by hselasky@hselasky_mini_itx on 2006/06/12 07:47:19 New feature: If bufsize == 0, use wMaxPacketSize instead when configuring USB transfers. This is useful for setting up interrupt transfers. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/README#3 edit .. //depot/projects/usb/src/sys/dev/usb/ehci.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/README#3 (text+ko) ==== @@ -211,8 +211,10 @@ USBD_USE_POLLING USBD_SELF_DESTRUCT -- The "bufsize" field sets the total pipe buffer size in bytes. This - field is mandatory. +- The "bufsize" field sets the total pipe buffer size in bytes. If + this field is zero, "wMaxPacketSize" will be used. This is useful for + setting up interrupt pipes. For control transfers "bufsize" includes the + length of the request structure. This field is mandatory. - The "callback" field sets the USB callback. This field is mandatory. ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#4 (text+ko) ==== @@ -3417,7 +3417,6 @@ xfer->usb_mtx = &sc->sc_bus.mtx; xfer->usb_root = info; xfer->flags = setup->flags; - xfer->length = setup->bufsize; xfer->nframes = setup->frames; xfer->timeout = setup->timeout; xfer->callback = setup->callback; @@ -3453,6 +3452,12 @@ xfer->endpoint = xfer->pipe->edesc->bEndpointAddress; xfer->max_packet_size = UGETW(xfer->pipe->edesc->wMaxPacketSize); + xfer->length = setup->bufsize; + + if (xfer->length == 0) { + xfer->length = xfer->max_packet_size; + } + /* wMaxPacketSize is validated by "usbd_fill_iface_data()" */ /* @@ -3544,7 +3549,7 @@ xfer->physbuffer = (physbuffer + size); } - size += setup->bufsize; + size += xfer->length; /* memory is allocated at * highest alignment ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#4 (text+ko) ==== @@ -2421,7 +2421,6 @@ xfer->usb_mtx = &sc->sc_bus.mtx; xfer->usb_root = info; xfer->flags = setup->flags; - xfer->length = setup->bufsize; xfer->nframes = setup->frames; xfer->timeout = setup->timeout; xfer->callback = setup->callback; @@ -2476,6 +2475,12 @@ xfer->endpoint = xfer->pipe->edesc->bEndpointAddress; xfer->max_packet_size = UGETW(xfer->pipe->edesc->wMaxPacketSize); + xfer->length = setup->bufsize; + + if (xfer->length == 0) { + xfer->length = xfer->max_packet_size; + } + /* wMaxPacketSize is validated by "usbd_fill_iface_data()" */ /* @@ -2492,7 +2497,7 @@ } else if(xfer->pipe->methods == &ohci_device_isoc_methods) { - nitd = (setup->bufsize / OHCI_PAGE_SIZE) + + nitd = (xfer->length / OHCI_PAGE_SIZE) + (max_frames / OHCI_ITD_NOFFSET) + 1 /* EXTRA */; ntd = 0; } @@ -2536,7 +2541,7 @@ xfer->physbuffer = (physbuffer + size); } - size += setup->bufsize; + size += xfer->length; size += ((-size) & (OHCI_ITD_ALIGN-1)); /* align data */ ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#4 (text+ko) ==== @@ -2711,7 +2711,6 @@ xfer->usb_mtx = &sc->sc_bus.mtx; xfer->usb_root = info; xfer->flags = setup->flags; - xfer->length = setup->bufsize; xfer->nframes = setup->frames; xfer->timeout = setup->timeout; xfer->callback = setup->callback; @@ -2747,6 +2746,12 @@ xfer->endpoint = xfer->pipe->edesc->bEndpointAddress; xfer->max_packet_size = UGETW(xfer->pipe->edesc->wMaxPacketSize); + xfer->length = setup->bufsize; + + if (xfer->length == 0) { + xfer->length = xfer->max_packet_size; + } + /* wMaxPacketSize is validated by "usbd_fill_iface_data()" */ /* @@ -2806,7 +2811,7 @@ xfer->physbuffer = (physbuffer + size); } - size += setup->bufsize; + size += xfer->length; size += ((-size) & (UHCI_TD_ALIGN-1)); /* align data */ ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#4 (text+ko) ==== @@ -251,8 +251,7 @@ for(setup = setup_start, n = n_setup; n--; setup++) { - if((setup->bufsize == 0) || - (setup->bufsize == 0xffffffff)) + if(setup->bufsize == 0xffffffff) { error = USBD_BAD_BUFSIZE; PRINTF(("invalid bufsize\n")); From owner-p4-projects@FreeBSD.ORG Mon Jun 12 08:36:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04A6116A4AC; Mon, 12 Jun 2006 08:36:12 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D48FC16A49C for ; Mon, 12 Jun 2006 08:36:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 919FA43D49 for ; Mon, 12 Jun 2006 08:36:11 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5C8XvXO032657 for ; Mon, 12 Jun 2006 08:33:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5C8Xv1o032654 for perforce@freebsd.org; Mon, 12 Jun 2006 08:33:57 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 12 Jun 2006 08:33:57 GMT Message-Id: <200606120833.k5C8Xv1o032654@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 99041 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, 12 Jun 2006 08:36:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=99041 Change 99041 by hselasky@hselasky_mini_itx on 2006/06/12 08:33:23 Use wMaxPacketSize for interrupt endpoints. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhid.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhid.c#6 (text+ko) ==== @@ -137,13 +137,13 @@ tr_transferred: DPRINTF(0, "transferred!\n"); - if (xfer->actlen == sc->sc_isize) { + if (xfer->actlen >= sc->sc_isize) { usb_cdev_put_data(&(sc->sc_cdev), - xfer->buffer, xfer->actlen, 1); + xfer->buffer, sc->sc_isize, 1); } else { /* ignore it */ - DPRINTF(0, "ignored short transfer, %d bytes\n", - xfer->actlen); + DPRINTF(0, "ignored short transfer, " + "%d bytes\n", xfer->actlen); } tr_setup: @@ -153,7 +153,6 @@ USBD_IF_POLL(&(sc->sc_cdev.sc_rdq_free), m); if (m) { - xfer->length = sc->sc_isize; usbd_start_hardware(xfer); } } @@ -310,7 +309,7 @@ .endpoint = -1, /* any */ .direction = UE_DIR_IN, .flags = USBD_SHORT_XFER_OK, - .bufsize = UHID_BSIZE, /* bytes */ + .bufsize = 0, /* use wMaxPacketSize */ .callback = &uhid_intr_callback, }, ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#5 (text+ko) ==== @@ -570,7 +570,7 @@ .endpoint = -1, /* any */ .direction = UE_DIR_IN, .flags = USBD_SHORT_XFER_OK, - .bufsize = sizeof(struct ukbd_data), /* bytes */ + .bufsize = 0, /* use wMaxPacketSize */ .callback = &ukbd_intr_callback, }, ==== //depot/projects/usb/src/sys/dev/usb/umodem.c#6 (text+ko) ==== @@ -317,7 +317,7 @@ .endpoint = -1, /* any */ .direction = UE_DIR_IN, .flags = USBD_SHORT_XFER_OK, - .bufsize = sizeof(usb_cdc_notification_t), + .bufsize = 0, /* use wMaxPacketSize */ .callback = &umodem_intr_callback, }, @@ -759,6 +759,7 @@ { usb_cdc_notification_t *nbuf = xfer->buffer; struct umodem_softc *sc = xfer->priv_sc; + u_int16_t wLength; USBD_CHECK_STATUS(xfer); @@ -786,9 +787,12 @@ * Set the serial state in ucom driver based on * the bits from the notify message */ - if (UGETW(nbuf->wLength) < 2) { - DPRINTF(0, "Invalid notification length, %d bytes!\n", - UGETW(nbuf->wLength)); + wLength = UGETW(nbuf->wLength); + + if ((wLength < 2) || + ((wLength + 8) < xfer->actlen)) { + DPRINTF(0, "Invalid notification length, " + "%d bytes!\n", wLength); break; } DPRINTF(0, "notify bytes = %02x%02x\n", ==== //depot/projects/usb/src/sys/dev/usb/ums.c#6 (text+ko) ==== @@ -77,7 +77,6 @@ #define MOUSE_FLAGS_MASK (HIO_CONST|HIO_RELATIVE) #define MOUSE_FLAGS (HIO_RELATIVE) -#define UMS_INT_SIZE 64 /* bytes */ #define UMS_BUF_SIZE 8 /* bytes */ #define UMS_IFQ_MAXLEN 50 /* units */ #define UMS_N_TRANSFER 2 /* units */ @@ -310,7 +309,7 @@ .endpoint = -1, /* any */ .direction = UE_DIR_IN, .flags = USBD_SHORT_XFER_OK, - .bufsize = UMS_INT_SIZE, /* bytes */ + .bufsize = 0, /* use wMaxPacketSize */ .callback = &ums_intr_callback, }, @@ -501,14 +500,12 @@ isize = hid_report_size(d_ptr, d_len, hid_input, &sc->sc_iid); - if (isize > UMS_INT_SIZE) { - DPRINTF(0, "cannot handle a report " - "size of %d bytes\n", isize); - goto detach; + if (isize > sc->sc_xfer[0]->length) { + DPRINTF(0, "WARNING: report size, %d bytes, is larger " + "than interrupt size, %d bytes!\n", + isize, sc->sc_xfer[0]->length); } - sc->sc_xfer[0]->length = isize; - free(d_ptr, M_TEMP); #ifdef USB_DEBUG ==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#5 (text+ko) ==== @@ -121,7 +121,6 @@ #define UPLCOM_CONFIG_INDEX 0 #define UPLCOM_IFACE_INDEX 0 #define UPLCOM_SECOND_IFACE_INDEX 1 -#define UPLCOM_INTR_SIZE 64 /* bytes */ #ifndef UPLCOM_INTR_INTERVAL #define UPLCOM_INTR_INTERVAL 0 /* default */ @@ -333,7 +332,7 @@ .endpoint = -1, /* any */ .direction = UE_DIR_IN, .flags = USBD_SHORT_XFER_OK, - .bufsize = UPLCOM_INTR_SIZE, + .bufsize = 0, /* use wMaxPacketSize */ .callback = &uplcom_intr_callback, }, @@ -460,7 +459,6 @@ struct uplcom_softc *sc = device_get_softc(dev); struct usbd_interface *iface; usb_interface_descriptor_t *id; - u_int16_t isize; int error; DPRINTF(10, "\n"); @@ -559,17 +557,6 @@ sc->sc_flag |= UPLCOM_FLAG_WAIT_USB_2; - isize = UGETW(sc->sc_xfer_intr[0]->pipe->edesc->wMaxPacketSize); - - if (isize > UPLCOM_INTR_SIZE) { - DPRINTF(0, "cannot handle an interrupt " - "packet of %d bytes\n", isize); - goto detach; - } - - /* set transfer length */ - sc->sc_xfer_intr[0]->length = isize; - sc->sc_dtr = -1; sc->sc_rts = -1; sc->sc_break = -1; ==== //depot/projects/usb/src/sys/dev/usb/uvscom.c#6 (text+ko) ==== @@ -140,7 +140,6 @@ */ #define UVSCOM_IBUFSIZE 512 /* bytes */ #define UVSCOM_OBUFSIZE 64 /* bytes */ -#define UVSCOM_INTR_SIZE 64 /* bytes */ #ifndef UVSCOM_DEFAULT_OPKTSIZE #define UVSCOM_DEFAULT_OPKTSIZE 8 @@ -298,7 +297,7 @@ .endpoint = -1, /* any */ .direction = UE_DIR_IN, .flags = USBD_SHORT_XFER_OK, - .bufsize = UVSCOM_INTR_SIZE, + .bufsize = 0, /* use wMaxPacketSize */ .callback = &uvscom_intr_callback, }, @@ -414,7 +413,6 @@ struct uvscom_softc *sc = device_get_softc(dev); usb_interface_descriptor_t *id; struct usbd_interface *iface; - u_int16_t isize; int error; if (sc == NULL) { @@ -465,18 +463,6 @@ sc->sc_flag |= UVSCOM_FLAG_WAIT_USB; - - isize = UGETW(sc->sc_xfer[4]->pipe->edesc->wMaxPacketSize); - - if (isize > UVSCOM_INTR_SIZE) { - DPRINTF(0, "cannot handle an interrupt " - "packet of %d bytes\n", isize); - goto detach; - } - - /* set interrupt transfer length */ - sc->sc_xfer[4]->length = isize; - sc->sc_dtr = -1; sc->sc_rts = -1; sc->sc_line_ctrl = UVSCOM_LINE_INIT; From owner-p4-projects@FreeBSD.ORG Mon Jun 12 14:00:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E68E416A6C9; Mon, 12 Jun 2006 14:00:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C257716A6B9 for ; Mon, 12 Jun 2006 14:00:57 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9103943D5F for ; Mon, 12 Jun 2006 14:00:56 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CDwflA070151 for ; Mon, 12 Jun 2006 13:58:41 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CDwfDW070148 for perforce@freebsd.org; Mon, 12 Jun 2006 13:58:41 GMT (envelope-from scottl@freebsd.org) Date: Mon, 12 Jun 2006 13:58:41 GMT Message-Id: <200606121358.k5CDwfDW070148@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 99050 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, 12 Jun 2006 14:00:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=99050 Change 99050 by scottl@scottl-x64 on 2006/06/12 13:58:16 Checkpoint sim lock handling in the da periph and camisr. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#10 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#7 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#7 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#35 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#10 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#10 (text+ko) ==== @@ -114,6 +114,7 @@ ac_callback_t *ac_callback, ac_code code, void *arg) { struct periph_driver **p_drv; + struct cam_sim *sim; struct cam_periph *periph; struct cam_periph *cur_periph; path_id_t path_id; @@ -159,7 +160,8 @@ if (strcmp((*p_drv)->driver_name, name) == 0) break; } - + + sim = xpt_path_sim(path); path_id = xpt_path_path_id(path); target_id = xpt_path_target_id(path); lun_id = xpt_path_lun_id(path); @@ -173,6 +175,7 @@ periph->unit_number = camperiphunit(*p_drv, path_id, target_id, lun_id); periph->immediate_priority = CAM_PRIORITY_NONE; periph->refcount = 0; + periph->sim = sim; SLIST_INIT(&periph->ccb_list); status = xpt_create_path(&path, periph, path_id, target_id, lun_id); if (status != CAM_REQ_CMP) ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#7 (text+ko) ==== @@ -104,6 +104,7 @@ char *periph_name; struct cam_path *path; /* Compiled path to device */ void *softc; + struct cam_sim *sim; u_int32_t unit_number; cam_periph_type type; u_int32_t flags; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#7 (text+ko) ==== @@ -116,6 +116,9 @@ }; +#define CAM_SIM_LOCK(sim) mtx_lock((sim)->mtx); +#define CAM_SIM_UNLOCK(sim) mtx_unlock((sim)->mtx); + static __inline u_int32_t cam_sim_path(struct cam_sim *sim) { ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#35 (text+ko) ==== @@ -83,9 +83,6 @@ SLIST_HEAD(async_list, async_node); SLIST_HEAD(periph_list, cam_periph); -#define CAM_SIM_LOCK(sim) mtx_lock((sim)->mtx); -#define CAM_SIM_UNLOCK(sim) mtx_unlock((sim)->mtx); - /* * This is the maximum number of high powered commands (e.g. start unit) * that can be outstanding at a particular time. @@ -1460,7 +1457,7 @@ } /* Install our software interrupt handlers */ - swi_add(NULL, "cambio", camisr, &cam_bioq, SWI_CAMBIO, 0, &cambio_ih); + swi_add(NULL, "cambio", camisr, &cam_bioq, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih); } static cam_status @@ -7201,6 +7198,7 @@ int runq; TAILQ_REMOVE(&queue, ccb_h, sim_links.tqe); + mtx_lock(ccb_h->path->bus->sim->mtx); ccb_h->pinfo.index = CAM_UNQUEUED_INDEX; splx(s); @@ -7290,6 +7288,7 @@ (*ccb_h->cbfcnp)(ccb_h->path->periph, (union ccb *)ccb_h); /* Raise IPL for while test */ + mtx_unlock(ccb_h->path->bus->sim->mtx); s = splcam(); } splx(s); ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#10 (text+ko) ==== @@ -37,6 +37,8 @@ #include #include #include +#include +#include #endif /* _KERNEL */ #include @@ -61,6 +63,7 @@ #include #include #include +#include #include @@ -528,6 +531,8 @@ splx(s); return (ENXIO); } + mtx_lock(periph->sim->mtx); + unit = periph->unit_number; softc = (struct da_softc *)periph->softc; @@ -539,8 +544,10 @@ if ((error = cam_periph_lock(periph, PRIBIO|PCATCH)) != 0) return (error); /* error code from tsleep */ - if (cam_periph_acquire(periph) != CAM_REQ_CMP) + if (cam_periph_acquire(periph) != CAM_REQ_CMP) { + mtx_unlock(periph->sim->mtx); return(ENXIO); + } softc->flags |= DA_FLAG_OPEN; if ((softc->flags & DA_FLAG_PACK_INVALID) != 0) { @@ -571,6 +578,7 @@ cam_periph_release(periph); } cam_periph_unlock(periph); + mtx_unlock(periph->sim->mtx); return (error); } @@ -585,9 +593,11 @@ if (periph == NULL) return (ENXIO); + mtx_lock(periph->sim->mtx); softc = (struct da_softc *)periph->softc; if ((error = cam_periph_lock(periph, PRIBIO)) != 0) { + mtx_unlock(periph->sim->mtx); return (error); /* error code from tsleep */ } @@ -655,6 +665,7 @@ softc->flags &= ~DA_FLAG_OPEN; cam_periph_unlock(periph); cam_periph_release(periph); + mtx_unlock(periph->sim->mtx); return (0); } @@ -676,6 +687,9 @@ return; } softc = (struct da_softc *)periph->softc; + + mtx_lock(periph->sim->mtx); + #if 0 /* * check it's not too big a transfer for our adapter @@ -695,6 +709,7 @@ */ if ((softc->flags & DA_FLAG_PACK_INVALID)) { splx(s); + mtx_unlock(periph->sim->mtx); biofinish(bp, NULL, ENXIO); return; } @@ -710,6 +725,7 @@ * Schedule ourselves for performing the work. */ xpt_schedule(periph, /* XXX priority */1); + mtx_unlock(periph->sim->mtx); return; } @@ -1164,7 +1180,7 @@ softc->disk->d_drv1 = periph; softc->disk->d_maxsize = DFLTPHYS; /* XXX: probably not arbitrary */ softc->disk->d_unit = periph->unit_number; - softc->disk->d_flags = DISKFLAG_NEEDSGIANT; + softc->disk->d_flags = 0; disk_create(softc->disk, DISK_VERSION); /* From owner-p4-projects@FreeBSD.ORG Mon Jun 12 16:49:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D16416A41B; Mon, 12 Jun 2006 16:49:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5B7116A418 for ; Mon, 12 Jun 2006 16:49:28 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2E2743D49 for ; Mon, 12 Jun 2006 16:49:28 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CGlDV5090043 for ; Mon, 12 Jun 2006 16:47:13 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CGlDgj090040 for perforce@freebsd.org; Mon, 12 Jun 2006 16:47:13 GMT (envelope-from cognet@freebsd.org) Date: Mon, 12 Jun 2006 16:47:13 GMT Message-Id: <200606121647.k5CGlDgj090040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 99059 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, 12 Jun 2006 16:49:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=99059 Change 99059 by cognet@cognet on 2006/06/12 16:46:19 Honor ${LD} and ${OBJCOPY}. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#17 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#17 (text+ko) ==== @@ -22,14 +22,17 @@ LIBAT91=${.OBJDIR}/../libat91/libat91.a +LD ?= ld +OBJCOPY ?= objcopy + .if defined(P) ${P}: ${P}.out - objcopy -S -O binary ${P}.out ${.TARGET} + ${OBJCOPY} -S -O binary ${P}.out ${.TARGET} @set -- `ls -l ${.TARGET}`; x=$$((12288-$$5)); \ echo "$$x bytes available"; test $$x -ge 0 ${P}.out: ${OBJS} - ld ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LIBAT91} + ${LD} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LIBAT91} CLEANFILES+= ${P} ${P}.out .endif From owner-p4-projects@FreeBSD.ORG Mon Jun 12 18:03:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4627E16A473; Mon, 12 Jun 2006 18:03:15 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E562F16A41B for ; Mon, 12 Jun 2006 18:03:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E754043D6A for ; Mon, 12 Jun 2006 18:03:05 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CI0oij096311 for ; Mon, 12 Jun 2006 18:00:50 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CI0olJ096308 for perforce@freebsd.org; Mon, 12 Jun 2006 18:00:50 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 12 Jun 2006 18:00:50 GMT Message-Id: <200606121800.k5CI0olJ096308@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 99063 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, 12 Jun 2006 18:03:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=99063 Change 99063 by hselasky@hselasky_mini_itx on 2006/06/12 18:00:12 New feature: Abstracted the waiting for the USB memory to get freed. There is a new function, usbd_transfer_drain() that is used for that. See the README for more info. Fixed some panics, where the driver, ehci, ohci, uhci and ugen, did not destroy the mutex at detach. This evidently caused "freed memory accessed" panics. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/README#4 edit .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/uhid.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#9 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/README#4 (text+ko) ==== @@ -113,7 +113,7 @@ /*------------------------------------------------------------------------* * usbd_status * usbd_transfer_setup(udev, iface_index, pxfer, setup_start, - * n_setup, priv_sc, priv_mtx, priv_func) + * n_setup, priv_sc, priv_mtx, priv_wait) *------------------------------------------------------------------------*/ - "udev" is a pointer to "struct usbd_device" @@ -135,8 +135,9 @@ - "priv_mtx" is the private mutex protecting the transfer structure and the softc. This pointer is used to initialize "xfer->priv_mtx". -- "priv_func" is a pointer to a function that is called back when the USB - system is finished using the "priv_mtx" mutex. +- "priv_wait" is a pointer to a structure of type "struct usbd_memory_wait", + that is passed to "usbd_transfer_drain()" after "usbd_transfer_unsetup()" + to wait for the USB system to finish using the "priv_mtx" mutex. /*------------------------------------------------------------------------* * void @@ -171,6 +172,18 @@ "xfer->error=USBD_CANCELLED", before this function returns /*------------------------------------------------------------------------* + * void + * usbd_transfer_drain(priv_wait, priv_mtx) + *------------------------------------------------------------------------*/ + +- "priv_wait" is a pointer to a structure of type "struct usbd_memory_wait" + +- "priv_mtx" is a pointer to a mutex protecting the "priv_wait" structure + +NOTE: This function returns when the mutex "priv_mtx", is not used by the USB +system any more. + +/*------------------------------------------------------------------------* * struct usbd_config { * type, endpoint, direction, interval, timeout, frames, index * flags, bufsize, callback @@ -218,5 +231,11 @@ - The "callback" field sets the USB callback. This field is mandatory. +MUTEX NOTE: +=========== + +When you create a mutex, using "mtx_init()", don't forget to call "mtx_destroy()" at detach, +else you can get freed memory accessed panics. + --HPS ==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#4 (text+ko) ==== @@ -365,6 +365,8 @@ sc->io_res = NULL; } + mtx_destroy(&sc->sc_bus.mtx); + usb_free_mem(sc, sizeof(*sc)); device_set_softc(self, NULL); ==== //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#4 (text+ko) ==== @@ -342,6 +342,8 @@ sc->io_res = NULL; } + mtx_destroy(&sc->sc_bus.mtx); + usb_free_mem(sc, sizeof(*sc)); device_set_softc(self, NULL); ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#4 (text+ko) ==== @@ -117,6 +117,7 @@ struct ugen_endpoint sc_endpoints[USB_MAX_ENDPOINTS]; struct ugen_endpoint sc_endpoints_end[0]; struct mtx sc_mtx; + struct usbd_memory_wait sc_mem_wait; }; extern cdevsw_t ugen_cdevsw; @@ -228,6 +229,12 @@ /* destroy all devices */ ugen_destroy_devnodes(sc, 0); + + /* wait for memory to get freed */ + usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); + + mtx_destroy(&sc->sc_mtx); + return 0; } @@ -397,7 +404,7 @@ */ error = usbd_transfer_setup(udev, iface_index, &temp[0], setup, n_setup, - sce, &sc->sc_mtx, NULL); + sce, &(sc->sc_mtx), &(sc->sc_mem_wait)); mtx_lock(&sc->sc_mtx); ==== //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#4 (text+ko) ==== @@ -367,6 +367,8 @@ sc->io_res = NULL; } + mtx_destroy(&sc->sc_bus.mtx); + usb_free_mem(sc, sizeof(*sc)); device_set_softc(self, NULL); ==== //depot/projects/usb/src/sys/dev/usb/uhid.c#7 (text+ko) ==== @@ -96,8 +96,9 @@ #define UHID_FRAME_NUM 50 /* bytes, frame number */ struct uhid_softc { - struct usb_cdev sc_cdev; - struct mtx sc_mtx; + struct usb_cdev sc_cdev; + struct mtx sc_mtx; + struct usbd_memory_wait sc_mem_wait; struct usbd_xfer * sc_xfer[UHID_N_TRANSFER]; void * sc_repdesc_ptr; @@ -113,13 +114,11 @@ u_int8_t sc_iid; u_int8_t sc_oid; u_int8_t sc_fid; - u_int8_t sc_wakeup_detach; u_int8_t sc_flags; #define UHID_FLAG_IMMED 0x01 /* set if read should be immediate */ #define UHID_FLAG_INTR_STALL 0x02 /* set if interrupt transfer stalled */ #define UHID_FLAG_STATIC_DESC 0x04 /* set if report descriptors are static */ #define UHID_FLAG_COMMAND_ERR 0x08 /* set if control transfer had an error */ -#define UHID_FLAG_WAIT_USB 0x10 /* set if should wait for USB */ }; static u_int8_t uhid_xb360gp_report_descr[] = { UHID_XB360GP_REPORT_DESCR() }; @@ -627,23 +626,6 @@ return UMATCH_IFACECLASS_GENERIC; } -static void -uhid_detach_complete(struct usbd_memory_info *info) -{ - struct uhid_softc *sc = info->priv_sc; - - mtx_lock(&(sc->sc_mtx)); - - if (sc->sc_flags & UHID_FLAG_WAIT_USB) { - sc->sc_flags &= ~UHID_FLAG_WAIT_USB; - wakeup(&(sc->sc_wakeup_detach)); - } - - mtx_unlock(&(sc->sc_mtx)); - - return; -} - static int uhid_attach(device_t dev) { @@ -670,14 +652,12 @@ error = usbd_transfer_setup(uaa->device, uaa->iface_index, sc->sc_xfer, uhid_config, UHID_N_TRANSFER, - sc, &(sc->sc_mtx), &(uhid_detach_complete)); + sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); if (error) { DPRINTF(0, "error=%s\n", usbd_errstr(error)) ; goto detach; } - sc->sc_flags |= UHID_FLAG_WAIT_USB; - if (uaa->vendor == USB_VENDOR_WACOM) { /* the report descriptor for the Wacom Graphire is broken */ @@ -805,7 +785,6 @@ uhid_detach(device_t dev) { struct uhid_softc *sc = device_get_softc(dev); - int32_t error; usb_cdev_detach(&(sc->sc_cdev)); @@ -817,13 +796,7 @@ } } - mtx_lock(&(sc->sc_mtx)); - while (sc->sc_flags & UHID_FLAG_WAIT_USB) { - - error = msleep(&(sc->sc_wakeup_detach), &(sc->sc_mtx), - PRIBIO, "uhid_sync", 0); - } - mtx_unlock(&(sc->sc_mtx)); + usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); mtx_destroy(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#6 (text+ko) ==== @@ -118,6 +118,7 @@ struct __callout sc_callout; struct ukbd_data sc_ndata; struct ukbd_data sc_odata; + struct usbd_memory_wait sc_mem_wait; struct usbd_device * sc_udev; struct usbd_interface * sc_iface; @@ -136,10 +137,8 @@ #define UKBD_FLAG_POLLING 0x0002 #define UKBD_FLAG_SET_LEDS 0x0004 #define UKBD_FLAG_PIPE_ERROR 0x0008 -#define UKBD_FLAG_WAIT_USB 0x0010 -#define UKBD_FLAG_WAIT_CO 0x0020 -#define UKBD_FLAG_ATTACHED 0x0040 -#define UKBD_FLAG_GONE 0x0080 +#define UKBD_FLAG_ATTACHED 0x0010 +#define UKBD_FLAG_GONE 0x0020 int32_t sc_mode; /* input mode (K_XLATE,K_RAW,K_CODE) */ int32_t sc_state; /* shift/lock key state */ @@ -151,7 +150,6 @@ u_int8_t sc_leds; u_int8_t sc_iface_index; - u_int8_t sc_wakeup_detach; /* dummy */ }; #define KEY_ERROR 0x01 @@ -593,23 +591,6 @@ }, }; -static void -ukbd_detach_complete(struct usbd_memory_info *info) -{ - struct ukbd_softc *sc = info->priv_sc; - - mtx_lock(&Giant); - - if (sc->sc_flags & UKBD_FLAG_WAIT_USB) { - sc->sc_flags &= ~UKBD_FLAG_WAIT_USB; - wakeup(&(sc->sc_wakeup_detach)); - } - - mtx_unlock(&Giant); - - return; -} - static int ukbd_probe(device_t dev) { @@ -669,22 +650,15 @@ __callout_init_mtx(&(sc->sc_callout), &Giant, CALLOUT_RETURNUNLOCKED); -#if 0 - /* TODO: "__callout_init_mtx()" does not support this: */ - sc->sc_flags |= UKBD_FLAG_WAIT_CO; -#endif - err = usbd_transfer_setup(uaa->device, uaa->iface_index, sc->sc_xfer, ukbd_config, UKBD_N_TRANSFER, sc, - &Giant, &ukbd_detach_complete); + &Giant, &(sc->sc_mem_wait)); if (err) { DPRINTF(0, "error=%s\n", usbd_errstr(err)) ; goto detach; } - sc->sc_flags |= UKBD_FLAG_WAIT_USB; - /* setup default keyboard maps */ sc->sc_keymap = key_map; @@ -804,13 +778,7 @@ usbd_transfer_unsetup(sc->sc_xfer, UKBD_N_TRANSFER); - /* wait for callbacks to be aborted */ - - while (sc->sc_flags & (UKBD_FLAG_WAIT_USB|UKBD_FLAG_WAIT_CO)) { - - error = msleep(&(sc->sc_wakeup_detach), &Giant, - PRIBIO, "ukbd_sync_2", 0); - } + usbd_transfer_drain(&(sc->sc_mem_wait), &Giant); DPRINTF(0, "%s: disconnected\n", device_get_nameunit(dev)); ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#9 (text+ko) ==== @@ -94,6 +94,7 @@ struct usb_cdev sc_cdev; struct __callout sc_watchdog; struct mtx sc_mtx; + struct usbd_memory_wait sc_mem_wait; device_t sc_dev; struct usbd_xfer * sc_xfer[ULPT_N_TRANSFER]; @@ -101,15 +102,12 @@ u_int8_t sc_flags; #define ULPT_FLAG_NO_READ 0x01 /* device has no read endpoint */ #define ULPT_FLAG_DUMP_READ 0x02 /* device is not opened for read */ -#define ULPT_FLAG_WAIT_USB 0x04 /* device is waiting for USB callbacks */ -#define ULPT_FLAG_WAIT_CO 0x08 /* device is waiting for callouts */ -#define ULPT_FLAG_READ_STALL 0x10 /* read transfer stalled */ -#define ULPT_FLAG_WRITE_STALL 0x20 /* write transfer stalled */ -#define ULPT_FLAG_RESETTING 0x40 /* device is resetting */ +#define ULPT_FLAG_READ_STALL 0x04 /* read transfer stalled */ +#define ULPT_FLAG_WRITE_STALL 0x08 /* write transfer stalled */ +#define ULPT_FLAG_RESETTING 0x10 /* device is resetting */ u_int8_t sc_iface_no; u_int8_t sc_last_status; - u_int8_t sc_wakeup_detach; /* dummy */ }; static void @@ -520,23 +518,6 @@ return UMATCH_NONE; } -static void -ulpt_detach_complete(struct usbd_memory_info *info) -{ - struct ulpt_softc *sc = info->priv_sc; - - mtx_lock(&(sc->sc_mtx)); - - if (sc->sc_flags & ULPT_FLAG_WAIT_USB) { - sc->sc_flags &= ~ULPT_FLAG_WAIT_USB; - wakeup(&(sc->sc_wakeup_detach)); - } - - mtx_unlock(&(sc->sc_mtx)); - - return; -} - static int ulpt_attach(device_t dev) { @@ -562,11 +543,6 @@ __callout_init_mtx(&(sc->sc_watchdog), &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); -#if 0 - /* TODO: "__callout_init_mtx()" does not support this: */ - - sc->sc_flags |= ULPT_FLAG_WAIT_CO; -#endif /* search through all the descriptors looking for bidir mode */ @@ -613,15 +589,13 @@ sc->sc_iface_no = id->bInterfaceNumber; error = usbd_transfer_setup(uaa->device, iface_index, - sc->sc_xfer, ulpt_config, ULPT_N_TRANSFER, - sc, &(sc->sc_mtx), &(ulpt_detach_complete)); + sc->sc_xfer, ulpt_config, ULPT_N_TRANSFER, + sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); if (error) { DPRINTF(0, "error=%s\n", usbd_errstr(error)) ; goto detach; } - sc->sc_flags |= ULPT_FLAG_WAIT_USB; - if (usbd_get_quirks(uaa->device)->uq_flags & UQ_BROKEN_BIDIR) { /* this device doesn't handle reading properly. */ sc->sc_flags |= ULPT_FLAG_NO_READ; @@ -709,7 +683,6 @@ ulpt_detach(device_t dev) { struct ulpt_softc *sc = device_get_softc(dev); - int error; DPRINTF(0, "sc=%p\n", sc); @@ -721,15 +694,7 @@ usbd_transfer_unsetup(sc->sc_xfer, ULPT_N_TRANSFER); - /* wait for callbacks to be aborted */ - - mtx_lock(&(sc->sc_mtx)); - while (sc->sc_flags & (ULPT_FLAG_WAIT_USB|ULPT_FLAG_WAIT_CO)) { - - error = msleep(&(sc->sc_wakeup_detach), &(sc->sc_mtx), - PRIBIO, "ulpt_sync", 0); - } - mtx_unlock(&(sc->sc_mtx)); + usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); mtx_destroy(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/umodem.c#7 (text+ko) ==== @@ -134,6 +134,7 @@ struct umodem_softc { struct ucom_softc sc_ucom; usb_cdc_line_state_t sc_line_state; /* current line state */ + struct usbd_memory_wait sc_mem_wait; struct usbd_xfer * sc_xfer_data[UMODEM_N_DATA_TRANSFER]; struct usbd_xfer * sc_xfer_intr[UMODEM_N_INTR_TRANSFER]; @@ -156,11 +157,7 @@ #define UMODEM_FLAG_INTR_STALL 0x04 #define UMODEM_FLAG_SET_LS 0x08 #define UMODEM_FLAG_SEND_BREAK 0x10 -#define UMODEM_FLAG_WAIT_USB_1 0x20 -#define UMODEM_FLAG_WAIT_USB_2 0x40 -#define UMODEM_FLAG_SET_LC 0x80 - - u_int8_t sc_wakeup_detach; /* dummy */ +#define UMODEM_FLAG_SET_LC 0x20 }; static device_probe_t umodem_probe; @@ -239,12 +236,6 @@ static usbd_status umodem_set_comm_feature(struct usbd_device *udev, u_int8_t iface_no, int feature, int state); -static void -umodem_detach_complete_1(struct usbd_memory_info *info); - -static void -umodem_detach_complete_2(struct usbd_memory_info *info); - static const struct usbd_config umodem_config_data[UMODEM_N_DATA_TRANSFER] = { [0] = { @@ -503,22 +494,18 @@ error = usbd_transfer_setup(uaa->device, sc->sc_data_iface_index, sc->sc_xfer_data, umodem_config_data, UMODEM_N_DATA_TRANSFER, - sc, &Giant, &(umodem_detach_complete_1)); + sc, &Giant, &(sc->sc_mem_wait)); if (error) { goto detach; } - sc->sc_flag |= UMODEM_FLAG_WAIT_USB_1; - error = usbd_transfer_setup(uaa->device, sc->sc_ctrl_iface_index, sc->sc_xfer_intr, umodem_config_intr, UMODEM_N_INTR_TRANSFER, - sc, &Giant, &(umodem_detach_complete_2)); + sc, &Giant, &(sc->sc_mem_wait)); if (error) { /* ignore */ DPRINTF(0, "no interrupt pipe!\n"); - } else { - sc->sc_flag |= UMODEM_FLAG_WAIT_USB_2; } sc->sc_rts = -1; @@ -1092,45 +1079,10 @@ return usbd_do_request(udev, &req, &ast); } -static void -umodem_detach_complete_1(struct usbd_memory_info *info) -{ - struct umodem_softc *sc = info->priv_sc; - - mtx_lock(&Giant); - - if (sc->sc_flag & UMODEM_FLAG_WAIT_USB_1) { - sc->sc_flag &= ~UMODEM_FLAG_WAIT_USB_1; - wakeup(&(sc->sc_wakeup_detach)); - } - - mtx_unlock(&Giant); - - return; -} - -static void -umodem_detach_complete_2(struct usbd_memory_info *info) -{ - struct umodem_softc *sc = info->priv_sc; - - mtx_lock(&Giant); - - if (sc->sc_flag & UMODEM_FLAG_WAIT_USB_2) { - sc->sc_flag &= ~UMODEM_FLAG_WAIT_USB_2; - wakeup(&(sc->sc_wakeup_detach)); - } - - mtx_unlock(&Giant); - - return; -} - static int umodem_detach(device_t dev) { struct umodem_softc *sc = device_get_softc(dev); - int error; DPRINTF(0, "sc=%p\n", sc); @@ -1140,13 +1092,7 @@ usbd_transfer_unsetup(sc->sc_xfer_data, UMODEM_N_DATA_TRANSFER); - /* wait for callbacks to finish */ - - while (sc->sc_flag & (UMODEM_FLAG_WAIT_USB_1|UMODEM_FLAG_WAIT_USB_2)) { - - error = msleep(&(sc->sc_wakeup_detach), &Giant, - PRIBIO, "umodem_sync", 0); - } + usbd_transfer_drain(&(sc->sc_mem_wait), &Giant); return 0; } ==== //depot/projects/usb/src/sys/dev/usb/ums.c#7 (text+ko) ==== @@ -88,6 +88,7 @@ struct usbd_ifqueue sc_rdq_free; struct usbd_ifqueue sc_rdq_used; struct __callout sc_callout; + struct usbd_memory_wait sc_mem_wait; struct selinfo sc_read_sel; struct hid_location sc_loc_x; struct hid_location sc_loc_y; @@ -110,17 +111,14 @@ #define UMS_FLAG_SBU 0x0010 /* spurious button up events */ #define UMS_FLAG_SELECT 0x0020 /* select is waiting */ #define UMS_FLAG_INTR_STALL 0x0040 /* set if transfer error */ -#define UMS_FLAG_WAIT_USB 0x0080 /* device is waiting for callbacks */ -#define UMS_FLAG_WAIT_CO 0x0100 /* device is waiting for callbacks */ -#define UMS_FLAG_GONE 0x0200 /* device is gone */ -#define UMS_FLAG_RD_WUP 0x0400 /* device is waiting for wakeup */ -#define UMS_FLAG_RD_SLP 0x0800 /* device is sleeping */ -#define UMS_FLAG_CLOSING 0x1000 /* device is closing */ -#define UMS_FLAG_DEV_OPEN 0x2000 /* device is open */ +#define UMS_FLAG_GONE 0x0080 /* device is gone */ +#define UMS_FLAG_RD_WUP 0x0100 /* device is waiting for wakeup */ +#define UMS_FLAG_RD_SLP 0x0200 /* device is sleeping */ +#define UMS_FLAG_CLOSING 0x0400 /* device is closing */ +#define UMS_FLAG_DEV_OPEN 0x0800 /* device is open */ u_int8_t sc_buttons; u_int8_t sc_iid; - u_int8_t sc_wakeup_detach; /* dummy */ u_int8_t sc_wakeup_read; /* dummy */ u_int8_t sc_wakeup_sync_1; /* dummy */ }; @@ -323,23 +321,6 @@ }, }; -static void -ums_detach_complete(struct usbd_memory_info *info) -{ - struct ums_softc *sc = info->priv_sc; - - mtx_lock(&(sc->sc_mtx)); - - if (sc->sc_flags & UMS_FLAG_WAIT_USB) { - sc->sc_flags &= ~UMS_FLAG_WAIT_USB; - wakeup(&(sc->sc_wakeup_detach)); - } - - mtx_unlock(&(sc->sc_mtx)); - - return; -} - static int ums_probe(device_t dev) { @@ -403,12 +384,7 @@ __callout_init_mtx(&(sc->sc_callout), &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); -#if 0 - /* TODO: "__callout_init_mtx()" does not support this: */ - sc->sc_flags |= UMS_FLAG_WAIT_CO; -#endif - sc->sc_mem_ptr_1 = usbd_alloc_mbufs(M_DEVBUF, &(sc->sc_rdq_free), UMS_BUF_SIZE, UMS_IFQ_MAXLEN); @@ -419,14 +395,12 @@ err = usbd_transfer_setup(uaa->device, uaa->iface_index, sc->sc_xfer, ums_config, UMS_N_TRANSFER, sc, - &(sc->sc_mtx), &ums_detach_complete); + &(sc->sc_mtx), &(sc->sc_mem_wait)); if (err) { DPRINTF(0, "error=%s\n", usbd_errstr(err)) ; goto detach; } - sc->sc_flags |= UMS_FLAG_WAIT_USB; - err = usbreq_read_report_desc(uaa->device, uaa->iface_index, &d_ptr, &d_len, M_TEMP); if (err) { @@ -570,8 +544,6 @@ { struct ums_softc *sc = device_get_softc(self); - int error; - DPRINTF(0, "sc=%p\n", sc); mtx_lock(&(sc->sc_mtx)); @@ -599,15 +571,7 @@ free(sc->sc_mem_ptr_1, M_DEVBUF); } - /* wait for callbacks to be aborted */ - - mtx_lock(&(sc->sc_mtx)); - while (sc->sc_flags & (UMS_FLAG_WAIT_USB|UMS_FLAG_WAIT_CO)) { - - error = msleep(&(sc->sc_wakeup_detach), &(sc->sc_mtx), - PRIBIO, "ums_sync_2", 0); - } - mtx_unlock(&(sc->sc_mtx)); + usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); mtx_destroy(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#6 (text+ko) ==== @@ -148,20 +148,19 @@ struct uplcom_softc { struct ucom_softc sc_ucom; usb_cdc_line_state_t sc_line_state; /* current line state */ + struct usbd_memory_wait sc_mem_wait; struct usbd_xfer * sc_xfer_intr[UPLCOM_N_INTR_TRANSFER]; struct usbd_xfer * sc_xfer_data[UPLCOM_N_DATA_TRANSFER]; u_int16_t sc_flag; -#define UPLCOM_FLAG_WAIT_USB_1 0x0001 -#define UPLCOM_FLAG_WAIT_USB_2 0x0002 -#define UPLCOM_FLAG_SET_LS 0x0004 -#define UPLCOM_FLAG_SET_BREAK 0x0008 -#define UPLCOM_FLAG_SET_LC 0x0010 -#define UPLCOM_FLAG_SET_CRTSCTS 0x0020 -#define UPLCOM_FLAG_INTR_STALL 0x0040 -#define UPLCOM_FLAG_READ_STALL 0x0080 -#define UPLCOM_FLAG_WRITE_STALL 0x0100 +#define UPLCOM_FLAG_SET_LS 0x0001 +#define UPLCOM_FLAG_SET_BREAK 0x0002 +#define UPLCOM_FLAG_SET_LC 0x0004 +#define UPLCOM_FLAG_SET_CRTSCTS 0x0008 +#define UPLCOM_FLAG_INTR_STALL 0x0010 +#define UPLCOM_FLAG_READ_STALL 0x0020 +#define UPLCOM_FLAG_WRITE_STALL 0x0040 u_int8_t sc_dtr; /* current DTR state */ u_int8_t sc_rts; /* current RTS state */ @@ -174,19 +173,11 @@ u_int8_t sc_data_iface_no; u_int8_t sc_data_iface_index; u_int8_t sc_crtscts; - - u_int8_t sc_wakeup_detach; /* dummy */ }; static const struct uplcom_product * uplcom_find_up(struct usb_attach_arg *uaa); -static void -uplcom_detach_complete_1(struct usbd_memory_info *info); - -static void -uplcom_detach_complete_2(struct usbd_memory_info *info); - static usbd_status uplcom_reset(struct uplcom_softc *sc, struct usbd_device *udev); @@ -536,27 +527,23 @@ error = usbd_transfer_setup(uaa->device, sc->sc_data_iface_index, sc->sc_xfer_data, uplcom_config_data, UPLCOM_N_DATA_TRANSFER, - sc, &Giant, &(uplcom_detach_complete_1)); + sc, &Giant, &(sc->sc_mem_wait)); if (error) { DPRINTF(0, "one or more missing data " "pipes, error=%s\n", usbd_errstr(error)); goto detach; } - sc->sc_flag |= UPLCOM_FLAG_WAIT_USB_1; - error = usbd_transfer_setup(uaa->device, sc->sc_ctrl_iface_index, sc->sc_xfer_intr, uplcom_config_intr, UPLCOM_N_INTR_TRANSFER, - sc, &Giant, &(uplcom_detach_complete_2)); + sc, &Giant, &(sc->sc_mem_wait)); if (error) { DPRINTF(0, "no interrupt pipe, error=%s\n", usbd_errstr(error)); goto detach; } - sc->sc_flag |= UPLCOM_FLAG_WAIT_USB_2; - sc->sc_dtr = -1; sc->sc_rts = -1; sc->sc_break = -1; @@ -596,45 +583,10 @@ return ENXIO; } -static void -uplcom_detach_complete_1(struct usbd_memory_info *info) -{ - struct uplcom_softc *sc = info->priv_sc; - - mtx_lock(&Giant); - - if (sc->sc_flag & UPLCOM_FLAG_WAIT_USB_1) { - sc->sc_flag &= ~UPLCOM_FLAG_WAIT_USB_1; - wakeup(&(sc->sc_wakeup_detach)); - } - - mtx_unlock(&Giant); - - return; -} - -static void -uplcom_detach_complete_2(struct usbd_memory_info *info) -{ - struct uplcom_softc *sc = info->priv_sc; - - mtx_lock(&Giant); - - if (sc->sc_flag & UPLCOM_FLAG_WAIT_USB_2) { - sc->sc_flag &= ~UPLCOM_FLAG_WAIT_USB_2; - wakeup(&(sc->sc_wakeup_detach)); - } - - mtx_unlock(&Giant); - - return; -} - static int uplcom_detach(device_t dev) { struct uplcom_softc *sc = device_get_softc(dev); - int error; DPRINTF(0, "sc=%p\n", sc); @@ -644,13 +596,7 @@ usbd_transfer_unsetup(sc->sc_xfer_data, UPLCOM_N_DATA_TRANSFER); - /* wait for callbacks to finish */ - - while (sc->sc_flag & (UPLCOM_FLAG_WAIT_USB_1|UPLCOM_FLAG_WAIT_USB_2)) { - - error = msleep(&(sc->sc_wakeup_detach), &Giant, - PRIBIO, "uplcom_sync", 0); - } + usbd_transfer_drain(&(sc->sc_mem_wait), &Giant); return 0; } ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#9 (text+ko) ==== @@ -382,16 +382,19 @@ #endif }; -typedef void (usbd_unsetup_callback_t)(struct usbd_memory_info *info); +struct usbd_memory_wait { + struct mtx * priv_mtx; + u_int16_t priv_refcount; + u_int16_t priv_sleeping; +}; struct usbd_memory_info { void * memory_base; u_int32_t memory_size; u_int32_t memory_refcount; - void * priv_sc; + struct usbd_memory_wait * priv_wait; struct mtx * priv_mtx; struct mtx * usb_mtx; - usbd_unsetup_callback_t *priv_func; }; struct usbd_callback_info { @@ -662,12 +665,15 @@ u_int16_t n_setup, void *priv_sc, struct mtx *priv_mtx, - usbd_unsetup_callback_t *priv_func); + struct usbd_memory_wait *priv_wait); void usbd_transfer_unsetup(struct usbd_xfer **pxfer, u_int16_t n_setup); void +usbd_transfer_drain(struct usbd_memory_wait *priv_wait, struct mtx *priv_mtx); + +void usbd_start_hardware(struct usbd_xfer *xfer); void ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#5 (text+ko) ==== @@ -226,7 +226,7 @@ u_int16_t n_setup, void *priv_sc, struct mtx *priv_mtx, - usbd_unsetup_callback_t *priv_func) + struct usbd_memory_wait *priv_wait) { const struct usbd_config *setup_end = setup_start + n_setup; const struct usbd_config *setup; @@ -305,6 +305,7 @@ xfer->priv_sc = priv_sc; xfer->priv_mtx = priv_mtx; xfer->udev = udev; + if(xfer->pipe) { xfer->pipe->refcount++; @@ -312,9 +313,18 @@ info = xfer->usb_root; info->memory_refcount++; - info->priv_sc = priv_sc; - info->priv_mtx = priv_mtx; - info->priv_func = priv_func; + + if (info->priv_wait == NULL) { + + info->priv_wait = priv_wait; + info->priv_mtx = priv_mtx; + + if (priv_wait) { + mtx_lock(priv_mtx); + priv_wait->priv_refcount++; + mtx_unlock(priv_mtx); + } + } } } @@ -336,11 +346,13 @@ static void usbd_drop_refcount(struct usbd_memory_info *info) { + struct usbd_memory_wait *priv_wait; u_int8_t free_memory; mtx_lock(info->usb_mtx); - __KASSERT(info->memory_refcount != 0, ("Invalid memory reference count!\n")); + __KASSERT(info->memory_refcount != 0, ("Invalid memory " + "reference count!\n")); free_memory = ((--(info->memory_refcount)) == 0); @@ -348,10 +360,25 @@ if(free_memory) { - if(info->priv_func) - { - (info->priv_func)(info); + priv_wait = info->priv_wait; + + /* check if someone is waiting for + * the memory to be released: + */ + if (priv_wait) { + mtx_lock(info->priv_mtx); + + __KASSERT(priv_wait->priv_refcount != 0, ("Invalid private " + "reference count!\n")); + priv_wait->priv_refcount--; + + if ((priv_wait->priv_refcount == 0) && + (priv_wait->priv_sleeping != 0)) { + wakeup(priv_wait); + } + mtx_unlock(info->priv_mtx); } + usb_free_mem(info->memory_base, info->memory_size); } return; @@ -367,8 +394,7 @@ * NOTE: the mutex "xfer->priv_mtx" might be in use by * the USB system after that this function has returned! * Therefore the mutex, "xfer->priv_mtx", should be allocated - * in static memory. The function "priv_func" will be called - * when it is safe to destroy this mutex. + * in static memory. *---------------------------------------------------------------------------*/ void usbd_transfer_unsetup(struct usbd_xfer **pxfer, u_int16_t n_setup) @@ -406,6 +432,34 @@ return; } +/*---------------------------------------------------------------------------* + * usbd_transfer_drain - wait for USB memory to get freed + * + * This function returns when the mutex "priv_mtx", is not used by the + * USB system any more. + *---------------------------------------------------------------------------*/ +void +usbd_transfer_drain(struct usbd_memory_wait *priv_wait, struct mtx *priv_mtx) +{ + int error; + + mtx_lock(priv_mtx); + + priv_wait->priv_sleeping = 1; + + while (priv_wait->priv_refcount > 0) { + + error = msleep(priv_wait, priv_mtx, PRIBIO, "usb_drain", 0); + } + + priv_wait->priv_sleeping = 0; + + mtx_unlock(priv_mtx); + + return; +} + + /* CALLBACK EXAMPLES: * ================== * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 12 19:46:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E166116A474; Mon, 12 Jun 2006 19:46:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A288F16A41F for ; Mon, 12 Jun 2006 19:46:02 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46E5343D48 for ; Mon, 12 Jun 2006 19:46:02 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CJhkZq003994 for ; Mon, 12 Jun 2006 19:43:46 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CJgwGR003946 for perforce@freebsd.org; Mon, 12 Jun 2006 19:42:58 GMT (envelope-from jhb@freebsd.org) Date: Mon, 12 Jun 2006 19:42:58 GMT Message-Id: <200606121942.k5CJgwGR003946@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 99068 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, 12 Jun 2006 19:46:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=99068 Change 99068 by jhb@jhb_mutex on 2006/06/12 19:42:11 IFC @99064. Affected files ... .. //depot/projects/smpng/sys/Makefile#11 integrate .. //depot/projects/smpng/sys/alpha/Makefile#2 delete .. //depot/projects/smpng/sys/alpha/alpha/api_up1000.c#7 delete .. //depot/projects/smpng/sys/alpha/alpha/atomic.s#4 delete .. //depot/projects/smpng/sys/alpha/alpha/autoconf.c#16 delete .. //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#30 delete .. //depot/projects/smpng/sys/alpha/alpha/busspace.c#4 delete .. //depot/projects/smpng/sys/alpha/alpha/clock.c#30 delete .. //depot/projects/smpng/sys/alpha/alpha/clock_if.m#3 delete .. //depot/projects/smpng/sys/alpha/alpha/cpuconf.c#8 delete .. //depot/projects/smpng/sys/alpha/alpha/db_disasm.c#8 delete .. //depot/projects/smpng/sys/alpha/alpha/db_instruction.h#5 delete .. //depot/projects/smpng/sys/alpha/alpha/db_interface.c#12 delete .. //depot/projects/smpng/sys/alpha/alpha/db_trace.c#19 delete .. //depot/projects/smpng/sys/alpha/alpha/dec_1000a.c#11 delete .. //depot/projects/smpng/sys/alpha/alpha/dec_2100_a50.c#9 delete .. //depot/projects/smpng/sys/alpha/alpha/dec_2100_a500.c#10 delete .. //depot/projects/smpng/sys/alpha/alpha/dec_3000_300.c#5 delete .. //depot/projects/smpng/sys/alpha/alpha/dec_3000_500.c#5 delete .. //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#10 delete .. //depot/projects/smpng/sys/alpha/alpha/dec_eb164.c#8 delete .. //depot/projects/smpng/sys/alpha/alpha/dec_eb64plus.c#9 delete .. //depot/projects/smpng/sys/alpha/alpha/dec_kn20aa.c#12 delete .. //depot/projects/smpng/sys/alpha/alpha/dec_kn300.c#10 delete .. //depot/projects/smpng/sys/alpha/alpha/dec_kn8ae.c#6 delete .. //depot/projects/smpng/sys/alpha/alpha/dec_st550.c#11 delete .. //depot/projects/smpng/sys/alpha/alpha/dec_st6600.c#7 delete .. //depot/projects/smpng/sys/alpha/alpha/divrem.m4#4 delete .. //depot/projects/smpng/sys/alpha/alpha/dump_machdep.c#7 delete .. //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#17 delete .. //depot/projects/smpng/sys/alpha/alpha/exception.s#10 delete .. //depot/projects/smpng/sys/alpha/alpha/fp_emulate.c#7 delete .. //depot/projects/smpng/sys/alpha/alpha/gdb_machdep.c#4 delete .. //depot/projects/smpng/sys/alpha/alpha/genassym.c#19 delete .. //depot/projects/smpng/sys/alpha/alpha/ieee_float.c#5 delete .. //depot/projects/smpng/sys/alpha/alpha/ieee_float.h#2 delete .. //depot/projects/smpng/sys/alpha/alpha/in_cksum.c#6 delete .. //depot/projects/smpng/sys/alpha/alpha/locore.s#8 delete .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#85 delete .. //depot/projects/smpng/sys/alpha/alpha/mem.c#17 delete .. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#36 delete .. //depot/projects/smpng/sys/alpha/alpha/pal.s#4 delete .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#79 delete .. //depot/projects/smpng/sys/alpha/alpha/prom.c#15 delete .. //depot/projects/smpng/sys/alpha/alpha/prom_disp.s#4 delete .. //depot/projects/smpng/sys/alpha/alpha/promcons.c#24 delete .. //depot/projects/smpng/sys/alpha/alpha/sgmap.c#6 delete .. //depot/projects/smpng/sys/alpha/alpha/support.s#12 delete .. //depot/projects/smpng/sys/alpha/alpha/swtch.s#8 delete .. //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#20 delete .. //depot/projects/smpng/sys/alpha/alpha/trap.c#66 delete .. //depot/projects/smpng/sys/alpha/alpha/uio_machdep.c#5 delete .. //depot/projects/smpng/sys/alpha/alpha/uma_machdep.c#2 delete .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#42 delete .. //depot/projects/smpng/sys/alpha/compile/.cvsignore#2 delete .. //depot/projects/smpng/sys/alpha/conf/.cvsignore#2 delete .. //depot/projects/smpng/sys/alpha/conf/DEFAULTS#4 delete .. //depot/projects/smpng/sys/alpha/conf/GENERIC#56 delete .. //depot/projects/smpng/sys/alpha/conf/GENERIC.hints#7 delete .. //depot/projects/smpng/sys/alpha/conf/MAC#2 delete .. //depot/projects/smpng/sys/alpha/conf/Makefile#3 delete .. //depot/projects/smpng/sys/alpha/conf/NOTES#12 delete .. //depot/projects/smpng/sys/alpha/include/_bus.h#2 delete .. //depot/projects/smpng/sys/alpha/include/_inttypes.h#3 delete .. //depot/projects/smpng/sys/alpha/include/_limits.h#9 delete .. //depot/projects/smpng/sys/alpha/include/_stdint.h#3 delete .. //depot/projects/smpng/sys/alpha/include/_types.h#8 delete .. //depot/projects/smpng/sys/alpha/include/alpha_cpu.h#8 delete .. //depot/projects/smpng/sys/alpha/include/asm.h#7 delete .. //depot/projects/smpng/sys/alpha/include/atomic.h#33 delete .. //depot/projects/smpng/sys/alpha/include/bootinfo.h#4 delete .. //depot/projects/smpng/sys/alpha/include/bus.h#20 delete .. //depot/projects/smpng/sys/alpha/include/bus_dma.h#2 delete .. //depot/projects/smpng/sys/alpha/include/bwx.h#2 delete .. //depot/projects/smpng/sys/alpha/include/chipset.h#3 delete .. //depot/projects/smpng/sys/alpha/include/clock.h#4 delete .. //depot/projects/smpng/sys/alpha/include/clockvar.h#3 delete .. //depot/projects/smpng/sys/alpha/include/cpu.h#17 delete .. //depot/projects/smpng/sys/alpha/include/cpuconf.h#6 delete .. //depot/projects/smpng/sys/alpha/include/cpufunc.h#9 delete .. //depot/projects/smpng/sys/alpha/include/db_machdep.h#8 delete .. //depot/projects/smpng/sys/alpha/include/elf.h#6 delete .. //depot/projects/smpng/sys/alpha/include/endian.h#14 delete .. //depot/projects/smpng/sys/alpha/include/exec.h#4 delete .. //depot/projects/smpng/sys/alpha/include/float.h#7 delete .. //depot/projects/smpng/sys/alpha/include/floatingpoint.h#3 delete .. //depot/projects/smpng/sys/alpha/include/fpu.h#5 delete .. //depot/projects/smpng/sys/alpha/include/frame.h#3 delete .. //depot/projects/smpng/sys/alpha/include/gdb_machdep.h#4 delete .. //depot/projects/smpng/sys/alpha/include/ieee.h#4 delete .. //depot/projects/smpng/sys/alpha/include/ieeefp.h#3 delete .. //depot/projects/smpng/sys/alpha/include/in_cksum.h#4 delete .. //depot/projects/smpng/sys/alpha/include/inst.h#2 delete .. //depot/projects/smpng/sys/alpha/include/intr.h#8 delete .. //depot/projects/smpng/sys/alpha/include/intrcnt.h#3 delete .. //depot/projects/smpng/sys/alpha/include/ioctl_bt848.h#4 delete .. //depot/projects/smpng/sys/alpha/include/ioctl_meteor.h#4 delete .. //depot/projects/smpng/sys/alpha/include/kdb.h#4 delete .. //depot/projects/smpng/sys/alpha/include/limits.h#11 delete .. //depot/projects/smpng/sys/alpha/include/memdev.h#2 delete .. //depot/projects/smpng/sys/alpha/include/mutex.h#7 delete .. //depot/projects/smpng/sys/alpha/include/pal.h#3 delete .. //depot/projects/smpng/sys/alpha/include/param.h#17 delete .. //depot/projects/smpng/sys/alpha/include/pc/bios.h#3 delete .. //depot/projects/smpng/sys/alpha/include/pc/display.h#2 delete .. //depot/projects/smpng/sys/alpha/include/pc/vesa.h#3 delete .. //depot/projects/smpng/sys/alpha/include/pcb.h#7 delete .. //depot/projects/smpng/sys/alpha/include/pcpu.h#9 delete .. //depot/projects/smpng/sys/alpha/include/pmap.h#25 delete .. //depot/projects/smpng/sys/alpha/include/pmc_mdep.h#3 delete .. //depot/projects/smpng/sys/alpha/include/ppireg.h#2 delete .. //depot/projects/smpng/sys/alpha/include/proc.h#10 delete .. //depot/projects/smpng/sys/alpha/include/profile.h#6 delete .. //depot/projects/smpng/sys/alpha/include/prom.h#6 delete .. //depot/projects/smpng/sys/alpha/include/pte.h#3 delete .. //depot/projects/smpng/sys/alpha/include/reg.h#7 delete .. //depot/projects/smpng/sys/alpha/include/reloc.h#3 delete .. //depot/projects/smpng/sys/alpha/include/resource.h#3 delete .. //depot/projects/smpng/sys/alpha/include/rpb.h#3 delete .. //depot/projects/smpng/sys/alpha/include/runq.h#4 delete .. //depot/projects/smpng/sys/alpha/include/setjmp.h#3 delete .. //depot/projects/smpng/sys/alpha/include/sf_buf.h#3 delete .. //depot/projects/smpng/sys/alpha/include/sgmap.h#2 delete .. //depot/projects/smpng/sys/alpha/include/sigframe.h#5 delete .. //depot/projects/smpng/sys/alpha/include/signal.h#9 delete .. //depot/projects/smpng/sys/alpha/include/smp.h#7 delete .. //depot/projects/smpng/sys/alpha/include/stdarg.h#7 delete .. //depot/projects/smpng/sys/alpha/include/swiz.h#2 delete .. //depot/projects/smpng/sys/alpha/include/sysarch.h#5 delete .. //depot/projects/smpng/sys/alpha/include/timerreg.h#3 delete .. //depot/projects/smpng/sys/alpha/include/ucontext.h#6 delete .. //depot/projects/smpng/sys/alpha/include/varargs.h#7 delete .. //depot/projects/smpng/sys/alpha/include/vmparam.h#7 delete .. //depot/projects/smpng/sys/alpha/isa/isa.c#17 delete .. //depot/projects/smpng/sys/alpha/isa/isa_dma.c#10 delete .. //depot/projects/smpng/sys/alpha/isa/isavar.h#2 delete .. //depot/projects/smpng/sys/alpha/isa/mcclock_isa.c#6 delete .. //depot/projects/smpng/sys/alpha/linux/Makefile#2 delete .. //depot/projects/smpng/sys/alpha/linux/linux.h#9 delete .. //depot/projects/smpng/sys/alpha/linux/linux_dummy.c#10 delete .. //depot/projects/smpng/sys/alpha/linux/linux_genassym.c#6 delete .. //depot/projects/smpng/sys/alpha/linux/linux_ipc64.h#2 delete .. //depot/projects/smpng/sys/alpha/linux/linux_locore.s#2 delete .. //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#21 delete .. //depot/projects/smpng/sys/alpha/linux/linux_proto.h#20 delete .. //depot/projects/smpng/sys/alpha/linux/linux_syscall.h#18 delete .. //depot/projects/smpng/sys/alpha/linux/linux_sysent.c#18 delete .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#26 delete .. //depot/projects/smpng/sys/alpha/linux/syscalls.conf#3 delete .. //depot/projects/smpng/sys/alpha/linux/syscalls.master#20 delete .. //depot/projects/smpng/sys/alpha/mcbus/mcbus.c#6 delete .. //depot/projects/smpng/sys/alpha/mcbus/mcbusreg.h#3 delete .. //depot/projects/smpng/sys/alpha/mcbus/mcbusvar.h#4 delete .. //depot/projects/smpng/sys/alpha/mcbus/mcmem.c#5 delete .. //depot/projects/smpng/sys/alpha/mcbus/mcpcia.c#24 delete .. //depot/projects/smpng/sys/alpha/mcbus/mcpciareg.h#3 delete .. //depot/projects/smpng/sys/alpha/mcbus/mcpciavar.h#4 delete .. //depot/projects/smpng/sys/alpha/osf1/Makefile#3 delete .. //depot/projects/smpng/sys/alpha/osf1/README.mach-traps#2 delete .. //depot/projects/smpng/sys/alpha/osf1/exec_ecoff.h#3 delete .. //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#15 delete .. //depot/projects/smpng/sys/alpha/osf1/osf1.h#4 delete .. //depot/projects/smpng/sys/alpha/osf1/osf1_ioctl.c#12 delete .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#42 delete .. //depot/projects/smpng/sys/alpha/osf1/osf1_mount.c#17 delete .. //depot/projects/smpng/sys/alpha/osf1/osf1_proto.h#11 delete .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#30 delete .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.h#4 delete .. //depot/projects/smpng/sys/alpha/osf1/osf1_syscall.h#10 delete .. //depot/projects/smpng/sys/alpha/osf1/osf1_sysent.c#10 delete .. //depot/projects/smpng/sys/alpha/osf1/osf1_sysvec.c#9 delete .. //depot/projects/smpng/sys/alpha/osf1/osf1_util.h#7 delete .. //depot/projects/smpng/sys/alpha/osf1/syscalls.conf#3 delete .. //depot/projects/smpng/sys/alpha/osf1/syscalls.master#11 delete .. //depot/projects/smpng/sys/alpha/pci/alphapci_if.m#3 delete .. //depot/projects/smpng/sys/alpha/pci/apecs.c#17 delete .. //depot/projects/smpng/sys/alpha/pci/apecs_pci.c#6 delete .. //depot/projects/smpng/sys/alpha/pci/apecsreg.h#3 delete .. //depot/projects/smpng/sys/alpha/pci/apecsvar.h#2 delete .. //depot/projects/smpng/sys/alpha/pci/bwx.c#4 delete .. //depot/projects/smpng/sys/alpha/pci/cia.c#21 delete .. //depot/projects/smpng/sys/alpha/pci/cia_pci.c#6 delete .. //depot/projects/smpng/sys/alpha/pci/ciareg.h#3 delete .. //depot/projects/smpng/sys/alpha/pci/ciavar.h#2 delete .. //depot/projects/smpng/sys/alpha/pci/irongate.c#7 delete .. //depot/projects/smpng/sys/alpha/pci/irongate_pci.c#6 delete .. //depot/projects/smpng/sys/alpha/pci/irongatereg.h#2 delete .. //depot/projects/smpng/sys/alpha/pci/irongatevar.h#2 delete .. //depot/projects/smpng/sys/alpha/pci/lca.c#9 delete .. //depot/projects/smpng/sys/alpha/pci/lca_pci.c#8 delete .. //depot/projects/smpng/sys/alpha/pci/lcareg.h#4 delete .. //depot/projects/smpng/sys/alpha/pci/lcavar.h#2 delete .. //depot/projects/smpng/sys/alpha/pci/pci_eb164_intr.s#3 delete .. //depot/projects/smpng/sys/alpha/pci/pci_eb64plus_intr.s#3 delete .. //depot/projects/smpng/sys/alpha/pci/pcibus.c#10 delete .. //depot/projects/smpng/sys/alpha/pci/pcibus.h#3 delete .. //depot/projects/smpng/sys/alpha/pci/swiz.c#4 delete .. //depot/projects/smpng/sys/alpha/pci/t2.c#23 delete .. //depot/projects/smpng/sys/alpha/pci/t2_pci.c#10 delete .. //depot/projects/smpng/sys/alpha/pci/t2reg.h#3 delete .. //depot/projects/smpng/sys/alpha/pci/t2var.h#2 delete .. //depot/projects/smpng/sys/alpha/pci/tsunami.c#18 delete .. //depot/projects/smpng/sys/alpha/pci/tsunami_pci.c#8 delete .. //depot/projects/smpng/sys/alpha/pci/tsunamireg.h#3 delete .. //depot/projects/smpng/sys/alpha/pci/tsunamivar.h#2 delete .. //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#18 delete .. //depot/projects/smpng/sys/alpha/tlsb/dwlpxreg.h#3 delete .. //depot/projects/smpng/sys/alpha/tlsb/dwlpxvar.h#3 delete .. //depot/projects/smpng/sys/alpha/tlsb/gbus.c#5 delete .. //depot/projects/smpng/sys/alpha/tlsb/gbusreg.h#2 delete .. //depot/projects/smpng/sys/alpha/tlsb/gbusvar.h#2 delete .. //depot/projects/smpng/sys/alpha/tlsb/kftxx.c#5 delete .. //depot/projects/smpng/sys/alpha/tlsb/kftxxreg.h#3 delete .. //depot/projects/smpng/sys/alpha/tlsb/kftxxvar.h#2 delete .. //depot/projects/smpng/sys/alpha/tlsb/mcclock_tlsb.c#5 delete .. //depot/projects/smpng/sys/alpha/tlsb/tlsb.c#6 delete .. //depot/projects/smpng/sys/alpha/tlsb/tlsbcpu.c#7 delete .. //depot/projects/smpng/sys/alpha/tlsb/tlsbmem.c#5 delete .. //depot/projects/smpng/sys/alpha/tlsb/tlsbreg.h#3 delete .. //depot/projects/smpng/sys/alpha/tlsb/tlsbvar.h#3 delete .. //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#20 delete .. //depot/projects/smpng/sys/alpha/tlsb/zsreg.h#2 delete .. //depot/projects/smpng/sys/alpha/tlsb/zsvar.h#2 delete .. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#14 integrate .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#22 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#52 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#37 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#57 integrate .. //depot/projects/smpng/sys/amd64/conf/DEFAULTS#5 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#45 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#31 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#12 integrate .. //depot/projects/smpng/sys/amd64/include/clock.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/cpu.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/mutex.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#22 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#13 integrate .. //depot/projects/smpng/sys/amd64/include/specialreg.h#9 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#16 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#17 integrate .. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#19 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#28 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#20 integrate .. //depot/projects/smpng/sys/arm/at91/at91.c#5 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/smpng/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/smpng/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/smpng/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/smpng/sys/arm/conf/IQ31244#10 integrate .. //depot/projects/smpng/sys/arm/conf/KB920X#2 integrate .. //depot/projects/smpng/sys/arm/conf/SIMICS#8 integrate .. //depot/projects/smpng/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/smpng/sys/arm/include/_types.h#8 integrate .. //depot/projects/smpng/sys/arm/include/atomic.h#25 integrate .. //depot/projects/smpng/sys/arm/include/cpu.h#6 integrate .. //depot/projects/smpng/sys/arm/include/cpuconf.h#5 integrate .. //depot/projects/smpng/sys/arm/include/cpufunc.h#8 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#17 integrate .. //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#10 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_io.c#6 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_reg.h#2 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_var.h#3 integrate .. //depot/projects/smpng/sys/arm/sa11x0/uart_cpu_sa1110.c#3 integrate .. //depot/projects/smpng/sys/arm/sa11x0/uart_dev_sa1110.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_space.c#5 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#18 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq80321.c#10 integrate .. //depot/projects/smpng/sys/boot/Makefile#20 integrate .. //depot/projects/smpng/sys/boot/alpha/Makefile#2 delete .. //depot/projects/smpng/sys/boot/alpha/Makefile.inc#4 delete .. //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#9 delete .. //depot/projects/smpng/sys/boot/alpha/boot1/boot1.c#4 delete .. //depot/projects/smpng/sys/boot/alpha/cdboot/Makefile#6 delete .. //depot/projects/smpng/sys/boot/alpha/cdboot/version#4 delete .. //depot/projects/smpng/sys/boot/alpha/common/Makefile.common#8 delete .. //depot/projects/smpng/sys/boot/alpha/common/conf.c#5 delete .. //depot/projects/smpng/sys/boot/alpha/common/help.alpha#3 delete .. //depot/projects/smpng/sys/boot/alpha/common/ldscript#2 delete .. //depot/projects/smpng/sys/boot/alpha/common/main.c#4 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/Makefile#6 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/OSFpal.c#3 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/alpha_copy.c#3 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/alpha_module.c#3 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/bbinfo.h#2 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/bootinfo.c#4 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/common.h#3 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/delay.c#4 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/devicename.c#4 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/elf_freebsd.c#5 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/getsecs.c#4 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/libalpha.h#3 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/pal.S#2 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/prom.c#3 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/prom_disp.S#2 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/prom_swpal.S#2 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/reboot.c#3 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/srmdisk.c#5 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/srmnet.c#3 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/start.S#2 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/time.c#3 delete .. //depot/projects/smpng/sys/boot/alpha/loader/Makefile#4 delete .. //depot/projects/smpng/sys/boot/alpha/loader/version#3 delete .. //depot/projects/smpng/sys/boot/alpha/netboot/Makefile#5 delete .. //depot/projects/smpng/sys/boot/alpha/netboot/version#3 delete .. //depot/projects/smpng/sys/boot/arc/Makefile#2 delete .. //depot/projects/smpng/sys/boot/arc/Makefile.inc#2 delete .. //depot/projects/smpng/sys/boot/arc/include/arcfuncs.h#4 delete .. //depot/projects/smpng/sys/boot/arc/include/arctypes.h#2 delete .. //depot/projects/smpng/sys/boot/arc/include/libarc.h#2 delete .. //depot/projects/smpng/sys/boot/arc/lib/Makefile#5 delete .. //depot/projects/smpng/sys/boot/arc/lib/abort.c#3 delete .. //depot/projects/smpng/sys/boot/arc/lib/arcconsole.c#3 delete .. //depot/projects/smpng/sys/boot/arc/lib/arcdisk.c#5 delete .. //depot/projects/smpng/sys/boot/arc/lib/arch/alpha/copy.c#2 delete .. //depot/projects/smpng/sys/boot/arc/lib/arch/alpha/rpb.c#2 delete .. //depot/projects/smpng/sys/boot/arc/lib/arch/alpha/setjmp.S#2 delete .. //depot/projects/smpng/sys/boot/arc/lib/arch/alpha/start.S#2 delete .. //depot/projects/smpng/sys/boot/arc/lib/bootinfo.c#4 delete .. //depot/projects/smpng/sys/boot/arc/lib/delay.c#3 delete .. //depot/projects/smpng/sys/boot/arc/lib/devicename.c#4 delete .. //depot/projects/smpng/sys/boot/arc/lib/elf_freebsd.c#5 delete .. //depot/projects/smpng/sys/boot/arc/lib/module.c#3 delete .. //depot/projects/smpng/sys/boot/arc/lib/prom.c#3 delete .. //depot/projects/smpng/sys/boot/arc/lib/setjmperr.c#3 delete .. //depot/projects/smpng/sys/boot/arc/lib/time.c#3 delete .. //depot/projects/smpng/sys/boot/arc/loader/Makefile#4 delete .. //depot/projects/smpng/sys/boot/arc/loader/conf.c#4 delete .. //depot/projects/smpng/sys/boot/arc/loader/help.alpha#2 delete .. //depot/projects/smpng/sys/boot/arc/loader/main.c#3 delete .. //depot/projects/smpng/sys/boot/arc/loader/version#2 delete .. //depot/projects/smpng/sys/boot/common/Makefile.inc#9 integrate .. //depot/projects/smpng/sys/boot/common/load_elf.c#14 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#39 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/bootinfo.c#11 integrate .. //depot/projects/smpng/sys/boot/ficl/Makefile#13 integrate .. //depot/projects/smpng/sys/boot/ficl/alpha/sysdep.c#2 delete .. //depot/projects/smpng/sys/boot/ficl/alpha/sysdep.h#4 delete .. //depot/projects/smpng/sys/boot/ficl/loader.c#9 integrate .. //depot/projects/smpng/sys/boot/forth/loader.4th#4 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#41 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0.S#7 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#13 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/bootinfo.c#4 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/conf.c#3 integrate .. //depot/projects/smpng/sys/boot/pc98/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/io.c#8 integrate .. //depot/projects/smpng/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/smpng/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/smpng/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/smpng/sys/boot/powerpc/loader/conf.c#6 integrate .. //depot/projects/smpng/sys/bsm/audit.h#5 integrate .. //depot/projects/smpng/sys/bsm/audit_record.h#3 integrate .. //depot/projects/smpng/sys/cam/cam_ccb.h#8 integrate .. //depot/projects/smpng/sys/cam/cam_debug.h#3 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#21 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#35 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#9 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#21 integrate .. //depot/projects/smpng/sys/coda/cnode.h#10 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#36 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#47 integrate .. //depot/projects/smpng/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/smpng/sys/compat/linux/linux_file.c#28 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#45 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.h#13 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#64 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#20 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#30 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#32 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.c#15 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.h#14 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#20 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#41 integrate .. //depot/projects/smpng/sys/conf/Makefile.alpha#28 delete .. //depot/projects/smpng/sys/conf/Makefile.arm#20 integrate .. //depot/projects/smpng/sys/conf/NOTES#119 integrate .. //depot/projects/smpng/sys/conf/files#175 integrate .. //depot/projects/smpng/sys/conf/files.alpha#40 delete .. //depot/projects/smpng/sys/conf/files.amd64#43 integrate .. //depot/projects/smpng/sys/conf/files.arm#8 integrate .. //depot/projects/smpng/sys/conf/files.i386#97 integrate .. //depot/projects/smpng/sys/conf/files.pc98#82 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#29 integrate .. //depot/projects/smpng/sys/conf/kern.mk#16 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#53 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#58 integrate .. //depot/projects/smpng/sys/conf/ldscript.alpha#6 delete .. //depot/projects/smpng/sys/conf/options#120 integrate .. //depot/projects/smpng/sys/conf/options.alpha#15 delete .. //depot/projects/smpng/sys/conf/options.amd64#19 integrate .. //depot/projects/smpng/sys/conf/options.arm#8 integrate .. //depot/projects/smpng/sys/conf/options.i386#57 integrate .. //depot/projects/smpng/sys/conf/options.pc98#56 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/COPYRIGHT#4 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/README#5 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ah.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ah_desc.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ah_devid.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ah_soc.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_if.m#4 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_osdep.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_osdep.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/ap30.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/ap30.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/ap30.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/ap43.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/ap43.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/ap43.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/ap51.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/ap51.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/ap51.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/ap61.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/ap61.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/ap61.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/i386-elf.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-be-elf.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-le-elf.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/sparc-be-elf.inc#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/x86_64-elf.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/version.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#17 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#18 integrate .. //depot/projects/smpng/sys/crypto/via/padlock.c#4 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#32 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_panasonic.c#5 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#29 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#93 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#21 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#30 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#36 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#62 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#13 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#16 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#18 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#41 integrate .. //depot/projects/smpng/sys/dev/amr/amr_linux.c#4 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#24 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#52 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#5 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl.c#11 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl_isa.c#7 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#32 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#83 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#66 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#62 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#40 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#24 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc.c#4 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/awi/awi.c#26 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#24 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfereg.h#8 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#75 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#41 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#27 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#30 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#27 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#46 integrate .. //depot/projects/smpng/sys/dev/cm/if_cm_isa.c#9 integrate .. //depot/projects/smpng/sys/dev/cm/smc90cx6.c#13 integrate .. //depot/projects/smpng/sys/dev/cm/smc90cx6reg.h#2 integrate .. //depot/projects/smpng/sys/dev/cm/smc90cx6var.h#5 integrate .. //depot/projects/smpng/sys/dev/cnw/if_cnw.c#22 integrate .. //depot/projects/smpng/sys/dev/cpufreq/ichss.c#4 integrate .. //depot/projects/smpng/sys/dev/ct/bshw_machdep.c#6 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#18 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#25 integrate .. //depot/projects/smpng/sys/dev/dc/dcphy.c#3 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#8 integrate .. //depot/projects/smpng/sys/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#8 integrate .. //depot/projects/smpng/sys/dev/de/if_de.c#2 integrate .. //depot/projects/smpng/sys/dev/dec/mc146818reg.h#3 delete .. //depot/projects/smpng/sys/dev/dec/mcclock.c#5 delete .. //depot/projects/smpng/sys/dev/dec/mcclock_if.m#3 delete .. //depot/projects/smpng/sys/dev/dec/mcclockvar.h#3 delete .. //depot/projects/smpng/sys/dev/digi/digi.c#33 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_scsi.c#14 integrate .. //depot/projects/smpng/sys/dev/drm/drm.h#11 integrate .. //depot/projects/smpng/sys/dev/drm/drm_scatter.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drv.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drv.c#10 integrate .. //depot/projects/smpng/sys/dev/drm/r300_cmdbuf.c#5 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#38 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#17 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_novell.c#5 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#37 integrate .. //depot/projects/smpng/sys/dev/ed/if_edvar.h#15 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#68 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.c#18 integrate .. //depot/projects/smpng/sys/dev/fb/boot_font.c#6 integrate .. //depot/projects/smpng/sys/dev/fb/gfb.c#8 integrate .. //depot/projects/smpng/sys/dev/fb/tga.c#8 delete .. //depot/projects/smpng/sys/dev/fb/tga.h#3 delete .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#36 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#74 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#28 integrate .. //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#23 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751var.h#8 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#31 integrate .. //depot/projects/smpng/sys/dev/hptmv/entry.c#10 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_alpha.c#2 delete .. //depot/projects/smpng/sys/dev/ic/ns16550.h#6 integrate .. //depot/projects/smpng/sys/dev/idt/idt.c#10 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/iir/iir.c#15 integrate .. //depot/projects/smpng/sys/dev/iir/iir_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/smpng/sys/dev/ips/ips.c#15 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#11 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipwvar.h#4 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#40 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#30 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#35 integrate .. //depot/projects/smpng/sys/dev/isp/isp_tpublic.h#9 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#29 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#17 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.h#8 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb_osdep.h#4 integrate .. //depot/projects/smpng/sys/dev/le/am7990.c#3 integrate .. //depot/projects/smpng/sys/dev/le/am79900.c#3 integrate .. //depot/projects/smpng/sys/dev/le/if_le_cbus.c#1 branch .. //depot/projects/smpng/sys/dev/le/if_le_isa.c#1 branch .. //depot/projects/smpng/sys/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/smpng/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/le/lance.c#2 integrate .. //depot/projects/smpng/sys/dev/le/lancereg.h#2 integrate .. //depot/projects/smpng/sys/dev/le/lancevar.h#2 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#35 integrate .. //depot/projects/smpng/sys/dev/lge/if_lgereg.h#7 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#12 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#22 delete .. //depot/projects/smpng/sys/dev/lnc/if_lnc_cbus.c#11 delete .. //depot/projects/smpng/sys/dev/lnc/if_lnc_isa.c#10 delete .. //depot/projects/smpng/sys/dev/lnc/if_lnc_pci.c#13 delete .. //depot/projects/smpng/sys/dev/lnc/if_lncreg.h#2 delete .. //depot/projects/smpng/sys/dev/lnc/if_lncvar.h#5 delete .. //depot/projects/smpng/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_linux.c#1 branch .. //depot/projects/smpng/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/smpng/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#31 integrate .. //depot/projects/smpng/sys/dev/mii/ciphy.c#4 integrate .. //depot/projects/smpng/sys/dev/mii/e1000phy.c#12 integrate .. //depot/projects/smpng/sys/dev/mii/mii_physubr.c#13 integrate .. //depot/projects/smpng/sys/dev/mii/miivar.h#7 integrate .. //depot/projects/smpng/sys/dev/mii/nsgphy.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/rgephy.c#6 integrate .. //depot/projects/smpng/sys/dev/mii/tdkphy.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/ukphy_subr.c#6 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.c#16 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#13 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.h#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_debug.c#13 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_raid.c#7 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_raid.h#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_reg.h#4 integrate .. //depot/projects/smpng/sys/dev/mse/mse.c#6 integrate .. //depot/projects/smpng/sys/dev/mse/mse_cbus.c#5 integrate .. //depot/projects/smpng/sys/dev/mse/mse_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#23 integrate .. //depot/projects/smpng/sys/dev/myri10ge/if_myri10ge.c#2 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500.c#10 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#49 integrate .. //depot/projects/smpng/sys/dev/nge/if_ngereg.h#11 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp.c#11 integrate .. //depot/projects/smpng/sys/dev/nve/if_nve.c#13 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#24 integrate .. //depot/projects/smpng/sys/dev/pbio/pbio.c#6 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#54 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#59 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#18 integrate .. //depot/projects/smpng/sys/dev/pci/fixup_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#70 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#15 integrate .. //depot/projects/smpng/sys/dev/pdq/pdq_freebsd.h#10 integrate .. //depot/projects/smpng/sys/dev/pdq/pdqvar.h#8 integrate .. //depot/projects/smpng/sys/dev/ppbus/vpoio.c#5 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc.c#13 integrate .. //depot/projects/smpng/sys/dev/ral/if_ral_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/smpng/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#39 integrate .. //depot/projects/smpng/sys/dev/rr232x/os_bsd.h#2 integrate .. //depot/projects/smpng/sys/dev/rr232x/osm_bsd.c#2 integrate .. //depot/projects/smpng/sys/dev/safe/safe.c#9 integrate .. //depot/projects/smpng/sys/dev/safe/safevar.h#2 integrate .. //depot/projects/smpng/sys/dev/sbsh/if_sbsh.c#13 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#60 integrate .. //depot/projects/smpng/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/smpng/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/isa/es1888.c#8 delete .. //depot/projects/smpng/sys/dev/sound/isa/gusc.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/midi/midiq.h#1 branch .. //depot/projects/smpng/sys/dev/sound/midi/mpu401.c#1 branch .. //depot/projects/smpng/sys/dev/sound/midi/mpu401.h#1 branch .. //depot/projects/smpng/sys/dev/sound/midi/mpu_if.m#1 branch .. //depot/projects/smpng/sys/dev/sound/midi/mpufoi_if.m#1 branch .. //depot/projects/smpng/sys/dev/sound/midi/synth_if.m#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#28 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#27 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#25 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30.c#11 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#25 integrate .. //depot/projects/smpng/sys/dev/syscons/apm/apm_saver.c#7 integrate .. //depot/projects/smpng/sys/dev/syscons/scterm-sc.c#8 integrate .. //depot/projects/smpng/sys/dev/syscons/scvesactl.c#7 integrate .. //depot/projects/smpng/sys/dev/syscons/scvgarndr.c#9 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#55 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#15 integrate .. //depot/projects/smpng/sys/dev/tga/tga_pci.c#12 delete .. //depot/projects/smpng/sys/dev/tga/tga_pci.h#3 delete .. //depot/projects/smpng/sys/dev/trm/trm.c#22 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#27 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#33 integrate .. //depot/projects/smpng/sys/dev/uart/uart.h#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_alpha.c#9 delete .. //depot/projects/smpng/sys/dev/uart/uart_dbg.c#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#14 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_z8530.c#11 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#19 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#20 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsecvar.h#8 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/ehcivar.h#11 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/if_axereg.h#8 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#42 integrate .. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/ohcireg.h#8 integrate .. //depot/projects/smpng/sys/dev/usb/ohcivar.h#16 integrate .. //depot/projects/smpng/sys/dev/usb/sl811hs.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#36 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#41 integrate .. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/uhcivar.h#14 integrate .. //depot/projects/smpng/sys/dev/usb/usb.c#33 integrate .. //depot/projects/smpng/sys/dev/usb/usb_mem.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#36 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/usbdivar.h#16 integrate .. //depot/projects/smpng/sys/dev/wds/wd7000.c#7 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#80 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#23 integrate .. //depot/projects/smpng/sys/dev/zs/zs.c#23 integrate .. //depot/projects/smpng/sys/doc/subsys/Dependencies#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-cam#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-crypto#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-dev_pci#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-dev_sound#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-dev_usb#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-geom#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-i4b#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-kern#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-libkern#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-linux#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-net80211#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-netgraph#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-netinet#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-netinet6#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-netipsec#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-opencrypto#1 branch .. //depot/projects/smpng/sys/doc/subsys/Doxyfile-vm#1 branch .. //depot/projects/smpng/sys/doc/subsys/Makefile#1 branch .. //depot/projects/smpng/sys/doc/subsys/README#1 branch .. //depot/projects/smpng/sys/doc/subsys/common-Doxyfile#1 branch .. //depot/projects/smpng/sys/doc/subsys/notreviewed.dox#1 branch .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#21 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#46 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#32 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#24 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_io.c#20 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs.c#12 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#22 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#23 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#23 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_subr.c#8 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#35 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#27 integrate .. //depot/projects/smpng/sys/gdb/gdb.h#3 integrate .. //depot/projects/smpng/sys/gdb/gdb_cons.c#2 integrate .. //depot/projects/smpng/sys/gdb/gdb_main.c#7 integrate .. //depot/projects/smpng/sys/gdb/gdb_packet.c#3 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#12 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.h#6 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli_ctl.c#5 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/smpng/sys/geom/eli/g_eli_key.c#3 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/smpng/sys/geom/geom.h#46 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#41 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#24 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#42 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#29 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vfsops.c#6 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/debug.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/sv.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#2 delete .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_acl.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_acl.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_ag.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_alloc.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_alloc.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_alloc_btree.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_alloc_btree.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_arch.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_attr.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_attr.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_attr_leaf.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_attr_leaf.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_attr_sf.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_behavior.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_behavior.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_bit.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_bmap.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_bmap_btree.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_btree.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_btree.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_buf_item.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_buf_item.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_cap.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_clnt.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_da_btree.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_da_btree.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dfrag.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dinode.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_block.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_block.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_data.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_data.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_leaf.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_leaf.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_node.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_node.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_sf.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_sf.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_trace.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_trace.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir_leaf.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir_leaf.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir_sf.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dmapi.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dmops.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_error.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_error.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_extfree_item.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_extfree_item.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_fs.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_fsops.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_fsops.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_ialloc.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_ialloc_btree.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_ialloc_btree.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_iget.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_imap.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_inode.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_inode_item.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_inode_item.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_inum.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_iocore.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_iomap.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_iomap.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_itable.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_itable.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_log.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_log_priv.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_log_recover.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_mac.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_macros.c#2 delete .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_macros.h#2 delete .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_mount.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_mount.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_qmops.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_quota.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_refcache.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_refcache.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_rename.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_rtalloc.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_rw.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_rw.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_sb.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans_ail.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans_buf.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans_extfree.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans_inode.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans_item.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans_priv.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans_space.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_types.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_utils.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_utils.h#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_vfsops.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/xfsidbg.c#2 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#23 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakecode.S#9 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#33 integrate .. //depot/projects/smpng/sys/i386/bios/apm.c#12 integrate .. //depot/projects/smpng/sys/i386/bios/apm.h#5 integrate .. //depot/projects/smpng/sys/i386/conf/DEFAULTS#5 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#75 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC.hints#8 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#120 integrate .. //depot/projects/smpng/sys/i386/conf/PAE#18 integrate .. //depot/projects/smpng/sys/i386/cpufreq/est.c#7 integrate .. //depot/projects/smpng/sys/i386/cpufreq/powernow.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#22 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#39 integrate .. //depot/projects/smpng/sys/i386/i386/initcpu.c#27 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#107 integrate .. //depot/projects/smpng/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#101 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#96 integrate .. //depot/projects/smpng/sys/i386/i386/ptrace_machdep.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#79 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#20 integrate .. //depot/projects/smpng/sys/i386/include/clock.h#13 integrate .. //depot/projects/smpng/sys/i386/include/cpu.h#15 integrate .. //depot/projects/smpng/sys/i386/include/md_var.h#32 integrate .. //depot/projects/smpng/sys/i386/include/mutex.h#10 integrate .. //depot/projects/smpng/sys/i386/include/npx.h#9 integrate .. //depot/projects/smpng/sys/i386/include/pcpu.h#15 integrate .. //depot/projects/smpng/sys/i386/include/pcvt_ioctl.h#4 delete .. //depot/projects/smpng/sys/i386/include/pmap.h#30 integrate .. //depot/projects/smpng/sys/i386/include/privatespace.h#4 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#21 integrate .. //depot/projects/smpng/sys/i386/include/specialreg.h#10 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#58 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_conf.h#3 delete .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#19 delete .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_ext.c#15 delete .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_hdr.h#11 delete .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_kbd.c#7 delete .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_kbd.h#3 delete .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_out.c#5 delete .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_sup.c#6 delete .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_tbl.h#3 delete .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_vtf.c#4 delete .. //depot/projects/smpng/sys/i386/isa/spic.c#13 integrate .. //depot/projects/smpng/sys/i386/linux/linux_dummy.c#13 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#24 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#23 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#24 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#51 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#24 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_card.c#6 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_isa.c#11 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_lli.c#9 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_pci.c#12 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_isac.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_l1.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#16 integrate .. //depot/projects/smpng/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#49 integrate .. //depot/projects/smpng/sys/ia64/conf/NOTES#8 integrate .. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#25 integrate .. //depot/projects/smpng/sys/ia64/ia64/clock.c#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#33 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#77 integrate .. //depot/projects/smpng/sys/ia64/ia64/ssc.c#18 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#79 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#51 integrate .. //depot/projects/smpng/sys/ia64/include/cpu.h#26 integrate .. //depot/projects/smpng/sys/isa/isa_common.c#18 integrate .. //depot/projects/smpng/sys/isa/isa_common.h#6 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#41 integrate .. //depot/projects/smpng/sys/kern/init_main.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#97 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#117 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#66 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#128 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 12 19:51:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6323916A474; Mon, 12 Jun 2006 19:51:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4027416A46F for ; Mon, 12 Jun 2006 19:51:09 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C4E743D45 for ; Mon, 12 Jun 2006 19:51:09 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CJmrr6004245 for ; Mon, 12 Jun 2006 19:48:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CJmr6b004242 for perforce@freebsd.org; Mon, 12 Jun 2006 19:48:53 GMT (envelope-from jhb@freebsd.org) Date: Mon, 12 Jun 2006 19:48:53 GMT Message-Id: <200606121948.k5CJmr6b004242@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 99069 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, 12 Jun 2006 19:51:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=99069 Change 99069 by jhb@jhb_mutex on 2006/06/12 19:48:22 IFC @99067. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#40 delete .. //depot/projects/smpng/sys/alpha/include/md_var.h#11 delete .. //depot/projects/smpng/sys/alpha/include/ptrace.h#11 delete .. //depot/projects/smpng/sys/dev/puc/pucdata.c#36 integrate .. //depot/projects/smpng/sys/dev/sound/midi/midi.c#10 branch .. //depot/projects/smpng/sys/dev/sound/midi/midi.h#8 branch .. //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#11 branch .. //depot/projects/smpng/sys/dev/sound/midi/sequencer.h#4 branch Differences ... ==== //depot/projects/smpng/sys/dev/puc/pucdata.c#36 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.55 2006/04/28 21:21:52 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.56 2006/06/12 19:22:44 imp Exp $"); /* * PCI "universal" communications card driver configuration data (used to @@ -38,6 +38,7 @@ #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Mon Jun 12 20:06:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 145F416A474; Mon, 12 Jun 2006 20:06:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5D8716A46F for ; Mon, 12 Jun 2006 20:06:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BBBE43D62 for ; Mon, 12 Jun 2006 20:06:28 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CK4C9o006174 for ; Mon, 12 Jun 2006 20:04:12 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CK4Cks006171 for perforce@freebsd.org; Mon, 12 Jun 2006 20:04:12 GMT (envelope-from jhb@freebsd.org) Date: Mon, 12 Jun 2006 20:04:12 GMT Message-Id: <200606122004.k5CK4Cks006171@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 99071 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, 12 Jun 2006 20:06:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=99071 Change 99071 by jhb@jhb_mutex on 2006/06/12 20:03:11 Whitespace. Affected files ... .. //depot/projects/smpng/sys/kern/kern_linker.c#67 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_linker.c#67 (text+ko) ==== @@ -566,7 +566,6 @@ return (0); } - KLD_DPF(FILE, ("linker_file_unload: file is unloading," " informing modules\n")); From owner-p4-projects@FreeBSD.ORG Mon Jun 12 20:30:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2760616A49E; Mon, 12 Jun 2006 20:30:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7A4E16A41A for ; Mon, 12 Jun 2006 20:30:04 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 764A043D66 for ; Mon, 12 Jun 2006 20:30:01 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CKRji6007509 for ; Mon, 12 Jun 2006 20:27:45 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CKRjLa007506 for perforce@freebsd.org; Mon, 12 Jun 2006 20:27:45 GMT (envelope-from wsalamon@computer.org) Date: Mon, 12 Jun 2006 20:27:45 GMT Message-Id: <200606122027.k5CKRjLa007506@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 99077 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, 12 Jun 2006 20:30:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=99077 Change 99077 by wsalamon@vh1 on 2006/06/12 20:27:30 Make the size of the subject32_ex and process32_ex tokens depend on whether we have an IPv6 address, or not. Write the term ID as 4 or 16 bytes depending on address type. This change matches the recent OpenBSM change, and what Solaris does. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#17 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#17 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#16 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#17 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.3 2006/06/05 13:13:02 rwatson Exp $ */ @@ -609,7 +609,7 @@ * terminal ID * port ID 4 bytes/8 bytes (32-bit/64-bit value) * address type-len 4 bytes - * machine address 16 bytes + * machine address 4/16 bytes */ token_t * au_to_process32_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, @@ -618,7 +618,12 @@ token_t *t; u_char *dptr = NULL; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * sizeof(u_int32_t)); + if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * + sizeof(u_int32_t)); + else + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * + sizeof(u_int32_t)); ADD_U_CHAR(dptr, AUT_PROCESS32_EX); ADD_U_INT32(dptr, auid); @@ -631,10 +636,11 @@ ADD_U_INT32(dptr, tid->at_port); ADD_U_INT32(dptr, tid->at_type); ADD_U_INT32(dptr, tid->at_addr[0]); - ADD_U_INT32(dptr, tid->at_addr[1]); - ADD_U_INT32(dptr, tid->at_addr[2]); - ADD_U_INT32(dptr, tid->at_addr[3]); - + if (tid->at_type == AU_IPv6) { + ADD_U_INT32(dptr, tid->at_addr[1]); + ADD_U_INT32(dptr, tid->at_addr[2]); + ADD_U_INT32(dptr, tid->at_addr[3]); + } return (t); } @@ -938,7 +944,7 @@ * terminal ID * port ID 4 bytes/8 bytes (32-bit/64-bit value) * address type/length 4 bytes - * machine address 16 bytes + * machine address 4/16 bytes */ token_t * au_to_subject32_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, @@ -947,7 +953,12 @@ token_t *t; u_char *dptr = NULL; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * sizeof(u_int32_t)); + if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * + sizeof(u_int32_t)); + else + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * + sizeof(u_int32_t)); ADD_U_CHAR(dptr, AUT_SUBJECT32_EX); ADD_U_INT32(dptr, auid); @@ -960,10 +971,11 @@ ADD_U_INT32(dptr, tid->at_port); ADD_U_INT32(dptr, tid->at_type); ADD_U_INT32(dptr, tid->at_addr[0]); - ADD_U_INT32(dptr, tid->at_addr[1]); - ADD_U_INT32(dptr, tid->at_addr[2]); - ADD_U_INT32(dptr, tid->at_addr[3]); - + if (tid->at_type == AU_IPv6) { + ADD_U_INT32(dptr, tid->at_addr[1]); + ADD_U_INT32(dptr, tid->at_addr[2]); + ADD_U_INT32(dptr, tid->at_addr[3]); + } return (t); } From owner-p4-projects@FreeBSD.ORG Mon Jun 12 20:33:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F414416A41F; Mon, 12 Jun 2006 20:33:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D190A16A418 for ; Mon, 12 Jun 2006 20:33:05 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BFC043D49 for ; Mon, 12 Jun 2006 20:33:05 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CKUnS9007845 for ; Mon, 12 Jun 2006 20:30:49 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CKUnZE007842 for perforce@freebsd.org; Mon, 12 Jun 2006 20:30:49 GMT (envelope-from jhb@freebsd.org) Date: Mon, 12 Jun 2006 20:30:49 GMT Message-Id: <200606122030.k5CKUnZE007842@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 99078 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, 12 Jun 2006 20:33:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=99078 Change 99078 by jhb@jhb_mutex on 2006/06/12 20:30:28 Style fixes and close a race. Affected files ... .. //depot/projects/smpng/sys/kern/subr_firmware.c#9 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_firmware.c#9 (text+ko) ==== @@ -96,11 +96,6 @@ return frp; } -/* - * Note that for a module loaded via kldload before it was asked for by - * a consumer, fp->file will be NULL, so we won't try to unload the - * module when the last reference is dropped. - */ static void clearentry(struct firmware *fp) { @@ -226,8 +221,7 @@ if (fp == NULL) break; file = fp->file; - /* No longer explicitly loaded. */ - fp->file = NULL; + clearentry(fp); mtx_unlock(&firmware_mtx); linker_release_module(NULL, NULL, file); @@ -251,6 +245,8 @@ if (fp->refcnt == 0) { if ((flags & FIRMWARE_UNLOAD) == 0) fp->flags |= FIRMWAREFLAG_KEEPKLDREF; + else if (fp->file) + taskqueue_enqueue(taskqueue_thread, &firmware_task); } mtx_unlock(&firmware_mtx); } @@ -261,6 +257,7 @@ static int firmware_modevent(module_t mod, int type, void *unused) { + struct firmware *fp; int i; switch (type) { @@ -269,7 +266,7 @@ return 0; case MOD_UNLOAD: for (i = 0; i < FIRMWARE_MAX; i++) { - struct firmware *fp = &firmware_table[i]; + fp = &firmware_table[i]; fp->flags &= ~FIRMWAREFLAG_KEEPKLDREF; } taskqueue_enqueue(taskqueue_thread, &firmware_task); From owner-p4-projects@FreeBSD.ORG Mon Jun 12 20:45:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0FAA16A473; Mon, 12 Jun 2006 20:45:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 87EF916A418 for ; Mon, 12 Jun 2006 20:45:54 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0448F43DA5 for ; Mon, 12 Jun 2006 20:45:47 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CKhUTe008405 for ; Mon, 12 Jun 2006 20:43:31 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CKhU1Y008373 for perforce@freebsd.org; Mon, 12 Jun 2006 20:43:30 GMT (envelope-from trhodes@freebsd.org) Date: Mon, 12 Jun 2006 20:43:30 GMT Message-Id: <200606122043.k5CKhU1Y008373@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 99079 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, 12 Jun 2006 20:45:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=99079 Change 99079 by trhodes@trhodes_local on 2006/06/12 20:35:11 If the login.conf file is not root:wheel, the configuration in login.conf.db will not be applied. This can sometimes happen when replicating configuration across hosts using a user account and scp. Add a check for this. Affected files ... .. //depot/projects/trhodesbsd/doc/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/README#1 branch .. //depot/projects/trhodesbsd/doc/bn_BD.ISO10646-1/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/bn_BD.ISO10646-1/articles/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/bn_BD.ISO10646-1/articles/Makefile.inc#1 branch .. //depot/projects/trhodesbsd/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/trhodesbsd/doc/da_DK.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/articles.ent#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/trhodesbsd/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/Makefile.inc#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/java-tomcat/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/java-tomcat/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/laptop/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/new-users/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/releng/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/releng/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/articles/releng/extra.css#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/share/sgml/articles.ent#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/share/sgml/catalog#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/share/sgml/teams.ent#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#1 branch .. //depot/projects/trhodesbsd/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/building-products/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/building-products/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/console-server/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/console-server/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/geom-class/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/hats/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/hats/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/hubs/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/hubs/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/portbuild/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/releng/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/solid-state/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/vinum/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/vinum/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/vm-design/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/bibliography/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/bibliography/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/dev-model/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/dev-model/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/dma/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/security/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/pmake/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/pmake/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/pmake/chapters.ent#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/share/mk/doc.local.mk#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/slides/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/slides/README#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/admin.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/applications.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/includes.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/install.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/misc.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/network.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/preface.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/serial.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/FAQ/x.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/releng/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/authors.ent#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/trhodesbsd/doc/es_ES.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/ddwg/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man1/builtin.1#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man1/cat.1#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man1/chkey.1#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man1/echo.1#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man1/head.1#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man1/intro.1#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man4/agp.4#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man4/amd.4#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man4/ncr.4#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man4/sd.4#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man4/sn.4#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man4/spic.4#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man4/st.4#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man5/intro.5#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man5/publickey.5#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man6/intro.6#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man7/ascii.7#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/man/man7/intro.7#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/trhodesbsd/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/Makefile.inc#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/committers-guide/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/committers-guide/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/euro/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/euro/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/multi-os/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/multi-os/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/new-users/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/new-users/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/vm-design/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/articles/vm-design/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/Makefile.inc#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/appendix.decl#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/audit/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/basics/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/boot/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/chapter.decl#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/chapters.ent#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/colophon.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/config/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/desktop/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/disks/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/eresources/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/geom/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/install/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/introduction/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/l10n/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/mac/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/mail/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/ports/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/printing/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/security/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/txtfiles.ent#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/users/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/vinum/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/x11/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/chapters.ent#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/history/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/flyer/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/flyer/flyer.tex#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/share/sgml/articles.ent#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/share/sgml/bookinfo.ent#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/share/sgml/books.ent#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/share/sgml/catalog#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/share/sgml/freebsd.dsl#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/share/sgml/l10n.ent#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/share/sgml/trademarks.ent#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/share/sgml/trademarks.sgml#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/share/sgml/translators.ent#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/trhodesbsd/doc/it_IT.ISO8859-15/share/sgml/transtable.xml#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/Makefile.inc#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/contributing/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/contributing/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/contributors/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/contributors/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/diskless-x/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/diskless-x/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.conf.default#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.sh#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.conf.default#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.sh#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_3.mk#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/fonts/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/fonts/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/ipsec-must/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/multi-os/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/multi-os/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/problem-reports/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/problem-reports/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/zip-drive/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/articles/zip-drive/article.sgml#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/books/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/books/Makefile.inc#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/books/design-44bsd/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/books/design-44bsd/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/books/design-44bsd/fig1.eps#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/books/design-44bsd/fig2.eps#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/books/design-44bsd/freebsd.dsl#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/books/faq/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/books/faq/book.sgml#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/books/fdp-primer/Makefile#1 branch .. //depot/projects/trhodesbsd/doc/ja_JP.eucJP/books/fdp-primer/book.sgml#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 12 20:53:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F18A616A41F; Mon, 12 Jun 2006 20:53:12 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 80E1B16A473; Mon, 12 Jun 2006 20:53:12 +0000 (UTC) (envelope-from trhodes@FreeBSD.org) Received: from pittgoth.com (ns1.pittgoth.com [216.38.206.188]) by mx1.FreeBSD.org (Postfix) with ESMTP id A687443D79; Mon, 12 Jun 2006 20:53:08 +0000 (GMT) (envelope-from trhodes@FreeBSD.org) Received: from localhost (ip70-177-190-239.dc.dc.cox.net [70.177.190.239]) (authenticated bits=0) by pittgoth.com (8.13.4/8.13.4) with ESMTP id k5CKtWSp067179 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 12 Jun 2006 16:55:33 -0400 (EDT) (envelope-from trhodes@FreeBSD.org) Date: Mon, 12 Jun 2006 16:52:59 -0400 From: Tom Rhodes To: Tom Rhodes Message-Id: <20060612165259.0164738d.trhodes@FreeBSD.org> In-Reply-To: <200606122043.k5CKhU1Y008373@repoman.freebsd.org> References: <200606122043.k5CKhU1Y008373@repoman.freebsd.org> X-Mailer: Sylpheed version 1.0.6 (GTK+ 1.2.10; i386-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: perforce@FreeBSD.org Subject: Re: PERFORCE change 99079 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, 12 Jun 2006 20:53:13 -0000 On Mon, 12 Jun 2006 20:43:30 GMT Tom Rhodes wrote: > http://perforce.freebsd.org/chv.cgi?CH=99079 > > Change 99079 by trhodes@trhodes_local on 2006/06/12 20:35:11 > > If the login.conf file is not root:wheel, the configuration > in login.conf.db will not be applied. This can sometimes > happen when replicating configuration across hosts using > a user account and scp. Add a check for this. > > Affected files ... > Ummm, it also included my integrate. The check file is src/periodic/security/410.logincheck. -- Tom Rhodes From owner-p4-projects@FreeBSD.ORG Mon Jun 12 21:13:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF37316A473; Mon, 12 Jun 2006 21:13:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AAE7D16A41F for ; Mon, 12 Jun 2006 21:13:24 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2671C43D5C for ; Mon, 12 Jun 2006 21:13:23 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CLB7pM018640 for ; Mon, 12 Jun 2006 21:11:07 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CLB6iS018637 for perforce@freebsd.org; Mon, 12 Jun 2006 21:11:06 GMT (envelope-from trhodes@freebsd.org) Date: Mon, 12 Jun 2006 21:11:06 GMT Message-Id: <200606122111.k5CLB6iS018637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 99081 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, 12 Jun 2006 21:13:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=99081 Change 99081 by trhodes@trhodes_local on 2006/06/12 21:10:06 Add a new function, vfs_oeaction() to wrap around calls to panic() in file systems. Affected files ... .. //depot/projects/trhodesbsd/src/sys/kern/vfs_mount.c#2 edit .. //depot/projects/trhodesbsd/src/sys/sys/mount.h#2 edit Differences ... ==== //depot/projects/trhodesbsd/src/sys/kern/vfs_mount.c#2 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -141,6 +142,8 @@ "suid", "exec", "update", + "oepanic", + "oerdonly", NULL }; @@ -2111,3 +2114,15 @@ error = kernel_mount(ma, flags); return (error); } + +void +vfs_oeaction(struct mount *vmount, char *message) +{ + + if (vfs_flagopt(vmount->mnt_opt, "oerdonly", NULL, 0)) { + printf("%s: Setting filesystem to read-only\n", message); + vmount->mnt_flag &=MNT_RDONLY; + log(LOG_ALERT, "%s\n", message); + } else + panic(message); +} ==== //depot/projects/trhodesbsd/src/sys/sys/mount.h#2 (text+ko) ==== @@ -181,6 +181,8 @@ struct vnode *__mnt_vnode_first(struct vnode **mvp, struct mount *mp); void __mnt_vnode_markerfree(struct vnode **mvp, struct mount *mp); +void vfs_oeaction(struct mount *, char *); + #define MNT_VNODE_FOREACH(vp, mp, mvp) \ for (vp = __mnt_vnode_first(&(mvp), (mp)); \ (vp) != NULL; vp = __mnt_vnode_next(&(mvp), (mp))) From owner-p4-projects@FreeBSD.ORG Mon Jun 12 21:18:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2926116A473; Mon, 12 Jun 2006 21:18:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E0B9416A41F for ; Mon, 12 Jun 2006 21:18:30 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA76943D55 for ; Mon, 12 Jun 2006 21:18:30 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CLGEfk018896 for ; Mon, 12 Jun 2006 21:16:14 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CLGElR018893 for perforce@freebsd.org; Mon, 12 Jun 2006 21:16:14 GMT (envelope-from trhodes@freebsd.org) Date: Mon, 12 Jun 2006 21:16:14 GMT Message-Id: <200606122116.k5CLGElR018893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 99083 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, 12 Jun 2006 21:18:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=99083 Change 99083 by trhodes@trhodes_local on 2006/06/12 21:15:41 Wrap four data corruption calls to panic() in vfs_oeaction(). Affected files ... .. //depot/projects/trhodesbsd/src/sys/fs/msdosfs/msdosfs_vnops.c#2 edit Differences ... ==== //depot/projects/trhodesbsd/src/sys/fs/msdosfs/msdosfs_vnops.c#2 (text+ko) ==== @@ -1176,7 +1176,10 @@ zp->de_fndoffset = from_diroffset; error = removede(zp, ip); if (error) { - /* XXX should downgrade to ro here, fs is corrupt */ + vfs_oeaction(fvp->v_mount, "File system corruption " \ + "detected"); + brelse(bp); + VOP_UNLOCK(fvp, 0, td); if (newparent) VOP_UNLOCK(fdvp, 0, td); VOP_UNLOCK(fvp, 0, td); @@ -1186,7 +1189,10 @@ error = pcbmap(dp, de_cluster(pmp, to_diroffset), 0, &ip->de_dirclust, 0); if (error) { - /* XXX should downgrade to ro here, fs is corrupt */ + vfs_oeaction(fvp->v_mount, "File system corruption " \ + "detected"); + brelse(bp); + VOP_UNLOCK(fvp, 0, td); if (newparent) VOP_UNLOCK(fdvp, 0, td); VOP_UNLOCK(fvp, 0, td); @@ -1216,7 +1222,10 @@ error = bread(pmp->pm_devvp, bn, pmp->pm_bpcluster, NOCRED, &bp); if (error) { - /* XXX should downgrade to ro here, fs is corrupt */ + vfs_oeaction(fvp->v_mount, "File system corruption " \ + "detected"); + brelse(bp); + VOP_UNLOCK(fvp, 0, td); brelse(bp); VOP_UNLOCK(fvp, 0, td); goto bad; @@ -1227,7 +1236,10 @@ putushort(dotdotp->deHighClust, dp->de_StartCluster >> 16); error = bwrite(bp); if (error) { - /* XXX should downgrade to ro here, fs is corrupt */ + vfs_oeaction(fvp->v_mount, "File system corruption " \ + "detected"); + brelse(bp); + VOP_UNLOCK(fvp, 0, td); VOP_UNLOCK(fvp, 0, td); goto bad; } From owner-p4-projects@FreeBSD.ORG Mon Jun 12 21:31:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA07C16A473; Mon, 12 Jun 2006 21:31:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C35A16A41F for ; Mon, 12 Jun 2006 21:31:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B75B543D49 for ; Mon, 12 Jun 2006 21:31:47 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CLTVjP020668 for ; Mon, 12 Jun 2006 21:29:31 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CLTV86020664 for perforce@freebsd.org; Mon, 12 Jun 2006 21:29:31 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 12 Jun 2006 21:29:31 GMT Message-Id: <200606122129.k5CLTV86020664@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 99084 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, 12 Jun 2006 21:31:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=99084 Change 99084 by hselasky@hselasky_mini_itx on 2006/06/12 21:28:43 Finished reworking "ubsa.c". Again, alot of changes. Please test! Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#4 (text+ko) ==== @@ -1,0 +1,1076 @@ +/*- + * Copyright (c) 2002, Alexander Kabaev . + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 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) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/*- + * Copyright (c) 2001 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Ichiro FUKUHARA (ichiro@ichiro.org). + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include "usbdevs.h" + +__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c $"); + +#ifdef USB_DEBUG +#define DPRINTF(n,fmt,...) \ + do { if (ubsa_debug > (n)) { \ + printf("%s: " fmt, __FUNCTION__,## __VA_ARGS__); } } while (0) + +static int ubsa_debug = 0; +SYSCTL_NODE(_hw_usb, OID_AUTO, ubsa, CTLFLAG_RW, 0, "USB ubsa"); +SYSCTL_INT(_hw_usb_ubsa, OID_AUTO, debug, CTLFLAG_RW, + &ubsa_debug, 0, "ubsa debug level"); +#else +#define DPRINTF(...) +#endif + +#define UBSA_MODVER 1 /* module version */ + +#define UBSA_N_TRANSFER 14 /* units */ +#define UBSA_BSIZE 64 /* bytes */ + +#define UBSA_CONFIG_INDEX 1 +#define UBSA_IFACE_INDEX 0 + +enum { + UBSA_REG_BAUDRATE, + UBSA_REG_STOP_BITS, + UBSA_REG_DATA_BITS, + UBSA_REG_PARITY, + UBSA_REG_DTR, + UBSA_REG_RTS, + UBSA_REG_BREAK, + UBSA_REG_FLOW_CTRL, + USBA_N_REG +}; + +#define UBSA_PARITY_NONE 0x00 +#define UBSA_PARITY_EVEN 0x01 +#define UBSA_PARITY_ODD 0x02 +#define UBSA_PARITY_MARK 0x03 +#define UBSA_PARITY_SPACE 0x04 + +#define UBSA_FLOW_NONE 0x0000 +#define UBSA_FLOW_OCTS 0x0001 +#define UBSA_FLOW_ODSR 0x0002 +#define UBSA_FLOW_IDSR 0x0004 +#define UBSA_FLOW_IDTR 0x0008 +#define UBSA_FLOW_IRTS 0x0010 +#define UBSA_FLOW_ORTS 0x0020 +#define UBSA_FLOW_UNKNOWN 0x0040 +#define UBSA_FLOW_OXON 0x0080 +#define UBSA_FLOW_IXON 0x0100 + +/* line status register */ +#define UBSA_LSR_TSRE 0x40 /* Transmitter empty: byte sent */ +#define UBSA_LSR_TXRDY 0x20 /* Transmitter buffer empty */ +#define UBSA_LSR_BI 0x10 /* Break detected */ +#define UBSA_LSR_FE 0x08 /* Framing error: bad stop bit */ +#define UBSA_LSR_PE 0x04 /* Parity error */ +#define UBSA_LSR_OE 0x02 /* Overrun, lost incoming byte */ +#define UBSA_LSR_RXRDY 0x01 /* Byte ready in Receive Buffer */ +#define UBSA_LSR_RCV_MASK 0x1f /* Mask for incoming data or error */ + +/* modem status register */ +/* All deltas are from the last read of the MSR. */ +#define UBSA_MSR_DCD 0x80 /* Current Data Carrier Detect */ +#define UBSA_MSR_RI 0x40 /* Current Ring Indicator */ +#define UBSA_MSR_DSR 0x20 /* Current Data Set Ready */ +#define UBSA_MSR_CTS 0x10 /* Current Clear to Send */ +#define UBSA_MSR_DDCD 0x08 /* DCD has changed state */ +#define UBSA_MSR_TERI 0x04 /* RI has toggled low to high */ +#define UBSA_MSR_DDSR 0x02 /* DSR has changed state */ +#define UBSA_MSR_DCTS 0x01 /* CTS has changed state */ + +struct ubsa_softc { + struct ucom_softc sc_ucom; + struct usbd_memory_wait sc_mem_wait; + + struct usbd_xfer * sc_xfer[UBSA_N_TRANSFER]; + + u_int16_t sc_flag; +#define UBSA_FLAG_WRITE_STALL 0x0001 +#define UBSA_FLAG_READ_STALL 0x0002 +#define UBSA_FLAG_INTR_STALL 0x0004 + + u_int16_t sc_reg_flag; + u_int16_t sc_reg[USBA_N_REG]; + + u_int8_t sc_iface_no; /* interface number */ + u_int8_t sc_iface_index; /* interface index */ + u_int8_t sc_dtr; /* current DTR state */ + u_int8_t sc_rts; /* current RTS state */ + u_int8_t sc_lsr; /* local status register */ + u_int8_t sc_msr; /* UBSA status register */ +}; + +static device_probe_t ubsa_probe; +static device_attach_t ubsa_attach; +static device_detach_t ubsa_detach; + +static void +ubsa_request(struct ubsa_softc *sc, u_int8_t index, u_int16_t value); + +static void +ubsa_set_dtr(struct ucom_softc *ucom, u_int8_t onoff); + +static void +ubsa_set_rts(struct ucom_softc *ucom, u_int8_t onoff); + +static void +ubsa_set_break(struct ucom_softc *ucom, u_int8_t onoff); + +static u_int8_t +ubsa_baudrate(struct ubsa_softc *sc, speed_t speed); + +static void +ubsa_parity(struct ubsa_softc *sc, tcflag_t cflag); + +static void +ubsa_databits(struct ubsa_softc *sc, tcflag_t cflag); + +static void +ubsa_stopbits(struct ubsa_softc *sc, tcflag_t cflag); + +static void +ubsa_flow(struct ubsa_softc *sc, tcflag_t cflag, tcflag_t iflag); + +static int +ubsa_param(struct ucom_softc *ucom, struct termios *ti); + +static int +ubsa_open(struct ucom_softc *ucom); + +static void +ubsa_close(struct ucom_softc *ucom); + +static void +ubsa_start_read(struct ucom_softc *ucom); + +static void +ubsa_stop_read(struct ucom_softc *ucom); + +static void +ubsa_start_write(struct ucom_softc *ucom); + +static void +ubsa_stop_write(struct ucom_softc *ucom); + +static void +ubsa_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr); + +static void +ubsa_write_callback(struct usbd_xfer *xfer); + +static void +ubsa_write_clear_stall_callback(struct usbd_xfer *xfer); + +static void +ubsa_read_callback(struct usbd_xfer *xfer); + +static void +ubsa_read_clear_stall_callback(struct usbd_xfer *xfer); + +static void +ubsa_intr_callback(struct usbd_xfer *xfer); + +static void +ubsa_intr_clear_stall_callback(struct usbd_xfer *xfer); + +static void +ubsa_request_callback(struct usbd_xfer *xfer, u_int8_t index); + +static void +ubsa_set_baudrate_callback(struct usbd_xfer *xfer); + +static void +ubsa_set_stop_bits_callback(struct usbd_xfer *xfer); + +static void +ubsa_set_data_bits_callback(struct usbd_xfer *xfer); + +static void +ubsa_set_parity_callback(struct usbd_xfer *xfer); + +static void +ubsa_set_dtr_callback(struct usbd_xfer *xfer); + +static void +ubsa_set_rts_callback(struct usbd_xfer *xfer); + +static void +ubsa_set_break_callback(struct usbd_xfer *xfer); + +static void +ubsa_set_flow_ctrl_callback(struct usbd_xfer *xfer); + +static const struct usbd_config ubsa_config[UBSA_N_TRANSFER] = { + + [0] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_OUT, + .bufsize = UBSA_BSIZE, /* bytes */ + .flags = 0, + .callback = &ubsa_write_callback, + }, + + [1] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .bufsize = UBSA_BSIZE, /* bytes */ + .flags = USBD_SHORT_XFER_OK, + .callback = &ubsa_read_callback, + }, + + [2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ubsa_write_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ubsa_read_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [4] = { + .type = UE_INTERRUPT, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .flags = USBD_SHORT_XFER_OK, + .bufsize = 0, /* use wMaxPacketSize */ + .callback = &ubsa_intr_callback, + }, + + [5] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ubsa_intr_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [6+UBSA_REG_BAUDRATE] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ubsa_set_baudrate_callback, + .timeout = 1000, /* 1 second */ + }, + + [6+UBSA_REG_STOP_BITS] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ubsa_set_stop_bits_callback, + .timeout = 1000, /* 1 second */ + }, + + [6+UBSA_REG_DATA_BITS] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ubsa_set_data_bits_callback, + .timeout = 1000, /* 1 second */ + }, + + [6+UBSA_REG_PARITY] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ubsa_set_parity_callback, + .timeout = 1000, /* 1 second */ + }, + + [6+UBSA_REG_DTR] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ubsa_set_dtr_callback, + .timeout = 1000, /* 1 second */ + }, + + [6+UBSA_REG_RTS] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ubsa_set_rts_callback, + .timeout = 1000, /* 1 second */ + }, + + [6+UBSA_REG_BREAK] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ubsa_set_break_callback, + .timeout = 1000, /* 1 second */ + }, + + [6+UBSA_REG_FLOW_CTRL] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ubsa_set_flow_ctrl_callback, + .timeout = 1000, /* 1 second */ + }, +}; + +static const struct ucom_callback ubsa_callback = { + .ucom_get_status = &ubsa_get_status, + .ucom_set_dtr = &ubsa_set_dtr, + .ucom_set_rts = &ubsa_set_rts, + .ucom_set_break = &ubsa_set_break, + .ucom_param = &ubsa_param, + .ucom_open = &ubsa_open, + .ucom_close = &ubsa_close, + .ucom_start_read = &ubsa_start_read, + .ucom_stop_read = &ubsa_stop_read, + .ucom_start_write = &ubsa_start_write, + .ucom_stop_write = &ubsa_stop_write, +}; + +static const struct ubsa_product { + u_int16_t vendor; + u_int16_t product; +} ubsa_products [] = { + /* BELKIN F5U103 */ + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U103 }, + /* BELKIN F5U120 */ + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U120 }, + /* GoHubs GO-COM232 */ + { USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM }, + /* GoHubs GO-COM232 */ + { USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232 }, + /* Peracom */ + { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1 }, + /* Vodafone */ + { USB_VENDOR_VODAFONE, USB_PRODUCT_VODAFONE_MC3G }, + { 0, 0 } +}; + +static device_method_t ubsa_methods[] = { + DEVMETHOD(device_probe, ubsa_probe), + DEVMETHOD(device_attach, ubsa_attach), + DEVMETHOD(device_detach, ubsa_detach), + { 0, 0 } +}; + +static driver_t ubsa_driver = { + .name = "ucom", + .methods = ubsa_methods, + .size = sizeof(struct ubsa_softc), +}; + +DRIVER_MODULE(ubsa, uhub, ubsa_driver, ucom_devclass, usbd_driver_load, 0); +MODULE_DEPEND(ubsa, usb, 1, 1, 1); +MODULE_DEPEND(ubsa, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); +MODULE_VERSION(ubsa, UBSA_MODVER); + +static int +ubsa_probe(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + const struct ubsa_product *up = ubsa_products; + + if (uaa->iface) { + return UMATCH_NONE; + } + + while (up->vendor) { + if ((up->vendor == uaa->vendor) && + (up->product == uaa->product)) { + return UMATCH_VENDOR_PRODUCT; + } + } + + return UMATCH_NONE; +} + +static int +ubsa_attach(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct ubsa_softc *sc = device_get_softc(dev); + struct usbd_interface *iface; + usb_interface_descriptor_t *id; + int error; + + DPRINTF(0, "sc=%p\n", sc); + + if (sc == NULL) { + return ENOMEM; + } + + usbd_set_desc(dev, uaa->device); + + /* configure the device */ + + error = usbd_set_config_index(uaa->device, UBSA_CONFIG_INDEX, 1); + + if (error) { + DPRINTF(0, "failed to set configuration, error=%s\n", + usbd_errstr(error)); + goto detach; + } + + iface = usbd_get_iface(uaa->device, UBSA_IFACE_INDEX); + + if (iface == NULL) { + DPRINTF(0, "no interface\n"); + goto detach; + } + + id = usbd_get_interface_descriptor(iface); + + if (id == NULL) { + DPRINTF(0, "no interface descriptor\n"); + goto detach; + } + + sc->sc_iface_no = id->bInterfaceNumber; + sc->sc_iface_index = UBSA_IFACE_INDEX; + + error = usbd_transfer_setup(uaa->device, sc->sc_iface_index, + sc->sc_xfer, ubsa_config, UBSA_N_TRANSFER, + sc, &Giant, &(sc->sc_mem_wait)); + if (error) { + DPRINTF(0, "could not allocate all pipes\n"); + goto detach; + } + + sc->sc_dtr = -1; + sc->sc_rts = -1; + + sc->sc_ucom.sc_parent = sc; + sc->sc_ucom.sc_portno = 0; + sc->sc_ucom.sc_callback = &ubsa_callback; + + error = ucom_attach(&(sc->sc_ucom), dev); + + if (error) { + DPRINTF(0, "ucom_attach failed\n"); + goto detach; + } + + return 0; + + detach: + ubsa_detach(dev); + return ENXIO; +} + +static int +ubsa_detach(device_t dev) +{ + struct ubsa_softc *sc = device_get_softc(dev); + + DPRINTF(0, "sc=%p\n", sc); + + ucom_detach(&(sc->sc_ucom)); + + usbd_transfer_unsetup(sc->sc_xfer, UBSA_N_TRANSFER); + + usbd_transfer_drain(&(sc->sc_mem_wait), &Giant); + + return 0; +} + +static void +ubsa_request(struct ubsa_softc *sc, u_int8_t index, u_int16_t value) +{ + if (index >= USBA_N_REG) { + panic("invalid register index!"); + } + sc->sc_reg_flag |= (1 << index); + sc->sc_reg[index] = value; + usbd_transfer_start(sc->sc_xfer[6+index]); + return; +} + +static void +ubsa_set_dtr(struct ucom_softc *ucom, u_int8_t onoff) +{ + struct ubsa_softc *sc = ucom->sc_parent; + + DPRINTF(0, "onoff = %d\n", onoff); + + if (sc->sc_dtr != onoff) { + sc->sc_dtr = onoff; + ubsa_request(sc, UBSA_REG_DTR, onoff ? 1 : 0); + } + return; +} + +static void +ubsa_set_rts(struct ucom_softc *ucom, u_int8_t onoff) +{ + struct ubsa_softc *sc = ucom->sc_parent; + + DPRINTF(0, "onoff = %d\n", onoff); + + if (sc->sc_rts != onoff) { + sc->sc_rts = onoff; + ubsa_request(sc, UBSA_REG_RTS, onoff ? 1 : 0); + } + return; +} + +static void +ubsa_set_break(struct ucom_softc *ucom, u_int8_t onoff) +{ + struct ubsa_softc *sc = ucom->sc_parent; + + DPRINTF(0, "onoff = %d\n", onoff); + + ubsa_request(sc, UBSA_REG_BREAK, onoff ? 1 : 0); + return; +} + +static u_int8_t +ubsa_baudrate(struct ubsa_softc *sc, speed_t speed) +{ + u_int16_t value = 0; + + DPRINTF(0, "speed = %d\n", speed); + + switch(speed) { + case B0: + break; + case B300: + case B600: + case B1200: + case B2400: + case B4800: + case B9600: + case B19200: + case B38400: + case B57600: + case B115200: + case B230400: + value = B230400 / speed; + break; + + default: + DPRINTF(0, "unsupported baudrate\n"); + return 1; + }; + + if (speed == B0) { + ubsa_flow(sc, 0, 0); + ubsa_set_dtr(&(sc->sc_ucom), 0); + ubsa_set_rts(&(sc->sc_ucom), 0); + } else { + ubsa_request(sc, UBSA_REG_BAUDRATE, value); + } + return 0; +} + +static void +ubsa_parity(struct ubsa_softc *sc, tcflag_t cflag) +{ + u_int16_t value; + + DPRINTF(0, "flag = 0x%x\n", cflag); + + if (cflag & PARENB) + value = (cflag & PARODD) ? UBSA_PARITY_ODD : UBSA_PARITY_EVEN; + else + value = UBSA_PARITY_NONE; + + ubsa_request(sc, UBSA_REG_PARITY, value); + return; +} + +static void +ubsa_databits(struct ubsa_softc *sc, tcflag_t cflag) +{ + u_int16_t value; + + DPRINTF(0, "cflag = 0x%x\n", cflag); + + switch (cflag & CSIZE) { + case CS5: value = 0; break; + case CS6: value = 1; break; + case CS7: value = 2; break; + case CS8: value = 3; break; + default: + DPRINTF(0, "unsupported databits requested, " + "forcing default of 8\n"); + value = 3; + } + + ubsa_request(sc, UBSA_REG_DATA_BITS, value); + return; +} + +static void +ubsa_stopbits(struct ubsa_softc *sc, tcflag_t cflag) +{ + u_int16_t value; + + DPRINTF(0, "cflag = 0x%x\n", cflag); + + value = (cflag & CSTOPB) ? 1 : 0; + + ubsa_request(sc, UBSA_REG_STOP_BITS, value); + return; +} + +static void +ubsa_flow(struct ubsa_softc *sc, tcflag_t cflag, tcflag_t iflag) +{ + u_int16_t value; + + DPRINTF(0, "cflag = 0x%x, iflag = 0x%x\n", cflag, iflag); + + value = 0; + if (cflag & CRTSCTS) + value |= UBSA_FLOW_OCTS | UBSA_FLOW_IRTS; + if (iflag & (IXON|IXOFF)) + value |= UBSA_FLOW_OXON | UBSA_FLOW_IXON; + + ubsa_request(sc, UBSA_REG_FLOW_CTRL, value); + return; +} + +static int +ubsa_param(struct ucom_softc *ucom, struct termios *ti) +{ + struct ubsa_softc *sc = ucom->sc_parent; + + DPRINTF(0, "sc = %p\n", sc); + + if (ubsa_baudrate(sc, ti->c_ospeed)) { + return EIO; + } + ubsa_parity(sc, ti->c_cflag); + ubsa_databits(sc, ti->c_cflag); + ubsa_stopbits(sc, ti->c_cflag); + ubsa_flow(sc, ti->c_cflag, ti->c_iflag); + + return (0); +} + +static int +ubsa_open(struct ucom_softc *ucom) +{ + struct ubsa_softc *sc = ucom->sc_parent; + usbd_transfer_start(sc->sc_xfer[4]); + return 0; +} + +static void +ubsa_close(struct ucom_softc *ucom) +{ + struct ubsa_softc *sc = ucom->sc_parent; + usbd_transfer_stop(sc->sc_xfer[5]); + usbd_transfer_stop(sc->sc_xfer[4]); + return; +} + +static void +ubsa_start_read(struct ucom_softc *ucom) +{ + struct ubsa_softc *sc = ucom->sc_parent; + usbd_transfer_start(sc->sc_xfer[1]); + return; +} + +static void +ubsa_stop_read(struct ucom_softc *ucom) +{ + struct ubsa_softc *sc = ucom->sc_parent; + usbd_transfer_stop(sc->sc_xfer[3]); + usbd_transfer_stop(sc->sc_xfer[1]); + return; +} + +static void +ubsa_start_write(struct ucom_softc *ucom) +{ + struct ubsa_softc *sc = ucom->sc_parent; + usbd_transfer_start(sc->sc_xfer[0]); + return; +} + +static void +ubsa_stop_write(struct ucom_softc *ucom) +{ + struct ubsa_softc *sc = ucom->sc_parent; + usbd_transfer_stop(sc->sc_xfer[2]); + usbd_transfer_stop(sc->sc_xfer[0]); + return; +} + +static void +ubsa_get_status(struct ucom_softc *ucom, u_int8_t *lsr, u_int8_t *msr) +{ + struct ubsa_softc *sc = ucom->sc_parent; + + DPRINTF(0, "\n"); + + if (lsr) { + *lsr = sc->sc_lsr; + } + + if (msr) { + *msr = sc->sc_msr; + } + return; +} + +static void +ubsa_write_callback(struct usbd_xfer *xfer) +{ + struct ubsa_softc *sc = xfer->priv_sc; + u_int32_t actlen; + + USBD_CHECK_STATUS(xfer); +tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flag |= UBSA_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer[2]); + } + return; + +tr_setup: +tr_transferred: + if (sc->sc_flag & UBSA_FLAG_WRITE_STALL) { + usbd_transfer_start(sc->sc_xfer[2]); + return; + } + + if(ucom_get_data(&(sc->sc_ucom), xfer->buffer, UBSA_BSIZE, &actlen)) { + + xfer->length = actlen; + + usbd_start_hardware(xfer); + } + return; +} + +static void +ubsa_write_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct ubsa_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, sc->sc_xfer[0]); + return; + + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, sc->sc_xfer[0]); + sc->sc_flag &= ~UBSA_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer[0]); + return; + + tr_error: + sc->sc_flag &= ~UBSA_FLAG_WRITE_STALL; + DPRINTF(0, "clear stall failed, error=%s\n", + usbd_errstr(xfer->error)); + return; +} + +static void +ubsa_read_callback(struct usbd_xfer *xfer) +{ + struct ubsa_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flag |= UBSA_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer[3]); + } + return; + + tr_transferred: + ucom_put_data(&(sc->sc_ucom), xfer->buffer, xfer->actlen); + + tr_setup: + if (sc->sc_flag & UBSA_FLAG_READ_STALL) { + usbd_transfer_start(sc->sc_xfer[3]); + } else { + usbd_start_hardware(xfer); + } + return; +} + +static void +ubsa_read_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct ubsa_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, sc->sc_xfer[1]); + return; + + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, sc->sc_xfer[1]); + sc->sc_flag &= ~UBSA_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer[1]); + return; + + tr_error: + sc->sc_flag &= ~UBSA_FLAG_READ_STALL; + DPRINTF(0, "clear stall failed, error=%s\n", + usbd_errstr(xfer->error)); + return; +} + +static void +ubsa_intr_callback(struct usbd_xfer *xfer) +{ + struct ubsa_softc *sc = xfer->priv_sc; + u_int8_t *buf = xfer->buffer; + + USBD_CHECK_STATUS(xfer); + + tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flag |= UBSA_FLAG_INTR_STALL; + usbd_transfer_start(sc->sc_xfer[5]); + } + return; + + tr_transferred: + + if (xfer->actlen >= 4) { + + /* incidentally, Belkin adapter status bits match UART 16550 bits */ + sc->sc_lsr = buf[2]; + sc->sc_msr = buf[3]; + + DPRINTF(0, "lsr = 0x%02x, msr = 0x%02x\n", + sc->sc_lsr, sc->sc_msr); + + ucom_status_change(&(sc->sc_ucom)); + } else { + DPRINTF(0, "ignoring short packet, %d bytes\n", + xfer->actlen); + } + + tr_setup: + if (sc->sc_flag & UBSA_FLAG_INTR_STALL) { + usbd_transfer_start(sc->sc_xfer[5]); + } else { + usbd_start_hardware(xfer); + } + return; +} + +static void +ubsa_intr_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct ubsa_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, sc->sc_xfer[4]); + return; + + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, sc->sc_xfer[4]); + sc->sc_flag &= ~UBSA_FLAG_INTR_STALL; + usbd_transfer_start(sc->sc_xfer[4]); + return; + + tr_error: + sc->sc_flag &= ~UBSA_FLAG_INTR_STALL; + DPRINTF(0, "clear stall failed, error=%s\n", + usbd_errstr(xfer->error)); + return; +} + +static void +ubsa_request_callback(struct usbd_xfer *xfer, u_int8_t index) +{ + static const u_int8_t mapping[USBA_N_REG] = { + [UBSA_REG_BAUDRATE] = 0x00, + [UBSA_REG_STOP_BITS] = 0x01, + [UBSA_REG_DATA_BITS] = 0x02, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 12 21:56:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73ECF16A46F; Mon, 12 Jun 2006 21:56:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5017F16A418 for ; Mon, 12 Jun 2006 21:56:20 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99AFB43D49 for ; Mon, 12 Jun 2006 21:56:19 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CLs3Wp024799 for ; Mon, 12 Jun 2006 21:54:03 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CLs3Sf024796 for perforce@freebsd.org; Mon, 12 Jun 2006 21:54:03 GMT (envelope-from trhodes@freebsd.org) Date: Mon, 12 Jun 2006 21:54:03 GMT Message-Id: <200606122154.k5CLs3Sf024796@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 99088 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, 12 Jun 2006 21:56:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=99088 Change 99088 by trhodes@trhodes_local on 2006/06/12 21:53:28 First cut at cleaning up mount options, adding a mount_ufs.8 manual page, documenting specific ufs mount options. Lot more work needed here. Affected files ... .. //depot/projects/trhodesbsd/src/sbin/mount/mount_ufs.8#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jun 12 22:02:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDFD816A41A; Mon, 12 Jun 2006 22:02:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A63C16A478 for ; Mon, 12 Jun 2006 22:02:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD2CD43D48 for ; Mon, 12 Jun 2006 22:02:27 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CM0BKi025517 for ; Mon, 12 Jun 2006 22:00:11 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CM0B4x025513 for perforce@freebsd.org; Mon, 12 Jun 2006 22:00:11 GMT (envelope-from jb@freebsd.org) Date: Mon, 12 Jun 2006 22:00:11 GMT Message-Id: <200606122200.k5CM0B4x025513@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99089 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, 12 Jun 2006 22:02:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=99089 Change 99089 by jb@jb_freebsd2 on 2006/06/12 21:59:37 Disable a couple of things which require a complete credentials implementation. These were preventing destructive actions. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_priv.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_priv.c#4 (text+ko) ==== @@ -127,21 +127,29 @@ static int dtrace_priv_kernel(dtrace_state_t *state) { +#if defined(sun) if (state->dts_cred.dcr_action & DTRACE_CRA_KERNEL) return (1); cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_KPRIV; return (0); +#else + return (1); +#endif } static int dtrace_priv_kernel_destructive(dtrace_state_t *state) { +#if defined(sun) if (state->dts_cred.dcr_action & DTRACE_CRA_KERNEL_DESTRUCTIVE) return (1); cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_KPRIV; return (0); +#else + return (1); +#endif } From owner-p4-projects@FreeBSD.ORG Mon Jun 12 22:38:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C990316A474; Mon, 12 Jun 2006 22:38:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A595716A41B for ; Mon, 12 Jun 2006 22:38:14 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8E7043D62 for ; Mon, 12 Jun 2006 22:38:12 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CMZuSL030698 for ; Mon, 12 Jun 2006 22:35:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CMZuKb030693 for perforce@freebsd.org; Mon, 12 Jun 2006 22:35:56 GMT (envelope-from imp@freebsd.org) Date: Mon, 12 Jun 2006 22:35:56 GMT Message-Id: <200606122235.k5CMZuKb030693@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99090 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, 12 Jun 2006 22:38:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=99090 Change 99090 by imp@imp_lighthouse on 2006/06/12 22:35:09 Bump kernel size from 8MB to 22MB, I think. Suggested by cognet. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#22 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#22 (text+ko) ==== @@ -96,7 +96,7 @@ #define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */ #define KERNEL_PT_KERN 1 -#define KERNEL_PT_KERN_NUM 8 +#define KERNEL_PT_KERN_NUM 22 #define KERNEL_PT_AFKERNEL KERNEL_PT_KERN + KERNEL_PT_KERN_NUM /* L2 table for mapping after kernel */ #define KERNEL_PT_AFKERNEL_NUM 5 From owner-p4-projects@FreeBSD.ORG Mon Jun 12 22:57:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 544C716A47A; Mon, 12 Jun 2006 22:57:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F2E7216A477 for ; Mon, 12 Jun 2006 22:57:44 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B0AF43D5E for ; Mon, 12 Jun 2006 22:57:39 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CMtMV9033074 for ; Mon, 12 Jun 2006 22:55:22 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CMtMeE033071 for perforce@freebsd.org; Mon, 12 Jun 2006 22:55:22 GMT (envelope-from cognet@freebsd.org) Date: Mon, 12 Jun 2006 22:55:22 GMT Message-Id: <200606122255.k5CMtMeE033071@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 99093 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, 12 Jun 2006 22:57:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=99093 Change 99093 by cognet@cognet on 2006/06/12 22:55:19 - Try hard to calculate a safe sp, so that the stack doesn't get smashed while uncompressing or relocating the kernel. - Bring in code needed to calculate the cacheline size etc, needed for arm9_idcache_wbinv_all. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#7 edit .. //depot/projects/arm/src/sys/arm/arm/inckern.S#3 edit .. //depot/projects/arm/src/sys/conf/Makefile.arm#12 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#7 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include #include @@ -41,6 +42,8 @@ extern char kernel_start[]; extern char kernel_end[]; +extern void *_end; + void __start(void); #define GZ_HEAD 0xa @@ -50,7 +53,7 @@ #elif defined(CPU_ARM8) #define cpu_idcache_wbinv_all arm8_cache_purgeID #elif defined(CPU_ARM9) -#define cpu_idcache_wbinv_all arm9_dcache_wbinv_all +#define cpu_idcache_wbinv_all arm9_idcache_wbinv_all #elif defined(CPU_ARM10) #define cpu_idcache_wbinv_all arm10_idcache_wbinv_all #elif defined(CPU_SA110) || defined(CPU_SA1110) || defined(CPU_SA1100) || \ @@ -60,8 +63,35 @@ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) #define cpu_idcache_wbinv_all xscale_cache_purgeID #endif -int arm_pdcache_line_size = 32; + +#ifdef KZIP +int arm_picache_size; +int arm_picache_line_size; +int arm_picache_ways; + +int arm_pdcache_size; /* and unified */ +int arm_pdcache_line_size = 32; +int arm_pdcache_ways; + +int arm_pcache_type; +int arm_pcache_unified; + +int arm_dcache_align; +int arm_dcache_align_mask; + +/* Additional cache information local to this file. Log2 of some of the + above numbers. */ +static int arm_dcache_l2_nsets; +static int arm_dcache_l2_assoc; +static int arm_dcache_l2_linesize; + + int block_userspace_access = 0; +extern int arm9_dcache_sets_inc; +extern int arm9_dcache_sets_max; +extern int arm9_dcache_index_max; +extern int arm9_dcache_index_inc; +#endif static __inline void * memcpy(void *dst, const void *src, int len) @@ -107,13 +137,18 @@ { int physaddr = KERNPHYSADDR; int tmp1; + unsigned int sp = (unsigned int)&_end; +#ifdef KZIP + sp += KERNSIZE + 0x100; + sp &= ~(L1_TABLE_SIZE - 1); + sp += 2 * L1_TABLE_SIZE; +#endif + sp += 1024 * 1024; /* Should be enough for a stack */ __asm __volatile("adr %0, 2f\n" "bic %0, %0, #0xff000000\n" - "bic sp, sp, #0xff000000\n" "and %1, %1, #0xff000000\n" "orr %0, %0, %1\n" - "orr sp, sp, %1\n" "mrc p15, 0, %1, c1, c0, 0\n" "bic %1, %1, #1\n" /* Disable MMU */ "orr %1, %1, #(4 | 8)\n" /* Add DC enable, @@ -127,11 +162,92 @@ "nop\n" "mov pc, %0\n" "2: nop\n" - : "=r" (tmp1), "+r" (physaddr)); + "mov sp, %2\n" + : "=r" (tmp1), "+r" (physaddr), "+r" (sp)); __start(); } #ifdef KZIP +static void +get_cachetype_cp15() +{ + u_int ctype, isize, dsize; + u_int multiplier; + + __asm __volatile("mrc p15, 0, %0, c0, c0, 1" + : "=r" (ctype)); + + /* + * ...and thus spake the ARM ARM: + * + * If an value corresponding to an unimplemented or + * reserved ID register is encountered, the System Control + * processor returns the value of the main ID register. + */ + if (ctype == cpufunc_id()) + goto out; + + if ((ctype & CPU_CT_S) == 0) + arm_pcache_unified = 1; + + /* + * If you want to know how this code works, go read the ARM ARM. + */ + + arm_pcache_type = CPU_CT_CTYPE(ctype); + if (arm_pcache_unified == 0) { + isize = CPU_CT_ISIZE(ctype); + multiplier = (isize & CPU_CT_xSIZE_M) ? 3 : 2; + arm_picache_line_size = 1U << (CPU_CT_xSIZE_LEN(isize) + 3); + if (CPU_CT_xSIZE_ASSOC(isize) == 0) { + if (isize & CPU_CT_xSIZE_M) + arm_picache_line_size = 0; /* not present */ + else + arm_picache_ways = 1; + } else { + arm_picache_ways = multiplier << + (CPU_CT_xSIZE_ASSOC(isize) - 1); + } + arm_picache_size = multiplier << (CPU_CT_xSIZE_SIZE(isize) + 8); + } + + dsize = CPU_CT_DSIZE(ctype); + multiplier = (dsize & CPU_CT_xSIZE_M) ? 3 : 2; + arm_pdcache_line_size = 1U << (CPU_CT_xSIZE_LEN(dsize) + 3); + if (CPU_CT_xSIZE_ASSOC(dsize) == 0) { + if (dsize & CPU_CT_xSIZE_M) + arm_pdcache_line_size = 0; /* not present */ + else + arm_pdcache_ways = 1; + } else { + arm_pdcache_ways = multiplier << + (CPU_CT_xSIZE_ASSOC(dsize) - 1); + } + arm_pdcache_size = multiplier << (CPU_CT_xSIZE_SIZE(dsize) + 8); + + arm_dcache_align = arm_pdcache_line_size; + + arm_dcache_l2_assoc = CPU_CT_xSIZE_ASSOC(dsize) + multiplier - 2; + arm_dcache_l2_linesize = CPU_CT_xSIZE_LEN(dsize) + 3; + arm_dcache_l2_nsets = 6 + CPU_CT_xSIZE_SIZE(dsize) - + CPU_CT_xSIZE_ASSOC(dsize) - CPU_CT_xSIZE_LEN(dsize); + out: + arm_dcache_align_mask = arm_dcache_align - 1; +} + +static void +arm9_setup(void) +{ + + get_cachetype_cp15(); + arm9_dcache_sets_inc = 1U << arm_dcache_l2_linesize; + arm9_dcache_sets_max = (1U << (arm_dcache_l2_linesize + + arm_dcache_l2_nsets)) - arm9_dcache_sets_inc; + arm9_dcache_index_inc = 1U << (32 - arm_dcache_l2_assoc); + arm9_dcache_index_max = 0U - arm9_dcache_index_inc; +} + + static unsigned char *orig_input, *i_input, *i_output; @@ -354,7 +470,6 @@ extern char func_end[]; -extern void *_end; #define PMAP_DOMAIN_KERNEL 15 /* * Just define it instead of including the @@ -404,6 +519,7 @@ void *curaddr; void *dst, *altdst; char *kernel = (char *)&kernel_start; + int sp; __asm __volatile("mov %0, pc" : "=r" (curaddr)); @@ -413,6 +529,11 @@ int pt_addr = (((int)&_end + KERNSIZE + 0x100) & ~(L1_TABLE_SIZE - 1)) + L1_TABLE_SIZE; +#ifdef CPU_ARM9 + /* So that idcache_wbinv works; */ + if ((cpufunc_id() & 0x0000f000) == 0x00009000) + arm9_setup(); +#endif setup_pagetables(pt_addr, (vm_paddr_t)curaddr, (vm_paddr_t)curaddr + 0x10000000); /* Gzipped kernel */ @@ -433,10 +554,10 @@ dst = 4 + load_kernel((unsigned int)&kernel_start, (unsigned int)curaddr, (unsigned int)&func_end, 0); + sp = (vm_offset_t)dst + 4096; + dst = (void *)sp; memcpy((void *)dst, (void *)&load_kernel, (unsigned int)&func_end - (unsigned int)&load_kernel); - ((void (*)())dst)((unsigned int)kernel, - (unsigned int)curaddr, - dst + (unsigned int)(&func_end) - - (unsigned int)(&load_kernel), 1); + do_call(dst, kernel, dst + (unsigned int)(&func_end) - + (unsigned int)(&load_kernel), sp); } ==== //depot/projects/arm/src/sys/arm/arm/inckern.S#3 (text+ko) ==== @@ -26,6 +26,14 @@ #include __FBSDID("$FreeBSD: src/sys/arm/arm/inckern.S,v 1.2 2005/12/05 12:55:46 cognet Exp $") +ENTRY(do_call) + mov r6, r0 + mov r0, r1 + ldr r1, =0xfff00000 + and r1, pc, r1 + mov sp, r3 + mov r3, #1 + mov pc, r6 .section ".real_kernel","aw" .globl kernel_start; kernel_start: ==== //depot/projects/arm/src/sys/conf/Makefile.arm#12 (text+ko) ==== @@ -62,7 +62,7 @@ FILES_CPU_FUNC = $S/$M/$M/cpufunc_asm_arm7tdmi.S \ $S/$M/$M/cpufunc_asm_arm8.S $S/$M/$M/cpufunc_asm_arm9.S \ $S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \ - $S/$M/$M/cpufunc_asm_xscale.S + $S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S trampoline: ${KERNEL_KO}.tramp ${KERNEL_KO}.tramp: ${KERNEL_KO} echo "#define KERNNAME \"${KERNEL_KO}.tmp\"" >opt_kernname.h @@ -71,6 +71,8 @@ ldscript.$M.tramp.noheader ${OBJCOPY} --strip-symbol '$$d' --strip-symbol '$$a' \ -g --strip-symbol '$$t' ${FULLKERNEL} ${KERNEL_KO}.tmp + eval $$(stat -s ${KERNEL_KO}.tmp) && \ + echo "#define KERNSIZE $$st_size" >>opt_kernname.h ${CC} -O -nostdlib -I. -Xlinker -T -Xlinker ldscript.$M.tramp \ $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S -o ${KERNEL_KO}.tramp ${CC} -O -nostdlib -I. -Xlinker -T -Xlinker ldscript.$M.tramp.noheader \ From owner-p4-projects@FreeBSD.ORG Tue Jun 13 00:49:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A199816A476; Tue, 13 Jun 2006 00:49:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 657F716A46F for ; Tue, 13 Jun 2006 00:49:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10E6A43D7E for ; Tue, 13 Jun 2006 00:49:02 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D0kgQg044779 for ; Tue, 13 Jun 2006 00:46:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D0kgxE044776 for perforce@freebsd.org; Tue, 13 Jun 2006 00:46:42 GMT (envelope-from jb@freebsd.org) Date: Tue, 13 Jun 2006 00:46:42 GMT Message-Id: <200606130046.k5D0kgxE044776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99098 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, 13 Jun 2006 00:49:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=99098 Change 99098 by jb@jb_freebsd2 on 2006/06/13 00:45:43 Back out the non-standard functions. These cause upgrade problems. I'll need to add them back again if I find code that really needs them for anything other than an assert. Affected files ... .. //depot/projects/dtrace/src/lib/libpthread/pthread.map#4 edit .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_mutex.c#5 edit .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_rwlock.c#4 edit Differences ... ==== //depot/projects/dtrace/src/lib/libpthread/pthread.map#4 (text+ko) ==== @@ -258,7 +258,6 @@ pthread_multi_np; pthread_mutex_destroy; pthread_mutex_getprioceiling; - pthread_mutex_held_np; pthread_mutex_init; pthread_mutex_lock; pthread_mutex_setprioceiling; @@ -281,8 +280,6 @@ pthread_resume_all_np; pthread_resume_np; pthread_rwlock_destroy; - pthread_rwlock_rdheld_np; - pthread_rwlock_wrheld_np; pthread_rwlock_init; pthread_rwlock_rdlock; pthread_rwlock_timedrdlock; ==== //depot/projects/dtrace/src/lib/libpthread/thread/thr_mutex.c#5 (text+ko) ==== @@ -107,8 +107,6 @@ LT10_COMPAT_DEFAULT(pthread_mutex_destroy); LT10_COMPAT_PRIVATE(_pthread_mutex_unlock); LT10_COMPAT_DEFAULT(pthread_mutex_unlock); -LT10_COMPAT_PRIVATE(_pthread_mutex_held_np); -LT10_COMPAT_DEFAULT(pthread_mutex_held_np); /* Single underscore versions provided for libc internal usage: */ __weak_reference(__pthread_mutex_init, pthread_mutex_init); @@ -119,7 +117,6 @@ /* No difference between libc and application usage of these: */ __weak_reference(_pthread_mutex_destroy, pthread_mutex_destroy); __weak_reference(_pthread_mutex_unlock, pthread_mutex_unlock); -__weak_reference(_pthread_mutex_held_np, pthread_mutex_held_np); @@ -1585,12 +1582,6 @@ } } -int -_pthread_mutex_held_np(pthread_mutex_t *m) -{ - return((*m)->m_owner == _get_curthread()); -} - /* * This is called by the current thread when it wants to back out of a * mutex_lock in order to run a signal handler. ==== //depot/projects/dtrace/src/lib/libpthread/thread/thr_rwlock.c#4 (text+ko) ==== @@ -56,10 +56,6 @@ LT10_COMPAT_DEFAULT(pthread_rwlock_wrlock); LT10_COMPAT_PRIVATE(_pthread_rwlock_timedwrlock); LT10_COMPAT_DEFAULT(pthread_rwlock_timedwrlock); -LT10_COMPAT_PRIVATE(_pthread_rwlock_rdheld_np); -LT10_COMPAT_DEFAULT(pthread_rwlock_rdheld_np); -LT10_COMPAT_PRIVATE(_pthread_rwlock_wrheld_np); -LT10_COMPAT_DEFAULT(pthread_rwlock_wrheld_np); __weak_reference(_pthread_rwlock_destroy, pthread_rwlock_destroy); __weak_reference(_pthread_rwlock_init, pthread_rwlock_init); @@ -70,8 +66,6 @@ __weak_reference(_pthread_rwlock_unlock, pthread_rwlock_unlock); __weak_reference(_pthread_rwlock_wrlock, pthread_rwlock_wrlock); __weak_reference(_pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock); -__weak_reference(_pthread_rwlock_rdheld_np, pthread_rwlock_rdheld_np); -__weak_reference(_pthread_rwlock_wrheld_np, pthread_rwlock_wrheld_np); /* * Prototypes @@ -442,15 +436,3 @@ { return (rwlock_wrlock_common (rwlock, abstime)); } - -int -_pthread_rwlock_rdheld_np(pthread_rwlock_t *rwlock) -{ - return((*rwlock)->state > 0); -} - -int -_pthread_rwlock_wrheld_np(pthread_rwlock_t *rwlock) -{ - return((*rwlock)->state < 0); -} From owner-p4-projects@FreeBSD.ORG Tue Jun 13 00:50:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A48E16A478; Tue, 13 Jun 2006 00:50:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 58F9816A41A for ; Tue, 13 Jun 2006 00:50:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B4E643D58 for ; Tue, 13 Jun 2006 00:50:01 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D0liA4052539 for ; Tue, 13 Jun 2006 00:47:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D0liTa052536 for perforce@freebsd.org; Tue, 13 Jun 2006 00:47:44 GMT (envelope-from jb@freebsd.org) Date: Tue, 13 Jun 2006 00:47:44 GMT Message-Id: <200606130047.k5D0liTa052536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99099 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, 13 Jun 2006 00:50:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=99099 Change 99099 by jb@jb_freebsd2 on 2006/06/13 00:47:28 Add hooks for DTrace to register a function to be called when the scheduler chooses a new thread to run. This is required for DTrace vtime. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_switch.c#3 edit .. //depot/projects/dtrace/src/sys/sys/proc.h#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_switch.c#3 (text+ko) ==== @@ -88,6 +88,7 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.121 2006/06/01 22:45:56 cognet Exp $"); +#include "opt_kdtrace.h" #include "opt_sched.h" #ifndef KERN_SWITCH_INCLUDE @@ -126,6 +127,11 @@ #define td_kse td_sched +#ifdef KDTRACE +int dtrace_vtime_active; +dtrace_vtime_switch_func_t dtrace_vtime_switch_func; +#endif + /* * kern.sched.preemption allows user space to determine if preemption support * is compiled in or not. It is not currently a boot or runtime flag that ==== //depot/projects/dtrace/src/sys/sys/proc.h#6 (text+ko) ==== @@ -484,7 +484,17 @@ #define TD_CLR_SUSPENDED(td) TD_CLR_INHIB((td), TDI_SUSPENDED) #define TD_CLR_IWAIT(td) TD_CLR_INHIB((td), TDI_IWAIT) +#ifdef KDTRACE +typedef void (*dtrace_vtime_switch_func_t)(struct thread *); + +extern int dtrace_vtime_active; +extern dtrace_vtime_switch_func_t dtrace_vtime_switch_func; +#define TD_SET_RUNNING(td) if (dtrace_vtime_active) \ + (*dtrace_vtime_switch_func)(td); \ + (td)->td_state = TDS_RUNNING +#else #define TD_SET_RUNNING(td) (td)->td_state = TDS_RUNNING +#endif #define TD_SET_RUNQ(td) (td)->td_state = TDS_RUNQ #define TD_SET_CAN_RUN(td) (td)->td_state = TDS_CAN_RUN From owner-p4-projects@FreeBSD.ORG Tue Jun 13 00:53:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0680B16A41F; Tue, 13 Jun 2006 00:53:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D59F516A41A for ; Tue, 13 Jun 2006 00:53:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A121443D49 for ; Tue, 13 Jun 2006 00:53:05 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D0omeV052780 for ; Tue, 13 Jun 2006 00:50:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D0om5T052777 for perforce@freebsd.org; Tue, 13 Jun 2006 00:50:48 GMT (envelope-from jb@freebsd.org) Date: Tue, 13 Jun 2006 00:50:48 GMT Message-Id: <200606130050.k5D0om5T052777@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99100 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, 13 Jun 2006 00:53:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=99100 Change 99100 by jb@jb_freebsd2 on 2006/06/13 00:49:56 Don't compile in the functions that reference the non-portable mutex/rwlock held functions. So far I haven't ported any code that requires these. I'll enable them again when I find some. This makes upgrading from FreeBSD-6 easier. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#8 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#8 (text) ==== @@ -822,41 +822,31 @@ return (popc + dt_popc(bp[maxw] & ((1UL << maxb) - 1))); } +#if defined(sun) struct _rwlock; struct _lwp_mutex; int dt_rw_read_held(pthread_rwlock_t *lock) { -#if defined(sun) extern int _rw_read_held(struct _rwlock *); return (_rw_read_held((struct _rwlock *)lock)); -#else - return (pthread_rwlock_rdheld_np(lock)); -#endif } int dt_rw_write_held(pthread_rwlock_t *lock) { -#if defined(sun) extern int _rw_write_held(struct _rwlock *); return (_rw_write_held((struct _rwlock *)lock)); -#else - return (pthread_rwlock_wrheld_np(lock)); -#endif } int dt_mutex_held(pthread_mutex_t *lock) { -#if defined(sun) extern int _mutex_held(struct _lwp_mutex *); return (_mutex_held((struct _lwp_mutex *)lock)); -#else - return (pthread_mutex_held_np(lock)); +} #endif -} static int dt_string2str(char *s, char *str, int nbytes) From owner-p4-projects@FreeBSD.ORG Tue Jun 13 00:54:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B051C16A476; Tue, 13 Jun 2006 00:54:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8CDA916A41A for ; Tue, 13 Jun 2006 00:54:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6D5643D66 for ; Tue, 13 Jun 2006 00:54:07 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D0poRF052864 for ; Tue, 13 Jun 2006 00:51:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D0poZm052861 for perforce@freebsd.org; Tue, 13 Jun 2006 00:51:50 GMT (envelope-from jb@freebsd.org) Date: Tue, 13 Jun 2006 00:51:50 GMT Message-Id: <200606130051.k5D0poZm052861@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99101 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, 13 Jun 2006 00:54:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=99101 Change 99101 by jb@jb_freebsd2 on 2006/06/13 00:51:08 Use Sun's standard module naming. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#9 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#13 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#9 (text) ==== @@ -846,18 +846,9 @@ #else GElf_Phdr ph; char name[MAXPATHLEN]; - char *p; int i = 0; - /* - * Create a module name based on the full path name of the - * kernel module, but with slashes and dots changed to be - * underscores to suit the parser. - */ - (void) strlcpy(name, k_stat->pathname, sizeof(name)); - for (p = name; *p != '\0'; p++) - if (*p == '/' || *p == '.') - *p = '_'; + (void) strlcpy(name, k_stat->name, sizeof(name)); (void) strlcpy(fname, k_stat->pathname, sizeof(fname)); #endif ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#13 (text) ==== @@ -119,7 +119,7 @@ }; /* - * Global varaiables that are formatted on FreeBSD based on the kernel file name. + * Global variables that are formatted on FreeBSD based on the kernel file name. */ #if !defined(sun) static char curthread_str[MAXPATHLEN]; @@ -1098,25 +1098,23 @@ #if !defined(sun) { char bootfile[MAXPATHLEN]; + char *p; int i; size_t len = sizeof(bootfile); /* This call shouldn't fail, but use a default just in case. */ if (sysctlbyname("kern.bootfile", bootfile, &len, NULL, 0) != 0) - strlcpy(bootfile, "_boot_kernel_kernel", sizeof(bootfile)); + strlcpy(bootfile, "kernel", sizeof(bootfile)); - /* - * Convert the kernel file name to a DTrace module name because DTrace - * doesn't like slashes in module names. - */ - for (i = 0; i < len; i++) - if (bootfile[i] == '/') - bootfile[i] = '_'; + if ((p = strrchr(bootfile, '/')) != NULL) + p++; + else + p = bootfile; /* * Format the global variables based on the kernel module name. */ - snprintf(curthread_str, sizeof(curthread_str), "%s`struct thread *",bootfile); + snprintf(curthread_str, sizeof(curthread_str), "%s`struct thread *",p); } #endif From owner-p4-projects@FreeBSD.ORG Tue Jun 13 00:59:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20B9716A474; Tue, 13 Jun 2006 00:59:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AFA2816A41B for ; Tue, 13 Jun 2006 00:59:14 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D34843D46 for ; Tue, 13 Jun 2006 00:59:14 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D0uvSE053149 for ; Tue, 13 Jun 2006 00:56:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D0uvWD053146 for perforce@freebsd.org; Tue, 13 Jun 2006 00:56:57 GMT (envelope-from jb@freebsd.org) Date: Tue, 13 Jun 2006 00:56:57 GMT Message-Id: <200606130056.k5D0uvWD053146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99102 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, 13 Jun 2006 00:59:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=99102 Change 99102 by jb@jb_freebsd2 on 2006/06/13 00:55:58 Save the invop address in a global variable for ease of access from kdb when system go kaboom gracefully. Ungraceful kabooms cause a reboot. Grumble. Also check a flag to see if a probe is already in progress and save the address just in case we have a chance to look at it before the system go kaboom. This shouldn't happen, but until the port is complete on FreeBSD and the functions called from the probe context meet Sun's design, it can happen. At the moment I think that it is witness in something that makes a bunch of functions uninstrumentable (is that a word?) by fbt reliably. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 (text+ko) ==== @@ -36,7 +36,9 @@ #include #include -extern uintptr_t kernelbase; +extern uintptr_t kernelbase; +extern uintptr_t dtrace_in_probe_addr; +extern int dtrace_in_probe; int dtrace_invop(uintptr_t, uintptr_t *, uintptr_t); @@ -47,7 +49,8 @@ struct dtrace_invop_hdlr *dtih_next; } dtrace_invop_hdlr_t; -dtrace_invop_hdlr_t *dtrace_invop_hdlr; +dtrace_invop_hdlr_t *dtrace_invop_hdlr; +uintptr_t dtrace_invop_addr; int dtrace_invop(uintptr_t addr, uintptr_t *stack, uintptr_t eax) @@ -55,6 +58,31 @@ dtrace_invop_hdlr_t *hdlr; int rval; + /* + * Save the address in a global variable which can be + * read via the kernel debugger in the event that a + * double fault occurs. + * + * From kdb: p *dtrace_invop_addr + * + * Then look up the value in an objdump of the kernel. + */ + dtrace_invop_addr = addr; + + /* + * An invalid opcode fault should not occur while executing + * a probe because only dtrace_ functions are supposed to + * be called by design. Check here if dtrace_probe() is + * in-progress. If so, that's very bad. Very, very bad. We + * can't call any non-dtrace functions to report this, so + * just save the invalid opcode address and hope that the + * dtrace_ioctl will report it. If the DTrace port is + * working according to Sun's design, this should never + * occur. + */ + if (dtrace_in_probe) + dtrace_in_probe_addr = addr; + for (hdlr = dtrace_invop_hdlr; hdlr != NULL; hdlr = hdlr->dtih_next) { if ((rval = hdlr->dtih_func(addr, stack, eax)) != 0) return (rval); From owner-p4-projects@FreeBSD.ORG Tue Jun 13 01:00:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8807A16A41F; Tue, 13 Jun 2006 01:00:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 66DDF16A477 for ; Tue, 13 Jun 2006 01:00:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D26E43D45 for ; Tue, 13 Jun 2006 01:00:16 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D0vx2x053199 for ; Tue, 13 Jun 2006 00:57:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D0vxYr053196 for perforce@freebsd.org; Tue, 13 Jun 2006 00:57:59 GMT (envelope-from jb@freebsd.org) Date: Tue, 13 Jun 2006 00:57:59 GMT Message-Id: <200606130057.k5D0vxYr053196@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99103 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, 13 Jun 2006 01:00:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=99103 Change 99103 by jb@jb_freebsd2 on 2006/06/13 00:57:48 Can't do any more printfs from the probe context now that fbt is around because it creates double faults which end in tears. Increment/decrement a count to help debug illegal probe recursion. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_probe.c#9 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_probe.c#9 (text+ko) ==== @@ -50,6 +50,9 @@ } #endif + /* Keep track of when a probe is being executed. */ + dtrace_in_probe++; + now = dtrace_gethrtime(); vtime = dtrace_vtime_references != 0; @@ -435,7 +438,6 @@ case DTRACEACT_USYM: case DTRACEACT_UMOD: case DTRACEACT_UADDR: { -printf("%s(%d): USYM, UMOD or UADDR\n",__FUNCTION__,__LINE__); #ifdef DOODAD struct pid *pid = curthread->t_procp->p_pidp; @@ -608,5 +610,11 @@ if (vtime) curthread->t_dtrace_start = dtrace_gethrtime(); + /* + * Probes shouldn't be called recursively, so this should return + * to zero. + */ + dtrace_in_probe--; + dtrace_interrupt_enable(cookie); } From owner-p4-projects@FreeBSD.ORG Tue Jun 13 01:08:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38B8E16A473; Tue, 13 Jun 2006 01:08:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F160C16A41F for ; Tue, 13 Jun 2006 01:08:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AEFFA43D48 for ; Tue, 13 Jun 2006 01:08:28 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D16BMH054854 for ; Tue, 13 Jun 2006 01:06:11 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D16BEI054851 for perforce@freebsd.org; Tue, 13 Jun 2006 01:06:11 GMT (envelope-from jb@freebsd.org) Date: Tue, 13 Jun 2006 01:06:11 GMT Message-Id: <200606130106.k5D16BEI054851@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99105 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, 13 Jun 2006 01:08:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=99105 Change 99105 by jb@jb_freebsd2 on 2006/06/13 01:05:26 There are a heap of functions that are unsafe to instrument, mostly, I suspect, due to witness in something that DTrace is calling from the probe context when it shouldn't be. The list of prefixes being filtered out is way larger than necessary, but I've only had time to do an iterative test over all combinations of [a-z][a-z]*. Each test takes a while because you actually have to use the system in the mean time. It will only go kaboom due to an illegal function call at the time the function is actually called, not when it is instrumented. Until more work is done on this provider, it should be used with care. Enabling all probes if currently doesn't filter out may still cause a crash if you happen to fire one that I haven't seen called. For the brave hearted, you can use the wild card probe naming that DTrace supports rather than the sysctl filters I've built in here. Those sysctl filters are there so that I can choose a small number of probes and then run through Sun's tests. This avoids me having to edit all the test files. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/fbt/fbt.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/fbt/fbt.c#2 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -64,6 +65,23 @@ MALLOC_DECLARE(M_FBT); MALLOC_DEFINE(M_FBT, "fbt", "Function Boundary Tracing"); +SYSCTL_DECL(_debug_dtrace); +int fbt_debug = 0; +int fbt_filter_0 = 0; +int fbt_filter_1 = 0; +int fbt_filter_2 = 0; +int fbt_filter_3 = 0; +int fbt_filter_len = 0; +char fbt_filter_str[64]; +TUNABLE_INT("debug.dtrace.fbt_debug", &fbt_debug); +SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_debug, CTLFLAG_RW, &fbt_debug, 0, ""); +SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_filter_0, CTLFLAG_RW, &fbt_filter_0, 0, ""); +SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_filter_1, CTLFLAG_RW, &fbt_filter_1, 0, ""); +SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_filter_2, CTLFLAG_RW, &fbt_filter_2, 0, ""); +SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_filter_3, CTLFLAG_RW, &fbt_filter_3, 0, ""); +SYSCTL_INT(_debug_dtrace, OID_AUTO, fbt_filter_len, CTLFLAG_RW, &fbt_filter_len, 0, ""); +SYSCTL_STRING(_debug_dtrace, OID_AUTO, fbt_filter_str, CTLFLAG_RW, fbt_filter_str, 0, ""); + #define FBT_PUSHL_EBP 0x55 #define FBT_MOVL_ESP_EBP0_V0 0x8b #define FBT_MOVL_ESP_EBP1_V0 0xec @@ -214,35 +232,74 @@ return (0); } - /* XXX - * - * If the module is the kernel, there are a few functions that - * are called (unwisely) from the DTrace probe context that - * will make the kernel go kaboom if instrumented. Don't ask - * me how I know! 8-) - * - * In the long term, I think we need to allow a developer to - * specify if a function is not safe to call from a DTrace - * probe. This is probably something we can do with SYSINIT. - * There aren't many functions. - * - * Of the functions listed here, some are just listed because I - * can't help putting a printf() in the probe context to work - * out what is going on. - * - * The rest should be implemented as 'dtrace_' prefixed functions - * like Sun does. I now see why they do that. 8-) + /* + * Still trying to narrow down why some of these things are + * being called from the probe context. At the moment I suspect + * there is some call which executes witness code and that + * is *certain* to end in tears. + */ + if (name[0] == '_' || + strcmp(name, "trap") == 0 || + strcmp(name, "userret") == 0 || + strncmp(name, "realtimer", 9) == 0 || + strncmp(name, "ithread", 7) == 0 || + strncmp(name, "itimer", 6) == 0 || + strncmp(name, "ioapic", 6) == 0 || + strncmp(name, "isitmy", 6) == 0 || + strncmp(name, "db_", 3) == 0 || + strncmp(name, "gdb_", 4) == 0 || + strncmp(name, "kdb_", 4) == 0 || + strncmp(name, "intr_", 5) == 0 || + + strncmp(name, "vm", 2) == 0 || + strncmp(name, "th", 2) == 0 || + strncmp(name, "sh", 2) == 0 || + strncmp(name, "fi", 2) == 0 || + strncmp(name, "fd", 2) == 0 || + strncmp(name, "str", 3) == 0 || + strncmp(name, "nfs", 3) == 0 || + strncmp(name, "ata_", 4) == 0 || + strncmp(name, "acpi", 4) == 0 || + strncmp(name, "bufobj", 6) == 0 || + strncmp(name, "linker", 6) == 0 || + strncmp(name, "witness", 7) == 0 || + strncmp(name, "spinlock", 8) == 0 || + strcmp(name, "pcpu_find") == 0) + return (0); + + /* + * These filters are set by sysctl to help debugging the initial + * port of this provider. Normally the wildcard would be + * specified to dtrace via the probe name (e.g. fbt::abc*:entry) + * rather than using these. However, to apply a filter to narrow + * the problem down while running Sun's tests, it is easier to + * set these filters rather than have to modify the tests all the + * time. */ - if (strcmp(lf->filename, "kernel") == 0) { - if (strcmp(name, "trap") == 0 || - strcmp(name, "putchar") == 0 || - strcmp(name, "kvprintf") == 0 || - strcmp(name, "printf") == 0 || - strcmp(name, "getnanouptime") == 0 || - strcmp(name, "pcpu_find") == 0) + if (fbt_filter_0 != 0) { + if (name[0] != fbt_filter_0) return (0); + if (fbt_filter_1 != 0) { + if (name[1] != fbt_filter_1) + return (0); + if (fbt_filter_2 != 0) { + if (name[2] != fbt_filter_2) + return (0); + if (fbt_filter_3 != 0) { + if (name[3] != fbt_filter_3) + return (0); + } + } + } } + /* + * This is an alternate form of filter. The one above is easier to + * set from a shell script though. + */ + if (fbt_filter_len > 0 && strncmp(name, fbt_filter_str, fbt_filter_len) != 0) + return (0); + size = symval->size; instr = (u_int8_t *) symval->value; @@ -272,8 +329,6 @@ fbt_probetab[FBT_ADDR2NDX(instr)] = fbt; lf->fbt_nentries++; -/* XXX Do we have a problem with return probes? */ -if (strcmp(name, "ioctl") != 0) return (0); retfbt = NULL; again: @@ -408,7 +463,6 @@ */ return; } -if (strcmp(modname, "kernel") != 0) return; /* * List the functions in the module and the symbol values. @@ -479,8 +533,11 @@ return; } - for (; fbt != NULL; fbt = fbt->fbtp_next) + for (; fbt != NULL; fbt = fbt->fbtp_next) { + if (fbt_debug) + printf("fbt_enable %s\n",fbt->fbtp_name); *fbt->fbtp_patchpoint = fbt->fbtp_patchval; + } } /* ARGSUSED */ From owner-p4-projects@FreeBSD.ORG Tue Jun 13 01:15:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9924E16A473; Tue, 13 Jun 2006 01:15:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 649BB16A41A for ; Tue, 13 Jun 2006 01:15:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32ED543D48 for ; Tue, 13 Jun 2006 01:15:38 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D1DLqQ055145 for ; Tue, 13 Jun 2006 01:13:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D1DLwb055142 for perforce@freebsd.org; Tue, 13 Jun 2006 01:13:21 GMT (envelope-from jb@freebsd.org) Date: Tue, 13 Jun 2006 01:13:21 GMT Message-Id: <200606130113.k5D1DLwb055142@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99106 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, 13 Jun 2006 01:15:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=99106 Change 99106 by jb@jb_freebsd2 on 2006/06/13 01:13:16 Add a couple of global variables to look at with kdb if things go pear shaped. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#28 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#28 (text+ko) ==== @@ -148,6 +148,10 @@ hrtime_t dtrace_deadman_interval = NANOSEC; hrtime_t dtrace_deadman_timeout = (hrtime_t)10 * NANOSEC; hrtime_t dtrace_deadman_user = (hrtime_t)30 * NANOSEC; +int dtrace_in_probe; /* non-zero if executing a probe */ +#if defined(__i386__) +uintptr_t dtrace_in_probe_addr; /* Address of invop when already in probe */ +#endif /* * DTrace External Variables From owner-p4-projects@FreeBSD.ORG Tue Jun 13 01:17:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C67216A474; Tue, 13 Jun 2006 01:17:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C3BCF16A41B for ; Tue, 13 Jun 2006 01:17:41 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 903CC43D45 for ; Tue, 13 Jun 2006 01:17:41 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D1FORG055322 for ; Tue, 13 Jun 2006 01:15:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D1FO4G055319 for perforce@freebsd.org; Tue, 13 Jun 2006 01:15:24 GMT (envelope-from jb@freebsd.org) Date: Tue, 13 Jun 2006 01:15:24 GMT Message-Id: <200606130115.k5D1FO4G055319@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99107 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, 13 Jun 2006 01:17:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=99107 Change 99107 by jb@jb_freebsd2 on 2006/06/13 01:14:44 Rmove printfs that make fbt double fault. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#3 (text+ko) ==== @@ -64,7 +64,6 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes, uint32_t *intrpc) { -printf("%s:\n",__FUNCTION__); #ifdef DOODAD struct frame *fp = (struct frame *)dtrace_getfp(); struct frame *nextfp, *minfp, *stacktop; @@ -138,7 +137,6 @@ dtrace_getustack_common(uint64_t *pcstack, int pcstack_limit, uintptr_t pc, uintptr_t sp) { -printf("%s:\n",__FUNCTION__); #ifdef DOODAD klwp_t *lwp = ttolwp(curthread); proc_t *p = curproc; @@ -219,7 +217,6 @@ void dtrace_getupcstack(uint64_t *pcstack, int pcstack_limit) { -printf("%s:\n",__FUNCTION__); #ifdef DOODAD klwp_t *lwp = ttolwp(curthread); proc_t *p = curproc; @@ -278,7 +275,6 @@ int dtrace_getustackdepth(void) { -printf("%s:\n",__FUNCTION__); #ifdef DOODAD klwp_t *lwp = ttolwp(curthread); proc_t *p = curproc; @@ -315,7 +311,6 @@ void dtrace_getufpstack(uint64_t *pcstack, uint64_t *fpstack, int pcstack_limit) { -printf("%s:\n",__FUNCTION__); #ifdef DOODAD klwp_t *lwp = ttolwp(curthread); proc_t *p = curproc; @@ -520,7 +515,6 @@ int dtrace_getstackdepth(int aframes) { -printf("%s:\n",__FUNCTION__); #ifdef DOODAD struct frame *fp = (struct frame *)dtrace_getfp(); struct frame *nextfp, *minfp, *stacktop; @@ -569,7 +563,6 @@ ulong_t dtrace_getreg(struct regs *rp, uint_t reg) { -printf("%s:\n",__FUNCTION__); #ifdef DOODAD #if defined(__amd64) int regmap[] = { From owner-p4-projects@FreeBSD.ORG Tue Jun 13 01:18:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8A8316A474; Tue, 13 Jun 2006 01:18:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D00416A418 for ; Tue, 13 Jun 2006 01:18:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5983F43D48 for ; Tue, 13 Jun 2006 01:18:43 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D1GQ7j055368 for ; Tue, 13 Jun 2006 01:16:26 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D1GQrc055365 for perforce@freebsd.org; Tue, 13 Jun 2006 01:16:26 GMT (envelope-from jb@freebsd.org) Date: Tue, 13 Jun 2006 01:16:26 GMT Message-Id: <200606130116.k5D1GQrc055365@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99108 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, 13 Jun 2006 01:18:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=99108 Change 99108 by jb@jb_freebsd2 on 2006/06/13 01:16:03 Add a bit of debug code while I'm still searching for things that cause double faults in fbt. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#14 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#14 (text+ko) ==== @@ -34,6 +34,18 @@ SDT_PROBE(dtrace, ioctl, entry, cmd, addr, 0, 0, 0); +#if defined(__i386__) + /* + * Check if any probe recursions have occurred. These are more + * likely to cause a crash, but let's try to report them if we + * can. + */ + if (dtrace_in_probe_addr != 0) { + printf("dtrace_in_probe_addr 0x%lx\n", (u_long) dtrace_in_probe_addr); + dtrace_in_probe_addr = 0; + } +#endif + switch (cmd) { case DTRACEIOC_AGGDESC: { dtrace_aggdesc_t **paggdesc = (dtrace_aggdesc_t **) addr; From owner-p4-projects@FreeBSD.ORG Tue Jun 13 01:19:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5838B16A484; Tue, 13 Jun 2006 01:19:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 353C516A481 for ; Tue, 13 Jun 2006 01:19:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4642443D46 for ; Tue, 13 Jun 2006 01:19:45 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D1HSXs055449 for ; Tue, 13 Jun 2006 01:17:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D1HSSQ055446 for perforce@freebsd.org; Tue, 13 Jun 2006 01:17:28 GMT (envelope-from jb@freebsd.org) Date: Tue, 13 Jun 2006 01:17:28 GMT Message-Id: <200606130117.k5D1HSSQ055446@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99109 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, 13 Jun 2006 01:19:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=99109 Change 99109 by jb@jb_freebsd2 on 2006/06/13 01:17:01 Remove printfs which cause fbt to double fault. Anyone for tennis? Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_action.c#5 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dif.c#10 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#16 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_action.c#5 (text+ko) ==== @@ -58,7 +58,6 @@ c[i++] = ')'; c[i] = '\0'; -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD debug_enter(c); #endif @@ -104,7 +103,6 @@ return; } -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD /* * raise() has a queue depth of 1 -- we ignore all subsequent @@ -124,7 +122,6 @@ if (dtrace_destructive_disallow) return; -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD if (!curthread->t_dtrace_stop) { curthread->t_dtrace_stop = 1; @@ -187,7 +184,6 @@ dtrace_action_ustack(dtrace_mstate_t *mstate, dtrace_state_t *state, uint64_t *buf, uint64_t arg) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD int nframes = DTRACE_USTACK_NFRAMES(arg); int strsize = DTRACE_USTACK_STRSIZE(arg); ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dif.c#10 (text+ko) ==== @@ -51,7 +51,6 @@ return (mstate->dtms_arg[ndx]); case DIF_VAR_UREGS: { -printf("%s:%s(%d): DIF_VAR_UREGS\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD klwp_t *lwp; @@ -352,7 +351,6 @@ break; case DIF_SUBR_MUTEX_OWNED: -printf("%s:%s(%d): DIF_SUBR_MUTEX_OWNED\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); if (MUTEX_TYPE_ADAPTIVE(&m.mi)) @@ -363,7 +361,6 @@ break; case DIF_SUBR_MUTEX_OWNER: -printf("%s:%s(%d): DIF_SUBR_MUTEX_OWNER\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); if (MUTEX_TYPE_ADAPTIVE(&m.mi) && @@ -375,7 +372,6 @@ break; case DIF_SUBR_MUTEX_TYPE_ADAPTIVE: -printf("%s:%s(%d): DIF_SUBR_MUTEX_TYPE_ADAPTIVE\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); regs[rd] = MUTEX_TYPE_ADAPTIVE(&m.mi); @@ -383,7 +379,6 @@ break; case DIF_SUBR_MUTEX_TYPE_SPIN: -printf("%s:%s(%d): DIF_SUBR_MUTEX_TYPE_SPIN\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD m.mx = dtrace_load64(tupregs[0].dttk_value); regs[rd] = MUTEX_TYPE_SPIN(&m.mi); @@ -391,7 +386,6 @@ break; case DIF_SUBR_RW_READ_HELD: { -printf("%s:%s(%d): DIF_SUBR_RW_READ_HELD\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD uintptr_t tmp; @@ -402,7 +396,6 @@ } case DIF_SUBR_RW_WRITE_HELD: -printf("%s:%s(%d): DIF_SUBR_RW_WRITE_HELD\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD r.rw = dtrace_loadptr(tupregs[0].dttk_value); regs[rd] = _RW_WRITE_HELD(&r.ri); @@ -410,7 +403,6 @@ break; case DIF_SUBR_RW_ISWRITER: -printf("%s:%s(%d): DIF_SUBR_RW_ISWRITER\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD r.rw = dtrace_loadptr(tupregs[0].dttk_value); regs[rd] = _RW_ISWRITER(&r.ri); @@ -518,7 +510,6 @@ case DIF_SUBR_MSGSIZE: case DIF_SUBR_MSGDSIZE: { -printf("%s:%s(%d): DIF_SUBR_MSGSIZE or DIF_SUBR_MSGDSIZE\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD uintptr_t baddr = tupregs[0].dttk_value, daddr; uintptr_t wptr, rptr; @@ -943,7 +934,6 @@ } case DIF_SUBR_GETMAJOR: -printf("%s:%s(%d): DIF_SUBR_GETMAJOR\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD #ifdef _LP64 regs[rd] = (tupregs[0].dttk_value >> NBITSMINOR64) & MAXMAJ64; @@ -954,7 +944,6 @@ break; case DIF_SUBR_GETMINOR: -printf("%s:%s(%d): DIF_SUBR_GETMINOR\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD #ifdef _LP64 regs[rd] = tupregs[0].dttk_value & MAXMIN64; @@ -965,7 +954,6 @@ break; case DIF_SUBR_DDI_PATHNAME: { -printf("%s:%s(%d): DIF_SUBR_DDI_PATHNAME\n",__FUNCTION__,__FILE__,__LINE__); #ifdef DOODAD /* * This one is a galactic mess. We are going to roughly ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#16 (text+ko) ==== @@ -27,12 +27,10 @@ void dtrace_vtime_enable(void) { - printf("%s:\n",__FUNCTION__); } void dtrace_vtime_disable(void) { - printf("%s:\n",__FUNCTION__); } void dtrace_vpanic(const char *fmt, __va_list args) @@ -43,7 +41,6 @@ int dtrace_getipl(void) { - printf("%s:\n",__FUNCTION__); return 0; } boolean_t @@ -79,13 +76,14 @@ (xc_func_t)dtrace_xcall_func); kpreempt_enable(); #else + critical_enter(); (*func)(arg); + critical_exit(); #endif } taskqid_t taskq_dispatch(taskq_t *a, task_func_t b, void *c, uint_t d) { - printf("%s:\n",__FUNCTION__); return 0; } int From owner-p4-projects@FreeBSD.ORG Tue Jun 13 02:20:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FF1A16A473; Tue, 13 Jun 2006 02:20:16 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B22416A478 for ; Tue, 13 Jun 2006 02:20:16 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C47FE43D45 for ; Tue, 13 Jun 2006 02:20:15 +0000 (GMT) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D2HwwG059796 for ; Tue, 13 Jun 2006 02:17:58 GMT (envelope-from dongmei@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D2Hw0L059792 for perforce@freebsd.org; Tue, 13 Jun 2006 02:17:58 GMT (envelope-from dongmei@FreeBSD.org) Date: Tue, 13 Jun 2006 02:17:58 GMT Message-Id: <200606130217.k5D2Hw0L059792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dongmei@FreeBSD.org using -f From: dongmei To: Perforce Change Reviews Cc: Subject: PERFORCE change 99113 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, 13 Jun 2006 02:20:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=99113 Change 99113 by dongmei@soc-dongmei on 2006/06/13 02:17:03 begin with the trustedbsd/sebsd branch Submitted by:dongmei Obtained from: //depot/projects/trustedbsd/sebsd Affected files ... .. //depot/projects/soc2006/dongmei_sebsd/COPYRIGHT#1 branch .. //depot/projects/soc2006/dongmei_sebsd/LOCKS#1 branch .. //depot/projects/soc2006/dongmei_sebsd/MACREADME#1 branch .. //depot/projects/soc2006/dongmei_sebsd/MAINTAINERS#1 branch .. //depot/projects/soc2006/dongmei_sebsd/MERGE#1 branch .. //depot/projects/soc2006/dongmei_sebsd/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/Makefile.inc1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/ObsoleteFiles.inc#1 branch .. //depot/projects/soc2006/dongmei_sebsd/SEBSD-Installation.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/SEBSD.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/UPDATING#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/Makefile.inc#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/cat/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/cat/cat.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/cat/cat.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/chflags/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/chflags/chflags.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/chflags/chflags.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/chio/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/chio/chio.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/chio/chio.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/chio/defs.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/chio/pathnames.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/chmod/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/chmod/chmod.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/chmod/chmod.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/cp/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/cp/cp.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/cp/cp.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/cp/extern.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/cp/utils.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/csh/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/csh/config.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/csh/config_p.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/csh/host.defs#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/csh/iconv.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/csh/iconv_stub.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/date/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/date/date.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/date/date.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/date/extern.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/date/netdate.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/date/vary.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/date/vary.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/args.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/conv.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/conv_tab.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/dd.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/dd.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/dd.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/extern.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/gen.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/misc.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/position.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/ref.ascii#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/ref.ebcdic#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/ref.ibm#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/ref.lcase#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/ref.oldascii#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/ref.oldibm#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/ref.pareven#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/ref.parnone#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/ref.parodd#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/ref.parset#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/ref.swab#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/dd/ref.ucase#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/df/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/df/df.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/df/df.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/domainname/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/domainname/domainname.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/domainname/domainname.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/echo/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/echo/echo.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/echo/echo.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/POSIX#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/README#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/buf.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/cbc.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/ed.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/ed.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/glbl.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/io.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/main.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/re.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/sub.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/=.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/README#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/TODO#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/a.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/a.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/a.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/a1.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/a2.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/addr.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/addr.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/addr.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/addr1.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/addr2.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/ascii.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/bang1.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/bang1.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/bang1.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/bang1.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/bang2.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/c.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/c.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/c.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/c1.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/c2.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/d.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/d.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/d.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/d.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/e1.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/e1.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/e1.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/e1.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/e2.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/e2.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/e2.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/e2.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/e3.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/e3.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/e3.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/e3.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/e4.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/e4.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/e4.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/f1.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/f2.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g1.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g1.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g1.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g1.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g2.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g2.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g2.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g2.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g3.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g3.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g3.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g3.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g4.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g4.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g4.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g5.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g5.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/g5.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/h.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/i.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/i.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/i.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/i1.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/i2.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/i3.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/j.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/j.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/j.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/k.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/k.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/k.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/k1.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/k2.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/k3.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/k4.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/l.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/l.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/l.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/m.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/m.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/m.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/m.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/n.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/n.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/n.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/nl.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/nl1.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/nl1.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/nl1.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/nl2.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/nl2.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/nl2.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/p.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/p.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/p.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/q.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/q.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/q.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/q1.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/r1.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/r1.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/r1.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/r1.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/r2.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/r2.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/r2.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/r2.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/r3.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/r3.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/r3.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s1.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s1.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s1.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s1.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s10.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s2.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s2.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s2.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s2.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s3.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s3.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s3.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s3.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s4.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s5.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s6.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s7.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s8.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/s9.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/t.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/t.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/t1.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/t1.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/t1.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/t1.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/t2.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/t2.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/t2.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/t2.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/u.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/u.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/u.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/u.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/v.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/v.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/v.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/w.d#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/w.r#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/w.t#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/w1.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/w2.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/w3.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/x.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/test/z.err#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ed/undo.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/expr/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/expr/expr.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/expr/expr.y#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/getfacl/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/getfacl/getfacl.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/getfacl/getfacl.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/hostname/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/hostname/hostname.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/hostname/hostname.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/kenv/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/kenv/kenv.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/kenv/kenv.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/kill/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/kill/kill.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/kill/kill.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ln/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ln/ln.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ln/ln.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ln/symlink.7#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ls/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ls/cmp.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ls/extern.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ls/ls.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ls/ls.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ls/ls.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ls/print.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ls/util.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/mkdir/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/mkdir/mkdir.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/mkdir/mkdir.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/mv/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/mv/mv.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/mv/mv.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/ar_io.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/ar_subs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/buf_subs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/cache.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/cache.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/cpio.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/cpio.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/cpio.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/extern.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/file_subs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/ftree.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/ftree.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/gen_subs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/getoldopt.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/options.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/options.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/pat_rep.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/pat_rep.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/pax.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/pax.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/pax.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/sel_subs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/sel_subs.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/tables.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/tables.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/tar.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/tar.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/tar.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pax/tty_subs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ps/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ps/extern.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ps/fmt.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ps/keyword.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ps/nlist.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ps/print.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ps/ps.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ps/ps.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/ps/ps.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pwd/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pwd/pwd.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/pwd/pwd.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/rcp/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/rcp/extern.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/rcp/rcp.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/rcp/rcp.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/rcp/util.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/realpath/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/realpath/realpath.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/realpath/realpath.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/rm/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/rm/rm.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/rm/rm.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/rmail/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/rmdir/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/rmdir/rmdir.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/rmdir/rmdir.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/setfacl/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/setfacl/file.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/setfacl/mask.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/setfacl/merge.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/setfacl/remove.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/setfacl/setfacl.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/setfacl/setfacl.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/setfacl/setfacl.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/setfacl/util.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/TOUR#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/alias.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/alias.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/arith.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/arith.y#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/arith_lex.l#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/bltin/echo.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/bltin/echo.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/builtins.def#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/cd.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/cd.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/error.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/error.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/eval.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/eval.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/exec.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/exec.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/expand.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/expand.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/funcs/cmv#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/funcs/dirs#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/funcs/kill#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/funcs/login#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/funcs/newgrp#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/funcs/popd#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/funcs/pushd#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/funcs/suspend#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/histedit.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/init.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/input.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/input.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/jobs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/jobs.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/mail.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/mail.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/main.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/main.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/memalloc.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/memalloc.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/miscbltin.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/mkbuiltins#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/mkinit.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/mknodes.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/mksyntax.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/mktokens#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/myhistedit.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/mystring.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/mystring.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/nodes.c.pat#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/nodetypes#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/options.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/options.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/output.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/output.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/parser.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/parser.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/redir.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/redir.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/sh.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/shell.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/show.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/show.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/trap.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/trap.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/var.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sh/var.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sleep/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sleep/sleep.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sleep/sleep.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/stty/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/stty/cchar.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/stty/extern.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/stty/gfmt.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/stty/key.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/stty/modes.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/stty/print.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/stty/stty.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/stty/stty.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/stty/stty.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/stty/util.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sync/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sync/sync.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/sync/sync.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/test/Makefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/test/TEST.README#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/test/TEST.csh#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/test/TEST.sh#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/test/test.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/bin/test/test.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/AUTHORS#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/BUGS#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/COPYING#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/ChangeLog#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/INSTALL#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/NEWS#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/README#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/README.ldap#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/README.y2k#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amd.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amd.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amd.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/autil.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/clock.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/conf.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/map.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/opts.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/restart.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/sched.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amq/amq.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amq/amq.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amq/amq.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/bootstrap#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/doc/version.texi#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/libamu/util.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/m4/amindent#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/m4/autopat#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/m4/mkconf#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/tasks#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/AUTHORS#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/ChangeLog#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/FAQ#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/INSTALL#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Makefile.am#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/NEWS#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/README#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/array.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/atan.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/div.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/exp.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/fact.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/jn.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/ln.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/mul.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/raise.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/signum#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/sine.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/Test/timetest#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/acconfig.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/aclocal.m4#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/bc.y#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/const.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/execute.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/global.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/global.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/load.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/main.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/proto.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/scan.l#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/storage.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/bc/util.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/config.h.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/configure#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/configure.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/dc/array.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/dc/dc.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/dc/dc.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/dc/eval.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/dc/misc.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/dc/stack.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/dc/string.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/doc/bc.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/doc/dc.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/h/number.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/install-sh#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/lib/number.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/missing#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bc/stamp-h.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/CHANGES#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/FAQ#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/README#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/acconfig.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/config.guess#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/config.sub#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/config.threads.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/configure.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/soc2006/dongmei_sebsd/contrib/bind9/doc/rfc/rfc3226.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 13 02:52:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77A4116A46F; Tue, 13 Jun 2006 02:52:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A20916A418 for ; Tue, 13 Jun 2006 02:52:57 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5ADA43D49 for ; Tue, 13 Jun 2006 02:52:56 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D2odce061514 for ; Tue, 13 Jun 2006 02:50:39 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D2odbv061511 for perforce@freebsd.org; Tue, 13 Jun 2006 02:50:39 GMT (envelope-from trhodes@freebsd.org) Date: Tue, 13 Jun 2006 02:50:39 GMT Message-Id: <200606130250.k5D2odbv061511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 99115 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, 13 Jun 2006 02:52:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=99115 Change 99115 by trhodes@trhodes_local on 2006/06/13 02:50:10 Update to describe new mount options. Affected files ... .. //depot/projects/trhodesbsd/src/sbin/mount_msdosfs/mount_msdosfs.8#2 edit Differences ... ==== //depot/projects/trhodesbsd/src/sbin/mount_msdosfs/mount_msdosfs.8#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" .\" $FreeBSD: src/sbin/mount_msdosfs/mount_msdosfs.8,v 1.32 2005/09/14 16:36:19 joel Exp $ .\" -.Dd April 7, 1994 +.Dd May 16, 2006 .Dt MOUNT_MSDOSFS 8 .Os .Sh NAME @@ -79,6 +79,16 @@ Force only the old MS-DOS 8.3 style filenames to be visible. .It Cm nowin95 Completely ignore Windows 95 extended file information. +.It Cm oerdonly +Update the file system to read only in cases where +.Fn panic +would be called to halt the system. +The default behavior is panic. +.It Cm oepanic +Call +.Fn panic +when unrecoverable file system errors occur. +The default has always been panic. .El .It Fl u Ar uid Set the owner of the files in the file system to From owner-p4-projects@FreeBSD.ORG Tue Jun 13 02:53:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF85516A473; Tue, 13 Jun 2006 02:53:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8DE5A16A46F for ; Tue, 13 Jun 2006 02:53:58 +0000 (UTC) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58E0E43D46 for ; Tue, 13 Jun 2006 02:53:58 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D2pfkr061583 for ; Tue, 13 Jun 2006 02:51:41 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D2pfo6061580 for perforce@freebsd.org; Tue, 13 Jun 2006 02:51:41 GMT (envelope-from trhodes@freebsd.org) Date: Tue, 13 Jun 2006 02:51:41 GMT Message-Id: <200606130251.k5D2pfo6061580@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 99116 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, 13 Jun 2006 02:53:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=99116 Change 99116 by trhodes@trhodes_local on 2006/06/13 02:51:27 Kill commented out options for Gemdos, removed a long time ago from the driver. Affected files ... .. //depot/projects/trhodesbsd/src/sbin/mount_msdosfs/mount_msdosfs.8#3 edit Differences ... ==== //depot/projects/trhodesbsd/src/sbin/mount_msdosfs/mount_msdosfs.8#3 (text+ko) ==== @@ -161,13 +161,6 @@ if deleting or renaming a file. This forces .Fl s . -.\".It Fl G -.\"This option causes the file system to be interpreted as an Atari-Gemdos -.\"file system. -.\"The differences to the MS-DOS file system are minimal and -.\"limited to the boot block. -.\"This option enforces -.\".Fl s . .It Fl L Ar locale Specify locale name used for file name conversions for DOS and Win'95 names. From owner-p4-projects@FreeBSD.ORG Tue Jun 13 04:07:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DD6316A473; Tue, 13 Jun 2006 04:07:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 00AD716A41B for ; Tue, 13 Jun 2006 04:07:12 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99AAC43D55 for ; Tue, 13 Jun 2006 04:07:11 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D44s9H066978 for ; Tue, 13 Jun 2006 04:04:54 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D448Im066940 for perforce@freebsd.org; Tue, 13 Jun 2006 04:04:08 GMT (envelope-from marcel@freebsd.org) Date: Tue, 13 Jun 2006 04:04:08 GMT Message-Id: <200606130404.k5D448Im066940@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 99117 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, 13 Jun 2006 04:07:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=99117 Change 99117 by marcel@marcel_nfs on 2006/06/13 04:03:16 IFC @99114 Affected files ... .. //depot/projects/uart/amd64/amd64/pmap.c#38 integrate .. //depot/projects/uart/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/uart/amd64/conf/NOTES#10 integrate .. //depot/projects/uart/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/uart/arm/arm/inckern.S#2 integrate .. //depot/projects/uart/arm/arm/pmap.c#16 integrate .. //depot/projects/uart/arm/arm/vm_machdep.c#11 integrate .. //depot/projects/uart/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/uart/arm/conf/IQ31244#9 integrate .. //depot/projects/uart/arm/conf/KB920X#3 integrate .. //depot/projects/uart/arm/conf/SKYEYE#3 integrate .. //depot/projects/uart/arm/include/pmap.h#12 integrate .. //depot/projects/uart/arm/sa11x0/assabet_machdep.c#9 integrate .. //depot/projects/uart/arm/sa11x0/uart_cpu_sa1110.c#4 integrate .. //depot/projects/uart/arm/sa11x0/uart_dev_sa1110.c#5 integrate .. //depot/projects/uart/arm/xscale/i80321/iq31244_machdep.c#13 integrate .. //depot/projects/uart/bsm/audit.h#4 integrate .. //depot/projects/uart/bsm/audit_record.h#2 integrate .. //depot/projects/uart/cam/cam_ccb.h#7 integrate .. //depot/projects/uart/cam/cam_xpt.c#12 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_misc.c#15 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#18 integrate .. //depot/projects/uart/compat/ndis/winx32_wrap.S#3 integrate .. //depot/projects/uart/conf/Makefile.arm#10 integrate .. //depot/projects/uart/conf/files#71 integrate .. //depot/projects/uart/conf/files.arm#6 integrate .. //depot/projects/uart/conf/files.powerpc#10 integrate .. //depot/projects/uart/conf/kern.post.mk#14 integrate .. //depot/projects/uart/conf/options#37 integrate .. //depot/projects/uart/conf/options.arm#8 integrate .. //depot/projects/uart/contrib/dev/ath/COPYRIGHT#4 integrate .. //depot/projects/uart/contrib/dev/ath/README#5 integrate .. //depot/projects/uart/contrib/dev/ath/ah.h#6 integrate .. //depot/projects/uart/contrib/dev/ath/ah_desc.h#4 integrate .. //depot/projects/uart/contrib/dev/ath/ah_devid.h#5 integrate .. //depot/projects/uart/contrib/dev/ath/ah_soc.h#1 branch .. //depot/projects/uart/contrib/dev/ath/freebsd/ah_if.m#4 integrate .. //depot/projects/uart/contrib/dev/ath/freebsd/ah_osdep.c#7 integrate .. //depot/projects/uart/contrib/dev/ath/freebsd/ah_osdep.h#6 integrate .. //depot/projects/uart/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/ap30.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/ap30.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/ap30.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/ap43.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/ap43.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/ap43.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/ap51.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/ap51.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/ap51.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/ap61.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/ap61.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/ap61.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/armv4-be-elf.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/armv4-le-elf.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/i386-elf.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/i386-elf.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips-be-elf.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips-le-elf.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips1-be-elf.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips1-le-elf.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/powerpc-be-eabi.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/powerpc-be-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/powerpc-le-eabi.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/sh4-le-elf.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#1 branch .. //depot/projects/uart/contrib/dev/ath/public/sparc-be-elf.inc#1 branch .. //depot/projects/uart/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#1 branch .. //depot/projects/uart/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/sparc64-be-elf.inc#2 integrate .. //depot/projects/uart/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/x86_64-elf.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/xscale-be-elf.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/xscale-le-elf.inc#3 integrate .. //depot/projects/uart/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 integrate .. //depot/projects/uart/contrib/dev/ath/version.h#6 integrate .. //depot/projects/uart/crypto/via/padlock.c#4 integrate .. //depot/projects/uart/dev/acpi_support/acpi_panasonic.c#6 integrate .. //depot/projects/uart/dev/acpica/acpi.c#24 integrate .. //depot/projects/uart/dev/acpica/acpi_battery.c#7 integrate .. //depot/projects/uart/dev/acpica/acpi_thermal.c#9 integrate .. //depot/projects/uart/dev/acpica/acpivar.h#12 integrate .. //depot/projects/uart/dev/ath/if_ath.c#31 integrate .. //depot/projects/uart/dev/ath/if_ath_pci.c#10 integrate .. //depot/projects/uart/dev/ath/if_athvar.h#20 integrate .. //depot/projects/uart/dev/atkbdc/atkbdc_isa.c#3 integrate .. //depot/projects/uart/dev/bce/if_bce.c#2 integrate .. //depot/projects/uart/dev/bge/if_bge.c#27 integrate .. //depot/projects/uart/dev/bge/if_bgereg.h#17 integrate .. //depot/projects/uart/dev/cardbus/cardbus.c#11 integrate .. //depot/projects/uart/dev/cardbus/cardbus_cis.c#11 integrate .. //depot/projects/uart/dev/cm/if_cm_isa.c#6 integrate .. //depot/projects/uart/dev/cm/smc90cx6.c#5 integrate .. //depot/projects/uart/dev/cm/smc90cx6reg.h#2 integrate .. //depot/projects/uart/dev/cm/smc90cx6var.h#4 integrate .. //depot/projects/uart/dev/dc/if_dc.c#7 integrate .. //depot/projects/uart/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/uart/dev/ed/if_ed.c#13 integrate .. //depot/projects/uart/dev/ed/if_ed_novell.c#5 integrate .. //depot/projects/uart/dev/ed/if_edvar.h#10 integrate .. //depot/projects/uart/dev/em/if_em.c#22 integrate .. //depot/projects/uart/dev/firewire/fwohci_pci.c#13 integrate .. //depot/projects/uart/dev/hifn/hifn7751.c#14 integrate .. //depot/projects/uart/dev/ipw/if_ipw.c#7 integrate .. //depot/projects/uart/dev/ipw/if_ipwvar.h#4 integrate .. //depot/projects/uart/dev/le/if_le_pci.c#3 integrate .. //depot/projects/uart/dev/mpt/mpt.h#15 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#16 integrate .. //depot/projects/uart/dev/mpt/mpt_pci.c#20 integrate .. //depot/projects/uart/dev/mxge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/uart/dev/mxge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/uart/dev/mxge/if_mxge.c#1 branch .. //depot/projects/uart/dev/mxge/if_mxge_var.h#1 branch .. //depot/projects/uart/dev/mxge/mcp_gen_header.h#1 branch .. //depot/projects/uart/dev/mxge/mxge_mcp.h#1 branch .. //depot/projects/uart/dev/my/if_my.c#10 integrate .. //depot/projects/uart/dev/puc/pucdata.c#47 integrate .. //depot/projects/uart/dev/ral/rt2661.c#6 integrate .. //depot/projects/uart/dev/safe/safe.c#10 integrate .. //depot/projects/uart/dev/sk/if_sk.c#8 integrate .. //depot/projects/uart/dev/ubsec/ubsec.c#13 integrate .. //depot/projects/uart/dev/usb/ugen.c#13 integrate .. //depot/projects/uart/dev/wi/if_wi.c#17 integrate .. //depot/projects/uart/fs/procfs/procfs.c#5 integrate .. //depot/projects/uart/geom/eli/g_eli.c#8 integrate .. //depot/projects/uart/geom/eli/g_eli.h#4 integrate .. //depot/projects/uart/geom/eli/g_eli_ctl.c#4 integrate .. //depot/projects/uart/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/uart/geom/eli/g_eli_key.c#3 integrate .. //depot/projects/uart/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/uart/geom/geom.h#11 integrate .. //depot/projects/uart/geom/geom_io.c#11 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/support/atomic.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/support/debug.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/support/kmem.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/support/ktrace.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/support/rwlock.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/support/sv.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#1 branch .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_frw.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_frw.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_globals.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_iget.c#3 delete .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_iops.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_mountops.c#4 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_super.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_vfs.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_acl.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_acl.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_ag.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_alloc.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_alloc.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_alloc_btree.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_alloc_btree.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_arch.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_attr.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_attr.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_attr_leaf.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_attr_leaf.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_attr_sf.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_behavior.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_behavior.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_bit.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_bit.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_bmap.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_bmap_btree.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_btree.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_btree.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_buf_item.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_buf_item.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_cap.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_clnt.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_da_btree.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_da_btree.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dfrag.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dfrag.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dinode.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir2.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir2.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir2_block.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir2_block.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir2_data.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir2_data.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir2_leaf.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir2_leaf.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir2_node.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir2_node.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir2_sf.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir2_sf.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir2_trace.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir2_trace.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir_leaf.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir_leaf.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dir_sf.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dmapi.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_dmops.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_error.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_error.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_extfree_item.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_extfree_item.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_fs.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_fsops.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_fsops.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_ialloc.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_ialloc_btree.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_ialloc_btree.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_iget.c#1 branch .. //depot/projects/uart/gnu/fs/xfs/xfs_imap.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_inode.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_inode.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_inode_item.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_inode_item.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_inum.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_iocore.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_iomap.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_iomap.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_itable.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_itable.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_log.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_log_priv.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_log_recover.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_mac.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_macros.c#2 delete .. //depot/projects/uart/gnu/fs/xfs/xfs_macros.h#2 delete .. //depot/projects/uart/gnu/fs/xfs/xfs_mount.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_mount.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_qmops.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_quota.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_refcache.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_refcache.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_rename.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_rtalloc.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_rw.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_rw.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_sb.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_trans.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_trans.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_trans_ail.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_trans_buf.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_trans_extfree.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_trans_inode.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_trans_item.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_trans_priv.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_trans_space.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_types.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_utils.c#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_utils.h#2 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_vfsops.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfs_vnodeops.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/xfsidbg.c#2 integrate .. //depot/projects/uart/i386/acpica/acpi_machdep.c#8 integrate .. //depot/projects/uart/i386/acpica/acpi_wakecode.S#5 integrate .. //depot/projects/uart/i386/acpica/acpi_wakeup.c#12 integrate .. //depot/projects/uart/i386/conf/DEFAULTS#4 integrate .. //depot/projects/uart/i386/conf/NOTES#21 integrate .. //depot/projects/uart/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/uart/i386/i386/pmap.c#39 integrate .. //depot/projects/uart/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#22 integrate .. //depot/projects/uart/isa/isa_common.c#9 integrate .. //depot/projects/uart/kern/kern_acct.c#10 integrate .. //depot/projects/uart/kern/kern_event.c#14 integrate .. //depot/projects/uart/kern/kern_mbuf.c#11 integrate .. //depot/projects/uart/kern/sched_4bsd.c#12 integrate .. //depot/projects/uart/kern/sched_ule.c#17 integrate .. //depot/projects/uart/kern/subr_firmware.c#2 integrate .. //depot/projects/uart/kern/subr_rman.c#10 integrate .. //depot/projects/uart/kern/sys_pipe.c#20 integrate .. //depot/projects/uart/kern/sysv_msg.c#8 integrate .. //depot/projects/uart/kern/sysv_sem.c#10 integrate .. //depot/projects/uart/kern/sysv_shm.c#12 integrate .. //depot/projects/uart/kern/uipc_mbuf.c#13 integrate .. //depot/projects/uart/kern/uipc_socket.c#19 integrate .. //depot/projects/uart/kern/uipc_socket2.c#13 integrate .. //depot/projects/uart/kern/uipc_syscalls.c#20 integrate .. //depot/projects/uart/kern/vfs_mount.c#26 integrate .. //depot/projects/uart/kern/vfs_subr.c#32 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#25 integrate .. //depot/projects/uart/modules/Makefile#37 integrate .. //depot/projects/uart/modules/ath_hal/Makefile#6 integrate .. //depot/projects/uart/modules/geom/geom_bde/Makefile#2 integrate .. //depot/projects/uart/modules/geom/geom_eli/Makefile#4 integrate .. //depot/projects/uart/modules/if_bridge/Makefile#4 integrate .. //depot/projects/uart/modules/mxge/Makefile#1 branch .. //depot/projects/uart/modules/mxge/mxge/Makefile#1 branch .. //depot/projects/uart/modules/mxge/mxge_eth_z8e/Makefile#1 branch .. //depot/projects/uart/modules/mxge/mxge_ethp_z8e/Makefile#1 branch .. //depot/projects/uart/modules/xfs/Makefile#3 integrate .. //depot/projects/uart/net/if.c#19 integrate .. //depot/projects/uart/net/if_bridge.c#10 integrate .. //depot/projects/uart/net/route.c#10 integrate .. //depot/projects/uart/netatalk/COPYRIGHT#3 integrate .. //depot/projects/uart/netgraph/netgraph.h#10 integrate .. //depot/projects/uart/netgraph/ng_base.c#13 integrate .. //depot/projects/uart/netinet/if_ether.c#13 integrate .. //depot/projects/uart/netinet/ip_dummynet.c#16 integrate .. //depot/projects/uart/netinet/ip_fw2.c#24 integrate .. //depot/projects/uart/netinet6/in6.c#11 integrate .. //depot/projects/uart/netinet6/nd6.c#13 integrate .. //depot/projects/uart/nfsserver/nfs_serv.c#12 integrate .. //depot/projects/uart/nfsserver/nfs_srvsubs.c#10 integrate .. //depot/projects/uart/opencrypto/criov.c#4 integrate .. //depot/projects/uart/opencrypto/crypto.c#8 integrate .. //depot/projects/uart/opencrypto/cryptodev.h#7 integrate .. //depot/projects/uart/opencrypto/cryptosoft.c#9 integrate .. //depot/projects/uart/pc98/conf/DEFAULTS#4 integrate .. //depot/projects/uart/pc98/conf/NOTES#18 integrate .. //depot/projects/uart/pc98/pc98/machdep.c#9 integrate .. //depot/projects/uart/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/uart/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/uart/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/uart/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/uart/security/audit/audit.c#5 integrate .. //depot/projects/uart/security/audit/audit_arg.c#3 integrate .. //depot/projects/uart/security/audit/audit_bsm.c#4 integrate .. //depot/projects/uart/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/uart/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/uart/security/audit/audit_ioctl.h#2 integrate .. //depot/projects/uart/security/audit/audit_pipe.c#4 integrate .. //depot/projects/uart/security/audit/audit_private.h#4 integrate .. //depot/projects/uart/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/uart/security/audit/audit_trigger.c#3 integrate .. //depot/projects/uart/security/audit/audit_worker.c#2 integrate .. //depot/projects/uart/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/uart/sparc64/conf/GENERIC#20 integrate .. //depot/projects/uart/sparc64/isa/isa.c#9 integrate .. //depot/projects/uart/sparc64/sbus/sbus.c#11 integrate .. //depot/projects/uart/sparc64/sparc64/pmap.c#22 integrate .. //depot/projects/uart/sys/firmware.h#2 integrate .. //depot/projects/uart/sys/protosw.h#9 integrate .. //depot/projects/uart/sys/rman.h#9 integrate .. //depot/projects/uart/sys/socketvar.h#12 integrate .. //depot/projects/uart/sys/sysctl.h#11 integrate .. //depot/projects/uart/vm/pmap.h#13 integrate .. //depot/projects/uart/vm/vm_map.c#21 integrate .. //depot/projects/uart/vm/vm_meter.c#7 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/pmap.c#38 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.554 2006/05/01 22:06:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.556 2006/06/12 20:05:27 alc Exp $"); /* * Manages physical address maps. @@ -209,6 +209,8 @@ static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); static void pmap_clear_ptes(vm_page_t m, long bit); +static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, + vm_page_t m, vm_prot_t prot, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva, pd_entry_t ptepde); static void pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde); @@ -1004,17 +1006,22 @@ * Note: SMP coherent. Uses a ranged shootdown IPI. */ void -pmap_qenter(vm_offset_t sva, vm_page_t *m, int count) +pmap_qenter(vm_offset_t sva, vm_page_t *ma, int count) { - vm_offset_t va; + pt_entry_t *endpte, oldpte, *pte; - va = sva; - while (count-- > 0) { - pmap_kenter(va, VM_PAGE_TO_PHYS(*m)); - va += PAGE_SIZE; - m++; + oldpte = 0; + pte = vtopte(sva); + endpte = pte + count; + while (pte < endpte) { + oldpte |= *pte; + pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G | PG_RW | PG_V); + pte++; + ma++; } - pmap_invalidate_range(kernel_pmap, sva, va); + if ((oldpte & PG_V) != 0) + pmap_invalidate_range(kernel_pmap, sva, sva + count * + PAGE_SIZE); } /* @@ -2310,6 +2317,37 @@ } /* + * Maps a sequence of resident pages belonging to the same object. + * The sequence begins with the given page m_start. This page is + * mapped at the given virtual address start. Each subsequent page is + * mapped at a virtual address that is offset from start by the same + * amount as the page is offset from m_start within the object. The + * last page in the sequence is the page with the largest offset from + * m_start that can be mapped at a virtual address less than the given + * virtual address end. Not every virtual page between start and end + * is mapped; only those for which a resident page exists with the + * corresponding offset from m_start are mapped. + */ +void +pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, + vm_page_t m_start, vm_prot_t prot) +{ + vm_page_t m, mpte; + vm_pindex_t diff, psize; + + psize = atop(end - start); + mpte = NULL; + m = m_start; + PMAP_LOCK(pmap); + while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { + mpte = pmap_enter_quick_locked(pmap, start + ptoa(diff), m, + prot, mpte); + m = TAILQ_NEXT(m, listq); + } + PMAP_UNLOCK(pmap); +} + +/* * this code makes some *MAJOR* assumptions: * 1. Current pmap & pmap exists. * 2. Not wired. @@ -2322,15 +2360,26 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte) { + + PMAP_LOCK(pmap); + mpte = pmap_enter_quick_locked(pmap, va, m, prot, mpte); + PMAP_UNLOCK(pmap); + return (mpte); +} + +static vm_page_t +pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, + vm_prot_t prot, vm_page_t mpte) +{ pt_entry_t *pte; vm_paddr_t pa; KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva || (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0, - ("pmap_enter_quick: managed mapping within the clean submap")); + ("pmap_enter_quick_locked: managed mapping within the clean submap")); mtx_assert(&vm_page_queue_mtx, MA_OWNED); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); - PMAP_LOCK(pmap); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); /* * In the case that a page table page is not @@ -2395,7 +2444,7 @@ pmap_unwire_pte_hold(pmap, va, mpte); mpte = NULL; } - goto out; + return (mpte); } /* @@ -2422,8 +2471,6 @@ pte_store(pte, pa | PG_V | PG_U); else pte_store(pte, pa | PG_V | PG_U | PG_MANAGED); -out: - PMAP_UNLOCK(pmap); return mpte; } ==== //depot/projects/uart/amd64/conf/DEFAULTS#4 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.5 2006/04/28 21:21:51 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.6 2006/06/12 04:21:49 imp Exp $ machine amd64 @@ -11,3 +11,6 @@ # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device + +# UART chips on this platform +device uart_ns8250 ==== //depot/projects/uart/amd64/conf/NOTES#10 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.55 2006/05/14 18:49:24 marius Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.56 2006/06/12 20:38:17 jhb Exp $ # # @@ -221,13 +221,21 @@ # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) # (requires miibus) +# ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter +# iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters # nve: nVidia nForce MCP on-board Ethernet Networking +# ral: Ralink Technology IEEE 802.11 wireless adapter +# ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter device ed options ED_3C503 options ED_HPP options ED_SIC +device iwi +device ipw device nve # nVidia nForce MCP on-board Ethernet Networking +device ral +device ural device ath device ath_hal # Atheros HAL (includes binary component) @@ -556,6 +564,10 @@ options VM_KMEM_SIZE_MAX options VM_KMEM_SIZE_SCALE +# Enable NDIS binary driver support +options NDISAPI +device ndis + # The I/O device device io ==== //depot/projects/uart/arm/arm/elf_trampoline.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.6 2006/05/30 21:13:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.7 2006/06/12 22:58:50 cognet Exp $"); #include #include #include @@ -32,6 +32,7 @@ #include #include #include +#include #include @@ -41,6 +42,8 @@ extern char kernel_start[]; extern char kernel_end[]; +extern void *_end; + void __start(void); #define GZ_HEAD 0xa @@ -50,7 +53,7 @@ #elif defined(CPU_ARM8) #define cpu_idcache_wbinv_all arm8_cache_purgeID #elif defined(CPU_ARM9) -#define cpu_idcache_wbinv_all arm9_dcache_wbinv_all +#define cpu_idcache_wbinv_all arm9_idcache_wbinv_all #elif defined(CPU_ARM10) #define cpu_idcache_wbinv_all arm10_idcache_wbinv_all #elif defined(CPU_SA110) || defined(CPU_SA1110) || defined(CPU_SA1100) || \ @@ -60,8 +63,35 @@ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) #define cpu_idcache_wbinv_all xscale_cache_purgeID #endif -int arm_pdcache_line_size = 32; + +#ifdef KZIP +int arm_picache_size; +int arm_picache_line_size; +int arm_picache_ways; + +int arm_pdcache_size; /* and unified */ +int arm_pdcache_line_size = 32; +int arm_pdcache_ways; + +int arm_pcache_type; +int arm_pcache_unified; + +int arm_dcache_align; +int arm_dcache_align_mask; + +/* Additional cache information local to this file. Log2 of some of the + above numbers. */ +static int arm_dcache_l2_nsets; +static int arm_dcache_l2_assoc; +static int arm_dcache_l2_linesize; + + int block_userspace_access = 0; +extern int arm9_dcache_sets_inc; +extern int arm9_dcache_sets_max; +extern int arm9_dcache_index_max; +extern int arm9_dcache_index_inc; +#endif static __inline void * memcpy(void *dst, const void *src, int len) @@ -107,13 +137,18 @@ { int physaddr = KERNPHYSADDR; int tmp1; + unsigned int sp = (unsigned int)&_end; +#ifdef KZIP + sp += KERNSIZE + 0x100; + sp &= ~(L1_TABLE_SIZE - 1); + sp += 2 * L1_TABLE_SIZE; +#endif + sp += 1024 * 1024; /* Should be enough for a stack */ __asm __volatile("adr %0, 2f\n" "bic %0, %0, #0xff000000\n" - "bic sp, sp, #0xff000000\n" "and %1, %1, #0xff000000\n" "orr %0, %0, %1\n" - "orr sp, sp, %1\n" "mrc p15, 0, %1, c1, c0, 0\n" "bic %1, %1, #1\n" /* Disable MMU */ "orr %1, %1, #(4 | 8)\n" /* Add DC enable, @@ -127,11 +162,92 @@ "nop\n" "mov pc, %0\n" "2: nop\n" - : "=r" (tmp1), "+r" (physaddr)); + "mov sp, %2\n" + : "=r" (tmp1), "+r" (physaddr), "+r" (sp)); __start(); } #ifdef KZIP +static void +get_cachetype_cp15() +{ + u_int ctype, isize, dsize; + u_int multiplier; + + __asm __volatile("mrc p15, 0, %0, c0, c0, 1" + : "=r" (ctype)); + + /* + * ...and thus spake the ARM ARM: + * + * If an value corresponding to an unimplemented or + * reserved ID register is encountered, the System Control + * processor returns the value of the main ID register. + */ + if (ctype == cpufunc_id()) + goto out; + + if ((ctype & CPU_CT_S) == 0) + arm_pcache_unified = 1; + + /* + * If you want to know how this code works, go read the ARM ARM. + */ + + arm_pcache_type = CPU_CT_CTYPE(ctype); + if (arm_pcache_unified == 0) { + isize = CPU_CT_ISIZE(ctype); + multiplier = (isize & CPU_CT_xSIZE_M) ? 3 : 2; + arm_picache_line_size = 1U << (CPU_CT_xSIZE_LEN(isize) + 3); + if (CPU_CT_xSIZE_ASSOC(isize) == 0) { + if (isize & CPU_CT_xSIZE_M) + arm_picache_line_size = 0; /* not present */ + else + arm_picache_ways = 1; + } else { + arm_picache_ways = multiplier << + (CPU_CT_xSIZE_ASSOC(isize) - 1); + } + arm_picache_size = multiplier << (CPU_CT_xSIZE_SIZE(isize) + 8); + } + + dsize = CPU_CT_DSIZE(ctype); + multiplier = (dsize & CPU_CT_xSIZE_M) ? 3 : 2; + arm_pdcache_line_size = 1U << (CPU_CT_xSIZE_LEN(dsize) + 3); + if (CPU_CT_xSIZE_ASSOC(dsize) == 0) { + if (dsize & CPU_CT_xSIZE_M) + arm_pdcache_line_size = 0; /* not present */ + else + arm_pdcache_ways = 1; + } else { + arm_pdcache_ways = multiplier << + (CPU_CT_xSIZE_ASSOC(dsize) - 1); + } + arm_pdcache_size = multiplier << (CPU_CT_xSIZE_SIZE(dsize) + 8); + + arm_dcache_align = arm_pdcache_line_size; + + arm_dcache_l2_assoc = CPU_CT_xSIZE_ASSOC(dsize) + multiplier - 2; + arm_dcache_l2_linesize = CPU_CT_xSIZE_LEN(dsize) + 3; + arm_dcache_l2_nsets = 6 + CPU_CT_xSIZE_SIZE(dsize) - + CPU_CT_xSIZE_ASSOC(dsize) - CPU_CT_xSIZE_LEN(dsize); + out: + arm_dcache_align_mask = arm_dcache_align - 1; +} + +static void +arm9_setup(void) +{ + + get_cachetype_cp15(); + arm9_dcache_sets_inc = 1U << arm_dcache_l2_linesize; + arm9_dcache_sets_max = (1U << (arm_dcache_l2_linesize + + arm_dcache_l2_nsets)) - arm9_dcache_sets_inc; + arm9_dcache_index_inc = 1U << (32 - arm_dcache_l2_assoc); + arm9_dcache_index_max = 0U - arm9_dcache_index_inc; +} + + static unsigned char *orig_input, *i_input, *i_output; @@ -354,7 +470,6 @@ extern char func_end[]; -extern void *_end; #define PMAP_DOMAIN_KERNEL 15 /* * Just define it instead of including the @@ -404,6 +519,7 @@ void *curaddr; void *dst, *altdst; char *kernel = (char *)&kernel_start; + int sp; __asm __volatile("mov %0, pc" : "=r" (curaddr)); @@ -413,6 +529,11 @@ int pt_addr = (((int)&_end + KERNSIZE + 0x100) & ~(L1_TABLE_SIZE - 1)) + L1_TABLE_SIZE; +#ifdef CPU_ARM9 + /* So that idcache_wbinv works; */ + if ((cpufunc_id() & 0x0000f000) == 0x00009000) + arm9_setup(); +#endif setup_pagetables(pt_addr, (vm_paddr_t)curaddr, (vm_paddr_t)curaddr + 0x10000000); /* Gzipped kernel */ @@ -433,10 +554,10 @@ dst = 4 + load_kernel((unsigned int)&kernel_start, (unsigned int)curaddr, (unsigned int)&func_end, 0); + sp = (vm_offset_t)dst + 4096; + dst = (void *)sp; memcpy((void *)dst, (void *)&load_kernel, (unsigned int)&func_end - (unsigned int)&load_kernel); - ((void (*)())dst)((unsigned int)kernel, - (unsigned int)curaddr, - dst + (unsigned int)(&func_end) - - (unsigned int)(&load_kernel), 1); + do_call(dst, kernel, dst + (unsigned int)(&func_end) - + (unsigned int)(&load_kernel), sp); } ==== //depot/projects/uart/arm/arm/inckern.S#2 (text+ko) ==== @@ -25,7 +25,15 @@ #include "opt_kernname.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/inckern.S,v 1.2 2005/12/05 12:55:46 cognet Exp $") +__FBSDID("$FreeBSD: src/sys/arm/arm/inckern.S,v 1.3 2006/06/12 22:58:50 cognet Exp $") +ENTRY(do_call) + mov r6, r0 + mov r0, r1 + ldr r1, =0xfff00000 + and r1, pc, r1 + mov sp, r3 + mov r3, #1 + mov pc, r6 .section ".real_kernel","aw" .globl kernel_start; kernel_start: ==== //depot/projects/uart/arm/arm/pmap.c#16 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.52 2006/06/01 01:31:07 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.63 2006/06/11 04:53:06 alc Exp $"); #include #include #include @@ -272,9 +272,6 @@ */ union pmap_cache_state *pmap_cache_state; -LIST_HEAD(pmaplist, pmap); -struct pmaplist allpmaps; - /* static pt_entry_t *msgbufmap;*/ struct msgbuf *msgbufp = 0; @@ -415,9 +412,7 @@ static vm_offset_t pmap_kernel_l2ptp_kva; static vm_paddr_t pmap_kernel_l2ptp_phys; static struct vm_object pvzone_obj; -static struct vm_object l2zone_obj; static int pv_entry_count=0, pv_entry_max=0, pv_entry_high_water=0; -int pmap_pagedaemon_waken = 0; /* * This list exists for the benefit of pmap_map_chunk(). It keeps track @@ -459,14 +454,8 @@ struct pv_addr *pv; SLIST_FOREACH(pv, &kernel_pt_list, pv_list) { -#ifndef ARM32_NEW_VM_LAYOUT - if (pv->pv_pa == (pa & ~PAGE_MASK)) { - return (pv->pv_va | (pa & PAGE_MASK)); - } -#else if (pv->pv_pa == pa) return (pv->pv_va); -#endif } return (0); } @@ -718,21 +707,12 @@ for (; size != 0; va += L2_S_SIZE, pa += L2_S_SIZE, size -= L2_S_SIZE) { -#ifndef ARM32_NEW_VM_LAYOUT - pte = (pt_entry_t *) - kernel_pt_lookup(pde[va >> L1_S_SHIFT] & L2_S_FRAME); -#else pte = (pt_entry_t *) kernel_pt_lookup( pde[L1_IDX(va)] & L1_C_ADDR_MASK); -#endif if (pte == NULL) panic("xscale_setup_minidata: can't find L2 table for " "VA 0x%08x", (u_int32_t) va); -#ifndef ARM32_NEW_VM_LAYOUT - pte[(va >> PAGE_SHIFT) & 0x3ff] = -#else pte[l2pte_index(va)] = -#endif L2_S_PROTO | pa | L2_S_PROT(PTE_KERNEL, VM_PROT_READ) | L2_C | L2_XSCALE_T_TEX(TEX_XSCALE_X); } @@ -917,6 +897,7 @@ l1idx = L1_IDX(va); + PMAP_ASSERT_LOCKED(pm); mtx_assert(&vm_page_queue_mtx, MA_OWNED); if ((l2 = pm->pm_l2[L2_IDX(l1idx)]) == NULL) { /* @@ -925,16 +906,21 @@ * Need to allocate a new l2_dtable. */ again_l2table: + PMAP_UNLOCK(pm); vm_page_unlock_queues(); if ((l2 = pmap_alloc_l2_dtable()) == NULL) { vm_page_lock_queues(); + PMAP_LOCK(pm); return (NULL); } vm_page_lock_queues(); + PMAP_LOCK(pm); if (pm->pm_l2[L2_IDX(l1idx)] != NULL) { + PMAP_UNLOCK(pm); vm_page_unlock_queues(); uma_zfree(l2table_zone, l2); vm_page_lock_queues(); + PMAP_LOCK(pm); l2 = pm->pm_l2[L2_IDX(l1idx)]; if (l2 == NULL) goto again_l2table; @@ -964,14 +950,18 @@ * is because we just allocated the l2_dtable, above. */ again_ptep: + PMAP_UNLOCK(pm); vm_page_unlock_queues(); ptep = (void*)uma_zalloc(l2zone, M_NOWAIT); vm_page_lock_queues(); + PMAP_LOCK(pm); if (l2b->l2b_kva != 0) { /* We lost the race. */ + PMAP_UNLOCK(pm); vm_page_unlock_queues(); uma_zfree(l2zone, ptep); vm_page_lock_queues(); + PMAP_LOCK(pm); if (l2b->l2b_kva == 0) goto again_ptep; return (l2b); @@ -1315,6 +1305,7 @@ { int nattr; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); nattr = pmap_get_vac_flags(pg); if (nattr < 0) { @@ -1545,10 +1536,8 @@ vm_offset_t va; u_int oflags; int count = 0; -#if 0 - PMAP_HEAD_TO_MAP_LOCK(); - simple_lock(&pg->mdpage.pvh_slock); -#endif + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); /* * Clear saved attributes (modify, reference) @@ -1556,10 +1545,6 @@ pg->md.pvh_attrs &= ~(maskbits & (PVF_MOD | PVF_REF)); if (TAILQ_EMPTY(&pg->md.pv_list)) { -#if 0 - simple_unlock(&pg->mdpage.pvh_slock); - PMAP_HEAD_TO_MAP_UNLOCK(); -#endif return (0); } @@ -1572,9 +1557,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 13 05:06:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D0AF16A41F; Tue, 13 Jun 2006 05:06:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED59A16A418 for ; Tue, 13 Jun 2006 05:06:26 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB02943D46 for ; Tue, 13 Jun 2006 05:06:26 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5D5491M078262 for ; Tue, 13 Jun 2006 05:04:09 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5D549NR078259 for perforce@freebsd.org; Tue, 13 Jun 2006 05:04:09 GMT (envelope-from scottl@freebsd.org) Date: Tue, 13 Jun 2006 05:04:09 GMT Message-Id: <200606130504.k5D549NR078259@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 99121 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, 13 Jun 2006 05:06:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=99121 Change 99121 by scottl@scottl-x64 on 2006/06/13 05:03:40 Fix a brain-o with INVARIANTS. The ccb typically gets freed in the periph callback in the camisr, so it can't be deferenced again to get to the mutex pointer. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#36 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#36 (text+ko) ==== @@ -7182,6 +7182,7 @@ cam_isrq_t queue; int s; struct ccb_hdr *ccb_h; + struct cam_sim *sim; /* * Transfer the ccb_bioq list to a temporary list so we can operate @@ -7198,7 +7199,8 @@ int runq; TAILQ_REMOVE(&queue, ccb_h, sim_links.tqe); - mtx_lock(ccb_h->path->bus->sim->mtx); + sim = ccb_h->path->bus->sim; + mtx_lock(sim->mtx); ccb_h->pinfo.index = CAM_UNQUEUED_INDEX; splx(s); @@ -7288,7 +7290,7 @@ (*ccb_h->cbfcnp)(ccb_h->path->periph, (union ccb *)ccb_h); /* Raise IPL for while test */ - mtx_unlock(ccb_h->path->bus->sim->mtx); + mtx_unlock(sim->mtx); s = splcam(); } splx(s); From owner-p4-projects@FreeBSD.ORG Tue Jun 13 09:53:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DC7216A41A; Tue, 13 Jun 2006 09:53:46 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F99516A41B; Tue, 13 Jun 2006 09:53:46 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B114A43D45; Tue, 13 Jun 2006 09:53:45 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 40DD846C34; Tue, 13 Jun 2006 05:53:45 -0400 (EDT) Date: Tue, 13 Jun 2006 10:53:45 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Tom Rhodes In-Reply-To: <20060612165259.0164738d.trhodes@FreeBSD.org> Message-ID: <20060613104537.U34121@fledge.watson.org> References: <200606122043.k5CKhU1Y008373@repoman.freebsd.org> <20060612165259.0164738d.trhodes@FreeBSD.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: perforce@FreeBSD.org Subject: Re: PERFORCE change 99079 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, 13 Jun 2006 09:53:46 -0000 On Mon, 12 Jun 2006, Tom Rhodes wrote: > On Mon, 12 Jun 2006 20:43:30 GMT > Tom Rhodes wrote: > >> http://perforce.freebsd.org/chv.cgi?CH=99079 >> >> Change 99079 by trhodes@trhodes_local on 2006/06/12 20:35:11 >> >> If the login.conf file is not root:wheel, the configuration >> in login.conf.db will not be applied. This can sometimes >> happen when replicating configuration across hosts using >> a user account and scp. Add a check for this. >> >> Affected files ... > > Ummm, it also included my integrate. The check file is > src/periodic/security/410.logincheck. Integration schedules merging of changes, and with the help of resolve, makes them appear and merge into your local branch. Like edit, add, and delete, the results of that operation are local to your work tree until submitted. This is why you see perforce messages that read "IFC" -- this means "Integrate From Current", and refers to integrating the latest CVS source into a branch as an explicit operation. The typical integrate sequence for a branch is one or more runs of p4 integ, one or more runs of p4 resolve -a , p4 resolve, p4 submit. The "one or more" bit is so that you can catch error conditions and provide additional flags or perform additional resolution as required. For example, p4 will occasionally tell you you need additional flags if a delete in the parent branch would delete a file that has changes in the child branch, or if a file is added to the parent branch after an identically named file is added to the child branch. In general, you don't want to combine submitting integrations with other edits, as it results in a significantly harder to read source history. For example, it's quite useful to be able to submit a change to P4, wait a few weeks, then merge it to CVS. If the change didn't require any refinement, you can do "p4 describe -du changenumber" and generate the description and patch for the change. If you combine branch integration with the edit, then you get the integration patch also, which will be unhelpful in your merge efforts. There are times when editing as part of an integrate will be required -- such as if you resolve the tree of conflicts, do a test build before submitting, and discover a typo in the resolve. Also, for minor changes, you may find that a personal user branch, such as //depot/user/trhodes/work/... avoids spamming the larger community. Typically, //depot/projects/... has been used for larger (potentially collaborative) projects that are long-running. By default, developers are set up with reviews on //depot/projects/..., //depot/user/{username}/..., and //depot/doc/.... Changes made to local user trees aren't seen by other users unless those users specifically subscribe to them. Robert N M Watson Computer Laboratory Universty of Cambridge From owner-p4-projects@FreeBSD.ORG Tue Jun 13 12:22:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C091F16A474; Tue, 13 Jun 2006 12:22:31 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9B3FA16A46F for ; Tue, 13 Jun 2006 12:22:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5140843D69 for ; Tue, 13 Jun 2006 12:22:31 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DCKCxt020519 for ; Tue, 13 Jun 2006 12:20:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DCKCgB020516 for perforce@freebsd.org; Tue, 13 Jun 2006 12:20:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 13 Jun 2006 12:20:12 GMT Message-Id: <200606131220.k5DCKCgB020516@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 99128 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, 13 Jun 2006 12:22:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=99128 Change 99128 by hselasky@hselasky_mini_itx on 2006/06/13 12:19:13 Bugfix. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#5 (text+ko) ==== @@ -468,8 +468,8 @@ (up->product == uaa->product)) { return UMATCH_VENDOR_PRODUCT; } + up++; } - return UMATCH_NONE; } From owner-p4-projects@FreeBSD.ORG Tue Jun 13 13:34:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A43C16A41A; Tue, 13 Jun 2006 13:34:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4709416A41B for ; Tue, 13 Jun 2006 13:34:00 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13BF943D4C for ; Tue, 13 Jun 2006 13:34:00 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DDVfnX036923 for ; Tue, 13 Jun 2006 13:31:41 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DDVewE036920 for perforce@freebsd.org; Tue, 13 Jun 2006 13:31:40 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 13 Jun 2006 13:31:40 GMT Message-Id: <200606131331.k5DDVewE036920@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 99131 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, 13 Jun 2006 13:34:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=99131 Change 99131 by rdivacky@rdivacky_witten on 2006/06/13 13:31:20 This enables modules which use linker sets to work. Patch submitted by: Kostik Belousov Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/kern/link_elf_obj.c#2 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/kern/link_elf_obj.c#2 (text+ko) ==== @@ -1112,6 +1112,51 @@ } static void +link_elf_fix_link_set(elf_file_t ef) +{ + static const char startn[] = "__start_"; + static const char stopn[] = "__stop_"; + Elf_Sym *sym; + const char *sym_name, *linkset_name; + Elf_Addr startp, stopp; + Elf_Size symidx; + int start, i; + + startp = stopp = 0; + for (symidx = 1 /* zero entry is special */; + symidx < ef->ddbsymcnt; symidx++) { + sym = ef->ddbsymtab + symidx; + if (sym->st_shndx != SHN_UNDEF) + continue; + + sym_name = ef->ddbstrtab + sym->st_name; + if (strncmp(sym_name, startn, sizeof(startn) - 1) == 0) { + start = 1; + linkset_name = sym_name + sizeof(startn) - 1; + } + else if (strncmp(sym_name, stopn, sizeof(stopn) - 1) == 0) { + start = 0; + linkset_name = sym_name + sizeof(stopn) - 1; + } + else + continue; + + for (i = 0; i < ef->nprogtab; i++) { + if (strcmp(ef->progtab[i].name, linkset_name) == 0) { + startp = (Elf_Addr)ef->progtab[i].addr; + stopp = (Elf_Addr)(startp + ef->progtab[i].size); + break; + } + } + if (i == ef->nprogtab) + continue; + + sym->st_value = start ? startp : stopp; + sym->st_shndx = i; + } +} + +static void link_elf_reloc_local(linker_file_t lf) { elf_file_t ef = (elf_file_t)lf; @@ -1124,6 +1169,8 @@ int i; Elf_Size symidx; + link_elf_fix_link_set(ef); + /* Perform relocations without addend if there are any: */ for (i = 0; i < ef->nrel; i++) { rel = ef->reltab[i].rel; From owner-p4-projects@FreeBSD.ORG Tue Jun 13 13:34:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C8F916A478; Tue, 13 Jun 2006 13:34:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 011B616A418; Tue, 13 Jun 2006 13:34:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF07F43D55; Tue, 13 Jun 2006 13:34:37 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from zion.baldwin.cx (zion.baldwin.cx [192.168.0.7]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k5DDYVuI022964; Tue, 13 Jun 2006 09:34:36 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: John Birrell Date: Tue, 13 Jun 2006 09:30:46 -0400 User-Agent: KMail/1.9.1 References: <200606130047.k5D0liTa052536@repoman.freebsd.org> In-Reply-To: <200606130047.k5D0liTa052536@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Message-Id: <200606130930.46610.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [192.168.0.1]); Tue, 13 Jun 2006 09:34:36 -0400 (EDT) X-Virus-Scanned: ClamAV 0.87.1/1537/Tue Jun 13 07:24:06 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 99099 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, 13 Jun 2006 13:34:39 -0000 On Monday 12 June 2006 20:47, John Birrell wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D99099 >=20 > Change 99099 by jb@jb_freebsd2 on 2006/06/13 00:47:28 >=20 > Add hooks for DTrace to register a function to be called when > the scheduler chooses a new thread to run. This is required for > DTrace vtime. You should probably do this in mi_switch() in kern_synch.c rather than in this macro. > Affected files ... >=20 > .. //depot/projects/dtrace/src/sys/kern/kern_switch.c#3 edit > .. //depot/projects/dtrace/src/sys/sys/proc.h#6 edit >=20 > Differences ... >=20 > =3D=3D=3D=3D //depot/projects/dtrace/src/sys/kern/kern_switch.c#3 (text+k= o) =3D=3D=3D=3D >=20 > @@ -88,6 +88,7 @@ > #include > __FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.121 2006/06/01 22:45:= 56 cognet Exp $"); > =20 > +#include "opt_kdtrace.h" > #include "opt_sched.h" > =20 > #ifndef KERN_SWITCH_INCLUDE > @@ -126,6 +127,11 @@ > =20 > #define td_kse td_sched > =20 > +#ifdef KDTRACE > +int dtrace_vtime_active; > +dtrace_vtime_switch_func_t dtrace_vtime_switch_func; > +#endif > + > /* > * kern.sched.preemption allows user space to determine if preemption su= pport > * is compiled in or not. It is not currently a boot or runtime flag th= at >=20 > =3D=3D=3D=3D //depot/projects/dtrace/src/sys/sys/proc.h#6 (text+ko) =3D= =3D=3D=3D >=20 > @@ -484,7 +484,17 @@ > #define TD_CLR_SUSPENDED(td) TD_CLR_INHIB((td), TDI_SUSPENDED) > #define TD_CLR_IWAIT(td) TD_CLR_INHIB((td), TDI_IWAIT) > =20 > +#ifdef KDTRACE > +typedef void (*dtrace_vtime_switch_func_t)(struct thread *); > + > +extern int dtrace_vtime_active; > +extern dtrace_vtime_switch_func_t dtrace_vtime_switch_func; > +#define TD_SET_RUNNING(td) if (dtrace_vtime_active) \ > + (*dtrace_vtime_switch_func)(td); \ > + (td)->td_state =3D TDS_RUNNING > +#else > #define TD_SET_RUNNING(td) (td)->td_state =3D TDS_RUNNING > +#endif > #define TD_SET_RUNQ(td) (td)->td_state =3D TDS_RUNQ > #define TD_SET_CAN_RUN(td) (td)->td_state =3D TDS_CAN_RUN > =20 >=20 =2D-=20 John Baldwin =A0<>< =A0http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" =A0=3D =A0http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Tue Jun 13 13:34:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A6A516A473; Tue, 13 Jun 2006 13:34:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C34E16A4C6; Tue, 13 Jun 2006 13:34:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F4DB43D4C; Tue, 13 Jun 2006 13:34:38 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from zion.baldwin.cx (zion.baldwin.cx [192.168.0.7]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k5DDYVuJ022964; Tue, 13 Jun 2006 09:34:37 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: John Birrell Date: Tue, 13 Jun 2006 09:34:31 -0400 User-Agent: KMail/1.9.1 References: <200604200058.k3K0wbxS078467@repoman.freebsd.org> In-Reply-To: <200604200058.k3K0wbxS078467@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Message-Id: <200606130934.31628.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [192.168.0.1]); Tue, 13 Jun 2006 09:34:37 -0400 (EDT) X-Virus-Scanned: ClamAV 0.87.1/1537/Tue Jun 13 07:24:06 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 95641 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, 13 Jun 2006 13:34:40 -0000 On Wednesday 19 April 2006 20:58, John Birrell wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D95641 >=20 > Change 95641 by jb@jb_freebsd2 on 2006/04/20 00:58:31 >=20 > Add convenience targets to load and unload the module. I do that an > /awful/ lot! >=20 > Affected files ... >=20 > . //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#4 edit >=20 > Differences ... >=20 > =3D=3D=3D=3D //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#4 (t= ext+ko) =3D=3D=3D=3D >=20 > @@ -10,4 +10,10 @@ > -I${.CURDIR}/../../contrib \ > -I${.CURDIR}/../.. > =20 > +load : > + kldload dtrace > + > +unload : > + kldunload dtrace > + > .include bsd.kmod.mk already includes those (via /sys/conf/kmod.mk). :) =2D-=20 John Baldwin =A0<>< =A0http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" =A0=3D =A0http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Tue Jun 13 14:07:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 682A116A47E; Tue, 13 Jun 2006 14:07:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4429216A473 for ; Tue, 13 Jun 2006 14:07:43 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1090F43D45 for ; Tue, 13 Jun 2006 14:07:43 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DE5NC3039922 for ; Tue, 13 Jun 2006 14:05:23 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DE5Nn6039919 for perforce@freebsd.org; Tue, 13 Jun 2006 14:05:23 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 13 Jun 2006 14:05:23 GMT Message-Id: <200606131405.k5DE5Nn6039919@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 99134 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, 13 Jun 2006 14:07:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=99134 Change 99134 by rdivacky@rdivacky_witten on 2006/06/13 14:05:12 Amd64 version needs linux_uid16 as well. Now we have fully working module on amd64. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/modules/linux/Makefile#3 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/modules/linux/Makefile#3 (text+ko) ==== @@ -11,12 +11,12 @@ SRCS= linux${SFX}_dummy.c linux_file.c linux_getcwd.c linux_ioctl.c linux_ipc.c \ linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c linux_socket.c \ linux_stats.c linux_sysctl.c linux${SFX}_sysent.c linux${SFX}_sysvec.c \ - linux_util.c opt_inet6.h opt_mac.h opt_compat.h \ + linux_uid16.c linux_util.c opt_inet6.h opt_mac.h opt_compat.h \ vnode_if.h device_if.h bus_if.h OBJS= linux${SFX}_locore.o .if ${MACHINE_ARCH} == "i386" -SRCS+= linux_ptrace.c linux_uid16.c imgact_linux.c opt_cpu.h +SRCS+= linux_ptrace.c imgact_linux.c opt_cpu.h .endif EXPORT_SYMS= From owner-p4-projects@FreeBSD.ORG Tue Jun 13 16:15:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1018E16A478; Tue, 13 Jun 2006 16:15:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD6F116A46F for ; Tue, 13 Jun 2006 16:15:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3577E43D6B for ; Tue, 13 Jun 2006 16:15:24 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DGD4Ru049526 for ; Tue, 13 Jun 2006 16:13:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DGD4kr049522 for perforce@freebsd.org; Tue, 13 Jun 2006 16:13:04 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 13 Jun 2006 16:13:04 GMT Message-Id: <200606131613.k5DGD4kr049522@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 99142 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, 13 Jun 2006 16:15:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=99142 Change 99142 by hselasky@hselasky_mini_itx on 2006/06/13 16:12:48 Finished reworking "uvisor.c". Removed the "Crank down UVISORBUFSIZE". I think this is due to ucom restarting the read pipe on flush, which has been removed. If it does not work, then I will revert this change. Else the driver should be functionally equivalent. Please test! Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uvisor.c#5 (text+ko) ==== @@ -1,0 +1,764 @@ +/* $NetBSD: uvisor.c,v 1.9 2001/01/23 14:04:14 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uvisor.c,v 1.25 2005/12/04 07:34:19 bmah Exp $ */ + +/* Also already merged from NetBSD: + * $NetBSD: uvisor.c,v 1.12 2001/11/13 06:24:57 lukem Exp $ + * $NetBSD: uvisor.c,v 1.13 2002/02/11 15:11:49 augustss Exp $ + * $NetBSD: uvisor.c,v 1.14 2002/02/27 23:00:03 augustss Exp $ + * $NetBSD: uvisor.c,v 1.15 2002/06/16 15:01:31 augustss Exp $ + * $NetBSD: uvisor.c,v 1.16 2002/07/11 21:14:36 augustss Exp $ + * $NetBSD: uvisor.c,v 1.17 2002/08/13 11:38:15 augustss Exp $ + * $NetBSD: uvisor.c,v 1.18 2003/02/05 00:50:14 augustss Exp $ + * $NetBSD: uvisor.c,v 1.19 2003/02/07 18:12:37 augustss Exp $ + * $NetBSD: uvisor.c,v 1.20 2003/04/11 01:30:10 simonb Exp $ + */ + +/*- + * Copyright (c) 2000 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Lennart Augustsson (lennart@augustsson.net) at + * Carlstedt Research & Technology. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * Handspring Visor (Palmpilot compatible PDA) driver + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "usbdevs.h" + +#ifdef USB_DEBUG +#define DPRINTF(n,fmt,...) \ + do { if (uvisor_debug > (n)) { \ + printf("%s: " fmt, __FUNCTION__,## __VA_ARGS__); } } while (0) + +static int uvisor_debug = 0; +SYSCTL_NODE(_hw_usb, OID_AUTO, uvisor, CTLFLAG_RW, 0, "USB uvisor"); +SYSCTL_INT(_hw_usb_uvisor, OID_AUTO, debug, CTLFLAG_RW, + &uvisor_debug, 0, "uvisor debug level"); +#else +#define DPRINTF(...) +#endif + +#define UVISOR_CONFIG_INDEX 0 +#define UVISOR_IFACE_INDEX 0 +#define UVISOR_MODVER 1 +#define UVISOR_N_TRANSFER 5 /* units */ +#define UVISOR_BUFSIZE 1024 /* bytes */ + +/* From the Linux driver */ +/* + * UVISOR_REQUEST_BYTES_AVAILABLE asks the visor for the number of bytes that + * are available to be transfered to the host for the specified endpoint. + * Currently this is not used, and always returns 0x0001 + */ +#define UVISOR_REQUEST_BYTES_AVAILABLE 0x01 + +/* + * UVISOR_CLOSE_NOTIFICATION is set to the device to notify it that the host + * is now closing the pipe. An empty packet is sent in response. + */ +#define UVISOR_CLOSE_NOTIFICATION 0x02 + +/* + * UVISOR_GET_CONNECTION_INFORMATION is sent by the host during enumeration to + * get the endpoints used by the connection. + */ +#define UVISOR_GET_CONNECTION_INFORMATION 0x03 + +/* + * UVISOR_GET_CONNECTION_INFORMATION returns data in the following format + */ +#define UVISOR_MAX_CONN 8 +struct uvisor_connection_info { + uWord num_ports; + struct { + uByte port_function_id; + uByte port; + } UPACKED connections[UVISOR_MAX_CONN]; +} UPACKED; +#define UVISOR_CONNECTION_INFO_SIZE 18 + +/* struct uvisor_connection_info.connection[x].port defines: */ +#define UVISOR_ENDPOINT_1 0x01 +#define UVISOR_ENDPOINT_2 0x02 + +/* struct uvisor_connection_info.connection[x].port_function_id defines: */ +#define UVISOR_FUNCTION_GENERIC 0x00 +#define UVISOR_FUNCTION_DEBUGGER 0x01 +#define UVISOR_FUNCTION_HOTSYNC 0x02 +#define UVISOR_FUNCTION_CONSOLE 0x03 +#define UVISOR_FUNCTION_REMOTE_FILE_SYS 0x04 + +/* + * Unknown PalmOS stuff. + */ +#define UVISOR_GET_PALM_INFORMATION 0x04 +#define UVISOR_GET_PALM_INFORMATION_LEN 0x44 + +struct uvisor_palm_connection_info { + uByte num_ports; + uByte endpoint_numbers_different; + uWord reserved1; + struct { + uDWord port_function_id; + uByte port; + uByte end_point_info; + uWord reserved; + } UPACKED connections[UVISOR_MAX_CONN]; +} UPACKED; + +struct uvisor_softc { + struct ucom_softc sc_ucom; + struct usbd_memory_wait sc_mem_wait; + + struct usbd_xfer * sc_xfer[UVISOR_N_TRANSFER]; + + u_int16_t sc_flag; +#define UVISOR_FLAG_PALM4 0x0001 +#define UVISOR_FLAG_VISOR 0x0002 +#define UVISOR_FLAG_PALM35 0x0004 +#define UVISOR_FLAG_SEND_NOTIFY 0x0008 +#define UVISOR_FLAG_WRITE_STALL 0x0010 +#define UVISOR_FLAG_READ_STALL 0x0020 + + u_int8_t sc_iface_no; + u_int8_t sc_iface_index; +}; + +struct uvisor_product { + u_int16_t vendor; + u_int16_t product; + u_int16_t flags; +}; + +static const struct uvisor_product * +uvisor_find_up(struct usb_attach_arg *uaa); + +static device_probe_t uvisor_probe; +static device_attach_t uvisor_attach; +static device_detach_t uvisor_detach; + +usbd_status +uvisor_init(struct uvisor_softc *sc, struct usbd_device *udev, struct usbd_config *config); + +static void +uvisor_close(struct ucom_softc *ucom); + +static void +uvisor_start_read(struct ucom_softc *ucom); + +static void +uvisor_stop_read(struct ucom_softc *ucom); + +static void +uvisor_start_write(struct ucom_softc *ucom); + +static void +uvisor_stop_write(struct ucom_softc *ucom); + +static void +uvisor_write_callback(struct usbd_xfer *xfer); + +static void +uvisor_write_clear_stall_callback(struct usbd_xfer *xfer); + +static void +uvisor_read_callback(struct usbd_xfer *xfer); + +static void +uvisor_read_clear_stall_callback(struct usbd_xfer *xfer); + +static void +usbd_close_notify_callback(struct usbd_xfer *xfer); + +static const struct usbd_config uvisor_config[UVISOR_N_TRANSFER] = { + + [0] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_OUT, + .bufsize = UVISOR_BUFSIZE, /* bytes */ + .flags = 0, + .callback = &uvisor_write_callback, + }, + + [1] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .bufsize = UVISOR_BUFSIZE, /* bytes */ + .flags = USBD_SHORT_XFER_OK, + .callback = &uvisor_read_callback, + }, + + [2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &uvisor_write_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &uvisor_read_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [4] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = (sizeof(usb_device_request_t) + sizeof(struct uvisor_connection_info)), + .flags = USBD_SHORT_XFER_OK, + .callback = &usbd_close_notify_callback, + .timeout = 1000, /* 1 second */ + }, +}; + +static const struct ucom_callback uvisor_callback = { + .ucom_close = &uvisor_close, + .ucom_start_read = &uvisor_start_read, + .ucom_stop_read = &uvisor_stop_read, + .ucom_start_write = &uvisor_start_write, + .ucom_stop_write = &uvisor_stop_write, +}; + +static device_method_t uvisor_methods[] = { + DEVMETHOD(device_probe, uvisor_probe), + DEVMETHOD(device_attach, uvisor_attach), + DEVMETHOD(device_detach, uvisor_detach), + { 0, 0 } +}; + +static driver_t uvisor_driver = { + .name = "ucom", + .methods = uvisor_methods, + .size = sizeof (struct uvisor_softc), +}; + +DRIVER_MODULE(uvisor, uhub, uvisor_driver, ucom_devclass, usbd_driver_load, 0); +MODULE_DEPEND(uvisor, usb, 1, 1, 1); +MODULE_DEPEND(uvisor, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); +MODULE_VERSION(uvisor, UVISOR_MODVER); + +static const struct uvisor_product uvisor_products[] = { + { USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR, UVISOR_FLAG_VISOR }, + { USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_TREO, UVISOR_FLAG_PALM4 }, + { USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_TREO600, UVISOR_FLAG_PALM4 }, + { USB_VENDOR_PALM, USB_PRODUCT_PALM_M500, UVISOR_FLAG_PALM4 }, + { USB_VENDOR_PALM, USB_PRODUCT_PALM_M505, UVISOR_FLAG_PALM4 }, + { USB_VENDOR_PALM, USB_PRODUCT_PALM_M515, UVISOR_FLAG_PALM4 }, + { USB_VENDOR_PALM, USB_PRODUCT_PALM_I705, UVISOR_FLAG_PALM4 }, + { USB_VENDOR_PALM, USB_PRODUCT_PALM_M125, UVISOR_FLAG_PALM4 }, + { USB_VENDOR_PALM, USB_PRODUCT_PALM_M130, UVISOR_FLAG_PALM4 }, + { USB_VENDOR_PALM, USB_PRODUCT_PALM_TUNGSTEN_Z, UVISOR_FLAG_PALM4 }, + { USB_VENDOR_PALM, USB_PRODUCT_PALM_TUNGSTEN_T, UVISOR_FLAG_PALM4 }, + { USB_VENDOR_PALM, USB_PRODUCT_PALM_ZIRE, UVISOR_FLAG_PALM4 }, + { USB_VENDOR_PALM, USB_PRODUCT_PALM_ZIRE31, UVISOR_FLAG_PALM4 }, + { USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40, 0 }, + { USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_41, UVISOR_FLAG_PALM4 }, + { USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_S360, UVISOR_FLAG_PALM4 }, + { USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_NX60, UVISOR_FLAG_PALM4 }, + { USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_35, UVISOR_FLAG_PALM35 }, +/* { USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_25, UVISOR_FLAG_PALM4 }, */ + { USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_TJ37, UVISOR_FLAG_PALM4 }, + { 0, 0, 0 } +}; + +static const struct uvisor_product * +uvisor_find_up(struct usb_attach_arg *uaa) +{ + const struct uvisor_product *up = uvisor_products; + + if (uaa->iface == NULL) { + while (up->vendor) { + if ((up->vendor == uaa->vendor) && + (up->product == uaa->product)) { + return up; + } + up++; + } + } + return NULL; +} + +static int +uvisor_probe(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + const struct uvisor_product *up = uvisor_find_up(uaa); + return (up ? UMATCH_VENDOR_PRODUCT : UMATCH_NONE); +} + +static int +uvisor_attach(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct uvisor_softc *sc = device_get_softc(dev); + const struct uvisor_product *up = uvisor_find_up(uaa); + struct usbd_interface *iface; + struct usbd_config uvisor_config_copy[UVISOR_N_TRANSFER]; + usb_interface_descriptor_t *id; + int error; + + DPRINTF(0, "sc=%p\n", sc); + + bcopy(uvisor_config, uvisor_config_copy, + sizeof(uvisor_config_copy)); + + if (sc == NULL) { + return ENOMEM; + } + + usbd_set_desc(dev, uaa->device); + + /* configure the device */ + + error = usbd_set_config_index(uaa->device, UVISOR_CONFIG_INDEX, 1); + + if (error) { + DPRINTF(0, "failed to set configuration, error=%s\n", + usbd_errstr(error)); + goto detach; + } + + iface = usbd_get_iface(uaa->device, UVISOR_IFACE_INDEX); + + if (iface == NULL) { + DPRINTF(0, "no interface\n"); + goto detach; + } + + id = usbd_get_interface_descriptor(iface); + + if (id == NULL) { + DPRINTF(0, "no interface descriptor\n"); + goto detach; + } + + sc->sc_flag = up->flags; + sc->sc_iface_no = id->bInterfaceNumber; + sc->sc_iface_index = UVISOR_IFACE_INDEX; + + error = uvisor_init(sc, uaa->device, uvisor_config_copy); + + if (error) { + DPRINTF(0, "init failed, error=%s\n", + usbd_errstr(error)); + goto detach; + } + + error = usbd_transfer_setup(uaa->device, sc->sc_iface_index, + sc->sc_xfer, uvisor_config_copy, UVISOR_N_TRANSFER, + sc, &Giant, &(sc->sc_mem_wait)); + if (error) { + DPRINTF(0, "could not allocate all pipes\n"); + goto detach; + } + + sc->sc_ucom.sc_parent = sc; + sc->sc_ucom.sc_portno = 0; + sc->sc_ucom.sc_callback = &uvisor_callback; + + error = ucom_attach(&(sc->sc_ucom), dev); + + if (error) { + DPRINTF(0, "ucom_attach failed\n"); + goto detach; + } + + return 0; + + detach: + uvisor_detach(dev); + return ENXIO; +} + +static int +uvisor_detach(device_t dev) +{ + struct uvisor_softc *sc = device_get_softc(dev); + + DPRINTF(0, "sc=%p\n", sc); + + ucom_detach(&(sc->sc_ucom)); + + usbd_transfer_unsetup(sc->sc_xfer, UVISOR_N_TRANSFER); + + usbd_transfer_drain(&(sc->sc_mem_wait), &Giant); + + return 0; +} + +usbd_status +uvisor_init(struct uvisor_softc *sc, struct usbd_device *udev, struct usbd_config *config) +{ + usbd_status err = 0; + usb_device_request_t req; + struct uvisor_connection_info coninfo; + struct uvisor_palm_connection_info pconinfo; + int actlen; + uWord wAvail; + u_int8_t buffer[256]; + + if (sc->sc_flag & UVISOR_FLAG_VISOR) { + DPRINTF(0, "getting connection info\n"); + req.bmRequestType = UT_READ_VENDOR_ENDPOINT; + req.bRequest = UVISOR_GET_CONNECTION_INFORMATION; + USETW(req.wValue, 0); + USETW(req.wIndex, 0); + USETW(req.wLength, UVISOR_CONNECTION_INFO_SIZE); + err = usbd_do_request_flags(udev, &req, &coninfo, + USBD_SHORT_XFER_OK, &actlen, + USBD_DEFAULT_TIMEOUT); + if (err) { + goto done; + } + } +#ifdef USB_DEBUG + if (sc->sc_flag & UVISOR_FLAG_VISOR) { + u_int16_t i, np; + const char *desc; + + np = UGETW(coninfo.num_ports); + if (np > UVISOR_MAX_CONN) { + np = UVISOR_MAX_CONN; + } + + DPRINTF(0, "Number of ports: %d\n", np); + + for (i = 0; i < np; ++i) { + switch (coninfo.connections[i].port_function_id) { + case UVISOR_FUNCTION_GENERIC: + desc = "Generic"; + break; + case UVISOR_FUNCTION_DEBUGGER: + desc = "Debugger"; + break; + case UVISOR_FUNCTION_HOTSYNC: + desc = "HotSync"; + break; + case UVISOR_FUNCTION_REMOTE_FILE_SYS: + desc = "Remote File System"; + break; + default: + desc = "unknown"; + break; + } + DPRINTF(0, "Port %d is for %s\n", + coninfo.connections[i].port, desc); + } + } +#endif + + if (sc->sc_flag & UVISOR_FLAG_PALM4) { + u_int8_t port; + + /* Palm OS 4.0 Hack */ + req.bmRequestType = UT_READ_VENDOR_ENDPOINT; + req.bRequest = UVISOR_GET_PALM_INFORMATION; + USETW(req.wValue, 0); + USETW(req.wIndex, 0); + USETW(req.wLength, UVISOR_GET_PALM_INFORMATION_LEN); + + err = usbd_do_request_flags(udev, &req, &pconinfo, + USBD_SHORT_XFER_OK, &actlen, + USBD_DEFAULT_TIMEOUT); + if (err) { + goto done; + } + + if (actlen < 12) { + DPRINTF(0, "too little data\n"); + err = USBD_INVAL; + goto done; + } + + if (pconinfo.endpoint_numbers_different) { + port = pconinfo.connections[0].end_point_info; + config[0].endpoint = (port & 0xF); /* output */ + config[1].endpoint = (port >> 4); /* input */ + } else { + port = pconinfo.connections[0].port; + config[0].endpoint = (port & 0xF); /* output */ + config[1].endpoint = (port & 0xF); /* input */ + } +#if 0 + req.bmRequestType = UT_READ_VENDOR_ENDPOINT; + req.bRequest = UVISOR_GET_PALM_INFORMATION; + USETW(req.wValue, 0); + USETW(req.wIndex, 0); + USETW(req.wLength, UVISOR_GET_PALM_INFORMATION_LEN); + err = usbd_do_request(udev, &req, buffer); + if (err) { + goto done; + } +#endif + } + + if (sc->sc_flag & UVISOR_FLAG_PALM35) { + /* get the config number */ + DPRINTF(0, "getting config info\n"); + req.bmRequestType = UT_READ; + req.bRequest = UR_GET_CONFIG; + USETW(req.wValue, 0); + USETW(req.wIndex, 0); + USETW(req.wLength, 1); + + err = usbd_do_request(udev, &req, buffer); + if (err) { + goto done; + } + + /* get the interface number */ + DPRINTF(0, "get the interface number\n"); + req.bmRequestType = UT_READ_DEVICE; + req.bRequest = UR_GET_INTERFACE; + USETW(req.wValue, 0); + USETW(req.wIndex, 0); + USETW(req.wLength, 1); + err = usbd_do_request(udev, &req, buffer); + if (err) { + goto done; + } + } + + DPRINTF(0, "getting available bytes\n"); + req.bmRequestType = UT_READ_VENDOR_ENDPOINT; + req.bRequest = UVISOR_REQUEST_BYTES_AVAILABLE; + USETW(req.wValue, 0); + USETW(req.wIndex, 5); + USETW(req.wLength, sizeof(wAvail)); + err = usbd_do_request(udev, &req, &wAvail); + if (err) { + goto done; + } + + DPRINTF(0, "avail=%d\n", UGETW(wAvail)); + + DPRINTF(0, "done\n"); + done: + return err; +} + +static void +uvisor_close(struct ucom_softc *ucom) +{ + struct uvisor_softc *sc = ucom->sc_parent; + sc->sc_flag |= UVISOR_FLAG_SEND_NOTIFY; + usbd_transfer_start(sc->sc_xfer[4]); + return; +} + +static void +uvisor_start_read(struct ucom_softc *ucom) +{ + struct uvisor_softc *sc = ucom->sc_parent; + usbd_transfer_start(sc->sc_xfer[1]); + return; +} + +static void +uvisor_stop_read(struct ucom_softc *ucom) +{ + struct uvisor_softc *sc = ucom->sc_parent; + usbd_transfer_stop(sc->sc_xfer[3]); + usbd_transfer_stop(sc->sc_xfer[1]); + return; +} + +static void +uvisor_start_write(struct ucom_softc *ucom) +{ + struct uvisor_softc *sc = ucom->sc_parent; + usbd_transfer_start(sc->sc_xfer[0]); + return; +} + +static void +uvisor_stop_write(struct ucom_softc *ucom) +{ + struct uvisor_softc *sc = ucom->sc_parent; + usbd_transfer_stop(sc->sc_xfer[2]); + usbd_transfer_stop(sc->sc_xfer[0]); + return; +} + +static void +uvisor_write_callback(struct usbd_xfer *xfer) +{ + struct uvisor_softc *sc = xfer->priv_sc; + u_int32_t actlen; + + USBD_CHECK_STATUS(xfer); +tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flag |= UVISOR_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer[2]); + } + return; + +tr_setup: +tr_transferred: + if (sc->sc_flag & UVISOR_FLAG_WRITE_STALL) { + usbd_transfer_start(sc->sc_xfer[2]); + return; + } + + if(ucom_get_data(&(sc->sc_ucom), xfer->buffer, UVISOR_BUFSIZE, &actlen)) { + + xfer->length = actlen; + + usbd_start_hardware(xfer); + } + return; +} + +static void +uvisor_write_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct uvisor_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, sc->sc_xfer[0]); + return; + + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, sc->sc_xfer[0]); + sc->sc_flag &= ~UVISOR_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer[0]); + return; + + tr_error: + sc->sc_flag &= ~UVISOR_FLAG_WRITE_STALL; + DPRINTF(0, "clear stall failed, error=%s\n", + usbd_errstr(xfer->error)); + return; +} + +static void +uvisor_read_callback(struct usbd_xfer *xfer) +{ + struct uvisor_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flag |= UVISOR_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer[3]); + } + return; + + tr_transferred: + ucom_put_data(&(sc->sc_ucom), xfer->buffer, xfer->actlen); + + tr_setup: + if (sc->sc_flag & UVISOR_FLAG_READ_STALL) { + usbd_transfer_start(sc->sc_xfer[3]); + } else { + usbd_start_hardware(xfer); + } + return; +} + +static void +uvisor_read_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct uvisor_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, sc->sc_xfer[1]); + return; + + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, sc->sc_xfer[1]); + sc->sc_flag &= ~UVISOR_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer[1]); + return; + + tr_error: + sc->sc_flag &= ~UVISOR_FLAG_READ_STALL; + DPRINTF(0, "clear stall failed, error=%s\n", + usbd_errstr(xfer->error)); + return; +} + +static void +usbd_close_notify_callback(struct usbd_xfer *xfer) +{ + usb_device_request_t *req = xfer->buffer; + struct uvisor_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_error: + DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); + tr_transferred: + tr_setup: + if (sc->sc_flag & UVISOR_FLAG_SEND_NOTIFY) { + sc->sc_flag &= ~UVISOR_FLAG_SEND_NOTIFY; + + req->bmRequestType = UT_READ_VENDOR_ENDPOINT; /* XXX read? */ + req->bRequest = UVISOR_CLOSE_NOTIFICATION; + USETW(req->wValue, 0); + USETW(req->wIndex, 0); + USETW(req->wLength, UVISOR_CONNECTION_INFO_SIZE); + usbd_start_hardware(xfer); + } + return; +} From owner-p4-projects@FreeBSD.ORG Tue Jun 13 16:29:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F35F216A551; Tue, 13 Jun 2006 16:29:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C70AB16A54F for ; Tue, 13 Jun 2006 16:29:42 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BF6043D45 for ; Tue, 13 Jun 2006 16:29:42 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DGRM9J050648 for ; Tue, 13 Jun 2006 16:27:22 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DGRMbh050645 for perforce@freebsd.org; Tue, 13 Jun 2006 16:27:22 GMT (envelope-from cognet@freebsd.org) Date: Tue, 13 Jun 2006 16:27:22 GMT Message-Id: <200606131627.k5DGRMbh050645@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 99143 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, 13 Jun 2006 16:29:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=99143 Change 99143 by cognet@cognet on 2006/06/13 16:26:29 Dirty hack to handle the special case of trapframe unwinding when the trap was an undefined instruction (has it happens on a breakpoint). Affected files ... .. //depot/projects/arm/gnu-arm.diff#11 edit Differences ... ==== //depot/projects/arm/gnu-arm.diff#11 (text+ko) ==== @@ -1,11 +1,11 @@ Index: gnu/lib/libgcc/Makefile =================================================================== RCS file: /cognet/ncvs/src/gnu/lib/libgcc/Makefile,v -retrieving revision 1.54 -diff -u -p -r1.54 Makefile ---- gnu/lib/libgcc/Makefile 21 Dec 2004 09:33:45 -0000 1.54 -+++ gnu/lib/libgcc/Makefile 29 Aug 2005 12:39:27 -0000 -@@ -97,8 +97,11 @@ LIB2FUNCS_EXTRA = qrnnd.asm +retrieving revision 1.55 +diff -u -p -r1.55 Makefile +--- gnu/lib/libgcc/Makefile 18 Mar 2006 21:37:03 -0000 1.55 ++++ gnu/lib/libgcc/Makefile 19 Mar 2006 21:13:20 -0000 +@@ -98,8 +98,11 @@ LIB2FUNCS_EXTRA = qrnnd.asm # from config/arm/t-strongarm-elf CFLAGS+= -Dinhibit_libc -fno-inline LIB1ASMSRC = lib1funcs.asm @@ -19,7 +19,7 @@ # We want fine grained libraries, so use the new code to build the # floating point emulation libraries. XXX fix this: NEED_FP_EMULATION set to "yes" with different rules per platform -@@ -168,7 +171,7 @@ ASM_S= ${LIB1ASMFUNCS:S/$/.So/} +@@ -169,7 +172,7 @@ ASM_S= ${LIB1ASMFUNCS:S/$/.So/} SYMS= ${LIB2FUNCS} \ ${LIB2_DIVMOD_FUNCS} @@ -96,7 +96,7 @@ RCS file: gnu/usr.bin/binutils/libbfd/Makefile.arm diff -N gnu/usr.bin/binutils/libbfd/Makefile.arm --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/binutils/libbfd/Makefile.arm 29 Aug 2005 12:39:27 -0000 ++++ gnu/usr.bin/binutils/libbfd/Makefile.arm 20 May 2006 22:58:30 -0000 @@ -0,0 +1,24 @@ +# $FreeBSD$ + @@ -136,11 +136,11 @@ Index: gnu/usr.bin/cc/cc_tools/Makefile =================================================================== RCS file: /cognet/ncvs/src/gnu/usr.bin/cc/cc_tools/Makefile,v -retrieving revision 1.81 -diff -u -p -r1.81 Makefile ---- gnu/usr.bin/cc/cc_tools/Makefile 3 Jun 2005 04:21:04 -0000 1.81 -+++ gnu/usr.bin/cc/cc_tools/Makefile 29 Aug 2005 12:39:27 -0000 -@@ -214,7 +214,9 @@ CLEANFILES+= fini +retrieving revision 1.82 +diff -u -p -r1.82 Makefile +--- gnu/usr.bin/cc/cc_tools/Makefile 17 Mar 2006 18:54:23 -0000 1.82 ++++ gnu/usr.bin/cc/cc_tools/Makefile 19 Mar 2006 21:13:24 -0000 +@@ -216,7 +216,9 @@ CLEANFILES+= fini .if ${TARGET_ARCH} == "amd64" TARGET_INC= i386/biarch64.h .endif @@ -150,7 +150,7 @@ .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/unix.h TARGET_INC+= ${GCC_CPU}/att.h -@@ -234,6 +236,11 @@ TARGET_INC+= ${GCC_CPU}/elf.h +@@ -236,6 +238,11 @@ TARGET_INC+= ${GCC_CPU}/elf.h TARGET_INC+= ${GCC_CPU}/sysv4.h .endif .endif @@ -999,8 +999,8 @@ RCS file: gnu/usr.bin/gdb/kgdb/trgt_arm.c diff -N gnu/usr.bin/gdb/kgdb/trgt_arm.c --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/gdb/kgdb/trgt_arm.c 4 Oct 2005 23:17:12 -0000 -@@ -0,0 +1,196 @@ ++++ gnu/usr.bin/gdb/kgdb/trgt_arm.c 13 Jun 2006 16:26:07 -0000 +@@ -0,0 +1,224 @@ +/* + * Copyright (c) 2004 Marcel Moolenaar + * All rights reserved. @@ -1033,6 +1033,7 @@ +#include +#include +#include ++#include +#include +#include +#include @@ -1133,6 +1134,8 @@ + return (cache); +} + ++static int is_undef; ++ +static void +kgdb_trgt_trapframe_this_id(struct frame_info *next_frame, void **this_cache, + struct frame_id *this_id) @@ -1151,6 +1154,7 @@ + char dummy_valuep[MAX_REGISTER_SIZE]; + struct kgdb_frame_cache *cache; + int ofs, regsz; ++ int is_undefined = 0; + + regsz = register_size(current_gdbarch, regnum); + @@ -1168,9 +1172,24 @@ + return; + + cache = kgdb_trgt_frame_cache(next_frame, this_cache); ++ ++ if (is_undef && (regnum == ARM_SP_REGNUM || regnum == ARM_PC_REGNUM)) { ++ *addrp = cache->sp + offsetof(struct trapframe, tf_spsr); ++ target_read_memory(*addrp, valuep, regsz); ++ is_undefined = 1; ++ ofs = kgdb_trgt_frame_offset[ARM_SP_REGNUM]; ++ ++ } + *addrp = cache->sp + ofs; + *lvalp = lval_memory; + target_read_memory(*addrp, valuep, regsz); ++ ++ if (is_undefined) { ++ *addrp = *(unsigned int *)valuep + (regnum == ARM_SP_REGNUM ? ++ 0 : 8); ++ target_read_memory(*addrp, valuep, regsz); ++ ++ } +} + +static const struct frame_unwind kgdb_trgt_trapframe_unwind = { @@ -1188,12 +1207,21 @@ + pc = frame_pc_unwind(next_frame); + pname = NULL; + find_pc_partial_function(pc, &pname, NULL, NULL); -+ if (pname == NULL) ++ if (pname == NULL) { ++ is_undef = 0; + return (NULL); ++ } ++ if (!strcmp(pname, "undefinedinstruction")) ++ is_undef = 1; + if (strcmp(pname, "Laddress_exception_entry") == 0 || + strcmp(pname, "undefined_entry") == 0 || + strcmp(pname, "exception_exit") == 0 || ++ strcmp(pname, "Laddress_exception_msg") == 0 || + strcmp(pname, "irq_entry") == 0) + return (&kgdb_trgt_trapframe_unwind); ++ if (!strcmp(pname, "undefinedinstruction")) ++ is_undef = 1; ++ else ++ is_undef = 0; + return (NULL); +} From owner-p4-projects@FreeBSD.ORG Tue Jun 13 17:14:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 405A716A41B; Tue, 13 Jun 2006 17:14:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E164F16A41A for ; Tue, 13 Jun 2006 17:14:38 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4A9743D45 for ; Tue, 13 Jun 2006 17:14:38 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DHCI2X063628 for ; Tue, 13 Jun 2006 17:12:18 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DHCIjF063625 for perforce@freebsd.org; Tue, 13 Jun 2006 17:12:18 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 13 Jun 2006 17:12:18 GMT Message-Id: <200606131712.k5DHCIjF063625@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 99144 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, 13 Jun 2006 17:14:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=99144 Change 99144 by rdivacky@rdivacky_witten on 2006/06/13 17:12:02 Make the LINUXBASE path settable via sysctl. Useful when you have more then one linux bases installed etc. example: sysctl compat.linux.emulpath=/tmp/linux/ /tmp/linux/bin/grep Usage: grep [OPTION]... PATTERN [FILE]... Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.c#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.h#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#2 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#2 (text+ko) ==== @@ -1018,7 +1018,7 @@ ELFOSABI_LINUX, EM_386, "Linux", - "/compat/linux", + linux_emul_path, "/lib/ld-linux.so.1", &elf_linux_sysvec, NULL, @@ -1029,7 +1029,7 @@ ELFOSABI_LINUX, EM_386, "Linux", - "/compat/linux", + linux_emul_path, "/lib/ld-linux.so.2", &elf_linux_sysvec, NULL, ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.c#2 (text+ko) ==== @@ -38,7 +38,10 @@ #include #include #include +#include +#include +extern Elf32_Brandinfo *linux_brandlist[]; #include "opt_compat.h" #ifdef COMPAT_LINUX32 @@ -52,6 +55,7 @@ char pr_osname[LINUX_MAX_UTSNAME]; char pr_osrelease[LINUX_MAX_UTSNAME]; int pr_oss_version; + char pr_emul_path[LINUX_NAME_MAX]; }; SYSCTL_NODE(_compat, OID_AUTO, linux, CTLFLAG_RW, 0, @@ -81,6 +85,32 @@ 0, 0, linux_sysctl_osname, "A", "Linux kernel OS name"); +char linux_emul_path[LINUX_NAME_MAX] = "/compat/linux/"; + +static int +linux_sysctl_linux_emul_path(SYSCTL_HANDLER_ARGS) +{ + char emul_path[LINUX_NAME_MAX]; + int error; + Elf32_Brandinfo **brandinfo; + + linux_get_emul_path(req->td, emul_path); + error = sysctl_handle_string(oidp, emul_path, LINUX_NAME_MAX, req); + if (error || req->newptr == NULL) + return (error); + error = linux_set_emul_path(req->td, emul_path); + for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; + ++brandinfo) + if (elf32_insert_brand_entry(*brandinfo) < 0) + error = EINVAL; + return (error); +} + +SYSCTL_PROC(_compat_linux, OID_AUTO, emulpath, + CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_PRISON, + 0, 0, linux_sysctl_linux_emul_path, "A", + "Linux kernel OS emulation path"); + static char linux_osrelease[LINUX_MAX_UTSNAME] = "2.4.2"; static int @@ -246,6 +276,51 @@ return (0); } +void +linux_get_emul_path(struct thread *td, char *dst) +{ + register struct prison *pr; + register struct linux_prison *lpr; + + pr = td->td_ucred->cr_prison; + if (pr != NULL) { + mtx_lock(&pr->pr_mtx); + if (pr->pr_linux != NULL) { + lpr = (struct linux_prison *)pr->pr_linux; + if (lpr->pr_emul_path[0]) { + bcopy(lpr->pr_emul_path, dst, LINUX_NAME_MAX); + mtx_unlock(&pr->pr_mtx); + return; + } + } + mtx_unlock(&pr->pr_mtx); + } + + mtx_lock(&osname_lock); + bcopy(linux_emul_path, dst, LINUX_NAME_MAX); + mtx_unlock(&osname_lock); +} + +int +linux_set_emul_path(struct thread *td, char *emul_path) +{ + struct prison *pr; + struct linux_prison *lpr; + + pr = linux_get_prison(td); + if (pr != NULL) { + lpr = (struct linux_prison *)pr->pr_linux; + strcpy(lpr->pr_emul_path, emul_path); + mtx_unlock(&pr->pr_mtx); + } else { + mtx_lock(&osname_lock); + strcpy(linux_emul_path, emul_path); + mtx_unlock(&osname_lock); + } + + return (0); +} + int linux_get_oss_version(struct thread *td) { ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.h#2 (text+ko) ==== @@ -40,4 +40,7 @@ int linux_get_oss_version(struct thread *td); int linux_set_oss_version(struct thread *td, int oss_version); +void linux_get_emul_path(struct thread *td, char *dst); +int linux_set_emul_path(struct thread *td, char *emul_path); + #endif /* _LINUX_MIB_H_ */ ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#2 (text+ko) ==== @@ -858,7 +858,7 @@ ELFOSABI_LINUX, EM_386, "Linux", - "/compat/linux", + linux_emul_path, "/lib/ld-linux.so.1", &elf_linux_sysvec, NULL, @@ -869,7 +869,7 @@ ELFOSABI_LINUX, EM_386, "Linux", - "/compat/linux", + linux_emul_path, "/lib/ld-linux.so.2", &elf_linux_sysvec, NULL, From owner-p4-projects@FreeBSD.ORG Tue Jun 13 17:57:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 395A116A5A0; Tue, 13 Jun 2006 17:57:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 72CC416A4D0; Tue, 13 Jun 2006 17:57:00 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5014843D46; Tue, 13 Jun 2006 17:57:00 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k5DHuo2B024438; Tue, 13 Jun 2006 13:56:58 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Tue, 13 Jun 2006 13:44:08 -0400 User-Agent: KMail/1.9.1 References: <200606131712.k5DHCIjF063625@repoman.freebsd.org> In-Reply-To: <200606131712.k5DHCIjF063625@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200606131344.08736.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Tue, 13 Jun 2006 13:56:58 -0400 (EDT) X-Virus-Scanned: ClamAV 0.87.1/1537/Tue Jun 13 07:24:06 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 99144 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, 13 Jun 2006 17:57:12 -0000 On Tuesday 13 June 2006 13:12, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=99144 > > Change 99144 by rdivacky@rdivacky_witten on 2006/06/13 17:12:02 > > Make the LINUXBASE path settable via sysctl. Useful when you have more then one linux bases > installed etc. Since you only check the one global variable, why did you make the sysctl's try to handle per-prison paths? > example: > sysctl compat.linux.emulpath=/tmp/linux/ > /tmp/linux/bin/grep > Usage: grep [OPTION]... PATTERN [FILE]... > > Affected files ... > > .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#2 edit > .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.c#2 edit > .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.h#2 edit > .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#2 edit > > Differences ... > > ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#2 (text+ko) ==== > > @@ -1018,7 +1018,7 @@ > ELFOSABI_LINUX, > EM_386, > "Linux", > - "/compat/linux", > + linux_emul_path, > "/lib/ld-linux.so.1", > &elf_linux_sysvec, > NULL, > @@ -1029,7 +1029,7 @@ > ELFOSABI_LINUX, > EM_386, > "Linux", > - "/compat/linux", > + linux_emul_path, > "/lib/ld-linux.so.2", > &elf_linux_sysvec, > NULL, > > ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.c#2 (text+ko) ==== > > @@ -38,7 +38,10 @@ > #include > #include > #include > +#include > +#include > > +extern Elf32_Brandinfo *linux_brandlist[]; > #include "opt_compat.h" > > #ifdef COMPAT_LINUX32 > @@ -52,6 +55,7 @@ > char pr_osname[LINUX_MAX_UTSNAME]; > char pr_osrelease[LINUX_MAX_UTSNAME]; > int pr_oss_version; > + char pr_emul_path[LINUX_NAME_MAX]; > }; > > SYSCTL_NODE(_compat, OID_AUTO, linux, CTLFLAG_RW, 0, > @@ -81,6 +85,32 @@ > 0, 0, linux_sysctl_osname, "A", > "Linux kernel OS name"); > > +char linux_emul_path[LINUX_NAME_MAX] = "/compat/linux/"; > + > +static int > +linux_sysctl_linux_emul_path(SYSCTL_HANDLER_ARGS) > +{ > + char emul_path[LINUX_NAME_MAX]; > + int error; > + Elf32_Brandinfo **brandinfo; > + > + linux_get_emul_path(req->td, emul_path); > + error = sysctl_handle_string(oidp, emul_path, LINUX_NAME_MAX, req); > + if (error || req->newptr == NULL) > + return (error); > + error = linux_set_emul_path(req->td, emul_path); > + for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; > + ++brandinfo) > + if (elf32_insert_brand_entry(*brandinfo) < 0) > + error = EINVAL; > + return (error); > +} > + > +SYSCTL_PROC(_compat_linux, OID_AUTO, emulpath, > + CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_PRISON, > + 0, 0, linux_sysctl_linux_emul_path, "A", > + "Linux kernel OS emulation path"); > + > static char linux_osrelease[LINUX_MAX_UTSNAME] = "2.4.2"; > > static int > @@ -246,6 +276,51 @@ > return (0); > } > > +void > +linux_get_emul_path(struct thread *td, char *dst) > +{ > + register struct prison *pr; > + register struct linux_prison *lpr; > + > + pr = td->td_ucred->cr_prison; > + if (pr != NULL) { > + mtx_lock(&pr->pr_mtx); > + if (pr->pr_linux != NULL) { > + lpr = (struct linux_prison *)pr->pr_linux; > + if (lpr->pr_emul_path[0]) { > + bcopy(lpr->pr_emul_path, dst, LINUX_NAME_MAX); > + mtx_unlock(&pr->pr_mtx); > + return; > + } > + } > + mtx_unlock(&pr->pr_mtx); > + } > + > + mtx_lock(&osname_lock); > + bcopy(linux_emul_path, dst, LINUX_NAME_MAX); > + mtx_unlock(&osname_lock); > +} > + > +int > +linux_set_emul_path(struct thread *td, char *emul_path) > +{ > + struct prison *pr; > + struct linux_prison *lpr; > + > + pr = linux_get_prison(td); > + if (pr != NULL) { > + lpr = (struct linux_prison *)pr->pr_linux; > + strcpy(lpr->pr_emul_path, emul_path); > + mtx_unlock(&pr->pr_mtx); > + } else { > + mtx_lock(&osname_lock); > + strcpy(linux_emul_path, emul_path); > + mtx_unlock(&osname_lock); > + } > + > + return (0); > +} > + > int > linux_get_oss_version(struct thread *td) > { > > ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.h#2 (text+ko) ==== > > @@ -40,4 +40,7 @@ > int linux_get_oss_version(struct thread *td); > int linux_set_oss_version(struct thread *td, int oss_version); > > +void linux_get_emul_path(struct thread *td, char *dst); > +int linux_set_emul_path(struct thread *td, char *emul_path); > + > #endif /* _LINUX_MIB_H_ */ > > ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#2 (text+ko) ==== > > @@ -858,7 +858,7 @@ > ELFOSABI_LINUX, > EM_386, > "Linux", > - "/compat/linux", > + linux_emul_path, > "/lib/ld-linux.so.1", > &elf_linux_sysvec, > NULL, > @@ -869,7 +869,7 @@ > ELFOSABI_LINUX, > EM_386, > "Linux", > - "/compat/linux", > + linux_emul_path, > "/lib/ld-linux.so.2", > &elf_linux_sysvec, > NULL, > -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Jun 13 18:04:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCEF516A476; Tue, 13 Jun 2006 18:04:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 53DE916A41A for ; Tue, 13 Jun 2006 18:04:53 +0000 (UTC) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E828A43D48 for ; Tue, 13 Jun 2006 18:04:52 +0000 (GMT) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DI2XbN068866 for ; Tue, 13 Jun 2006 18:02:33 GMT (envelope-from swhitman@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DI2WuW068842 for perforce@freebsd.org; Tue, 13 Jun 2006 18:02:32 GMT (envelope-from swhitman@FreeBSD.org) Date: Tue, 13 Jun 2006 18:02:32 GMT Message-Id: <200606131802.k5DI2WuW068842@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swhitman@FreeBSD.org using -f From: Spencer Whitman To: Perforce Change Reviews Cc: Subject: PERFORCE change 99148 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, 13 Jun 2006 18:04:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=99148 Change 99148 by swhitman@swhitman_joecatmini on 2006/06/13 18:00:37 Populated K branch with FreeBSD source, as this seemed to be the most resonable and useful thing to do. Affected files ... .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/README#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/Makefile.inc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/da_DK.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/articles.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/Makefile.inc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/java-tomcat/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/java-tomcat/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/laptop/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/new-users/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/articles/releng/extra.css#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/articles.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/catalog#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/teams.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/building-products/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/building-products/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/console-server/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/console-server/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/geom-class/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/hats/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/hats/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/hubs/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/hubs/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/portbuild/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/solid-state/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/vinum/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/vinum/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/vm-design/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/bibliography/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/bibliography/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/dev-model/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/dev-model/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/dma/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/security/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/chapters.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/mk/doc.local.mk#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/README#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/admin.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/applications.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/includes.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/install.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/misc.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/network.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/preface.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/serial.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/FAQ/x.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/p4-primer/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/p4-primer/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/releng/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/authors.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/es_ES.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ddwg/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/builtin.1#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/cat.1#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/chkey.1#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/echo.1#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/head.1#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man1/intro.1#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/agp.4#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/amd.4#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/ncr.4#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/sd.4#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/sn.4#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/spic.4#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/st.4#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man5/intro.5#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man5/publickey.5#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man6/intro.6#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man7/ascii.7#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/man/man7/intro.7#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/Makefile.inc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/committers-guide/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/committers-guide/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/euro/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/euro/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/multi-os/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/multi-os/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/new-users/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/new-users/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/vm-design/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/articles/vm-design/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/Makefile.inc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/appendix.decl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/audit/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/basics/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/boot/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/chapter.decl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/chapters.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/colophon.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/config/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/desktop/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/disks/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/eresources/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/geom/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/install/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/introduction/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/l10n/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mac/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mail/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/ports/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/printing/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/security/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/txtfiles.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/users/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/vinum/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/x11/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/chapters.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/history/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/flyer/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/flyer/flyer.tex#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/articles.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/bookinfo.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/books.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/catalog#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/trademarks.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/trademarks.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/translators.ent#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/it_IT.ISO8859-15/share/sgml/transtable.xml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/Makefile.inc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/contributing/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/contributing/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/contributors/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/contributors/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/diskless-x/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/diskless-x/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.conf.default#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.sh#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.conf.default#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.sh#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_3.mk#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fonts/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/fonts/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/ipsec-must/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/multi-os/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/multi-os/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/problem-reports/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/problem-reports/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/zip-drive/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/articles/zip-drive/article.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/Makefile.inc#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/design-44bsd/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/design-44bsd/book.sgml#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/design-44bsd/fig1.eps#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/design-44bsd/fig2.eps#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/design-44bsd/freebsd.dsl#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/faq/Makefile#1 branch .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/doc/ja_JP.eucJP/books/faq/book.sgml#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 13 18:17:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECD0D16A474; Tue, 13 Jun 2006 18:17:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7CD116A41A for ; Tue, 13 Jun 2006 18:17:10 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 784E843D46 for ; Tue, 13 Jun 2006 18:17:10 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DIEohp071852 for ; Tue, 13 Jun 2006 18:14:50 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DIEmef071849 for perforce@freebsd.org; Tue, 13 Jun 2006 18:14:48 GMT (envelope-from jhb@freebsd.org) Date: Tue, 13 Jun 2006 18:14:48 GMT Message-Id: <200606131814.k5DIEmef071849@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 99150 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, 13 Jun 2006 18:17:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=99150 Change 99150 by jhb@jhb_mutex on 2006/06/13 18:13:54 IFC @99141. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#58 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#46 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#32 integrate .. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/inckern.S#3 integrate .. //depot/projects/smpng/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/smpng/sys/compat/ndis/winx32_wrap.S#5 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#21 integrate .. //depot/projects/smpng/sys/conf/NOTES#120 integrate .. //depot/projects/smpng/sys/conf/files#176 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#54 integrate .. //depot/projects/smpng/sys/conf/options#121 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/smpng/sys/dev/mxge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/smpng/sys/dev/mxge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#1 branch .. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#1 branch .. //depot/projects/smpng/sys/dev/mxge/mcp_gen_header.h#1 branch .. //depot/projects/smpng/sys/dev/mxge/mxge_mcp.h#1 branch .. //depot/projects/smpng/sys/i386/conf/DEFAULTS#6 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#76 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#121 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#97 integrate .. //depot/projects/smpng/sys/isa/isa_common.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#50 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#64 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#57 integrate .. //depot/projects/smpng/sys/kern/sched_core.c#1 branch .. //depot/projects/smpng/sys/kern/sched_ule.c#66 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#58 integrate .. //depot/projects/smpng/sys/modules/Makefile#123 integrate .. //depot/projects/smpng/sys/modules/mxge/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mxge/mxge/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mxge/mxge_eth_z8e/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mxge/mxge_ethp_z8e/Makefile#1 branch .. //depot/projects/smpng/sys/net/if_bridge.c#29 integrate .. //depot/projects/smpng/sys/pc98/conf/DEFAULTS#6 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#56 integrate .. //depot/projects/smpng/sys/powerpc/conf/DEFAULTS#4 integrate .. //depot/projects/smpng/sys/sys/sched.h#20 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#58 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.555 2006/06/05 20:35:25 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.556 2006/06/12 20:05:27 alc Exp $"); /* * Manages physical address maps. @@ -1006,17 +1006,22 @@ * Note: SMP coherent. Uses a ranged shootdown IPI. */ void -pmap_qenter(vm_offset_t sva, vm_page_t *m, int count) +pmap_qenter(vm_offset_t sva, vm_page_t *ma, int count) { - vm_offset_t va; + pt_entry_t *endpte, oldpte, *pte; - va = sva; - while (count-- > 0) { - pmap_kenter(va, VM_PAGE_TO_PHYS(*m)); - va += PAGE_SIZE; - m++; + oldpte = 0; + pte = vtopte(sva); + endpte = pte + count; + while (pte < endpte) { + oldpte |= *pte; + pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G | PG_RW | PG_V); + pte++; + ma++; } - pmap_invalidate_range(kernel_pmap, sva, va); + if ((oldpte & PG_V) != 0) + pmap_invalidate_range(kernel_pmap, sva, sva + count * + PAGE_SIZE); } /* ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#46 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.458 2006/05/17 20:45:44 marius Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.459 2006/06/13 13:12:56 davidxu Exp $ cpu HAMMER ident GENERIC @@ -28,6 +28,7 @@ #options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler +#options SCHED_CORE # CORE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols ==== //depot/projects/smpng/sys/amd64/conf/NOTES#32 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.55 2006/05/14 18:49:24 marius Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.56 2006/06/12 20:38:17 jhb Exp $ # # ==== //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.6 2006/05/30 21:13:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.7 2006/06/12 22:58:50 cognet Exp $"); #include #include #include @@ -32,6 +32,7 @@ #include #include #include +#include #include @@ -41,6 +42,8 @@ extern char kernel_start[]; extern char kernel_end[]; +extern void *_end; + void __start(void); #define GZ_HEAD 0xa @@ -50,7 +53,7 @@ #elif defined(CPU_ARM8) #define cpu_idcache_wbinv_all arm8_cache_purgeID #elif defined(CPU_ARM9) -#define cpu_idcache_wbinv_all arm9_dcache_wbinv_all +#define cpu_idcache_wbinv_all arm9_idcache_wbinv_all #elif defined(CPU_ARM10) #define cpu_idcache_wbinv_all arm10_idcache_wbinv_all #elif defined(CPU_SA110) || defined(CPU_SA1110) || defined(CPU_SA1100) || \ @@ -60,8 +63,35 @@ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) #define cpu_idcache_wbinv_all xscale_cache_purgeID #endif -int arm_pdcache_line_size = 32; + +#ifdef KZIP +int arm_picache_size; +int arm_picache_line_size; +int arm_picache_ways; + +int arm_pdcache_size; /* and unified */ +int arm_pdcache_line_size = 32; +int arm_pdcache_ways; + +int arm_pcache_type; +int arm_pcache_unified; + +int arm_dcache_align; +int arm_dcache_align_mask; + +/* Additional cache information local to this file. Log2 of some of the + above numbers. */ +static int arm_dcache_l2_nsets; +static int arm_dcache_l2_assoc; +static int arm_dcache_l2_linesize; + + int block_userspace_access = 0; +extern int arm9_dcache_sets_inc; +extern int arm9_dcache_sets_max; +extern int arm9_dcache_index_max; +extern int arm9_dcache_index_inc; +#endif static __inline void * memcpy(void *dst, const void *src, int len) @@ -107,13 +137,18 @@ { int physaddr = KERNPHYSADDR; int tmp1; + unsigned int sp = (unsigned int)&_end; +#ifdef KZIP + sp += KERNSIZE + 0x100; + sp &= ~(L1_TABLE_SIZE - 1); + sp += 2 * L1_TABLE_SIZE; +#endif + sp += 1024 * 1024; /* Should be enough for a stack */ __asm __volatile("adr %0, 2f\n" "bic %0, %0, #0xff000000\n" - "bic sp, sp, #0xff000000\n" "and %1, %1, #0xff000000\n" "orr %0, %0, %1\n" - "orr sp, sp, %1\n" "mrc p15, 0, %1, c1, c0, 0\n" "bic %1, %1, #1\n" /* Disable MMU */ "orr %1, %1, #(4 | 8)\n" /* Add DC enable, @@ -127,11 +162,92 @@ "nop\n" "mov pc, %0\n" "2: nop\n" - : "=r" (tmp1), "+r" (physaddr)); + "mov sp, %2\n" + : "=r" (tmp1), "+r" (physaddr), "+r" (sp)); __start(); } #ifdef KZIP +static void +get_cachetype_cp15() +{ + u_int ctype, isize, dsize; + u_int multiplier; + + __asm __volatile("mrc p15, 0, %0, c0, c0, 1" + : "=r" (ctype)); + + /* + * ...and thus spake the ARM ARM: + * + * If an value corresponding to an unimplemented or + * reserved ID register is encountered, the System Control + * processor returns the value of the main ID register. + */ + if (ctype == cpufunc_id()) + goto out; + + if ((ctype & CPU_CT_S) == 0) + arm_pcache_unified = 1; + + /* + * If you want to know how this code works, go read the ARM ARM. + */ + + arm_pcache_type = CPU_CT_CTYPE(ctype); + if (arm_pcache_unified == 0) { + isize = CPU_CT_ISIZE(ctype); + multiplier = (isize & CPU_CT_xSIZE_M) ? 3 : 2; + arm_picache_line_size = 1U << (CPU_CT_xSIZE_LEN(isize) + 3); + if (CPU_CT_xSIZE_ASSOC(isize) == 0) { + if (isize & CPU_CT_xSIZE_M) + arm_picache_line_size = 0; /* not present */ + else + arm_picache_ways = 1; + } else { + arm_picache_ways = multiplier << + (CPU_CT_xSIZE_ASSOC(isize) - 1); + } + arm_picache_size = multiplier << (CPU_CT_xSIZE_SIZE(isize) + 8); + } + + dsize = CPU_CT_DSIZE(ctype); + multiplier = (dsize & CPU_CT_xSIZE_M) ? 3 : 2; + arm_pdcache_line_size = 1U << (CPU_CT_xSIZE_LEN(dsize) + 3); + if (CPU_CT_xSIZE_ASSOC(dsize) == 0) { + if (dsize & CPU_CT_xSIZE_M) + arm_pdcache_line_size = 0; /* not present */ + else + arm_pdcache_ways = 1; + } else { + arm_pdcache_ways = multiplier << + (CPU_CT_xSIZE_ASSOC(dsize) - 1); + } + arm_pdcache_size = multiplier << (CPU_CT_xSIZE_SIZE(dsize) + 8); + + arm_dcache_align = arm_pdcache_line_size; + + arm_dcache_l2_assoc = CPU_CT_xSIZE_ASSOC(dsize) + multiplier - 2; + arm_dcache_l2_linesize = CPU_CT_xSIZE_LEN(dsize) + 3; + arm_dcache_l2_nsets = 6 + CPU_CT_xSIZE_SIZE(dsize) - + CPU_CT_xSIZE_ASSOC(dsize) - CPU_CT_xSIZE_LEN(dsize); + out: + arm_dcache_align_mask = arm_dcache_align - 1; +} + +static void +arm9_setup(void) +{ + + get_cachetype_cp15(); + arm9_dcache_sets_inc = 1U << arm_dcache_l2_linesize; + arm9_dcache_sets_max = (1U << (arm_dcache_l2_linesize + + arm_dcache_l2_nsets)) - arm9_dcache_sets_inc; + arm9_dcache_index_inc = 1U << (32 - arm_dcache_l2_assoc); + arm9_dcache_index_max = 0U - arm9_dcache_index_inc; +} + + static unsigned char *orig_input, *i_input, *i_output; @@ -354,7 +470,6 @@ extern char func_end[]; -extern void *_end; #define PMAP_DOMAIN_KERNEL 15 /* * Just define it instead of including the @@ -404,6 +519,7 @@ void *curaddr; void *dst, *altdst; char *kernel = (char *)&kernel_start; + int sp; __asm __volatile("mov %0, pc" : "=r" (curaddr)); @@ -413,6 +529,11 @@ int pt_addr = (((int)&_end + KERNSIZE + 0x100) & ~(L1_TABLE_SIZE - 1)) + L1_TABLE_SIZE; +#ifdef CPU_ARM9 + /* So that idcache_wbinv works; */ + if ((cpufunc_id() & 0x0000f000) == 0x00009000) + arm9_setup(); +#endif setup_pagetables(pt_addr, (vm_paddr_t)curaddr, (vm_paddr_t)curaddr + 0x10000000); /* Gzipped kernel */ @@ -433,10 +554,10 @@ dst = 4 + load_kernel((unsigned int)&kernel_start, (unsigned int)curaddr, (unsigned int)&func_end, 0); + sp = (vm_offset_t)dst + 4096; + dst = (void *)sp; memcpy((void *)dst, (void *)&load_kernel, (unsigned int)&func_end - (unsigned int)&load_kernel); - ((void (*)())dst)((unsigned int)kernel, - (unsigned int)curaddr, - dst + (unsigned int)(&func_end) - - (unsigned int)(&load_kernel), 1); + do_call(dst, kernel, dst + (unsigned int)(&func_end) - + (unsigned int)(&load_kernel), sp); } ==== //depot/projects/smpng/sys/arm/arm/inckern.S#3 (text+ko) ==== @@ -25,7 +25,15 @@ #include "opt_kernname.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/inckern.S,v 1.2 2005/12/05 12:55:46 cognet Exp $") +__FBSDID("$FreeBSD: src/sys/arm/arm/inckern.S,v 1.3 2006/06/12 22:58:50 cognet Exp $") +ENTRY(do_call) + mov r6, r0 + mov r0, r1 + ldr r1, =0xfff00000 + and r1, pc, r1 + mov sp, r3 + mov r3, #1 + mov pc, r6 .section ".real_kernel","aw" .globl kernel_start; kernel_start: ==== //depot/projects/smpng/sys/arm/at91/kb920x_machdep.c#4 (text) ==== @@ -47,7 +47,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.5 2006/06/07 05:36:10 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.6 2006/06/12 22:57:24 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -96,7 +96,7 @@ #define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */ #define KERNEL_PT_KERN 1 -#define KERNEL_PT_KERN_NUM 8 +#define KERNEL_PT_KERN_NUM 22 #define KERNEL_PT_AFKERNEL KERNEL_PT_KERN + KERNEL_PT_KERN_NUM /* L2 table for mapping after kernel */ #define KERNEL_PT_AFKERNEL_NUM 5 ==== //depot/projects/smpng/sys/compat/ndis/winx32_wrap.S#5 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/winx32_wrap.S,v 1.4 2005/11/02 18:01:04 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/winx32_wrap.S,v 1.5 2006/06/12 20:35:59 jhb Exp $ */ /* The 'ret' macro doesn't work in this file if GPROF is enabled. */ ==== //depot/projects/smpng/sys/conf/Makefile.arm#21 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.27 2006/05/30 21:13:47 cognet Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.28 2006/06/12 22:58:50 cognet Exp $ # # Makefile for FreeBSD # @@ -62,7 +62,7 @@ FILES_CPU_FUNC = $S/$M/$M/cpufunc_asm_arm7tdmi.S \ $S/$M/$M/cpufunc_asm_arm8.S $S/$M/$M/cpufunc_asm_arm9.S \ $S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \ - $S/$M/$M/cpufunc_asm_xscale.S + $S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S trampoline: ${KERNEL_KO}.tramp ${KERNEL_KO}.tramp: ${KERNEL_KO} echo "#define KERNNAME \"${KERNEL_KO}.tmp\"" >opt_kernname.h @@ -71,6 +71,8 @@ ldscript.$M.tramp.noheader ${OBJCOPY} --strip-symbol '$$d' --strip-symbol '$$a' \ -g --strip-symbol '$$t' ${FULLKERNEL} ${KERNEL_KO}.tmp + eval $$(stat -s ${KERNEL_KO}.tmp) && \ + echo "#define KERNSIZE $$st_size" >>opt_kernname.h ${CC} -O -nostdlib -I. -Xlinker -T -Xlinker ldscript.$M.tramp \ $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S -o ${KERNEL_KO}.tramp ${CC} -O -nostdlib -I. -Xlinker -T -Xlinker ldscript.$M.tramp.noheader \ ==== //depot/projects/smpng/sys/conf/NOTES#120 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1365 2006/06/03 23:30:16 kris Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1366 2006/06/13 13:12:55 davidxu Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -166,6 +166,7 @@ # over time. # options SCHED_4BSD +#options SCHED_CORE #options SCHED_ULE ##################################################################### ==== //depot/projects/smpng/sys/conf/files#176 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1122 2006/06/12 04:21:49 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1124 2006/06/13 13:12:55 davidxu Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1245,8 +1245,8 @@ isa/isa_common.c optional isa isa/isahint.c optional isa isa/orm.c optional isa -isa/pnp.c optional isa -isa/pnpparse.c optional isa +isa/pnp.c optional isa isapnp +isa/pnpparse.c optional isa isapnp isofs/cd9660/cd9660_bmap.c optional cd9660 isofs/cd9660/cd9660_lookup.c optional cd9660 isofs/cd9660/cd9660_node.c optional cd9660 @@ -1324,6 +1324,7 @@ kern/md4c.c optional netsmb kern/md5c.c standard kern/sched_4bsd.c optional sched_4bsd +kern/sched_core.c optional sched_core kern/sched_ule.c optional sched_ule kern/serdev_if.m optional puc | scc kern/subr_autoconf.c standard ==== //depot/projects/smpng/sys/conf/kern.post.mk#54 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.93 2006/05/12 02:45:12 jmg Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.94 2006/06/13 00:57:10 cognet Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -68,15 +68,6 @@ ${FULLKERNEL} ${.TARGET} ${KERNEL_KO}.symbols: ${FULLKERNEL} ${OBJCOPY} --only-keep-debug ${FULLKERNEL} ${.TARGET} -.if defined(MFS_IMAGE) - @dd if="${MFS_IMAGE}" ibs=8192 of="${KERNEL_KO}" \ - obs=`strings -at d "${KERNEL_KO}" | \ - grep "MFS Filesystem goes here" | awk '{print $$1}'` \ - oseek=1 conv=notrunc 2>/dev/null && \ - strings ${KERNEL_KO} | \ - grep 'MFS Filesystem had better STOP here' > /dev/null || \ - (rm ${KERNEL_KO} && echo 'MFS image too large' && false) -.endif install.debug reinstall.debug: gdbinit cd ${.CURDIR}; ${MAKE} ${.TARGET:R} @@ -99,6 +90,15 @@ ${OBJCOPY} --strip-debug ${.TARGET} .endif ${SYSTEM_LD_TAIL} +.if defined(MFS_IMAGE) + @dd if="${MFS_IMAGE}" ibs=8192 of="${KERNEL_KO}" \ + obs=`strings -at d "${KERNEL_KO}" | \ + grep "MFS Filesystem goes here" | awk '{print $$1}'` \ + oseek=1 conv=notrunc 2>/dev/null && \ + strings ${KERNEL_KO} | \ + grep 'MFS Filesystem had better STOP here' > /dev/null || \ + (rm ${KERNEL_KO} && echo 'MFS image too large' && false) +.endif .if !exists(${.OBJDIR}/.depend) ${SYSTEM_OBJS}: assym.s vnode_if.h ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/} ==== //depot/projects/smpng/sys/conf/options#121 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.544 2006/06/07 17:53:15 sam Exp $ +# $FreeBSD: src/sys/conf/options,v 1.546 2006/06/13 13:12:55 davidxu Exp $ # # On the handling of kernel options # @@ -128,6 +128,7 @@ PREEMPTION opt_sched.h QUOTA SCHED_4BSD opt_sched.h +SCHED_CORE opt_sched.h SCHED_ULE opt_sched.h SHOW_BUSYBUFS SLEEPQUEUE_PROFILING @@ -615,13 +616,16 @@ ACPI_NO_SEMAPHORES opt_acpi.h ACPICA_PEDANTIC opt_acpi.h +# ISA support +DEV_ISA opt_isa.h +ISAPNP opt_isa.h + # options for DEVFS, see sys/fs/devfs/devfs.h NDEVFSINO opt_devfs.h NDEVFSOVERFLOW opt_devfs.h # various 'device presence' options. DEV_BPF opt_bpf.h -DEV_ISA opt_isa.h DEV_MCA opt_mca.h DEV_CARP opt_carp.h DEV_SPLASH opt_splash.h ==== //depot/projects/smpng/sys/dev/mfi/mfi.c#5 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.5 2006/05/18 23:30:47 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.6 2006/06/13 14:27:52 ambrisko Exp $"); #include "opt_mfi.h" @@ -59,7 +59,9 @@ static int mfi_get_controller_info(struct mfi_softc *); static int mfi_get_log_state(struct mfi_softc *, struct mfi_evt_log_state *); +#ifdef NOTYET static int mfi_get_entry(struct mfi_softc *, int); +#endif static void mfi_data_cb(void *, bus_dma_segment_t *, int, int); static void mfi_startup(void *arg); static void mfi_intr(void *arg); @@ -608,7 +610,7 @@ * the AEN mechanism via setting it lower then * current. The firmware will iterate through them. */ -#if 0 +#ifdef NOTYET for (seq = log_state.shutdown_seq_num; seq <= log_state.newest_seq_num; seq++) { mfi_get_entry(sc, seq); @@ -930,7 +932,7 @@ mfi_ldprobe_capacity(sc, hdr->target_id); } -#ifndef MFI_DECODE_LOG +#ifdef NOTYET static void mfi_decode_log(struct mfi_softc *sc, struct mfi_log_detail *detail) { @@ -943,9 +945,6 @@ break; } } -#else -#include -#include #endif static void @@ -953,12 +952,14 @@ { switch (detail->arg_type) { case MR_EVT_ARGS_NONE: - /* Try to get info from log entry */ - mfi_get_entry(sc, detail->seq); + device_printf(sc->mfi_dev, "%d - %s\n", + detail->seq, + detail->description + ); break; case MR_EVT_ARGS_CDB_SENSE: device_printf(sc->mfi_dev, "%d - PD %02d(e%d/s%d) CDB %*D" - "Sense %*D\n: %s", + "Sense %*D\n: %s\n", detail->seq, detail->args.cdb_sense.pd.device_id, detail->args.cdb_sense.pd.enclosure_index, @@ -1284,6 +1285,7 @@ } } +#ifdef NOTYET static int mfi_get_entry(struct mfi_softc *sc, int seq) { @@ -1349,6 +1351,7 @@ mtx_unlock(&sc->mfi_io_lock); return (0); } +#endif static int mfi_ldprobe_capacity(struct mfi_softc *sc, int id) ==== //depot/projects/smpng/sys/i386/conf/DEFAULTS#6 (text+ko) ==== @@ -1,12 +1,13 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/i386 # -# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.5 2006/06/12 04:21:50 imp Exp $ +# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.6 2006/06/12 21:07:12 marius Exp $ machine i386 # Bus support. device isa +options ISAPNP # Floating point support. device npx ==== //depot/projects/smpng/sys/i386/conf/GENERIC#76 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.448 2006/05/17 20:44:00 marius Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.449 2006/06/13 13:12:56 davidxu Exp $ cpu I486_CPU cpu I586_CPU @@ -30,6 +30,7 @@ #options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler +#options SCHED_CORE # CORE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols ==== //depot/projects/smpng/sys/i386/conf/NOTES#121 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1227 2006/05/17 21:25:23 marius Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1228 2006/06/12 20:38:17 jhb Exp $ # # ==== //depot/projects/smpng/sys/i386/i386/pmap.c#97 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.559 2006/06/05 20:35:26 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.560 2006/06/12 20:05:27 alc Exp $"); /* * Manages physical address maps. @@ -1057,17 +1057,22 @@ * Note: SMP coherent. Uses a ranged shootdown IPI. */ void -pmap_qenter(vm_offset_t sva, vm_page_t *m, int count) +pmap_qenter(vm_offset_t sva, vm_page_t *ma, int count) { - vm_offset_t va; + pt_entry_t *endpte, oldpte, *pte; - va = sva; - while (count-- > 0) { - pmap_kenter(va, VM_PAGE_TO_PHYS(*m)); - va += PAGE_SIZE; - m++; + oldpte = 0; + pte = vtopte(sva); + endpte = pte + count; + while (pte < endpte) { + oldpte |= *pte; + pte_store(pte, VM_PAGE_TO_PHYS(*ma) | pgeflag | PG_RW | PG_V); + pte++; + ma++; } - pmap_invalidate_range(kernel_pmap, sva, va); + if ((oldpte & PG_V) != 0) + pmap_invalidate_range(kernel_pmap, sva, sva + count * + PAGE_SIZE); } /* ==== //depot/projects/smpng/sys/isa/isa_common.c#19 (text+ko) ==== @@ -58,7 +58,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/isa/isa_common.c,v 1.44 2006/05/12 05:04:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/isa/isa_common.c,v 1.45 2006/06/12 21:07:12 marius Exp $"); + +#include "opt_isa.h" #include #include @@ -652,8 +654,10 @@ retval += resource_list_print_type(rl, "drq", SYS_RES_DRQ, "%ld"); if (device_get_flags(dev)) retval += printf(" flags %#x", device_get_flags(dev)); +#ifdef ISAPNP if (idev->id_vendorid) retval += printf(" pnpid %s", pnp_eisaformat(idev->id_vendorid)); +#endif return (retval); } @@ -1062,11 +1066,13 @@ isa_child_pnpinfo_str(device_t bus, device_t child, char *buf, size_t buflen) { +#ifdef ISAPNP struct isa_device *idev = DEVTOISA(child); if (idev->id_vendorid) snprintf(buf, buflen, "pnpid=%s", pnp_eisaformat(idev->id_vendorid)); +#endif return (0); } ==== //depot/projects/smpng/sys/kern/kern_clock.c#50 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.188 2006/04/17 20:14:51 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.189 2006/06/13 13:12:56 davidxu Exp $"); #include "opt_device_polling.h" #include "opt_hwpmc_hooks.h" @@ -201,6 +201,7 @@ * Run current process's virtual and profile time, as needed. */ mtx_lock_spin_flags(&sched_lock, MTX_QUIET); + sched_tick(); if (p->p_flag & P_SA) { /* XXXKSE What to do? */ } else { ==== //depot/projects/smpng/sys/kern/kern_event.c#47 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.102 2006/06/02 13:23:39 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_event.c,v 1.103 2006/06/12 21:46:23 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/kern/kern_switch.c#64 (text+ko) ==== @@ -86,7 +86,7 @@ ***/ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.121 2006/06/01 22:45:56 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.122 2006/06/13 13:12:56 davidxu Exp $"); #include "opt_sched.h" @@ -308,7 +308,12 @@ if ((td->td_proc->p_flag & P_HADTHREADS) == 0) { /* We only care about the kse in the run queue. */ td->td_priority = newpri; - if (ke->ke_rqindex != (newpri / RQ_PPQ)) { +#ifndef SCHED_CORE + if (ke->ke_rqindex != (newpri / RQ_PPQ)) +#else + if (ke->ke_rqindex != newpri) +#endif + { sched_rem(td); sched_add(td, SRQ_BORING); } ==== //depot/projects/smpng/sys/kern/sched_4bsd.c#57 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.81 2006/06/06 12:26:17 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.82 2006/06/13 13:12:56 davidxu Exp $"); #include "opt_hwpmc_hooks.h" @@ -1386,5 +1386,10 @@ return (0); } + +void +sched_tick(void) +{ +} #define KERN_SWITCH_INCLUDE 1 #include "kern/kern_switch.c" ==== //depot/projects/smpng/sys/kern/sched_ule.c#66 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.162 2006/06/06 12:26:17 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.163 2006/06/13 13:12:56 davidxu Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_sched.h" @@ -2007,5 +2007,10 @@ { return (sizeof(struct thread) + sizeof(struct td_sched)); } + +void +sched_tick(void) +{ +} #define KERN_SWITCH_INCLUDE 1 #include "kern/kern_switch.c" ==== //depot/projects/smpng/sys/kern/uipc_usrreq.c#58 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.167 2006/04/24 19:09:33 maxim Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.168 2006/06/13 14:33:35 maxim Exp $"); #include "opt_mac.h" @@ -1498,8 +1498,9 @@ struct mbuf * unp_addsockcred(struct thread *td, struct mbuf *control) { - struct mbuf *m, *n; + struct mbuf *m, *n, *n_prev; struct sockcred *sc; + const struct cmsghdr *cm; int ngroups; int i; @@ -1508,7 +1509,6 @@ m = sbcreatecontrol(NULL, SOCKCREDSIZE(ngroups), SCM_CREDS, SOL_SOCKET); if (m == NULL) return (control); - m->m_next = NULL; sc = (struct sockcred *) CMSG_DATA(mtod(m, struct cmsghdr *)); sc->sc_uid = td->td_ucred->cr_ruid; @@ -1520,16 +1520,30 @@ sc->sc_groups[i] = td->td_ucred->cr_groups[i]; /* - * If a control message already exists, append us to the end. + * Unlink SCM_CREDS control messages (struct cmsgcred), since + * just created SCM_CREDS control message (struct sockcred) has + * another format. */ - if (control != NULL) { - for (n = control; n->m_next != NULL; n = n->m_next) - ; - n->m_next = m; - } else - control = m; + if (control != NULL) + for (n = control, n_prev = NULL; n != NULL;) { + cm = mtod(n, struct cmsghdr *); + if (cm->cmsg_level == SOL_SOCKET && + cm->cmsg_type == SCM_CREDS) { + if (n_prev == NULL) + control = n->m_next; + else + n_prev->m_next = n->m_next; + n = m_free(n); + } else { + n_prev = n; + n = n->m_next; + } + } + + /* Prepend it to the head. */ + m->m_next = control; - return (control); + return (m); } /* ==== //depot/projects/smpng/sys/modules/Makefile#123 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.497 2006/06/08 23:35:58 sam Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.498 2006/06/13 13:53:52 gallatin Exp $ .include @@ -160,6 +160,7 @@ msdosfs \ msdosfs_iconv \ ${_mse} \ + ${_mxge} \ my \ ${_ncp} \ ${_ncv} \ @@ -413,6 +414,7 @@ _ipw= ipw _iwi= iwi _mly= mly +_mxge= mxge _nve= nve .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) .if exists(${.CURDIR}/../crypto/via) @@ -469,6 +471,7 @@ _ipw= ipw _iwi= iwi _mly= mly +_mxge= mxge _ndis= ndis _nve= nve _pccard= pccard ==== //depot/projects/smpng/sys/net/if_bridge.c#29 (text+ko) ==== @@ -80,7 +80,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.62 2006/06/08 23:40:16 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.63 2006/06/12 22:43:37 thompsa Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -501,8 +501,8 @@ ifp->if_hdrlen = ETHER_HDR_LEN; /* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 13 18:53:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0186816A476; Tue, 13 Jun 2006 18:53:04 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B2D5B16A474 for ; Tue, 13 Jun 2006 18:53:03 +0000 (UTC) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55FD043D6E for ; Tue, 13 Jun 2006 18:52:58 +0000 (GMT) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DIocYU073899 for ; Tue, 13 Jun 2006 18:50:38 GMT (envelope-from swhitman@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DIobYG073896 for perforce@freebsd.org; Tue, 13 Jun 2006 18:50:37 GMT (envelope-from swhitman@FreeBSD.org) Date: Tue, 13 Jun 2006 18:50:37 GMT Message-Id: <200606131850.k5DIobYG073896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swhitman@FreeBSD.org using -f From: Spencer Whitman To: Perforce Change Reviews Cc: Subject: PERFORCE change 99155 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, 13 Jun 2006 18:53:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=99155 Change 99155 by swhitman@swhitman_joecatmini on 2006/06/13 18:50:27 Added current K files to repository Affected files ... .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/Makefile#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/SocTask1#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/SocTask2#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/cpp.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/expr.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/file.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/flint.lnt#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/gcc.h#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/k-soc.tgz#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/k.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/k.c~#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/k.h#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/lexer.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/notes#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/obj/.depend#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/obj/fixed_token.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/obj/token_data_temp.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/obj/token_defs.h#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/parser.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/string.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/symbol.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/test.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/token.tcl#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/token_data.c#1 add .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/types.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jun 13 20:27:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5781016A476; Tue, 13 Jun 2006 20:27:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 10F3616A41A for ; Tue, 13 Jun 2006 20:27:07 +0000 (UTC) (envelope-from Patrick.LeBlanc@sparta.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B512E43D46 for ; Tue, 13 Jun 2006 20:27:06 +0000 (GMT) (envelope-from Patrick.LeBlanc@sparta.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DKOkr8083105 for ; Tue, 13 Jun 2006 20:24:46 GMT (envelope-from Patrick.LeBlanc@sparta.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DKOjst083102 for perforce@freebsd.org; Tue, 13 Jun 2006 20:24:45 GMT (envelope-from Patrick.LeBlanc@sparta.com) Date: Tue, 13 Jun 2006 20:24:45 GMT Message-Id: <200606132024.k5DKOjst083102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to Patrick.LeBlanc@sparta.com using -f From: pleblanc To: Perforce Change Reviews Cc: Subject: PERFORCE change 99162 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, 13 Jun 2006 20:27:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=99162 Change 99162 by pleblanc@pleblanc_p4 on 2006/06/13 20:24:38 - Re-automate the installation of the sebsd policy sources. - Make actual installation paths agree with the installation doc. Affected files ... .. //depot/projects/trustedbsd/sebsd/Makefile#18 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#25 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/Makefile#18 (text+ko) ==== @@ -310,9 +310,19 @@ sebsd_bootstrap: .if exists(${.CURDIR}/contrib/sebsd) @echo "Installing SEBSD policy" + +.if !exists(${DESTDIR}/etc/security/sebsd/targeted/policy) + (cd ${.CURDIR}/contrib/sebsd/refpolicy; gmake install-src) +.else + @echo "Existing SEBSD targeted policy sources found." + @echo "Will not reinstall them. To reinstall them by hand" + @echo "do \"cd contrib/sebsd/refpolicy && gmake install-src\"." +.endif + .if exists(${DESTDIR}/usr/bin/checkpolicy) .if !exists(${DESTDIR}/etc/security/sebsd/targeted/policy/policy.20) + mkdir -p ${DESTDIR}/etc/security/sebsd/targeted/policy (${DESTDIR}/usr/bin/checkpolicy -o ${DESTDIR}/etc/security/sebsd/targeted/policy/policy.20 ${.CURDIR}/contrib/sebsd/support/policy.conf) .else @echo "Binary policy file found. Not overwriting." ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#25 (text+ko) ==== @@ -33,7 +33,7 @@ .endif POLICYVER := policy.$(POLICYVERTMP) POLICYBIN = policy.bin -INSTALLDIR = $(DESTDIR)/etc/security/sebsd +INSTALLDIR = $(DESTDIR)/etc/security/sebsd/targeted POLICYPATH = $(INSTALLDIR)/policy SRCPATH = $(INSTALLDIR)/src CONTEXTPATH = $(INSTALLDIR)/contexts @@ -138,10 +138,10 @@ m4 $(M4PARAM) -Imacros -s $(POLICYFILES) > $@.tmp mv $@.tmp $@ -install-src: /etc/security/sebsd - rm -rf $(INSTALLDIR)/policy.old - -mv $(INSTALLDIR)/policy $(INSTALLDIR)/policy.old - cd ..; tar cf - policy | (cd $(INSTALLDIR); tar xf -) +install-src: $(SRCPATH) + rm -rf $(SRCPATH)/policy.old + -mv $(SRCPATH)/policy $(SRCPATH)/policy.old + cd ..; tar cf - policy | (cd $(SRCPATH); tar xf -) tmp/program_used_flags.te: $(wildcard domains/program/*.te) domains/program mkdir -p tmp From owner-p4-projects@FreeBSD.ORG Tue Jun 13 20:59:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B37416A478; Tue, 13 Jun 2006 20:59:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D3EA716A41A for ; Tue, 13 Jun 2006 20:59:50 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E9DB43D46 for ; Tue, 13 Jun 2006 20:59:50 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DKvTWi093556 for ; Tue, 13 Jun 2006 20:57:29 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DKvTBE093553 for perforce@freebsd.org; Tue, 13 Jun 2006 20:57:29 GMT (envelope-from jhb@freebsd.org) Date: Tue, 13 Jun 2006 20:57:29 GMT Message-Id: <200606132057.k5DKvTBE093553@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 99165 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, 13 Jun 2006 20:59:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=99165 Change 99165 by jhb@jhb_mutex on 2006/06/13 20:57:22 0 makes more sense here and is what I committed to CVS. Affected files ... .. //depot/projects/smpng/sys/kern/kern_linker.c#68 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_linker.c#68 (text+ko) ==== @@ -371,7 +371,7 @@ return (0); } foundfile = 0; - error = ENOENT; + error = 0; /* * We do not need to protect (lock) classes here because there is From owner-p4-projects@FreeBSD.ORG Tue Jun 13 21:32:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DFF116A474; Tue, 13 Jun 2006 21:32:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C19416A47B for ; Tue, 13 Jun 2006 21:32:33 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C353943D49 for ; Tue, 13 Jun 2006 21:32:32 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DLUCAx096501 for ; Tue, 13 Jun 2006 21:30:12 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DLUCBe096498 for perforce@freebsd.org; Tue, 13 Jun 2006 21:30:12 GMT (envelope-from piso@freebsd.org) Date: Tue, 13 Jun 2006 21:30:12 GMT Message-Id: <200606132130.k5DLUCBe096498@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 99169 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, 13 Jun 2006 21:32:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=99169 Change 99169 by piso@piso_newluxor on 2006/06/13 21:29:27 Bring in some defines from jhb_intr Affected files ... .. //depot/projects/soc2006/intr_filter/i386/conf/GENERIC#2 edit .. //depot/projects/soc2006/intr_filter/sys/bus.h#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/i386/conf/GENERIC#2 (text+ko) ==== @@ -293,3 +293,5 @@ device firewire # FireWire bus code device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) + +options INTR_FILTER # use interrupt filters when available ==== //depot/projects/soc2006/intr_filter/sys/bus.h#2 (text+ko) ==== @@ -119,9 +119,48 @@ */ #define device_method_t kobj_method_t +#ifdef INTR_FILTER /** - * @brief A driver interrupt service routine + * @brief Driver interrupt filter return values + * + * If a driver provides an interrupt filter routine it must return an + * integer consisting of oring together zero or more of the following + * flags: + * + * FILTER_STRAY - this device did not trigger the interrupt + * FILTER_HANDLED - the interrupt has been fully handled and can be EOId + * FILTER_SCHEDULE_THREAD - the threaded interrupt handler should be + * scheduled to execute + * + * If the driver does not provide a filter, then the interrupt code will + * act is if the filter had returned FILTER_SCHEDULE_THREAD. Note that it + * is illegal to specify any other flag with FILTER_STRAY and that it is + * illegal to not specify either of FILTER_HANDLED or FILTER_SCHEDULE_THREAD + * if FILTER_STRAY is not specified. + */ +#define FILTER_STRAY 0x01 +#define FILTER_HANDLED 0x02 +#define FILTER_SCHEDULE_THREAD 0x04 +#endif + +/** + * @brief Driver interrupt service routines + * + * The filter routine is run in primary interrupt context and may not + * block or use regular mutexes. It may only use spin mutexes for + * synchronization. The filter may either completely handle the + * interrupt or it may perform some of the work and defer more + * expensive work to the regular interrupt handler. If a filter + * routine is not registered by the driver, then the regular interrupt + * handler is always used to handle interrupts from this device. + * + * The regular interrupt handler executes in its own thread context + * and may use regular mutexes. However, it is prohibited from + * sleeping on a sleep queue. */ +#ifdef INTR_FILTER +typedef int driver_filter_t(void*); +#endif typedef void driver_intr_t(void*); /** From owner-p4-projects@FreeBSD.ORG Tue Jun 13 21:45:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F01916A479; Tue, 13 Jun 2006 21:45:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 78FB916A41B for ; Tue, 13 Jun 2006 21:45:01 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E860543D64 for ; Tue, 13 Jun 2006 21:44:52 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DLgWsB097364 for ; Tue, 13 Jun 2006 21:42:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DLgVst097361 for perforce@freebsd.org; Tue, 13 Jun 2006 21:42:31 GMT (envelope-from jhb@freebsd.org) Date: Tue, 13 Jun 2006 21:42:31 GMT Message-Id: <200606132142.k5DLgVst097361@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 99175 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, 13 Jun 2006 21:45:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=99175 Change 99175 by jhb@jhb_mutex on 2006/06/13 21:41:39 IFC @99173. Loopback the linker stuff from today. Affected files ... .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#7 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#7 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#7 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#7 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#25 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#24 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#25 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#25 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#69 integrate .. //depot/projects/smpng/sys/kern/subr_firmware.c#10 integrate .. //depot/projects/smpng/sys/sparc64/conf/DEFAULTS#4 integrate .. //depot/projects/smpng/sys/sparc64/include/_bus.h#2 integrate .. //depot/projects/smpng/sys/sparc64/include/bus.h#27 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#28 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#7 (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.11 2006/05/10 18:19:51 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.12 2006/06/13 18:48:29 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.11 2006/05/10 18:19:51 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.12 2006/06/13 18:48:29 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp */ #define LINUX_SYS_exit 1 @@ -221,4 +221,4 @@ #define LINUX_SYS_linux_fremovexattr 237 #define LINUX_SYS_linux_fadvise64 250 #define LINUX_SYS_exit_group 252 -#define LINUX_SYS_MAXSYSCALL 268 +#define LINUX_SYS_MAXSYSCALL 311 ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.11 2006/05/10 18:19:51 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.12 2006/06/13 18:48:29 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp */ #include @@ -21,178 +21,178 @@ struct sysent linux_sysent[] = { #define nosys linux_nosys { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = setup */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_NULL }, /* 2 = linux_fork */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_NULL }, /* 5 = linux_open */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ - { SYF_MPSAFE | AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_NULL }, /* 7 = linux_waitpid */ - { SYF_MPSAFE | AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_NULL }, /* 8 = linux_creat */ - { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_NULL }, /* 9 = linux_link */ - { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_NULL }, /* 10 = linux_unlink */ - { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_NULL }, /* 11 = linux_execve */ - { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_NULL }, /* 12 = linux_chdir */ + { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 5 = linux_open */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { SYF_MPSAFE | AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4 }, /* 7 = linux_waitpid */ + { SYF_MPSAFE | AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT }, /* 8 = linux_creat */ + { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ + { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ + { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 11 = linux_execve */ + { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ { SYF_MPSAFE | AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL }, /* 13 = linux_time */ - { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_NULL }, /* 14 = linux_mknod */ - { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ - { SYF_MPSAFE | AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_NULL }, /* 16 = linux_lchown16 */ + { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ + { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ + { SYF_MPSAFE | AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN }, /* 16 = linux_lchown16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 17 = break */ - { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_NULL }, /* 18 = linux_stat */ - { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_NULL }, /* 19 = linux_lseek */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_NULL }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_NULL }, /* 22 = linux_oldumount */ - { SYF_MPSAFE | AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_NULL }, /* 23 = linux_setuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid16, AUE_NULL }, /* 24 = linux_getuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_stime, AUE_NULL }, /* 25 = linux_stime */ - { SYF_MPSAFE | AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_NULL }, /* 26 = linux_ptrace */ + { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 18 = linux_stat */ + { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_GETPID }, /* 20 = linux_getpid */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ + { SYF_MPSAFE | AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID }, /* 23 = linux_setuid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid16, AUE_GETUID }, /* 24 = linux_getuid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY }, /* 25 = linux_stime */ + { SYF_MPSAFE | AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ { SYF_MPSAFE | AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL }, /* 27 = linux_alarm */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 28 = fstat */ { SYF_MPSAFE | 0, (sy_call_t *)linux_pause, AUE_NULL }, /* 29 = linux_pause */ - { SYF_MPSAFE | AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_NULL }, /* 30 = linux_utime */ + { SYF_MPSAFE | AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME }, /* 30 = linux_utime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = stty */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = gtty */ - { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_NULL }, /* 33 = linux_access */ - { SYF_MPSAFE | AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NULL }, /* 34 = linux_nice */ + { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ + { SYF_MPSAFE | AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE }, /* 34 = linux_nice */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = ftime */ - { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ - { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_NULL }, /* 37 = linux_kill */ - { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_NULL }, /* 38 = linux_rename */ - { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_NULL }, /* 39 = linux_mkdir */ - { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_NULL }, /* 40 = linux_rmdir */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_NULL }, /* 41 = dup */ - { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_NULL }, /* 42 = linux_pipe */ + { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ + { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ + { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 38 = linux_rename */ + { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 39 = linux_mkdir */ + { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 40 = linux_rmdir */ + { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ + { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ - { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_NULL }, /* 46 = linux_setgid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_NULL }, /* 47 = linux_getgid16 */ + { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ { SYF_MPSAFE | AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_geteuid16, AUE_NULL }, /* 49 = linux_geteuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getegid16, AUE_NULL }, /* 50 = linux_getegid16 */ - { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_NULL }, /* 52 = linux_umount */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID }, /* 49 = linux_geteuid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getegid16, AUE_GETEGID }, /* 50 = linux_getegid16 */ + { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = lock */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_NULL }, /* 54 = linux_ioctl */ - { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_NULL }, /* 55 = linux_fcntl */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ + { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = mpx */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 57 = setpgid */ + { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 57 = setpgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 58 = ulimit */ { SYF_MPSAFE | 0, (sy_call_t *)linux_olduname, AUE_NULL }, /* 59 = linux_olduname */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ { SYF_MPSAFE | AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 62 = linux_ustat */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_NULL }, /* 63 = dup2 */ - { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_NULL }, /* 64 = getppid */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_NULL }, /* 65 = getpgrp */ - { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_NULL }, /* 66 = setsid */ + { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 63 = dup2 */ + { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 64 = getppid */ + { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 65 = getpgrp */ + { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 66 = setsid */ { SYF_MPSAFE | AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL }, /* 67 = linux_sigaction */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sgetmask, AUE_NULL }, /* 68 = linux_sgetmask */ { SYF_MPSAFE | AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL }, /* 69 = linux_ssetmask */ - { SYF_MPSAFE | AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_NULL }, /* 70 = linux_setreuid16 */ - { SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_NULL }, /* 71 = linux_setregid16 */ + { SYF_MPSAFE | AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID }, /* 70 = linux_setreuid16 */ + { SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID }, /* 71 = linux_setregid16 */ { SYF_MPSAFE | AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL }, /* 72 = linux_sigsuspend */ { SYF_MPSAFE | AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL }, /* 73 = linux_sigpending */ - { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_NULL }, /* 74 = linux_sethostname */ - { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_NULL }, /* 75 = linux_setrlimit */ - { SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_NULL }, /* 76 = linux_old_getrlimit */ - { SYF_MPSAFE | AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_NULL }, /* 77 = linux_getrusage */ + { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 74 = linux_sethostname */ + { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 75 = linux_setrlimit */ + { SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT }, /* 76 = linux_old_getrlimit */ + { SYF_MPSAFE | AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE }, /* 77 = linux_getrusage */ { SYF_MPSAFE | AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL }, /* 78 = linux_gettimeofday */ - { SYF_MPSAFE | AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_NULL }, /* 79 = linux_settimeofday */ - { SYF_MPSAFE | AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_NULL }, /* 80 = linux_getgroups16 */ - { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_NULL }, /* 81 = linux_setgroups16 */ - { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_NULL }, /* 82 = linux_old_select */ - { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_NULL }, /* 83 = linux_symlink */ - { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_NULL }, /* 84 = linux_lstat */ - { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_NULL }, /* 85 = linux_readlink */ + { SYF_MPSAFE | AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY }, /* 79 = linux_settimeofday */ + { SYF_MPSAFE | AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS }, /* 80 = linux_getgroups16 */ + { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ + { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ + { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ + { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT }, /* 84 = linux_lstat */ + { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = linux_uselib */ - { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_NULL }, /* 87 = swapon */ - { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_NULL }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_NULL }, /* 89 = linux_readdir */ - { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_NULL }, /* 90 = linux_mmap */ - { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_NULL }, /* 91 = munmap */ - { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_NULL }, /* 92 = linux_truncate */ - { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_NULL }, /* 93 = linux_ftruncate */ - { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL }, /* 94 = fchmod */ - { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 95 = fchown */ - { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_NULL }, /* 96 = linux_getpriority */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_NULL }, /* 97 = setpriority */ + { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ + { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ + { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ + { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ + { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ + { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 93 = linux_ftruncate */ + { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 94 = fchmod */ + { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 95 = fchown */ + { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 96 = linux_getpriority */ + { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 97 = setpriority */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 98 = profil */ - { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_NULL }, /* 99 = linux_statfs */ - { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_NULL }, /* 100 = linux_fstatfs */ + { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 99 = linux_statfs */ + { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 100 = linux_fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 101 = ioperm */ { SYF_MPSAFE | AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL }, /* 102 = linux_socketcall */ { SYF_MPSAFE | AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 103 = linux_syslog */ - { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_NULL }, /* 104 = linux_setitimer */ - { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_NULL }, /* 105 = linux_getitimer */ - { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_NULL }, /* 106 = linux_newstat */ - { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_NULL }, /* 107 = linux_newlstat */ - { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_NULL }, /* 108 = linux_newfstat */ + { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 104 = linux_setitimer */ + { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 105 = linux_getitimer */ + { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 106 = linux_newstat */ + { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 107 = linux_newlstat */ + { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 108 = linux_newfstat */ { SYF_MPSAFE | 0, (sy_call_t *)linux_uname, AUE_NULL }, /* 109 = linux_uname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = iopl */ { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 111 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = idle */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 113 = vm86old */ - { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_NULL }, /* 114 = linux_wait4 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_NULL }, /* 115 = linux_swapoff */ + { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ { SYF_MPSAFE | AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 118 = fsync */ - { SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_NULL }, /* 119 = linux_sigreturn */ - { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_NULL }, /* 120 = linux_clone */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_NULL }, /* 121 = setdomainname */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ + { SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ + { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ + { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 121 = setdomainname */ { SYF_MPSAFE | AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 122 = linux_newuname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 123 = modify_ldt */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_NULL }, /* 124 = linux_adjtimex */ - { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_NULL }, /* 125 = linux_mprotect */ - { SYF_MPSAFE | AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_NULL }, /* 126 = linux_sigprocmask */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 124 = linux_adjtimex */ + { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 125 = linux_mprotect */ + { SYF_MPSAFE | AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK }, /* 126 = linux_sigprocmask */ { SYF_MPSAFE | 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 127 = linux_create_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 128 = linux_init_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 129 = linux_delete_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 130 = linux_get_kernel_syms */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_NULL }, /* 131 = linux_quotactl */ - { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_NULL }, /* 132 = getpgid */ - { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_NULL }, /* 133 = fchdir */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_NULL }, /* 134 = linux_bdflush */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 131 = linux_quotactl */ + { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 132 = getpgid */ + { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 133 = fchdir */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 134 = linux_bdflush */ { SYF_MPSAFE | AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 135 = linux_sysfs */ - { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_NULL }, /* 136 = linux_personality */ + { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 136 = linux_personality */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 137 = afs_syscall */ - { SYF_MPSAFE | AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_NULL }, /* 138 = linux_setfsuid16 */ - { SYF_MPSAFE | AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_NULL }, /* 139 = linux_setfsgid16 */ - { SYF_MPSAFE | AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_NULL }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_NULL }, /* 141 = linux_getdents */ - { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_NULL }, /* 142 = linux_select */ - { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_NULL }, /* 143 = flock */ - { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_NULL }, /* 144 = linux_msync */ - { SYF_MPSAFE | AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_NULL }, /* 145 = linux_readv */ - { SYF_MPSAFE | AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_NULL }, /* 146 = linux_writev */ - { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_NULL }, /* 147 = linux_getsid */ + { SYF_MPSAFE | AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */ + { SYF_MPSAFE | AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */ + { SYF_MPSAFE | AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ + { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */ + { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */ + { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */ + { SYF_MPSAFE | AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV }, /* 145 = linux_readv */ + { SYF_MPSAFE | AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV }, /* 146 = linux_writev */ + { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 147 = linux_getsid */ { SYF_MPSAFE | AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL }, /* 148 = linux_fdatasync */ - { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_NULL }, /* 149 = linux_sysctl */ - { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_NULL }, /* 150 = mlock */ - { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_NULL }, /* 151 = munlock */ - { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_NULL }, /* 152 = mlockall */ - { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_NULL }, /* 153 = munlockall */ - { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL }, /* 154 = sched_setparam */ - { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL }, /* 155 = sched_getparam */ - { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_NULL }, /* 156 = linux_sched_setscheduler */ - { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_NULL }, /* 157 = linux_sched_getscheduler */ + { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 149 = linux_sysctl */ + { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 150 = mlock */ + { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 151 = munlock */ + { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 152 = mlockall */ + { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 153 = munlockall */ + { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 154 = sched_setparam */ + { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 155 = sched_getparam */ + { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 156 = linux_sched_setscheduler */ + { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 157 = linux_sched_getscheduler */ { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 158 = sched_yield */ - { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_NULL }, /* 159 = linux_sched_get_priority_max */ - { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_NULL }, /* 160 = linux_sched_get_priority_min */ - { SYF_MPSAFE | AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_NULL }, /* 161 = linux_sched_rr_get_interval */ + { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 159 = linux_sched_get_priority_max */ + { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 160 = linux_sched_get_priority_min */ + { SYF_MPSAFE | AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 161 = linux_sched_rr_get_interval */ { SYF_MPSAFE | AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL }, /* 162 = linux_nanosleep */ { SYF_MPSAFE | AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 163 = linux_mremap */ - { SYF_MPSAFE | AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_NULL }, /* 164 = linux_setresuid16 */ - { SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_NULL }, /* 165 = linux_getresuid16 */ + { SYF_MPSAFE | AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID }, /* 164 = linux_setresuid16 */ + { SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID }, /* 165 = linux_getresuid16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 166 = vm86 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 167 = linux_query_module */ - { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_NULL }, /* 168 = poll */ + { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 168 = poll */ { SYF_MPSAFE | 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 169 = linux_nfsservctl */ - { SYF_MPSAFE | AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_NULL }, /* 170 = linux_setresgid16 */ - { SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_NULL }, /* 171 = linux_getresgid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_NULL }, /* 172 = linux_prctl */ + { SYF_MPSAFE | AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID }, /* 170 = linux_setresgid16 */ + { SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID }, /* 171 = linux_getresgid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 172 = linux_prctl */ { SYF_MPSAFE | AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */ { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */ { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */ @@ -200,48 +200,48 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 177 = linux_rt_sigtimedwait */ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 178 = linux_rt_sigqueueinfo */ { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 179 = linux_rt_sigsuspend */ - { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_NULL }, /* 180 = linux_pread */ - { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_NULL }, /* 181 = linux_pwrite */ - { SYF_MPSAFE | AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_NULL }, /* 182 = linux_chown16 */ - { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_NULL }, /* 183 = linux_getcwd */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_NULL }, /* 184 = linux_capget */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_NULL }, /* 185 = linux_capset */ + { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 180 = linux_pread */ + { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 181 = linux_pwrite */ + { SYF_MPSAFE | AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN }, /* 182 = linux_chown16 */ + { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 183 = linux_getcwd */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 184 = linux_capget */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 185 = linux_capset */ { SYF_MPSAFE | AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 186 = linux_sigaltstack */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_NULL }, /* 187 = linux_sendfile */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 187 = linux_sendfile */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 188 = getpmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 189 = putpmsg */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_NULL }, /* 190 = linux_vfork */ - { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_NULL }, /* 191 = linux_getrlimit */ - { SYF_MPSAFE | AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_NULL }, /* 192 = linux_mmap2 */ - { SYF_MPSAFE | AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_NULL }, /* 193 = linux_truncate64 */ - { SYF_MPSAFE | AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_NULL }, /* 194 = linux_ftruncate64 */ - { SYF_MPSAFE | AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_NULL }, /* 195 = linux_stat64 */ - { SYF_MPSAFE | AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_NULL }, /* 196 = linux_lstat64 */ - { SYF_MPSAFE | AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_NULL }, /* 197 = linux_fstat64 */ - { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_NULL }, /* 198 = linux_lchown */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid, AUE_NULL }, /* 199 = linux_getuid */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid, AUE_NULL }, /* 200 = linux_getgid */ - { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_NULL }, /* 201 = geteuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_NULL }, /* 202 = getegid */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_NULL }, /* 203 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_NULL }, /* 204 = setregid */ - { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_NULL }, /* 205 = linux_getgroups */ - { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_NULL }, /* 206 = linux_setgroups */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 190 = linux_vfork */ + { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 191 = linux_getrlimit */ + { SYF_MPSAFE | AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP }, /* 192 = linux_mmap2 */ + { SYF_MPSAFE | AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE }, /* 193 = linux_truncate64 */ + { SYF_MPSAFE | AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE }, /* 194 = linux_ftruncate64 */ + { SYF_MPSAFE | AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT }, /* 195 = linux_stat64 */ + { SYF_MPSAFE | AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT }, /* 196 = linux_lstat64 */ + { SYF_MPSAFE | AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT }, /* 197 = linux_fstat64 */ + { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 198 = linux_lchown */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid, AUE_GETUID }, /* 199 = linux_getuid */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid, AUE_GETGID }, /* 200 = linux_getgid */ + { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 201 = geteuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 202 = getegid */ + { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 203 = setreuid */ + { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 204 = setregid */ + { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 205 = linux_getgroups */ + { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 206 = linux_setgroups */ { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 207 = fchown */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_NULL }, /* 208 = setresuid */ - { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 209 = getresuid */ - { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_NULL }, /* 210 = setresgid */ - { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 211 = getresgid */ - { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_NULL }, /* 212 = linux_chown */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_NULL }, /* 213 = setuid */ - { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_NULL }, /* 214 = setgid */ - { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_NULL }, /* 215 = linux_setfsuid */ - { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_NULL }, /* 216 = linux_setfsgid */ - { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_NULL }, /* 217 = linux_pivot_root */ - { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_NULL }, /* 218 = linux_mincore */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_NULL }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_NULL }, /* 220 = linux_getdents64 */ - { SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_NULL }, /* 221 = linux_fcntl64 */ + { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 208 = setresuid */ + { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 209 = getresuid */ + { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 210 = setresgid */ + { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 211 = getresgid */ + { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 212 = linux_chown */ + { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 213 = setuid */ + { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 214 = setgid */ + { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 215 = linux_setfsuid */ + { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 216 = linux_setfsgid */ + { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */ + { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ + { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ + { SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 224 = gettid */ @@ -272,7 +272,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = linux_io_cancel */ { SYF_MPSAFE | 0, (sy_call_t *)linux_fadvise64, AUE_NULL }, /* 250 = linux_fadvise64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 251 = */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 252 = exit_group */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 252 = exit_group */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 253 = linux_lookup_dcookie */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 254 = linux_epoll_create */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 255 = linux_epoll_ctl */ @@ -288,4 +288,47 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 265 = linux_clock_gettime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 266 = linux_clock_getres */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 267 = linux_clock_nanosleep */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 268 = linux_statfs64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 269 = linux_fstatfs64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 270 = linux_tgkill */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 271 = linux_utimes */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 272 = linux_fadvise64_64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = linux_ni_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 274 = linux_mbind */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 275 = linux_get_mempolicy */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 276 = linux_set_mempolicy */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 277 = linux_mq_open */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 278 = linux_mq_unlink */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 279 = linux_mq_timedsend */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 280 = linux_mq_timedreceive */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 281 = linux_mq_notify */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 282 = linux_mq_getsetattr */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 283 = linux_kexec_load */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 284 = linux_waitid */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = linux_ni_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 286 = linux_add_key */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 287 = linux_request_key */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 288 = linux_keyctl */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 289 = linux_ioprio_set */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 290 = linux_ioprio_get */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 291 = linux_inotify_init */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 292 = linux_inotify_add_watch */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 294 = linux_migrate_pages */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 295 = linux_openat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 296 = linux_mkdirat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 297 = linux_mknodat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 298 = linux_fchownat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = linux_futimesat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 300 = linux_fstatat64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 301 = linux_unlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 302 = linux_renameat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 303 = linux_linkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 304 = linux_symlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 305 = linux_readlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 306 = linux_fchmodat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 307 = linux_faccessat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 308 = linux_pselect6 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 309 = linux_ppoll */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 310 = linux_unshare */ }; ==== //depot/projects/smpng/sys/amd64/linux32/syscalls.master#7 (text+ko) ==== @@ -1,10 +1,10 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ; Processed to create linux_sysent.c, linux_proto.h and linux_syscall.h. -; Columns: number type nargs name alt{name,tag,rtyp}/comments +; Columns: number audit type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that @@ -14,15 +14,20 @@ ; type one of STD, OBSOL, UNIMPL ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: +; audit the audit event associated with the system call +; A value of AUE_NULL means no auditing, but it also means that +; there is no audit event for the call at this time. For the +; case where the event exists, but we don't want auditing, the +; event should be #defined to AUE_NULL in audit_kevents.h. ; altname name of system call if different ; alttag name of args struct tag if different from [o]`name'"_args" ; altrtyp return type if not int (bogus - syscalls always return int) ; for UNIMPL/OBSOL, name continues with comments ; types: -; STD always included +; AUE_NULL STD always included ; OBSOL obsolete, not included in system, only specifies name -; UNIMPL not implemented, placeholder only +; AUE_NULL UNIMPL not implemented, placeholder only #include "opt_compat.h" #include @@ -38,247 +43,244 @@ ; #ifdef's, etc. may be included, and are copied to the output files. 0 AUE_NULL UNIMPL setup -1 AUE_NULL MNOPROTO { void sys_exit(int rval); } exit \ +1 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit \ sys_exit_args void -2 AUE_NULL MSTD { int linux_fork(void); } +2 AUE_FORK MSTD { int linux_fork(void); } 3 AUE_NULL MNOPROTO { int read(int fd, char *buf, \ u_int nbyte); } 4 AUE_NULL MNOPROTO { int write(int fd, char *buf, \ u_int nbyte); } -5 AUE_NULL MSTD { int linux_open(char *path, l_int flags, \ +5 AUE_OPEN_RWTC MSTD { int linux_open(char *path, l_int flags, \ l_int mode); } -6 AUE_NULL MNOPROTO { int close(int fd); } -7 AUE_NULL MSTD { int linux_waitpid(l_pid_t pid, \ +6 AUE_CLOSE MNOPROTO { int close(int fd); } +7 AUE_WAIT4 MSTD { int linux_waitpid(l_pid_t pid, \ l_int *status, l_int options); } -8 AUE_NULL MSTD { int linux_creat(char *path, l_int mode); } -9 AUE_NULL MSTD { int linux_link(char *path, char *to); } -10 AUE_NULL MSTD { int linux_unlink(char *path); } -11 AUE_NULL MSTD { int linux_execve(char *path, char **argp, \ +8 AUE_O_CREAT MSTD { int linux_creat(char *path, \ + l_int mode); } +9 AUE_LINK MSTD { int linux_link(char *path, char *to); } +10 AUE_UNLINK MSTD { int linux_unlink(char *path); } +11 AUE_EXECVE MSTD { int linux_execve(char *path, char **argp, \ char **envp); } -12 AUE_NULL MSTD { int linux_chdir(char *path); } +12 AUE_CHDIR MSTD { int linux_chdir(char *path); } 13 AUE_NULL MSTD { int linux_time(l_time_t *tm); } -14 AUE_NULL MSTD { int linux_mknod(char *path, l_int mode, \ +14 AUE_MKNOD MSTD { int linux_mknod(char *path, l_int mode, \ l_dev_t dev); } -15 AUE_NULL MSTD { int linux_chmod(char *path, \ +15 AUE_CHMOD MSTD { int linux_chmod(char *path, \ l_mode_t mode); } -16 AUE_NULL MSTD { int linux_lchown16(char *path, \ +16 AUE_LCHOWN MSTD { int linux_lchown16(char *path, \ l_uid16_t uid, l_gid16_t gid); } 17 AUE_NULL UNIMPL break -18 AUE_NULL MSTD { int linux_stat(char *path, \ - struct linux_stat *up); } -19 AUE_NULL MSTD { int linux_lseek(l_uint fdes, l_off_t off, \ +18 AUE_STAT MSTD { int linux_stat(char *path, \ + struct linux_stat *up); } +19 AUE_LSEEK MSTD { int linux_lseek(l_uint fdes, l_off_t off, \ l_int whence); } -20 AUE_NULL MSTD { int linux_getpid(void); } -21 AUE_NULL STD { int linux_mount(char *specialfile, \ +20 AUE_GETPID MSTD { int linux_getpid(void); } +21 AUE_MOUNT STD { int linux_mount(char *specialfile, \ char *dir, char *filesystemtype, \ l_ulong rwflag, void *data); } -22 AUE_NULL STD { int linux_oldumount(char *path); } -23 AUE_NULL MSTD { int linux_setuid16(l_uid16_t uid); } -24 AUE_NULL MSTD { int linux_getuid16(void); } -25 AUE_NULL MSTD { int linux_stime(void); } -26 AUE_NULL MSTD { int linux_ptrace(l_long req, l_long pid, \ +22 AUE_UMOUNT STD { int linux_oldumount(char *path); } +23 AUE_SETUID MSTD { int linux_setuid16(l_uid16_t uid); } +24 AUE_GETUID MSTD { int linux_getuid16(void); } +25 AUE_SETTIMEOFDAY MSTD { int linux_stime(void); } +26 AUE_PTRACE MSTD { int linux_ptrace(l_long req, l_long pid, \ l_long addr, l_long data); } 27 AUE_NULL MSTD { int linux_alarm(l_uint secs); } 28 AUE_NULL UNIMPL fstat 29 AUE_NULL MSTD { int linux_pause(void); } -30 AUE_NULL MSTD { int linux_utime(char *fname, \ +30 AUE_UTIME MSTD { int linux_utime(char *fname, \ struct l_utimbuf *times); } 31 AUE_NULL UNIMPL stty 32 AUE_NULL UNIMPL gtty -33 AUE_NULL MSTD { int linux_access(char *path, l_int flags); } -34 AUE_NULL MSTD { int linux_nice(l_int inc); } +33 AUE_ACCESS MSTD { int linux_access(char *path, l_int flags); } +34 AUE_NICE MSTD { int linux_nice(l_int inc); } 35 AUE_NULL UNIMPL ftime -36 AUE_NULL MNOPROTO { int sync(void); } -37 AUE_NULL MSTD { int linux_kill(l_int pid, l_int signum); } -38 AUE_NULL MSTD { int linux_rename(char *from, char *to); } -39 AUE_NULL MSTD { int linux_mkdir(char *path, l_int mode); } -40 AUE_NULL MSTD { int linux_rmdir(char *path); } -41 AUE_NULL MNOPROTO { int dup(u_int fd); } -42 AUE_NULL MSTD { int linux_pipe(l_ulong *pipefds); } +36 AUE_SYNC MNOPROTO { int sync(void); } +37 AUE_KILL MSTD { int linux_kill(l_int pid, l_int signum); } +38 AUE_RENAME MSTD { int linux_rename(char *from, char *to); } +39 AUE_MKDIR MSTD { int linux_mkdir(char *path, l_int mode); } +40 AUE_RMDIR MSTD { int linux_rmdir(char *path); } +41 AUE_DUP MNOPROTO { int dup(u_int fd); } +42 AUE_PIPE MSTD { int linux_pipe(l_ulong *pipefds); } 43 AUE_NULL MSTD { int linux_times(struct l_times_argv *buf); } 44 AUE_NULL UNIMPL prof 45 AUE_NULL STD { int linux_brk(l_ulong dsend); } -46 AUE_NULL MSTD { int linux_setgid16(l_gid16_t gid); } -47 AUE_NULL MSTD { int linux_getgid16(void); } +46 AUE_SETGID MSTD { int linux_setgid16(l_gid16_t gid); } +47 AUE_GETGID MSTD { int linux_getgid16(void); } 48 AUE_NULL MSTD { int linux_signal(l_int sig, \ l_handler_t handler); } -49 AUE_NULL MSTD { int linux_geteuid16(void); } -50 AUE_NULL MSTD { int linux_getegid16(void); } -51 AUE_NULL MNOPROTO { int acct(char *path); } -52 AUE_NULL STD { int linux_umount(char *path, l_int flags); } +49 AUE_GETEUID MSTD { int linux_geteuid16(void); } +50 AUE_GETEGID MSTD { int linux_getegid16(void); } +51 AUE_ACCT MNOPROTO { int acct(char *path); } +52 AUE_UMOUNT STD { int linux_umount(char *path, l_int flags); } 53 AUE_NULL UNIMPL lock -54 AUE_NULL STD { int linux_ioctl(l_uint fd, l_uint cmd, \ +54 AUE_IOCTL STD { int linux_ioctl(l_uint fd, l_uint cmd, \ uintptr_t arg); } -55 AUE_NULL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \ +55 AUE_FCNTL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \ uintptr_t arg); } 56 AUE_NULL UNIMPL mpx -57 AUE_NULL MNOPROTO { int setpgid(int pid, int pgid); } +57 AUE_SETPGRP MNOPROTO { int setpgid(int pid, int pgid); } 58 AUE_NULL UNIMPL ulimit 59 AUE_NULL MSTD { int linux_olduname(void); } -60 AUE_NULL MNOPROTO { int umask(int newmask); } -61 AUE_NULL MNOPROTO { int chroot(char *path); } +60 AUE_UMASK MNOPROTO { int umask(int newmask); } +61 AUE_CHROOT MNOPROTO { int chroot(char *path); } 62 AUE_NULL MSTD { int linux_ustat(l_dev_t dev, \ struct l_ustat *ubuf); } -63 AUE_NULL MNOPROTO { int dup2(u_int from, u_int to); } -64 AUE_NULL MNOPROTO { int getppid(void); } -65 AUE_NULL MNOPROTO { int getpgrp(void); } -66 AUE_NULL MNOPROTO { int setsid(void); } +63 AUE_DUP2 MNOPROTO { int dup2(u_int from, u_int to); } +64 AUE_GETPPID MNOPROTO { int getppid(void); } +65 AUE_GETPGRP MNOPROTO { int getpgrp(void); } +66 AUE_SETSID MNOPROTO { int setsid(void); } 67 AUE_NULL MSTD { int linux_sigaction(l_int sig, \ l_osigaction_t *nsa, \ l_osigaction_t *osa); } 68 AUE_NULL MSTD { int linux_sgetmask(void); } 69 AUE_NULL MSTD { int linux_ssetmask(l_osigset_t mask); } -70 AUE_NULL MSTD { int linux_setreuid16(l_uid16_t ruid, \ +70 AUE_SETREUID MSTD { int linux_setreuid16(l_uid16_t ruid, \ l_uid16_t euid); } -71 AUE_NULL MSTD { int linux_setregid16(l_gid16_t rgid, \ +71 AUE_SETREGID MSTD { int linux_setregid16(l_gid16_t rgid, \ l_gid16_t egid); } 72 AUE_NULL MSTD { int linux_sigsuspend(l_int hist0, \ l_int hist1, l_osigset_t mask); } 73 AUE_NULL MSTD { int linux_sigpending(l_osigset_t *mask); } -74 AUE_NULL MSTD { int linux_sethostname(char *hostname, \ +74 AUE_SYSCTL MSTD { int linux_sethostname(char *hostname, \ u_int len); } -75 AUE_NULL MSTD { int linux_setrlimit(l_uint resource, \ +75 AUE_SETRLIMIT MSTD { int linux_setrlimit(l_uint resource, \ struct l_rlimit *rlim); } -76 AUE_NULL MSTD { int linux_old_getrlimit(l_uint resource, \ +76 AUE_GETRLIMIT MSTD { int linux_old_getrlimit(l_uint resource, \ struct l_rlimit *rlim); } -77 AUE_NULL MSTD { int linux_getrusage(int who, \ +77 AUE_GETRUSAGE MSTD { int linux_getrusage(int who, \ struct l_rusage *rusage); } 78 AUE_NULL MSTD { int linux_gettimeofday( \ struct l_timeval *tp, \ struct timezone *tzp); } -79 AUE_NULL MSTD { int linux_settimeofday( \ +79 AUE_SETTIMEOFDAY MSTD { int linux_settimeofday( \ struct l_timeval *tp, \ struct timezone *tzp); } -80 AUE_NULL MSTD { int linux_getgroups16(l_uint gidsetsize, \ +80 AUE_GETGROUPS MSTD { int linux_getgroups16(l_uint gidsetsize, \ l_gid16_t *gidset); } -81 AUE_NULL MSTD { int linux_setgroups16(l_uint gidsetsize, \ +81 AUE_SETGROUPS MSTD { int linux_setgroups16(l_uint gidsetsize, \ l_gid16_t *gidset); } -82 AUE_NULL MSTD { int linux_old_select( \ +82 AUE_SELECT MSTD { int linux_old_select( \ struct l_old_select_argv *ptr); } -83 AUE_NULL MSTD { int linux_symlink(char *path, \ - char *to); } -84 AUE_NULL MSTD { int linux_lstat(char *path, struct linux_lstat *up); } -85 AUE_NULL MSTD { int linux_readlink(char *name, \ - char *buf, l_int count); } +83 AUE_SYMLINK MSTD { int linux_symlink(char *path, char *to); } +84 AUE_LSTAT MSTD { int linux_lstat(char *path, struct linux_lstat *up); } +85 AUE_READLINK MSTD { int linux_readlink(char *name, char *buf, \ + l_int count); } 86 AUE_NULL UNIMPL linux_uselib -87 AUE_NULL MNOPROTO { int swapon(char *name); } -88 AUE_NULL MSTD { int linux_reboot(l_int magic1, \ - l_int magic2, l_uint cmd, \ - void *arg); } -89 AUE_NULL STD { int linux_readdir(l_uint fd, \ +87 AUE_SWAPON MNOPROTO { int swapon(char *name); } +88 AUE_REBOOT MSTD { int linux_reboot(l_int magic1, \ + l_int magic2, l_uint cmd, void *arg); } +89 AUE_O_GETDENTS STD { int linux_readdir(l_uint fd, \ struct l_dirent *dent, l_uint count); } -90 AUE_NULL MSTD { int linux_mmap(struct l_mmap_argv *ptr); } -91 AUE_NULL MNOPROTO { int munmap(caddr_t addr, int len); } -92 AUE_NULL MSTD { int linux_truncate(char *path, \ +90 AUE_MMAP MSTD { int linux_mmap(struct l_mmap_argv *ptr); } +91 AUE_MUNMAP MNOPROTO { int munmap(caddr_t addr, int len); } +92 AUE_TRUNCATE MSTD { int linux_truncate(char *path, \ l_ulong length); } -93 AUE_NULL MSTD { int linux_ftruncate(int fd, long length); } -94 AUE_NULL MNOPROTO { int fchmod(int fd, int mode); } -95 AUE_NULL MNOPROTO { int fchown(int fd, int uid, int gid); } -96 AUE_NULL MSTD { int linux_getpriority(int which, int who); } -97 AUE_NULL MNOPROTO { int setpriority(int which, int who, \ +93 AUE_FTRUNCATE MSTD { int linux_ftruncate(int fd, long length); } +94 AUE_FCHMOD MNOPROTO { int fchmod(int fd, int mode); } +95 AUE_FCHOWN MNOPROTO { int fchown(int fd, int uid, int gid); } +96 AUE_GETPRIORITY MSTD { int linux_getpriority(int which, int who); } +97 AUE_SETPRIORITY MNOPROTO { int setpriority(int which, int who, \ int prio); } -98 AUE_NULL UNIMPL profil -99 AUE_NULL MSTD { int linux_statfs(char *path, \ +98 AUE_AUE_PROFILE UNIMPL profil +99 AUE_STATFS MSTD { int linux_statfs(char *path, \ struct l_statfs_buf *buf); } -100 AUE_NULL MSTD { int linux_fstatfs(l_uint fd, \ +100 AUE_FSTATFS MSTD { int linux_fstatfs(l_uint fd, \ struct l_statfs_buf *buf); } 101 AUE_NULL UNIMPL ioperm 102 AUE_NULL MSTD { int linux_socketcall(l_int what, \ l_ulong args); } 103 AUE_NULL MSTD { int linux_syslog(l_int type, char *buf, \ l_int len); } -104 AUE_NULL MSTD { int linux_setitimer(l_int which, \ +104 AUE_SETITIMER MSTD { int linux_setitimer(l_int which, \ struct l_itimerval *itv, \ struct l_itimerval *oitv); } -105 AUE_NULL MSTD { int linux_getitimer(l_int which, \ +105 AUE_GETITIMER MSTD { int linux_getitimer(l_int which, \ struct l_itimerval *itv); } -106 AUE_NULL MSTD { int linux_newstat(char *path, \ +106 AUE_STAT MSTD { int linux_newstat(char *path, \ struct l_newstat *buf); } -107 AUE_NULL MSTD { int linux_newlstat(char *path, \ +107 AUE_LSTAT MSTD { int linux_newlstat(char *path, \ struct l_newstat *buf); } -108 AUE_NULL MSTD { int linux_newfstat(l_uint fd, \ +108 AUE_FSTAT MSTD { int linux_newfstat(l_uint fd, \ struct l_newstat *buf); } 109 AUE_NULL MSTD { int linux_uname(void); } 110 AUE_NULL UNIMPL iopl 111 AUE_NULL MSTD { int linux_vhangup(void); } 112 AUE_NULL UNIMPL idle 113 AUE_NULL UNIMPL vm86old -114 AUE_NULL MSTD { int linux_wait4(l_pid_t pid, \ +114 AUE_WAIT4 MSTD { int linux_wait4(l_pid_t pid, \ l_uint *status, l_int options, \ struct l_rusage *rusage); } -115 AUE_NULL MSTD { int linux_swapoff(void); } +115 AUE_SWAPOFF MSTD { int linux_swapoff(void); } 116 AUE_NULL MSTD { int linux_sysinfo(struct l_sysinfo *info); } 117 AUE_NULL STD { int linux_ipc(l_uint what, l_int arg1, \ l_int arg2, l_int arg3, void *ptr, \ l_long arg5); } -118 AUE_NULL MNOPROTO { int fsync(int fd); } -119 AUE_NULL MSTD { int linux_sigreturn( \ +118 AUE_FSYNC MNOPROTO { int fsync(int fd); } +119 AUE_SIGRETURN MSTD { int linux_sigreturn( \ struct l_sigframe *sfp); } -120 AUE_NULL MSTD { int linux_clone(l_int flags, \ - void *stack); } -121 AUE_NULL MNOPROTO { int setdomainname(char *name, int len); } +120 AUE_RFORK MSTD { int linux_clone(l_int flags, void *stack); } +121 AUE_SYSCTL MNOPROTO { int setdomainname(char *name, \ + int len); } 122 AUE_NULL MSTD { int linux_newuname( \ struct l_new_utsname *buf); } 123 AUE_NULL UNIMPL modify_ldt -124 AUE_NULL MSTD { int linux_adjtimex(void); } -125 AUE_NULL MSTD { int linux_mprotect(caddr_t addr, int len, \ +124 AUE_ADJTIME MSTD { int linux_adjtimex(void); } +125 AUE_MPROTECT MSTD { int linux_mprotect(caddr_t addr, int len, \ int prot); } -126 AUE_NULL MSTD { int linux_sigprocmask(l_int how, \ +126 AUE_SIGPROCMASK MSTD { int linux_sigprocmask(l_int how, \ l_osigset_t *mask, l_osigset_t *omask); } 127 AUE_NULL MSTD { int linux_create_module(void); } 128 AUE_NULL MSTD { int linux_init_module(void); } 129 AUE_NULL MSTD { int linux_delete_module(void); } 130 AUE_NULL MSTD { int linux_get_kernel_syms(void); } -131 AUE_NULL MSTD { int linux_quotactl(void); } -132 AUE_NULL MNOPROTO { int getpgid(int pid); } -133 AUE_NULL MNOPROTO { int fchdir(int fd); } -134 AUE_NULL MSTD { int linux_bdflush(void); } +131 AUE_QUOTACTL MSTD { int linux_quotactl(void); } +132 AUE_GETPGID MNOPROTO { int getpgid(int pid); } +133 AUE_FCHDIR MNOPROTO { int fchdir(int fd); } +134 AUE_BDFLUSH MSTD { int linux_bdflush(void); } 135 AUE_NULL MSTD { int linux_sysfs(l_int option, \ l_ulong arg1, l_ulong arg2); } -136 AUE_NULL MSTD { int linux_personality(l_ulong per); } +136 AUE_PERSONALITY MSTD { int linux_personality(l_ulong per); } 137 AUE_NULL UNIMPL afs_syscall -138 AUE_NULL MSTD { int linux_setfsuid16(l_uid16_t uid); } -139 AUE_NULL MSTD { int linux_setfsgid16(l_gid16_t gid); } -140 AUE_NULL MSTD { int linux_llseek(l_int fd, l_ulong ohigh, \ +138 AUE_SETFSUID MSTD { int linux_setfsuid16(l_uid16_t uid); } +139 AUE_SETFSGID MSTD { int linux_setfsgid16(l_gid16_t gid); } +140 AUE_LSEEK MSTD { int linux_llseek(l_int fd, l_ulong ohigh, \ l_ulong olow, l_loff_t *res, \ l_uint whence); } -141 AUE_NULL STD { int linux_getdents(l_uint fd, void *dent, \ +141 AUE_O_GETDENTS STD { int linux_getdents(l_uint fd, void *dent, \ l_uint count); } -142 AUE_NULL MSTD { int linux_select(l_int nfds, \ +142 AUE_SELECT MSTD { int linux_select(l_int nfds, \ l_fd_set *readfds, l_fd_set *writefds, \ l_fd_set *exceptfds, \ struct l_timeval *timeout); } -143 AUE_NULL MNOPROTO { int flock(int fd, int how); } -144 AUE_NULL MSTD { int linux_msync(l_ulong addr, \ +143 AUE_FLOCK MNOPROTO { int flock(int fd, int how); } +144 AUE_MSYNC MSTD { int linux_msync(l_ulong addr, \ l_size_t len, l_int fl); } -145 AUE_NULL MSTD { int linux_readv(int fd, \ - struct iovec32 *iovp, u_int iovcnt); } -146 AUE_NULL MSTD { int linux_writev(int fd, \ - struct iovec32 *iovp, u_int iovcnt); } -147 AUE_NULL MSTD { int linux_getsid(l_pid_t pid); } +145 AUE_READV MSTD { int linux_readv(int fd, struct iovec32 *iovp, \ + u_int iovcnt); } +146 AUE_WRITEV MSTD { int linux_writev(int fd, struct iovec32 *iovp, \ + u_int iovcnt); } +147 AUE_GETSID MSTD { int linux_getsid(l_pid_t pid); } 148 AUE_NULL MSTD { int linux_fdatasync(l_uint fd); } -149 AUE_NULL MSTD { int linux_sysctl( \ +149 AUE_SYSCTL MSTD { int linux_sysctl( \ struct l___sysctl_args *args); } -150 AUE_NULL MNOPROTO { int mlock(const void *addr, size_t len); } -151 AUE_NULL MNOPROTO { int munlock(const void *addr, \ - size_t len); } -152 AUE_NULL MNOPROTO { int mlockall(int how); } -153 AUE_NULL MNOPROTO { int munlockall(void); } -154 AUE_NULL MNOPROTO { int sched_setparam(pid_t pid, \ +150 AUE_MLOCK MNOPROTO { int mlock(const void *addr, size_t len); } +151 AUE_MUNLOCK MNOPROTO { int munlock(const void *addr, size_t len); } +152 AUE_MLOCKALL MNOPROTO { int mlockall(int how); } +153 AUE_MUNLOCKALL MNOPROTO { int munlockall(void); } +154 AUE_SCHED_SETPARAM MNOPROTO { int sched_setparam(pid_t pid, \ const struct sched_param *param); } -155 AUE_NULL MNOPROTO { int sched_getparam(pid_t pid, \ +155 AUE_SCHED_GETPARAM MNOPROTO { int sched_getparam(pid_t pid, \ struct sched_param *param); } -156 AUE_NULL MSTD { int linux_sched_setscheduler(l_pid_t pid, \ +156 AUE_SCHED_SETSCHEDULER MSTD { int linux_sched_setscheduler(l_pid_t pid, \ l_int policy, \ struct l_sched_param *param); } -157 AUE_NULL MSTD { int linux_sched_getscheduler(l_pid_t pid); } +157 AUE_SCHED_GETSCHEDULER MSTD { int linux_sched_getscheduler(l_pid_t pid); } 158 AUE_NULL MNOPROTO { int sched_yield(void); } -159 AUE_NULL MSTD { int linux_sched_get_priority_max( \ +159 AUE_SCHED_GET_PRIORITY_MAX MSTD { int linux_sched_get_priority_max( \ l_int policy); } -160 AUE_NULL MSTD { int linux_sched_get_priority_min( \ +160 AUE_SCHED_GET_PRIORITY_MIN MSTD { int linux_sched_get_priority_min( \ l_int policy); } -161 AUE_NULL MSTD { int linux_sched_rr_get_interval( \ - l_pid_t pid, \ +161 AUE_SCHED_RR_GET_INTERVAL MSTD { int linux_sched_rr_get_interval(l_pid_t pid, \ struct l_timespec *interval); } 162 AUE_NULL MSTD { int linux_nanosleep( \ const struct l_timespec *rqtp, \ @@ -286,20 +288,20 @@ 163 AUE_NULL MSTD { int linux_mremap(l_ulong addr, \ l_ulong old_len, l_ulong new_len, \ l_ulong flags, l_ulong new_addr); } -164 AUE_NULL MSTD { int linux_setresuid16(l_uid16_t ruid, \ +164 AUE_SETRESUID MSTD { int linux_setresuid16(l_uid16_t ruid, \ l_uid16_t euid, l_uid16_t suid); } -165 AUE_NULL MSTD { int linux_getresuid16(l_uid16_t *ruid, \ +165 AUE_GETRESUID MSTD { int linux_getresuid16(l_uid16_t *ruid, \ l_uid16_t *euid, l_uid16_t *suid); } 166 AUE_NULL UNIMPL vm86 167 AUE_NULL MSTD { int linux_query_module(void); } -168 AUE_NULL MNOPROTO { int poll(struct pollfd*, \ +168 AUE_POLL MNOPROTO { int poll(struct pollfd*, \ unsigned int nfds, int timeout); } 169 AUE_NULL MSTD { int linux_nfsservctl(void); } -170 AUE_NULL MSTD { int linux_setresgid16(l_gid16_t rgid, \ +170 AUE_SETRESGID MSTD { int linux_setresgid16(l_gid16_t rgid, \ l_gid16_t egid, l_gid16_t sgid); } -171 AUE_NULL MSTD { int linux_getresgid16(l_gid16_t *rgid, \ +171 AUE_GETRESGID MSTD { int linux_getresgid16(l_gid16_t *rgid, \ l_gid16_t *egid, l_gid16_t *sgid); } -172 AUE_NULL MSTD { int linux_prctl(void); } +172 AUE_PRCTL MSTD { int linux_prctl(void); } 173 AUE_NULL MSTD { int linux_rt_sigreturn( \ struct l_ucontext *ucp); } 174 AUE_NULL MSTD { int linux_rt_sigaction(l_int sig, \ @@ -315,78 +317,78 @@ 179 AUE_NULL MSTD { int linux_rt_sigsuspend( \ l_sigset_t *newset, \ l_size_t sigsetsize); } -180 AUE_NULL MSTD { int linux_pread(l_uint fd, char *buf, \ +180 AUE_PREAD MSTD { int linux_pread(l_uint fd, char *buf, \ l_size_t nbyte, l_loff_t offset); } -181 AUE_NULL MSTD { int linux_pwrite(l_uint fd, char *buf, \ +181 AUE_PWRITE MSTD { int linux_pwrite(l_uint fd, char *buf, \ l_size_t nbyte, l_loff_t offset); } -182 AUE_NULL MSTD { int linux_chown16(char *path, \ +182 AUE_CHOWN MSTD { int linux_chown16(char *path, \ l_uid16_t uid, l_gid16_t gid); } -183 AUE_NULL MSTD { int linux_getcwd(char *buf, \ +183 AUE_GETCWD MSTD { int linux_getcwd(char *buf, \ l_ulong bufsize); } -184 AUE_NULL MSTD { int linux_capget(void); } -185 AUE_NULL MSTD { int linux_capset(void); } +184 AUE_CAPGET MSTD { int linux_capget(void); } +185 AUE_CAPSET MSTD { int linux_capset(void); } 186 AUE_NULL MSTD { int linux_sigaltstack(l_stack_t *uss, \ l_stack_t *uoss); } -187 AUE_NULL MSTD { int linux_sendfile(void); } -188 AUE_NULL UNIMPL getpmsg -189 AUE_NULL UNIMPL putpmsg -190 AUE_NULL MSTD { int linux_vfork(void); } -191 AUE_NULL MSTD { int linux_getrlimit(l_uint resource, \ +187 AUE_SENDFILE MSTD { int linux_sendfile(void); } +188 AUE_GETPMSG UNIMPL getpmsg +189 AUE_PUTPMSG UNIMPL putpmsg +190 AUE_VFORK MSTD { int linux_vfork(void); } +191 AUE_GETRLIMIT MSTD { int linux_getrlimit(l_uint resource, \ struct l_rlimit *rlim); } -192 AUE_NULL MSTD { int linux_mmap2(l_ulong addr, l_ulong len, \ +192 AUE_MMAP MSTD { int linux_mmap2(l_ulong addr, l_ulong len, \ l_ulong prot, l_ulong flags, l_ulong fd, \ l_ulong pgoff); } -193 AUE_NULL MSTD { int linux_truncate64(char *path, \ +193 AUE_TRUNCATE MSTD { int linux_truncate64(char *path, \ l_loff_t length); } -194 AUE_NULL MSTD { int linux_ftruncate64(l_uint fd, \ +194 AUE_FTRUNCATE MSTD { int linux_ftruncate64(l_uint fd, \ l_loff_t length); } -195 AUE_NULL MSTD { int linux_stat64(char *filename, \ +195 AUE_STAT MSTD { int linux_stat64(char *filename, \ struct l_stat64 *statbuf, l_long flags); } -196 AUE_NULL MSTD { int linux_lstat64(char *filename, \ +196 AUE_LSTAT MSTD { int linux_lstat64(char *filename, \ struct l_stat64 *statbuf, l_long flags); } -197 AUE_NULL MSTD { int linux_fstat64(l_ulong fd, \ +197 AUE_FSTAT MSTD { int linux_fstat64(l_ulong fd, \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 13 21:46:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85BB916A47D; Tue, 13 Jun 2006 21:46:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6167C16A47B for ; Tue, 13 Jun 2006 21:46:56 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E591043D46 for ; Tue, 13 Jun 2006 21:46:55 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DLiZ1X097467 for ; Tue, 13 Jun 2006 21:44:35 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DLiZd4097464 for perforce@freebsd.org; Tue, 13 Jun 2006 21:44:35 GMT (envelope-from jhb@freebsd.org) Date: Tue, 13 Jun 2006 21:44:35 GMT Message-Id: <200606132144.k5DLiZd4097464@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 99176 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, 13 Jun 2006 21:46:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=99176 Change 99176 by jhb@jhb_mutex on 2006/06/13 21:43:34 Trim trailing whitespace. Affected files ... .. //depot/projects/smpng/sys/kern/kern_linker.c#70 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_linker.c#70 (text+ko) ==== @@ -192,7 +192,7 @@ /* * Perform a bubble sort of the system initialization objects by * their subsystem (primary key) and order (secondary key). - * + * * Since some things care about execution order, this is the operation * which ensures continued function. */ @@ -236,7 +236,7 @@ /* * Perform a reverse bubble sort of the system initialization objects * by their subsystem (primary key) and order (secondary key). - * + * * Since some things care about execution order, this is the operation * which ensures continued function. */ @@ -597,8 +597,8 @@ } } - /* - * Don't try to run SYSUNINITs if we are unloaded due to a + /* + * Don't try to run SYSUNINITs if we are unloaded due to a * link error. */ if (file->flags & LINKER_FILE_LINKED) { @@ -766,7 +766,7 @@ /* * DDB Helpers. DDB has to look across multiple files with their own symbol * tables and string tables. - * + * * Note that we do not obey list locking protocols here. We really don't need * DDB to hang because somebody's got the lock held. We'll take the chance * that the files list is inconsistant instead. @@ -925,7 +925,7 @@ */ printf("kldunload: attempt to unload file that was" " loaded by the kernel\n"); - error = EBUSY; + error = EBUSY; } else { #ifdef HWPMC_HOOKS /* Save data needed by hwpmc(4) before unloading. */ @@ -1348,7 +1348,7 @@ } if (nmdp < stop) /* it's a self reference */ continue; - + /* * ok, the module isn't here yet, we * are not finished @@ -1463,15 +1463,15 @@ /* * Search for a not-loaded module by name. - * + * * Modules may be found in the following locations: - * + * * - preloaded (result is just the module name) - on disk (result is full path * to module) - * + * * If the module name is qualified in any way (contains path, etc.) the we * simply return a copy of it. - * + * * The search path can be manipulated via sysctl. Note that we use the ';' * character as a separator to be consistent with the bootloader. */ From owner-p4-projects@FreeBSD.ORG Tue Jun 13 21:47:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6791816A47C; Tue, 13 Jun 2006 21:47:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 29FE016A47A for ; Tue, 13 Jun 2006 21:47:58 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB03E43D46 for ; Tue, 13 Jun 2006 21:47:57 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DLjbRG097595 for ; Tue, 13 Jun 2006 21:45:37 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DLjabh097592 for perforce@freebsd.org; Tue, 13 Jun 2006 21:45:36 GMT (envelope-from jhb@freebsd.org) Date: Tue, 13 Jun 2006 21:45:36 GMT Message-Id: <200606132145.k5DLjabh097592@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 99177 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, 13 Jun 2006 21:47:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=99177 Change 99177 by jhb@jhb_mutex on 2006/06/13 21:44:54 IFC @99174 - more loopback. Affected files ... .. //depot/projects/smpng/sys/kern/vfs_init.c#23 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#39 integrate Differences ... ==== //depot/projects/smpng/sys/kern/vfs_init.c#23 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_init.c,v 1.81 2005/02/20 23:02:20 das Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_init.c,v 1.82 2006/06/13 21:36:23 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.10 2005/12/12 18:04:44 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.11 2006/06/13 21:36:23 jhb Exp $"); /* * IEEE 802.11 support (FreeBSD-specific code) ==== //depot/projects/smpng/sys/netgraph/ng_socket.c#39 (text+ko) ==== @@ -37,7 +37,7 @@ * * Author: Julian Elischer * - * $FreeBSD: src/sys/netgraph/ng_socket.c,v 1.75 2006/05/16 11:49:26 glebius Exp $ + * $FreeBSD: src/sys/netgraph/ng_socket.c,v 1.76 2006/06/13 21:36:23 jhb Exp $ * $Whistle: ng_socket.c,v 1.28 1999/11/01 09:24:52 julian Exp $ */ From owner-p4-projects@FreeBSD.ORG Tue Jun 13 22:14:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD9C716A47E; Tue, 13 Jun 2006 22:14:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BE8716A47C for ; Tue, 13 Jun 2006 22:14:35 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CCD0443D48 for ; Tue, 13 Jun 2006 22:14:34 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DMCE0B000564 for ; Tue, 13 Jun 2006 22:12:14 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DMCDij000561 for perforce@freebsd.org; Tue, 13 Jun 2006 22:12:13 GMT (envelope-from imp@freebsd.org) Date: Tue, 13 Jun 2006 22:12:13 GMT Message-Id: <200606132212.k5DMCDij000561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99181 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, 13 Jun 2006 22:14:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=99181 Change 99181 by imp@imp_harmony on 2006/06/13 22:11:43 IFC @99179 Affected files ... .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#14 integrate .. //depot/projects/arm/src/sys/amd64/conf/DEFAULTS#5 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#11 integrate .. //depot/projects/arm/src/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#8 integrate .. //depot/projects/arm/src/sys/arm/arm/inckern.S#4 integrate .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#23 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/arm/src/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/arm/src/sys/conf/Makefile.arm#13 integrate .. //depot/projects/arm/src/sys/conf/NOTES#22 integrate .. //depot/projects/arm/src/sys/conf/files#30 integrate .. //depot/projects/arm/src/sys/conf/kern.post.mk#9 integrate .. //depot/projects/arm/src/sys/conf/options#21 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpivar.h#6 integrate .. //depot/projects/arm/src/sys/dev/atkbdc/atkbdc_isa.c#3 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed.c#5 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_novell.c#4 integrate .. //depot/projects/arm/src/sys/dev/ed/if_edvar.h#5 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/arm/src/sys/dev/mxge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/arm/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#1 branch .. //depot/projects/arm/src/sys/dev/mxge/if_mxge_var.h#1 branch .. //depot/projects/arm/src/sys/dev/mxge/mcp_gen_header.h#1 branch .. //depot/projects/arm/src/sys/dev/mxge/mxge_mcp.h#1 branch .. //depot/projects/arm/src/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/arm/src/sys/i386/conf/DEFAULTS#5 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#10 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#14 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#7 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.master#7 integrate .. //depot/projects/arm/src/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/arm/src/sys/isa/isa_common.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_clock.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_event.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_linker.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_switch.c#6 integrate .. //depot/projects/arm/src/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/arm/src/sys/kern/sched_core.c#1 branch .. //depot/projects/arm/src/sys/kern/sched_ule.c#7 integrate .. //depot/projects/arm/src/sys/kern/subr_firmware.c#3 integrate .. //depot/projects/arm/src/sys/kern/subr_rman.c#8 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#10 integrate .. //depot/projects/arm/src/sys/kern/vfs_init.c#3 integrate .. //depot/projects/arm/src/sys/modules/Makefile#21 integrate .. //depot/projects/arm/src/sys/modules/mxge/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/mxge/mxge/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/mxge/mxge_eth_z8e/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/mxge/mxge_ethp_z8e/Makefile#1 branch .. //depot/projects/arm/src/sys/net/if_bridge.c#14 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/ng_socket.c#6 integrate .. //depot/projects/arm/src/sys/pc98/conf/DEFAULTS#5 integrate .. //depot/projects/arm/src/sys/pc98/conf/NOTES#11 integrate .. //depot/projects/arm/src/sys/powerpc/conf/DEFAULTS#3 integrate .. //depot/projects/arm/src/sys/sparc64/conf/DEFAULTS#4 integrate .. //depot/projects/arm/src/sys/sparc64/include/_bus.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/bus.h#5 integrate .. //depot/projects/arm/src/sys/sys/rman.h#4 integrate .. //depot/projects/arm/src/sys/sys/sched.h#3 integrate .. //depot/projects/arm/src/sys/sys/syscallsubr.h#6 integrate Differences ... ==== //depot/projects/arm/src/sys/amd64/amd64/pmap.c#14 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.555 2006/06/05 20:35:25 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.556 2006/06/12 20:05:27 alc Exp $"); /* * Manages physical address maps. @@ -1006,17 +1006,22 @@ * Note: SMP coherent. Uses a ranged shootdown IPI. */ void -pmap_qenter(vm_offset_t sva, vm_page_t *m, int count) +pmap_qenter(vm_offset_t sva, vm_page_t *ma, int count) { - vm_offset_t va; + pt_entry_t *endpte, oldpte, *pte; - va = sva; - while (count-- > 0) { - pmap_kenter(va, VM_PAGE_TO_PHYS(*m)); - va += PAGE_SIZE; - m++; + oldpte = 0; + pte = vtopte(sva); + endpte = pte + count; + while (pte < endpte) { + oldpte |= *pte; + pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G | PG_RW | PG_V); + pte++; + ma++; } - pmap_invalidate_range(kernel_pmap, sva, va); + if ((oldpte & PG_V) != 0) + pmap_invalidate_range(kernel_pmap, sva, sva + count * + PAGE_SIZE); } /* ==== //depot/projects/arm/src/sys/amd64/conf/DEFAULTS#5 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.5 2006/04/28 21:21:51 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.6 2006/06/12 04:21:49 imp Exp $ machine amd64 @@ -11,3 +11,6 @@ # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device + +# UART chips on this platform +device uart_ns8250 ==== //depot/projects/arm/src/sys/amd64/conf/GENERIC#11 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.458 2006/05/17 20:45:44 marius Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.459 2006/06/13 13:12:56 davidxu Exp $ cpu HAMMER ident GENERIC @@ -28,6 +28,7 @@ #options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler +#options SCHED_CORE # CORE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols ==== //depot/projects/arm/src/sys/amd64/conf/NOTES#8 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.55 2006/05/14 18:49:24 marius Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.56 2006/06/12 20:38:17 jhb Exp $ # # @@ -221,13 +221,21 @@ # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) # (requires miibus) +# ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter +# iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters # nve: nVidia nForce MCP on-board Ethernet Networking +# ral: Ralink Technology IEEE 802.11 wireless adapter +# ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter device ed options ED_3C503 options ED_HPP options ED_SIC +device iwi +device ipw device nve # nVidia nForce MCP on-board Ethernet Networking +device ral +device ural device ath device ath_hal # Atheros HAL (includes binary component) @@ -556,6 +564,10 @@ options VM_KMEM_SIZE_MAX options VM_KMEM_SIZE_SCALE +# Enable NDIS binary driver support +options NDISAPI +device ndis + # The I/O device device io ==== //depot/projects/arm/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.11 2006/05/10 18:19:51 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.12 2006/06/13 18:48:29 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.11 2006/05/10 18:19:51 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.12 2006/06/13 18:48:29 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp */ #define LINUX_SYS_exit 1 @@ -221,4 +221,4 @@ #define LINUX_SYS_linux_fremovexattr 237 #define LINUX_SYS_linux_fadvise64 250 #define LINUX_SYS_exit_group 252 -#define LINUX_SYS_MAXSYSCALL 268 +#define LINUX_SYS_MAXSYSCALL 311 ==== //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.11 2006/05/10 18:19:51 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.12 2006/06/13 18:48:29 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp */ #include @@ -21,178 +21,178 @@ struct sysent linux_sysent[] = { #define nosys linux_nosys { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = setup */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_NULL }, /* 2 = linux_fork */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_NULL }, /* 5 = linux_open */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ - { SYF_MPSAFE | AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_NULL }, /* 7 = linux_waitpid */ - { SYF_MPSAFE | AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_NULL }, /* 8 = linux_creat */ - { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_NULL }, /* 9 = linux_link */ - { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_NULL }, /* 10 = linux_unlink */ - { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_NULL }, /* 11 = linux_execve */ - { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_NULL }, /* 12 = linux_chdir */ + { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 5 = linux_open */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { SYF_MPSAFE | AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4 }, /* 7 = linux_waitpid */ + { SYF_MPSAFE | AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT }, /* 8 = linux_creat */ + { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ + { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ + { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 11 = linux_execve */ + { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ { SYF_MPSAFE | AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL }, /* 13 = linux_time */ - { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_NULL }, /* 14 = linux_mknod */ - { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ - { SYF_MPSAFE | AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_NULL }, /* 16 = linux_lchown16 */ + { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ + { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ + { SYF_MPSAFE | AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN }, /* 16 = linux_lchown16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 17 = break */ - { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_NULL }, /* 18 = linux_stat */ - { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_NULL }, /* 19 = linux_lseek */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_NULL }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_NULL }, /* 22 = linux_oldumount */ - { SYF_MPSAFE | AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_NULL }, /* 23 = linux_setuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid16, AUE_NULL }, /* 24 = linux_getuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_stime, AUE_NULL }, /* 25 = linux_stime */ - { SYF_MPSAFE | AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_NULL }, /* 26 = linux_ptrace */ + { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 18 = linux_stat */ + { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_GETPID }, /* 20 = linux_getpid */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ + { SYF_MPSAFE | AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID }, /* 23 = linux_setuid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid16, AUE_GETUID }, /* 24 = linux_getuid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY }, /* 25 = linux_stime */ + { SYF_MPSAFE | AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ { SYF_MPSAFE | AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL }, /* 27 = linux_alarm */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 28 = fstat */ { SYF_MPSAFE | 0, (sy_call_t *)linux_pause, AUE_NULL }, /* 29 = linux_pause */ - { SYF_MPSAFE | AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_NULL }, /* 30 = linux_utime */ + { SYF_MPSAFE | AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME }, /* 30 = linux_utime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = stty */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = gtty */ - { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_NULL }, /* 33 = linux_access */ - { SYF_MPSAFE | AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NULL }, /* 34 = linux_nice */ + { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ + { SYF_MPSAFE | AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE }, /* 34 = linux_nice */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = ftime */ - { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ - { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_NULL }, /* 37 = linux_kill */ - { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_NULL }, /* 38 = linux_rename */ - { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_NULL }, /* 39 = linux_mkdir */ - { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_NULL }, /* 40 = linux_rmdir */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_NULL }, /* 41 = dup */ - { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_NULL }, /* 42 = linux_pipe */ + { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ + { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ + { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 38 = linux_rename */ + { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 39 = linux_mkdir */ + { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 40 = linux_rmdir */ + { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ + { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ - { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_NULL }, /* 46 = linux_setgid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_NULL }, /* 47 = linux_getgid16 */ + { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ { SYF_MPSAFE | AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_geteuid16, AUE_NULL }, /* 49 = linux_geteuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getegid16, AUE_NULL }, /* 50 = linux_getegid16 */ - { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_NULL }, /* 52 = linux_umount */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID }, /* 49 = linux_geteuid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getegid16, AUE_GETEGID }, /* 50 = linux_getegid16 */ + { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = lock */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_NULL }, /* 54 = linux_ioctl */ - { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_NULL }, /* 55 = linux_fcntl */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ + { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = mpx */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 57 = setpgid */ + { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 57 = setpgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 58 = ulimit */ { SYF_MPSAFE | 0, (sy_call_t *)linux_olduname, AUE_NULL }, /* 59 = linux_olduname */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ { SYF_MPSAFE | AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 62 = linux_ustat */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_NULL }, /* 63 = dup2 */ - { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_NULL }, /* 64 = getppid */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_NULL }, /* 65 = getpgrp */ - { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_NULL }, /* 66 = setsid */ + { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 63 = dup2 */ + { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 64 = getppid */ + { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 65 = getpgrp */ + { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 66 = setsid */ { SYF_MPSAFE | AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL }, /* 67 = linux_sigaction */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sgetmask, AUE_NULL }, /* 68 = linux_sgetmask */ { SYF_MPSAFE | AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL }, /* 69 = linux_ssetmask */ - { SYF_MPSAFE | AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_NULL }, /* 70 = linux_setreuid16 */ - { SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_NULL }, /* 71 = linux_setregid16 */ + { SYF_MPSAFE | AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID }, /* 70 = linux_setreuid16 */ + { SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID }, /* 71 = linux_setregid16 */ { SYF_MPSAFE | AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL }, /* 72 = linux_sigsuspend */ { SYF_MPSAFE | AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL }, /* 73 = linux_sigpending */ - { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_NULL }, /* 74 = linux_sethostname */ - { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_NULL }, /* 75 = linux_setrlimit */ - { SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_NULL }, /* 76 = linux_old_getrlimit */ - { SYF_MPSAFE | AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_NULL }, /* 77 = linux_getrusage */ + { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 74 = linux_sethostname */ + { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 75 = linux_setrlimit */ + { SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT }, /* 76 = linux_old_getrlimit */ + { SYF_MPSAFE | AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE }, /* 77 = linux_getrusage */ { SYF_MPSAFE | AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL }, /* 78 = linux_gettimeofday */ - { SYF_MPSAFE | AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_NULL }, /* 79 = linux_settimeofday */ - { SYF_MPSAFE | AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_NULL }, /* 80 = linux_getgroups16 */ - { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_NULL }, /* 81 = linux_setgroups16 */ - { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_NULL }, /* 82 = linux_old_select */ - { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_NULL }, /* 83 = linux_symlink */ - { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_NULL }, /* 84 = linux_lstat */ - { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_NULL }, /* 85 = linux_readlink */ + { SYF_MPSAFE | AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY }, /* 79 = linux_settimeofday */ + { SYF_MPSAFE | AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS }, /* 80 = linux_getgroups16 */ + { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ + { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ + { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ + { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT }, /* 84 = linux_lstat */ + { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = linux_uselib */ - { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_NULL }, /* 87 = swapon */ - { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_NULL }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_NULL }, /* 89 = linux_readdir */ - { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_NULL }, /* 90 = linux_mmap */ - { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_NULL }, /* 91 = munmap */ - { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_NULL }, /* 92 = linux_truncate */ - { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_NULL }, /* 93 = linux_ftruncate */ - { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL }, /* 94 = fchmod */ - { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 95 = fchown */ - { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_NULL }, /* 96 = linux_getpriority */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_NULL }, /* 97 = setpriority */ + { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ + { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ + { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ + { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ + { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ + { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 93 = linux_ftruncate */ + { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 94 = fchmod */ + { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 95 = fchown */ + { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 96 = linux_getpriority */ + { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 97 = setpriority */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 98 = profil */ - { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_NULL }, /* 99 = linux_statfs */ - { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_NULL }, /* 100 = linux_fstatfs */ + { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 99 = linux_statfs */ + { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 100 = linux_fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 101 = ioperm */ { SYF_MPSAFE | AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL }, /* 102 = linux_socketcall */ { SYF_MPSAFE | AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 103 = linux_syslog */ - { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_NULL }, /* 104 = linux_setitimer */ - { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_NULL }, /* 105 = linux_getitimer */ - { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_NULL }, /* 106 = linux_newstat */ - { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_NULL }, /* 107 = linux_newlstat */ - { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_NULL }, /* 108 = linux_newfstat */ + { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 104 = linux_setitimer */ + { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 105 = linux_getitimer */ + { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 106 = linux_newstat */ + { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 107 = linux_newlstat */ + { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 108 = linux_newfstat */ { SYF_MPSAFE | 0, (sy_call_t *)linux_uname, AUE_NULL }, /* 109 = linux_uname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = iopl */ { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 111 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = idle */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 113 = vm86old */ - { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_NULL }, /* 114 = linux_wait4 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_NULL }, /* 115 = linux_swapoff */ + { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ { SYF_MPSAFE | AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 118 = fsync */ - { SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_NULL }, /* 119 = linux_sigreturn */ - { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_NULL }, /* 120 = linux_clone */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_NULL }, /* 121 = setdomainname */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ + { SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ + { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ + { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 121 = setdomainname */ { SYF_MPSAFE | AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 122 = linux_newuname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 123 = modify_ldt */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_NULL }, /* 124 = linux_adjtimex */ - { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_NULL }, /* 125 = linux_mprotect */ - { SYF_MPSAFE | AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_NULL }, /* 126 = linux_sigprocmask */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 124 = linux_adjtimex */ + { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 125 = linux_mprotect */ + { SYF_MPSAFE | AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK }, /* 126 = linux_sigprocmask */ { SYF_MPSAFE | 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 127 = linux_create_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 128 = linux_init_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 129 = linux_delete_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 130 = linux_get_kernel_syms */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_NULL }, /* 131 = linux_quotactl */ - { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_NULL }, /* 132 = getpgid */ - { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_NULL }, /* 133 = fchdir */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_NULL }, /* 134 = linux_bdflush */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 131 = linux_quotactl */ + { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 132 = getpgid */ + { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 133 = fchdir */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 134 = linux_bdflush */ { SYF_MPSAFE | AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 135 = linux_sysfs */ - { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_NULL }, /* 136 = linux_personality */ + { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 136 = linux_personality */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 137 = afs_syscall */ - { SYF_MPSAFE | AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_NULL }, /* 138 = linux_setfsuid16 */ - { SYF_MPSAFE | AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_NULL }, /* 139 = linux_setfsgid16 */ - { SYF_MPSAFE | AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_NULL }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_NULL }, /* 141 = linux_getdents */ - { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_NULL }, /* 142 = linux_select */ - { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_NULL }, /* 143 = flock */ - { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_NULL }, /* 144 = linux_msync */ - { SYF_MPSAFE | AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_NULL }, /* 145 = linux_readv */ - { SYF_MPSAFE | AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_NULL }, /* 146 = linux_writev */ - { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_NULL }, /* 147 = linux_getsid */ + { SYF_MPSAFE | AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */ + { SYF_MPSAFE | AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */ + { SYF_MPSAFE | AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ + { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */ + { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */ + { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */ + { SYF_MPSAFE | AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV }, /* 145 = linux_readv */ + { SYF_MPSAFE | AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV }, /* 146 = linux_writev */ + { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 147 = linux_getsid */ { SYF_MPSAFE | AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL }, /* 148 = linux_fdatasync */ - { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_NULL }, /* 149 = linux_sysctl */ - { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_NULL }, /* 150 = mlock */ - { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_NULL }, /* 151 = munlock */ - { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_NULL }, /* 152 = mlockall */ - { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_NULL }, /* 153 = munlockall */ - { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL }, /* 154 = sched_setparam */ - { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL }, /* 155 = sched_getparam */ - { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_NULL }, /* 156 = linux_sched_setscheduler */ - { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_NULL }, /* 157 = linux_sched_getscheduler */ + { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 149 = linux_sysctl */ + { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 150 = mlock */ + { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 151 = munlock */ + { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 152 = mlockall */ + { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 153 = munlockall */ + { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 154 = sched_setparam */ + { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 155 = sched_getparam */ + { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 156 = linux_sched_setscheduler */ + { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 157 = linux_sched_getscheduler */ { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 158 = sched_yield */ - { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_NULL }, /* 159 = linux_sched_get_priority_max */ - { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_NULL }, /* 160 = linux_sched_get_priority_min */ - { SYF_MPSAFE | AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_NULL }, /* 161 = linux_sched_rr_get_interval */ + { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 159 = linux_sched_get_priority_max */ + { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 160 = linux_sched_get_priority_min */ + { SYF_MPSAFE | AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 161 = linux_sched_rr_get_interval */ { SYF_MPSAFE | AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL }, /* 162 = linux_nanosleep */ { SYF_MPSAFE | AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 163 = linux_mremap */ - { SYF_MPSAFE | AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_NULL }, /* 164 = linux_setresuid16 */ - { SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_NULL }, /* 165 = linux_getresuid16 */ + { SYF_MPSAFE | AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID }, /* 164 = linux_setresuid16 */ + { SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID }, /* 165 = linux_getresuid16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 166 = vm86 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 167 = linux_query_module */ - { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_NULL }, /* 168 = poll */ + { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 168 = poll */ { SYF_MPSAFE | 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 169 = linux_nfsservctl */ - { SYF_MPSAFE | AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_NULL }, /* 170 = linux_setresgid16 */ - { SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_NULL }, /* 171 = linux_getresgid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_NULL }, /* 172 = linux_prctl */ + { SYF_MPSAFE | AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID }, /* 170 = linux_setresgid16 */ + { SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID }, /* 171 = linux_getresgid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 172 = linux_prctl */ { SYF_MPSAFE | AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */ { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */ { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */ @@ -200,48 +200,48 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 177 = linux_rt_sigtimedwait */ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 178 = linux_rt_sigqueueinfo */ { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 179 = linux_rt_sigsuspend */ - { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_NULL }, /* 180 = linux_pread */ - { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_NULL }, /* 181 = linux_pwrite */ - { SYF_MPSAFE | AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_NULL }, /* 182 = linux_chown16 */ - { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_NULL }, /* 183 = linux_getcwd */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_NULL }, /* 184 = linux_capget */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_NULL }, /* 185 = linux_capset */ + { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 180 = linux_pread */ + { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 181 = linux_pwrite */ + { SYF_MPSAFE | AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN }, /* 182 = linux_chown16 */ + { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 183 = linux_getcwd */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 184 = linux_capget */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 185 = linux_capset */ { SYF_MPSAFE | AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 186 = linux_sigaltstack */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_NULL }, /* 187 = linux_sendfile */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 187 = linux_sendfile */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 188 = getpmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 189 = putpmsg */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_NULL }, /* 190 = linux_vfork */ - { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_NULL }, /* 191 = linux_getrlimit */ - { SYF_MPSAFE | AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_NULL }, /* 192 = linux_mmap2 */ - { SYF_MPSAFE | AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_NULL }, /* 193 = linux_truncate64 */ - { SYF_MPSAFE | AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_NULL }, /* 194 = linux_ftruncate64 */ - { SYF_MPSAFE | AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_NULL }, /* 195 = linux_stat64 */ - { SYF_MPSAFE | AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_NULL }, /* 196 = linux_lstat64 */ - { SYF_MPSAFE | AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_NULL }, /* 197 = linux_fstat64 */ - { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_NULL }, /* 198 = linux_lchown */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid, AUE_NULL }, /* 199 = linux_getuid */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid, AUE_NULL }, /* 200 = linux_getgid */ - { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_NULL }, /* 201 = geteuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_NULL }, /* 202 = getegid */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_NULL }, /* 203 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_NULL }, /* 204 = setregid */ - { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_NULL }, /* 205 = linux_getgroups */ - { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_NULL }, /* 206 = linux_setgroups */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 190 = linux_vfork */ + { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 191 = linux_getrlimit */ + { SYF_MPSAFE | AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP }, /* 192 = linux_mmap2 */ + { SYF_MPSAFE | AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE }, /* 193 = linux_truncate64 */ + { SYF_MPSAFE | AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE }, /* 194 = linux_ftruncate64 */ + { SYF_MPSAFE | AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT }, /* 195 = linux_stat64 */ + { SYF_MPSAFE | AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT }, /* 196 = linux_lstat64 */ + { SYF_MPSAFE | AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT }, /* 197 = linux_fstat64 */ + { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 198 = linux_lchown */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid, AUE_GETUID }, /* 199 = linux_getuid */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid, AUE_GETGID }, /* 200 = linux_getgid */ + { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 201 = geteuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 202 = getegid */ + { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 203 = setreuid */ + { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 204 = setregid */ + { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 205 = linux_getgroups */ + { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 206 = linux_setgroups */ { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 207 = fchown */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_NULL }, /* 208 = setresuid */ - { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 209 = getresuid */ - { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_NULL }, /* 210 = setresgid */ - { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 211 = getresgid */ - { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_NULL }, /* 212 = linux_chown */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_NULL }, /* 213 = setuid */ - { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_NULL }, /* 214 = setgid */ - { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_NULL }, /* 215 = linux_setfsuid */ - { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_NULL }, /* 216 = linux_setfsgid */ - { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_NULL }, /* 217 = linux_pivot_root */ - { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_NULL }, /* 218 = linux_mincore */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_NULL }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_NULL }, /* 220 = linux_getdents64 */ - { SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_NULL }, /* 221 = linux_fcntl64 */ + { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 208 = setresuid */ + { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 209 = getresuid */ + { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 210 = setresgid */ + { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 211 = getresgid */ + { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 212 = linux_chown */ + { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 213 = setuid */ + { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 214 = setgid */ + { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 215 = linux_setfsuid */ + { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 216 = linux_setfsgid */ + { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */ + { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ + { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ + { SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 224 = gettid */ @@ -272,7 +272,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = linux_io_cancel */ { SYF_MPSAFE | 0, (sy_call_t *)linux_fadvise64, AUE_NULL }, /* 250 = linux_fadvise64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 251 = */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 252 = exit_group */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 252 = exit_group */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 253 = linux_lookup_dcookie */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 254 = linux_epoll_create */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 255 = linux_epoll_ctl */ @@ -288,4 +288,47 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 265 = linux_clock_gettime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 266 = linux_clock_getres */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 267 = linux_clock_nanosleep */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 268 = linux_statfs64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 269 = linux_fstatfs64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 270 = linux_tgkill */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 271 = linux_utimes */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 272 = linux_fadvise64_64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = linux_ni_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 274 = linux_mbind */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 275 = linux_get_mempolicy */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 276 = linux_set_mempolicy */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 277 = linux_mq_open */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 278 = linux_mq_unlink */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 279 = linux_mq_timedsend */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 280 = linux_mq_timedreceive */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 281 = linux_mq_notify */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 282 = linux_mq_getsetattr */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 283 = linux_kexec_load */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 284 = linux_waitid */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = linux_ni_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 286 = linux_add_key */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 287 = linux_request_key */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 288 = linux_keyctl */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 289 = linux_ioprio_set */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 290 = linux_ioprio_get */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 291 = linux_inotify_init */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 292 = linux_inotify_add_watch */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 294 = linux_migrate_pages */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 295 = linux_openat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 296 = linux_mkdirat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 297 = linux_mknodat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 298 = linux_fchownat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = linux_futimesat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 300 = linux_fstatat64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 301 = linux_unlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 302 = linux_renameat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 303 = linux_linkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 304 = linux_symlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 305 = linux_readlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 306 = linux_fchmodat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 307 = linux_faccessat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 308 = linux_pselect6 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 309 = linux_ppoll */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 310 = linux_unshare */ }; ==== //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#6 (text+ko) ==== @@ -1,10 +1,10 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ; Processed to create linux_sysent.c, linux_proto.h and linux_syscall.h. -; Columns: number type nargs name alt{name,tag,rtyp}/comments +; Columns: number audit type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that @@ -14,15 +14,20 @@ ; type one of STD, OBSOL, UNIMPL ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: +; audit the audit event associated with the system call +; A value of AUE_NULL means no auditing, but it also means that +; there is no audit event for the call at this time. For the +; case where the event exists, but we don't want auditing, the +; event should be #defined to AUE_NULL in audit_kevents.h. ; altname name of system call if different ; alttag name of args struct tag if different from [o]`name'"_args" ; altrtyp return type if not int (bogus - syscalls always return int) ; for UNIMPL/OBSOL, name continues with comments ; types: -; STD always included +; AUE_NULL STD always included ; OBSOL obsolete, not included in system, only specifies name -; UNIMPL not implemented, placeholder only +; AUE_NULL UNIMPL not implemented, placeholder only #include "opt_compat.h" #include @@ -38,247 +43,244 @@ ; #ifdef's, etc. may be included, and are copied to the output files. 0 AUE_NULL UNIMPL setup -1 AUE_NULL MNOPROTO { void sys_exit(int rval); } exit \ +1 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit \ sys_exit_args void -2 AUE_NULL MSTD { int linux_fork(void); } +2 AUE_FORK MSTD { int linux_fork(void); } 3 AUE_NULL MNOPROTO { int read(int fd, char *buf, \ u_int nbyte); } 4 AUE_NULL MNOPROTO { int write(int fd, char *buf, \ u_int nbyte); } -5 AUE_NULL MSTD { int linux_open(char *path, l_int flags, \ +5 AUE_OPEN_RWTC MSTD { int linux_open(char *path, l_int flags, \ l_int mode); } -6 AUE_NULL MNOPROTO { int close(int fd); } -7 AUE_NULL MSTD { int linux_waitpid(l_pid_t pid, \ +6 AUE_CLOSE MNOPROTO { int close(int fd); } +7 AUE_WAIT4 MSTD { int linux_waitpid(l_pid_t pid, \ l_int *status, l_int options); } -8 AUE_NULL MSTD { int linux_creat(char *path, l_int mode); } -9 AUE_NULL MSTD { int linux_link(char *path, char *to); } -10 AUE_NULL MSTD { int linux_unlink(char *path); } -11 AUE_NULL MSTD { int linux_execve(char *path, char **argp, \ +8 AUE_O_CREAT MSTD { int linux_creat(char *path, \ + l_int mode); } +9 AUE_LINK MSTD { int linux_link(char *path, char *to); } +10 AUE_UNLINK MSTD { int linux_unlink(char *path); } +11 AUE_EXECVE MSTD { int linux_execve(char *path, char **argp, \ char **envp); } -12 AUE_NULL MSTD { int linux_chdir(char *path); } +12 AUE_CHDIR MSTD { int linux_chdir(char *path); } 13 AUE_NULL MSTD { int linux_time(l_time_t *tm); } -14 AUE_NULL MSTD { int linux_mknod(char *path, l_int mode, \ +14 AUE_MKNOD MSTD { int linux_mknod(char *path, l_int mode, \ l_dev_t dev); } -15 AUE_NULL MSTD { int linux_chmod(char *path, \ +15 AUE_CHMOD MSTD { int linux_chmod(char *path, \ l_mode_t mode); } -16 AUE_NULL MSTD { int linux_lchown16(char *path, \ +16 AUE_LCHOWN MSTD { int linux_lchown16(char *path, \ l_uid16_t uid, l_gid16_t gid); } 17 AUE_NULL UNIMPL break -18 AUE_NULL MSTD { int linux_stat(char *path, \ - struct linux_stat *up); } -19 AUE_NULL MSTD { int linux_lseek(l_uint fdes, l_off_t off, \ +18 AUE_STAT MSTD { int linux_stat(char *path, \ + struct linux_stat *up); } +19 AUE_LSEEK MSTD { int linux_lseek(l_uint fdes, l_off_t off, \ l_int whence); } -20 AUE_NULL MSTD { int linux_getpid(void); } -21 AUE_NULL STD { int linux_mount(char *specialfile, \ +20 AUE_GETPID MSTD { int linux_getpid(void); } +21 AUE_MOUNT STD { int linux_mount(char *specialfile, \ char *dir, char *filesystemtype, \ l_ulong rwflag, void *data); } -22 AUE_NULL STD { int linux_oldumount(char *path); } -23 AUE_NULL MSTD { int linux_setuid16(l_uid16_t uid); } -24 AUE_NULL MSTD { int linux_getuid16(void); } -25 AUE_NULL MSTD { int linux_stime(void); } -26 AUE_NULL MSTD { int linux_ptrace(l_long req, l_long pid, \ +22 AUE_UMOUNT STD { int linux_oldumount(char *path); } +23 AUE_SETUID MSTD { int linux_setuid16(l_uid16_t uid); } +24 AUE_GETUID MSTD { int linux_getuid16(void); } +25 AUE_SETTIMEOFDAY MSTD { int linux_stime(void); } +26 AUE_PTRACE MSTD { int linux_ptrace(l_long req, l_long pid, \ l_long addr, l_long data); } 27 AUE_NULL MSTD { int linux_alarm(l_uint secs); } 28 AUE_NULL UNIMPL fstat 29 AUE_NULL MSTD { int linux_pause(void); } -30 AUE_NULL MSTD { int linux_utime(char *fname, \ +30 AUE_UTIME MSTD { int linux_utime(char *fname, \ struct l_utimbuf *times); } 31 AUE_NULL UNIMPL stty 32 AUE_NULL UNIMPL gtty -33 AUE_NULL MSTD { int linux_access(char *path, l_int flags); } -34 AUE_NULL MSTD { int linux_nice(l_int inc); } +33 AUE_ACCESS MSTD { int linux_access(char *path, l_int flags); } +34 AUE_NICE MSTD { int linux_nice(l_int inc); } 35 AUE_NULL UNIMPL ftime -36 AUE_NULL MNOPROTO { int sync(void); } -37 AUE_NULL MSTD { int linux_kill(l_int pid, l_int signum); } -38 AUE_NULL MSTD { int linux_rename(char *from, char *to); } -39 AUE_NULL MSTD { int linux_mkdir(char *path, l_int mode); } -40 AUE_NULL MSTD { int linux_rmdir(char *path); } -41 AUE_NULL MNOPROTO { int dup(u_int fd); } -42 AUE_NULL MSTD { int linux_pipe(l_ulong *pipefds); } +36 AUE_SYNC MNOPROTO { int sync(void); } +37 AUE_KILL MSTD { int linux_kill(l_int pid, l_int signum); } +38 AUE_RENAME MSTD { int linux_rename(char *from, char *to); } +39 AUE_MKDIR MSTD { int linux_mkdir(char *path, l_int mode); } +40 AUE_RMDIR MSTD { int linux_rmdir(char *path); } +41 AUE_DUP MNOPROTO { int dup(u_int fd); } +42 AUE_PIPE MSTD { int linux_pipe(l_ulong *pipefds); } 43 AUE_NULL MSTD { int linux_times(struct l_times_argv *buf); } 44 AUE_NULL UNIMPL prof 45 AUE_NULL STD { int linux_brk(l_ulong dsend); } -46 AUE_NULL MSTD { int linux_setgid16(l_gid16_t gid); } -47 AUE_NULL MSTD { int linux_getgid16(void); } +46 AUE_SETGID MSTD { int linux_setgid16(l_gid16_t gid); } +47 AUE_GETGID MSTD { int linux_getgid16(void); } 48 AUE_NULL MSTD { int linux_signal(l_int sig, \ l_handler_t handler); } -49 AUE_NULL MSTD { int linux_geteuid16(void); } -50 AUE_NULL MSTD { int linux_getegid16(void); } -51 AUE_NULL MNOPROTO { int acct(char *path); } -52 AUE_NULL STD { int linux_umount(char *path, l_int flags); } +49 AUE_GETEUID MSTD { int linux_geteuid16(void); } +50 AUE_GETEGID MSTD { int linux_getegid16(void); } +51 AUE_ACCT MNOPROTO { int acct(char *path); } +52 AUE_UMOUNT STD { int linux_umount(char *path, l_int flags); } 53 AUE_NULL UNIMPL lock -54 AUE_NULL STD { int linux_ioctl(l_uint fd, l_uint cmd, \ +54 AUE_IOCTL STD { int linux_ioctl(l_uint fd, l_uint cmd, \ uintptr_t arg); } -55 AUE_NULL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \ +55 AUE_FCNTL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \ uintptr_t arg); } 56 AUE_NULL UNIMPL mpx -57 AUE_NULL MNOPROTO { int setpgid(int pid, int pgid); } +57 AUE_SETPGRP MNOPROTO { int setpgid(int pid, int pgid); } 58 AUE_NULL UNIMPL ulimit 59 AUE_NULL MSTD { int linux_olduname(void); } -60 AUE_NULL MNOPROTO { int umask(int newmask); } -61 AUE_NULL MNOPROTO { int chroot(char *path); } +60 AUE_UMASK MNOPROTO { int umask(int newmask); } +61 AUE_CHROOT MNOPROTO { int chroot(char *path); } 62 AUE_NULL MSTD { int linux_ustat(l_dev_t dev, \ struct l_ustat *ubuf); } -63 AUE_NULL MNOPROTO { int dup2(u_int from, u_int to); } -64 AUE_NULL MNOPROTO { int getppid(void); } -65 AUE_NULL MNOPROTO { int getpgrp(void); } -66 AUE_NULL MNOPROTO { int setsid(void); } +63 AUE_DUP2 MNOPROTO { int dup2(u_int from, u_int to); } +64 AUE_GETPPID MNOPROTO { int getppid(void); } +65 AUE_GETPGRP MNOPROTO { int getpgrp(void); } +66 AUE_SETSID MNOPROTO { int setsid(void); } 67 AUE_NULL MSTD { int linux_sigaction(l_int sig, \ l_osigaction_t *nsa, \ l_osigaction_t *osa); } 68 AUE_NULL MSTD { int linux_sgetmask(void); } 69 AUE_NULL MSTD { int linux_ssetmask(l_osigset_t mask); } -70 AUE_NULL MSTD { int linux_setreuid16(l_uid16_t ruid, \ +70 AUE_SETREUID MSTD { int linux_setreuid16(l_uid16_t ruid, \ l_uid16_t euid); } -71 AUE_NULL MSTD { int linux_setregid16(l_gid16_t rgid, \ +71 AUE_SETREGID MSTD { int linux_setregid16(l_gid16_t rgid, \ l_gid16_t egid); } 72 AUE_NULL MSTD { int linux_sigsuspend(l_int hist0, \ l_int hist1, l_osigset_t mask); } 73 AUE_NULL MSTD { int linux_sigpending(l_osigset_t *mask); } -74 AUE_NULL MSTD { int linux_sethostname(char *hostname, \ +74 AUE_SYSCTL MSTD { int linux_sethostname(char *hostname, \ u_int len); } -75 AUE_NULL MSTD { int linux_setrlimit(l_uint resource, \ +75 AUE_SETRLIMIT MSTD { int linux_setrlimit(l_uint resource, \ struct l_rlimit *rlim); } -76 AUE_NULL MSTD { int linux_old_getrlimit(l_uint resource, \ +76 AUE_GETRLIMIT MSTD { int linux_old_getrlimit(l_uint resource, \ struct l_rlimit *rlim); } -77 AUE_NULL MSTD { int linux_getrusage(int who, \ +77 AUE_GETRUSAGE MSTD { int linux_getrusage(int who, \ struct l_rusage *rusage); } 78 AUE_NULL MSTD { int linux_gettimeofday( \ struct l_timeval *tp, \ struct timezone *tzp); } -79 AUE_NULL MSTD { int linux_settimeofday( \ +79 AUE_SETTIMEOFDAY MSTD { int linux_settimeofday( \ struct l_timeval *tp, \ struct timezone *tzp); } -80 AUE_NULL MSTD { int linux_getgroups16(l_uint gidsetsize, \ +80 AUE_GETGROUPS MSTD { int linux_getgroups16(l_uint gidsetsize, \ l_gid16_t *gidset); } -81 AUE_NULL MSTD { int linux_setgroups16(l_uint gidsetsize, \ +81 AUE_SETGROUPS MSTD { int linux_setgroups16(l_uint gidsetsize, \ l_gid16_t *gidset); } -82 AUE_NULL MSTD { int linux_old_select( \ +82 AUE_SELECT MSTD { int linux_old_select( \ struct l_old_select_argv *ptr); } -83 AUE_NULL MSTD { int linux_symlink(char *path, \ - char *to); } -84 AUE_NULL MSTD { int linux_lstat(char *path, struct linux_lstat *up); } -85 AUE_NULL MSTD { int linux_readlink(char *name, \ - char *buf, l_int count); } +83 AUE_SYMLINK MSTD { int linux_symlink(char *path, char *to); } +84 AUE_LSTAT MSTD { int linux_lstat(char *path, struct linux_lstat *up); } +85 AUE_READLINK MSTD { int linux_readlink(char *name, char *buf, \ + l_int count); } 86 AUE_NULL UNIMPL linux_uselib -87 AUE_NULL MNOPROTO { int swapon(char *name); } -88 AUE_NULL MSTD { int linux_reboot(l_int magic1, \ - l_int magic2, l_uint cmd, \ - void *arg); } -89 AUE_NULL STD { int linux_readdir(l_uint fd, \ +87 AUE_SWAPON MNOPROTO { int swapon(char *name); } +88 AUE_REBOOT MSTD { int linux_reboot(l_int magic1, \ + l_int magic2, l_uint cmd, void *arg); } +89 AUE_O_GETDENTS STD { int linux_readdir(l_uint fd, \ struct l_dirent *dent, l_uint count); } -90 AUE_NULL MSTD { int linux_mmap(struct l_mmap_argv *ptr); } -91 AUE_NULL MNOPROTO { int munmap(caddr_t addr, int len); } -92 AUE_NULL MSTD { int linux_truncate(char *path, \ +90 AUE_MMAP MSTD { int linux_mmap(struct l_mmap_argv *ptr); } +91 AUE_MUNMAP MNOPROTO { int munmap(caddr_t addr, int len); } +92 AUE_TRUNCATE MSTD { int linux_truncate(char *path, \ l_ulong length); } -93 AUE_NULL MSTD { int linux_ftruncate(int fd, long length); } -94 AUE_NULL MNOPROTO { int fchmod(int fd, int mode); } -95 AUE_NULL MNOPROTO { int fchown(int fd, int uid, int gid); } -96 AUE_NULL MSTD { int linux_getpriority(int which, int who); } -97 AUE_NULL MNOPROTO { int setpriority(int which, int who, \ +93 AUE_FTRUNCATE MSTD { int linux_ftruncate(int fd, long length); } +94 AUE_FCHMOD MNOPROTO { int fchmod(int fd, int mode); } +95 AUE_FCHOWN MNOPROTO { int fchown(int fd, int uid, int gid); } +96 AUE_GETPRIORITY MSTD { int linux_getpriority(int which, int who); } +97 AUE_SETPRIORITY MNOPROTO { int setpriority(int which, int who, \ int prio); } -98 AUE_NULL UNIMPL profil -99 AUE_NULL MSTD { int linux_statfs(char *path, \ +98 AUE_AUE_PROFILE UNIMPL profil +99 AUE_STATFS MSTD { int linux_statfs(char *path, \ struct l_statfs_buf *buf); } -100 AUE_NULL MSTD { int linux_fstatfs(l_uint fd, \ +100 AUE_FSTATFS MSTD { int linux_fstatfs(l_uint fd, \ struct l_statfs_buf *buf); } 101 AUE_NULL UNIMPL ioperm 102 AUE_NULL MSTD { int linux_socketcall(l_int what, \ l_ulong args); } 103 AUE_NULL MSTD { int linux_syslog(l_int type, char *buf, \ l_int len); } -104 AUE_NULL MSTD { int linux_setitimer(l_int which, \ +104 AUE_SETITIMER MSTD { int linux_setitimer(l_int which, \ struct l_itimerval *itv, \ struct l_itimerval *oitv); } -105 AUE_NULL MSTD { int linux_getitimer(l_int which, \ +105 AUE_GETITIMER MSTD { int linux_getitimer(l_int which, \ struct l_itimerval *itv); } -106 AUE_NULL MSTD { int linux_newstat(char *path, \ +106 AUE_STAT MSTD { int linux_newstat(char *path, \ struct l_newstat *buf); } -107 AUE_NULL MSTD { int linux_newlstat(char *path, \ +107 AUE_LSTAT MSTD { int linux_newlstat(char *path, \ struct l_newstat *buf); } -108 AUE_NULL MSTD { int linux_newfstat(l_uint fd, \ +108 AUE_FSTAT MSTD { int linux_newfstat(l_uint fd, \ struct l_newstat *buf); } 109 AUE_NULL MSTD { int linux_uname(void); } 110 AUE_NULL UNIMPL iopl 111 AUE_NULL MSTD { int linux_vhangup(void); } 112 AUE_NULL UNIMPL idle 113 AUE_NULL UNIMPL vm86old -114 AUE_NULL MSTD { int linux_wait4(l_pid_t pid, \ +114 AUE_WAIT4 MSTD { int linux_wait4(l_pid_t pid, \ l_uint *status, l_int options, \ struct l_rusage *rusage); } -115 AUE_NULL MSTD { int linux_swapoff(void); } +115 AUE_SWAPOFF MSTD { int linux_swapoff(void); } 116 AUE_NULL MSTD { int linux_sysinfo(struct l_sysinfo *info); } 117 AUE_NULL STD { int linux_ipc(l_uint what, l_int arg1, \ l_int arg2, l_int arg3, void *ptr, \ l_long arg5); } -118 AUE_NULL MNOPROTO { int fsync(int fd); } -119 AUE_NULL MSTD { int linux_sigreturn( \ +118 AUE_FSYNC MNOPROTO { int fsync(int fd); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 13 22:21:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 042DA16A47A; Tue, 13 Jun 2006 22:21:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB37316A474 for ; Tue, 13 Jun 2006 22:21:52 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFC2843D7E for ; Tue, 13 Jun 2006 22:21:44 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5DMJON9000864 for ; Tue, 13 Jun 2006 22:19:24 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5DMJNT7000861 for perforce@freebsd.org; Tue, 13 Jun 2006 22:19:23 GMT (envelope-from piso@freebsd.org) Date: Tue, 13 Jun 2006 22:19:23 GMT Message-Id: <200606132219.k5DMJNT7000861@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 99182 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, 13 Jun 2006 22:21:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=99182 Change 99182 by piso@piso_newluxor on 2006/06/13 22:19:17 First step toward interrupt filtering: convert all the INTR_FAST interrupt handlers to behave like a driver_filter_t, in this phase they will just return FILTER_HANDLED. Mark all the converted drivers with FIX_INTR_FILTER so i can easily find them later. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/fdc/fdc.c#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/fdc/fdc.c#2 (text+ko) ==== @@ -259,6 +259,7 @@ #define FD_NOT_VALID -2 static driver_intr_t fdc_intr; +static driver_filter_t fdc_intr_fast; static void fdc_reset(struct fdc_data *); SYSCTL_NODE(_debug, OID_AUTO, fdc, CTLFLAG_RW, 0, "fdc driver"); @@ -672,6 +673,14 @@ wakeup(arg); } +static int +fdc_intr_fast(void *arg) +{ + + wakeup(arg); + return(FILTER_HANDLED); +} + /* * fdc_pio(): perform programmed IO read/write for YE PCMCIA floppy. */ @@ -1736,10 +1745,12 @@ device_printf(dev, "does not respond\n"); return (error); } + // XXX - FIX_INTR_FILTER error = bus_setup_intr(dev, fdc->res_irq, INTR_TYPE_BIO | INTR_ENTROPY | INTR_MPSAFE | - ((fdc->flags & FDC_NOFAST) ? 0 : INTR_FAST), - fdc_intr, fdc, &fdc->fdc_intr); + ((fdc->flags & FDC_NOFAST) ? 0 : INTR_FAST), + ((fdc->flags & FDC_NOFAST) ? fdc_intr : (driver_intr_t *)fdc_intr_fast), + fdc, &fdc->fdc_intr); if (error) { device_printf(dev, "cannot setup interrupt\n"); return (error); From owner-p4-projects@FreeBSD.ORG Wed Jun 14 02:07:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4603A16A47E; Wed, 14 Jun 2006 02:07:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C90F16A47A for ; Wed, 14 Jun 2006 02:07:32 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5EF143D7B for ; Wed, 14 Jun 2006 02:07:27 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5E256Kn024208 for ; Wed, 14 Jun 2006 02:05:06 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5E255Ri024201 for perforce@freebsd.org; Wed, 14 Jun 2006 02:05:06 GMT (envelope-from kevlo@freebsd.org) Date: Wed, 14 Jun 2006 02:05:06 GMT Message-Id: <200606140205.k5E255Ri024201@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 99188 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, 14 Jun 2006 02:07:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=99188 Change 99188 by kevlo@kevlo_rtsl on 2006/06/14 02:04:27 Sync my tree. I'm sure I lost something... Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/fs2410_machdep.c#4 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#5 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_clk.c#2 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_bus_s3c2410.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/fs2410_machdep.c#4 (text+ko) ==== @@ -325,7 +325,7 @@ int i = 0; uint32_t fake_preload[35]; - uint32_t memsize = 32 * 1024 * 1024; + uint32_t memsize = 64 * 1024 * 1024; i = 0; @@ -394,7 +394,6 @@ kernel_pt_table[loop].pv_va = kernel_pt_table[loop].pv_pa + 0x20000000; } - i++; } freemem_pt = freemempos; freemempos = 0x30100000; ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#5 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_clk.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: s3c24x0_clk.c,v 1.3 2003/08/27 03:57:05 bsh Exp $ */ +/* $NetBSD: s3c24x0_clk.c,v 1.6 2005/12/24 20:06:52 perry Exp $ */ /* * Copyright (c) 2003 Genetec corporation. All rights reserved. @@ -30,24 +30,79 @@ */ #include +__FBSDID("$FreeBSD$"); #include #include #include +#include #include #include +#include +#include +#include #include +#include +#include +#include +#include #include -#include #include #include +struct s3c24x0_timer_softc { + device_t dev; +} timer_softc; + +static unsigned s3c24x0_timer_get_timecount(struct timecounter *tc); + +static struct timecounter s3c24x0_timer_timecounter = { + s3c24x0_timer_get_timecount, /* get_timecount */ + NULL, /* no poll_pps */ + ~0u, /* counter_mask */ + 3686400, /* frequency */ + "s3c24x0 timer", /* name */ + 1000 /* quality */ +}; + +static int +s3c24x0_timer_probe(device_t dev) +{ + device_set_desc(dev, "s3c24x0 timer"); + return (0); +} + +static int +s3c24x0_timer_attach(device_t dev) +{ + timer_softc.dev = dev; + return (0); +} + +static device_method_t s3c24x0_timer_methods[] = { + DEVMETHOD(device_probe, s3c24x0_timer_probe), + DEVMETHOD(device_attach, s3c24x0_timer_attach), + {0, 0}, +}; + +static driver_t s3c24x0_timer_driver = { + "timer", + s3c24x0_timer_methods, + sizeof(struct s3c24x0_timer_softc), +}; +static devclass_t s3c24x0_timer_devclass; + +DRIVER_MODULE(s3c24x0timer, s3c2410, s3c24x0_timer_driver, s3c24x0_timer_devclass, 0, 0); + #ifndef STATHZ #define STATHZ 64 #endif +#define hardintr (void *)hardclock +#define statintr (void *)statclock + #define TIMER_FREQUENCY(pclk) ((pclk)/16) /* divider=1/16 */ static unsigned int timer4_reload_value; @@ -60,116 +115,7 @@ #define counter_to_usec(c,pclk) \ (((c)*timer4_prescaler*1000)/(TIMER_FREQUENCY(pclk)/1000)) - -/* - * microtime: - * - * Fill in the specified timeval struct with the current time - * accurate to the microsecond. - */ -#if 0 -void -microtime(struct timeval *tvp) -{ - struct s3c24x0_softc *sc = (struct s3c24x0_softc *) s3c2xx0_softc; - int save, int_pend0, int_pend1, count, delta; - static struct timeval last; - int pclk = s3c2xx0_softc->sc_pclk; - - if( timer4_reload_value == 0 ){ - /* not initialized yet */ - tvp->tv_sec = 0; - tvp->tv_usec = 0; - return; - } - - save = disable_interrupts(I32_bit); - - again: - int_pend0 = S3C24X0_INT_TIMER4 & - bus_space_read_4(sc->sc_sx.sc_iot, sc->sc_sx.sc_intctl_ioh, - INTCTL_SRCPND); - count = bus_space_read_2(sc->sc_sx.sc_iot, sc->sc_timer_ioh, - TIMER_TCNTO(4)); - - for (;;){ - - int_pend1 = S3C24X0_INT_TIMER4 & - bus_space_read_4(sc->sc_sx.sc_iot, sc->sc_sx.sc_intctl_ioh, - INTCTL_SRCPND); - if( int_pend0 == int_pend1 ) - break; - - /* - * Down counter reached to zero while we were reading - * timer values. do it again to get consistent values. - */ - int_pend0 = int_pend1; - count = bus_space_read_2(sc->sc_sx.sc_iot, sc->sc_timer_ioh, - TIMER_TCNTO(4)); - } - - if( __predict_false(count > timer4_reload_value) ){ - /* - * Buggy Hardware Warning --- sometimes timer counter - * reads bogus value like 0xffff. I guess it happens when - * the timer is reloaded. - */ - printf( "Bogus value from timer counter: %d\n", count ); - goto again; - } - - /* copy system time */ - *tvp = time; - - restore_interrupts(save); - - delta = timer4_reload_value - count; - - if( int_pend1 ){ - /* - * down counter underflow, but - * clock interrupt have not serviced yet - */ - tvp->tv_usec += tick; - } - - tvp->tv_usec += counter_to_usec(delta, pclk); - - /* Make sure microseconds doesn't overflow. */ - tvp->tv_sec += tvp->tv_usec / 1000000; - tvp->tv_usec = tvp->tv_usec % 1000000; - - if (last.tv_sec && - (tvp->tv_sec < last.tv_sec || - (tvp->tv_sec == last.tv_sec && - tvp->tv_usec < last.tv_usec) ) ){ - - /* XXX: This happens very often when the kernel runs - under Multi-ICE */ -#if 0 - printf("time reversal: %ld.%06ld(%d,%d) -> %ld.%06ld(%d,%d)\n", - last.tv_sec, last.tv_usec, - last_count, last_pend, - tvp->tv_sec, tvp->tv_usec, - count, int_pend1 ); -#endif - - /* make sure the time has advanced. */ - *tvp = last; - tvp->tv_usec++; - if( tvp->tv_usec >= 1000000 ){ - tvp->tv_usec -= 1000000; - tvp->tv_sec++; - } - } - - last = *tvp; - -} -#endif - -static __inline int +static inline int read_timer(struct s3c24x0_softc *sc) { int count; @@ -182,98 +128,29 @@ return count; } -/* - * delay: - * - * Delay for at least N microseconds. - */ -void -DELAY(int n) +static unsigned +s3c24x0_timer_get_timecount(struct timecounter *tc) { - struct s3c24x0_softc *sc = (struct s3c24x0_softc *) s3c2xx0_softc; - int v0, v1, delta; - u_int ucnt; + struct s3c24x0_softc *sc = (struct s3c24x0_softc *)s3c2xx0_softc; - if ( timer4_reload_value == 0 ){ - /* not initialized yet */ - while ( n-- > 0 ){ - int m; - - for (m=0; m<100; ++m ) - ; - } - return; - } - - /* read down counter */ - v0 = read_timer(sc); - - ucnt = usec_to_counter(n); - - while( ucnt > 0 ) { - v1 = read_timer(sc); - delta = v0 - v1; - if ( delta < 0 ) - delta += timer4_reload_value; -#ifdef DEBUG - if (delta < 0 || delta > timer4_reload_value) - panic("wrong value from timer counter"); -#endif - - if((u_int)delta < ucnt){ - ucnt -= (u_int)delta; - v0 = v1; - } - else { - ucnt = 0; - } - } - /*NOTREACHED*/ + return (bus_space_read_4(sc->sc_sx.sc_iot, sc->sc_timer_ioh, + TIMER_TCON)); } -/* - * inittodr: - * - * Initialize time from the time-of-day register. - */ -#if 0 void -inittodr(time_t base) -{ - - time.tv_sec = base; - time.tv_usec = 0; -} - -/* - * resettodr: - * - * Reset the time-of-day register with the current time. - */ -void -resettodr(void) -{ -} - -void -setstatclockrate(hz) - int hz; -{ -} -#endif -#define hardintr (int (*)(void *))hardclock -#define statintr (int (*)(void *))statclock - -void cpu_initclocks(void) { struct s3c24x0_softc *sc = (struct s3c24x0_softc *)s3c2xx0_softc; long tc; + struct resource *irq; + int rid = 0; + void *ihl; int prescaler, h; int pclk = s3c2xx0_softc->sc_pclk; bus_space_tag_t iot = sc->sc_sx.sc_iot; bus_space_handle_t ioh = sc->sc_timer_ioh; uint32_t reg; + device_t dev = timer_softc.dev; stathz = STATHZ; profhz = stathz; @@ -311,12 +188,14 @@ bus_space_write_4(iot, ioh, TIMER_TCNTB(3), ((prescaler - 1) << 16) | (time_constant(stathz) - 1)); -#if 0 - s3c24x0_intr_establish(S3C24X0_INT_TIMER4, IPL_CLOCK, - IST_NONE, hardintr, 0); - s3c24x0_intr_establish(S3C24X0_INT_TIMER3, IPL_STATCLOCK, - IST_NONE, statintr, 0); -#endif + irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, S3C24X0_INT_TIMER4, + S3C24X0_INT_TIMER4, 1, RF_ACTIVE); + if (!irq) + panic("Unable to setup the clock irq handler.\n"); + else + bus_setup_intr(dev, irq, INTR_TYPE_CLK | INTR_FAST, + hardintr, NULL, &ihl); + /* set prescaler1 */ reg = bus_space_read_4(iot, ioh, TIMER_TCFG0); bus_space_write_4(iot, ioh, TIMER_TCFG0, @@ -341,35 +220,54 @@ bus_space_write_4(iot, ioh, TIMER_TCON, reg | TCON_AUTORELOAD(3) | TCON_START(3) | TCON_AUTORELOAD(4) | TCON_START(4) ); + + tc_init(&s3c24x0_timer_timecounter); } +/* + * DELAY: + * + * Delay for at least N microseconds. + */ +void +DELAY(int n) +{ + struct s3c24x0_softc *sc = (struct s3c24x0_softc *) s3c2xx0_softc; + int v0, v1, delta; + u_int ucnt; + + if (timer4_reload_value == 0) { + /* not initialized yet */ + while ( n-- > 0 ){ + int m; + + for (m = 0; m < 100; ++m ) + ; + } + return; + } -#if 0 -/* test routine for delay() */ + /* read down counter */ + v0 = read_timer(sc); -void delay_test(void); -void -delay_test(void) -{ - struct s3c2xx0_softc *sc = s3c2xx0_softc; - volatile int *pdatc = (volatile int *) - ((char *)bus_space_vaddr(sc->sc_iot, sc->sc_gpio_ioh) + GPIO_PDATC); - static const int d[] = {0, 1, 5, 10, 50, 100, 500, 1000, -1}; - int i; - int v = *pdatc & ~0x07; + ucnt = usec_to_counter(n); - for (;;) { - *pdatc = v | 2; + while( ucnt > 0 ) { + v1 = read_timer(sc); + delta = v0 - v1; + if ( delta < 0 ) + delta += timer4_reload_value; - for (i=0; d[i] >= 0; ++i) { - *pdatc = v | 3; - delay(d[i]); - *pdatc = v | 2; + if((u_int)delta < ucnt){ + ucnt -= (u_int)delta; + v0 = v1; + } + else { + ucnt = 0; } - *pdatc = v; } + /*NOTREACHED*/ } -#endif void cpu_startprofclock(void) ==== //depot/projects/arm/src/sys/arm/s3c2xx0/uart_bus_s3c2410.c#2 (text+ko) ==== @@ -1,3 +1,6 @@ +#include +__FBSDID("$FreeBSD$"); + #include #include #include @@ -17,10 +20,7 @@ #include "uart_if.h" static int uart_s3c2410_probe(device_t dev); -#if 0 -static int uart_sa1110_attach(device_t dev); -static int uart_sa1110_detach(device_t dev); -#endif + static device_method_t uart_s3c2410_methods[] = { /* Device interface */ DEVMETHOD(device_probe, uart_s3c2410_probe), @@ -50,18 +50,4 @@ return (0); } - -#if 0 -static int -uart_sa1110_attach(device_t dev) -{ - return (0); -} - -static int -uart_sa1110_detach(device_t dev) -{ - return (0); -} -#endif -DRIVER_MODULE(uart, ssio, uart_s3c2410_driver, uart_devclass, 0, 0); +DRIVER_MODULE(uart, s3c2410, uart_s3c2410_driver, uart_devclass, 0, 0); From owner-p4-projects@FreeBSD.ORG Wed Jun 14 02:50:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D75B16A479; Wed, 14 Jun 2006 02:50:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C25FB16A41A for ; Wed, 14 Jun 2006 02:50:23 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40E1E43D53 for ; Wed, 14 Jun 2006 02:50:23 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5E2m1ZS026744 for ; Wed, 14 Jun 2006 02:48:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5E2m1Hd026740 for perforce@freebsd.org; Wed, 14 Jun 2006 02:48:01 GMT (envelope-from imp@freebsd.org) Date: Wed, 14 Jun 2006 02:48:01 GMT Message-Id: <200606140248.k5E2m1Hd026740@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99193 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, 14 Jun 2006 02:50:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=99193 Change 99193 by imp@imp_Speedy on 2006/06/14 02:47:25 Some debugging stuff. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#15 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#4 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#15 (text+ko) ==== @@ -256,7 +256,7 @@ process = i; - pFrameType = (unsigned short *) ((p_rxBD[i].address & 0xFFFFFFFC) + 12); + pFrameType = (unsigned short *)((p_rxBD[i].address & 0xFFFFFFFC) + 12); pData = (char *)(p_rxBD[i].address & 0xFFFFFFFC); switch (*pFrameType) { @@ -355,7 +355,6 @@ return (pEmac->EMAC_MAN & 0x0000ffff); } -#if 0 /* * .KB_C_FN_DEFINITION_START * unsigned short AT91F_MII_ReadPhy (AT91PS_EMAC pEmac, unsigned char addr) @@ -373,7 +372,6 @@ pEmac->EMAC_CTL &= ~AT91C_EMAC_MPE; return (pEmac->EMAC_MAN & 0x0000ffff); } -#endif /* * .KB_C_FN_DEFINITION_START @@ -392,7 +390,7 @@ // AT91F_MII_WritePhy(pEmac, 20, 0x70); AT91F_MII_WritePhy(pEmac, 0x0, 0x3300); -// while (AT91F_MII_ReadPhy(pEmac, 0x0) & (1 << 9)); + while (AT91F_MII_ReadPhy(pEmac, 0x0) & (1 << 9)); sec = GetSeconds(); while (1) { for (i = 0; i <= 0x18; i++) @@ -402,14 +400,41 @@ sec = GetSeconds(); } #endif +#ifdef BOOT_KB9202 stat2 = AT91F_MII_ReadPhy(pEmac, MII_STS2_REG); - if (!(stat2 & 0x400)) + if (!(stat2 & MII_STS2_LINK)) return ; update = pEmac->EMAC_CFG & ~(AT91C_EMAC_SPD | AT91C_EMAC_FD); - if (stat2 & 0x4000) + if (stat2 & MII_STS2_100TX) + update |= AT91C_EMAC_SPD; + if (stat2 & MII_STS2_FDX) + update |= AT91C_EMAC_FD; +#endif +#ifdef BOOT_TSC +again:; + stat2 = AT91F_MII_ReadPhy(pEmac, MII_STS_REG); + stat2 = AT91F_MII_ReadPhy(pEmac, MII_STS_REG); + if (!(stat2 & MII_STS_LINK_STAT)) { + printf("emac: missing link status 0x%x\r\n", stat2); + printf("%x\r\n", AT91F_MII_ReadPhy(pEmac, MII_SPEC_STS_REG)); + AT91F_MII_WritePhy(pEmac, 0x0, 0x3300); + while (AT91F_MII_ReadPhy(pEmac, 0x0) & (1 << 9)); + goto again; + return; + } + printf("emac: link"); + stat2 = AT91F_MII_ReadPhy(pEmac, MII_SPEC_STS_REG); + update = pEmac->EMAC_CFG & ~(AT91C_EMAC_SPD | AT91C_EMAC_FD); + if (stat2 & (MII_SSTS_100FDX | MII_SSTS_100HDX)) { + printf(" 100TX"); update |= AT91C_EMAC_SPD; - if (stat2 & 0x200) + } + if (stat2 & (MII_SSTS_100FDX | MII_SSTS_10FDX)) { + printf(" FDX"); update |= AT91C_EMAC_FD; + } + printf("\r\n"); +#endif pEmac->EMAC_CFG = update; } ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#4 (text+ko) ==== @@ -117,6 +117,18 @@ /* MII registers definition */ #define MII_STS_REG 0x01 +#define MII_STS_LINK_STAT 0x04 +#ifdef BOOT_KB9202 #define MII_STS2_REG 0x11 +#define MII_STS2_LINK 0x400 +#define MII_STS2_100TX 0x4000 +#define MII_STS2_FDX 0x200 +#else +#define MII_SPEC_STS_REG 0x11 +#define MII_SSTS_100FDX 0x8000 +#define MII_SSTS_100HDX 0x4000 +#define MII_SSTS_10FDX 0x2000 +#define MII_SSTS_10HDX 0x1000 +#endif #endif /* _EMAC_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jun 14 02:50:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45A3416A52B; Wed, 14 Jun 2006 02:50:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 11F0816A47A for ; Wed, 14 Jun 2006 02:50:24 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCC0843D48 for ; Wed, 14 Jun 2006 02:50:22 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5E2m1sa026737 for ; Wed, 14 Jun 2006 02:48:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5E2m1m0026733 for perforce@freebsd.org; Wed, 14 Jun 2006 02:48:01 GMT (envelope-from imp@freebsd.org) Date: Wed, 14 Jun 2006 02:48:01 GMT Message-Id: <200606140248.k5E2m1m0026733@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99192 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, 14 Jun 2006 02:50:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=99192 Change 99192 by imp@imp_Speedy on 2006/06/14 02:47:09 Remove duplicate option. Affected files ... .. //depot/projects/arm/src/sys/conf/options.arm#11 edit Differences ... ==== //depot/projects/arm/src/sys/conf/options.arm#11 (text+ko) ==== @@ -13,7 +13,6 @@ PHYSADDR opt_global.h SKYEYE_WORKAROUNDS opt_global.h STARTUP_PAGETABLE_ADDR opt_global.h -VERBOSE_INIT_ARM opt_global.h XSCALE_CACHE_READ_WRITE_ALLOCATE opt_global.h XSACLE_DISABLE_CCNT opt_timer.h VERBOSE_INIT_ARM opt_global.h From owner-p4-projects@FreeBSD.ORG Wed Jun 14 02:55:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75DB716A482; Wed, 14 Jun 2006 02:55:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 514EE16A47D for ; Wed, 14 Jun 2006 02:55:30 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19ABB43D49 for ; Wed, 14 Jun 2006 02:55:30 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5E2r8U8026975 for ; Wed, 14 Jun 2006 02:53:08 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5E2r8EN026972 for perforce@freebsd.org; Wed, 14 Jun 2006 02:53:08 GMT (envelope-from imp@freebsd.org) Date: Wed, 14 Jun 2006 02:53:08 GMT Message-Id: <200606140253.k5E2r8EN026972@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99194 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, 14 Jun 2006 02:55:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=99194 Change 99194 by imp@imp_Speedy on 2006/06/14 02:52:33 Add a bit of a delay and print the registers out of the mii chip for debug for the hardware guys. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#16 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#16 (text+ko) ==== @@ -384,9 +384,9 @@ { unsigned short stat2; unsigned update; -#if 0 unsigned sec; int i; +#if 0 // AT91F_MII_WritePhy(pEmac, 20, 0x70); AT91F_MII_WritePhy(pEmac, 0x0, 0x3300); @@ -415,8 +415,13 @@ stat2 = AT91F_MII_ReadPhy(pEmac, MII_STS_REG); stat2 = AT91F_MII_ReadPhy(pEmac, MII_STS_REG); if (!(stat2 & MII_STS_LINK_STAT)) { + sec = GetSeconds(); printf("emac: missing link status 0x%x\r\n", stat2); - printf("%x\r\n", AT91F_MII_ReadPhy(pEmac, MII_SPEC_STS_REG)); + for (i = 0; i <= 0x18; i++) + printf("%x ", AT91F_MII_ReadPhy(pEmac, i)); + printf("\r\n"); + while (GetSeconds() <= sec + 2) continue; + sec = GetSeconds(); AT91F_MII_WritePhy(pEmac, 0x0, 0x3300); while (AT91F_MII_ReadPhy(pEmac, 0x0) & (1 << 9)); goto again; From owner-p4-projects@FreeBSD.ORG Wed Jun 14 06:10:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3CE016A47E; Wed, 14 Jun 2006 06:10:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 87D3E16A47A for ; Wed, 14 Jun 2006 06:10:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88B4C43D46 for ; Wed, 14 Jun 2006 06:10:42 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5E68Kbx050392 for ; Wed, 14 Jun 2006 06:08:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5E68K0k050389 for perforce@freebsd.org; Wed, 14 Jun 2006 06:08:20 GMT (envelope-from jb@freebsd.org) Date: Wed, 14 Jun 2006 06:08:20 GMT Message-Id: <200606140608.k5E68K0k050389@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99201 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, 14 Jun 2006 06:10:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=99201 Change 99201 by jb@jb_freebsd2 on 2006/06/14 06:07:22 Re-implement the DTrace vtime hook in a better place as pointer out by jhb@. Thanks. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_switch.c#4 edit .. //depot/projects/dtrace/src/sys/kern/kern_synch.c#4 edit .. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#5 edit .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#3 edit .. //depot/projects/dtrace/src/sys/sys/proc.h#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_switch.c#4 (text+ko) ==== @@ -88,7 +88,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.121 2006/06/01 22:45:56 cognet Exp $"); -#include "opt_kdtrace.h" #include "opt_sched.h" #ifndef KERN_SWITCH_INCLUDE @@ -127,11 +126,6 @@ #define td_kse td_sched -#ifdef KDTRACE -int dtrace_vtime_active; -dtrace_vtime_switch_func_t dtrace_vtime_switch_func; -#endif - /* * kern.sched.preemption allows user space to determine if preemption support * is compiled in or not. It is not currently a boot or runtime flag that ==== //depot/projects/dtrace/src/sys/kern/kern_synch.c#4 (text+ko) ==== @@ -64,6 +64,11 @@ #include +#ifdef KDTRACE +int dtrace_vtime_active; +dtrace_vtime_switch_func_t dtrace_vtime_switch_func; +#endif + static void synch_setup(void *dummy); SYSINIT(synch_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, synch_setup, NULL) @@ -422,6 +427,17 @@ td, td->td_proc->p_comm, td->td_priority, td->td_inhibitors, td->td_wmesg, td->td_lockname); #endif + +#ifdef KDTRACE + /* + * If DTrace has set the active vtime enum to anything + * other than INACTIVE (0), then it should have set the + * function to call. + */ + if (dtrace_vtime_active) + (*dtrace_vtime_switch_func)(newtd); +#endif + sched_switch(td, newtd, flags); CTR3(KTR_SCHED, "mi_switch: running %p(%s) prio %d", td, td->td_proc->p_comm, td->td_priority); ==== //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#5 (text+ko) ==== @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.81 2006/06/06 12:26:17 davidxu Exp $"); #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #define kse td_sched ==== //depot/projects/dtrace/src/sys/kern/sched_ule.c#3 (text+ko) ==== @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.162 2006/06/06 12:26:17 davidxu Exp $"); #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_sched.h" #define kse td_sched ==== //depot/projects/dtrace/src/sys/sys/proc.h#7 (text+ko) ==== @@ -489,12 +489,8 @@ extern int dtrace_vtime_active; extern dtrace_vtime_switch_func_t dtrace_vtime_switch_func; -#define TD_SET_RUNNING(td) if (dtrace_vtime_active) \ - (*dtrace_vtime_switch_func)(td); \ - (td)->td_state = TDS_RUNNING -#else +#endif #define TD_SET_RUNNING(td) (td)->td_state = TDS_RUNNING -#endif #define TD_SET_RUNQ(td) (td)->td_state = TDS_RUNQ #define TD_SET_CAN_RUN(td) (td)->td_state = TDS_CAN_RUN From owner-p4-projects@FreeBSD.ORG Wed Jun 14 08:33:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BECF916A479; Wed, 14 Jun 2006 08:33:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8353416A47F for ; Wed, 14 Jun 2006 08:33:42 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A78C43D45 for ; Wed, 14 Jun 2006 08:33:42 +0000 (GMT) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5E8VJwh059967 for ; Wed, 14 Jun 2006 08:31:19 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5E8VJVD059964 for perforce@freebsd.org; Wed, 14 Jun 2006 08:31:19 GMT (envelope-from ryanb@FreeBSD.org) Date: Wed, 14 Jun 2006 08:31:19 GMT Message-Id: <200606140831.k5E8VJVD059964@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ryanb@FreeBSD.org using -f From: Ryan Beasley To: Perforce Change Reviews Cc: Subject: PERFORCE change 99207 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, 14 Jun 2006 08:33:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=99207 Change 99207 by ryanb@ryanb_yuki on 2006/06/14 08:30:34 Added stub handler for SNDCTL_SYSINFO ioctl available to audio (/dev/dsp), mixer, and MIDI devices. (Currently only supported on dsp and mixer devices>) Submission also includes tweaked sys/soundcard.h with definitions from the new API. For the time being, all of my changes will be wrapped in gross OSSV4_EXPERIMENT ifdefs until things begin to take shape. Affected files ... .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/dsp.c#2 edit .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/mixer.c#2 edit .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/mixer.h#2 edit .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.c#2 edit .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.h#2 edit .. //depot/projects/soc2006/rbeasley_sound/sys/sys/soundcard.h#2 edit Differences ... ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/dsp.c#2 (text+ko) ==== @@ -1032,6 +1032,11 @@ dsp_set_flags(i_dev, dsp_get_flags(i_dev)^SD_F_SIMPLEX); break; +#ifdef OSSV4_EXPERIMENT + case SNDCTL_SYSINFO: + sound_oss_sysinfo((oss_sysinfo *)arg); + break; +#endif /* !OSSV4_EXPERIMENT */ case SNDCTL_DSP_MAPINBUF: case SNDCTL_DSP_MAPOUTBUF: case SNDCTL_DSP_SETSYNCRO: @@ -1206,4 +1211,5 @@ SYSUNINIT(dsp_sysuninit, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, dsp_sysuninit, NULL); #endif - +#ifdef OSSV4_EXPERIMENT +#endif /* !OSSV4_EXPERIMENT */ ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/mixer.c#2 (text+ko) ==== @@ -513,6 +513,13 @@ snd_mtxunlock(m->lock); return (v != -1)? 0 : ENXIO; } +#ifdef OSSV4_EXPERIMENT + if (cmd == SNDCTL_SYSINFO) { + sound_oss_sysinfo((oss_sysinfo *)arg); + snd_mtxunlock(m->lock); + return 0; + } +#endif /* !OSSV4_EXPERIMENT */ snd_mtxunlock(m->lock); return ENXIO; } @@ -552,4 +559,24 @@ SYSUNINIT(mixer_sysuninit, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, mixer_sysuninit, NULL); #endif +#ifdef OSSV4_EXPERIMENT +/** + * @brief Counts the number of mixers in the system. + * @returns Number of mixer devices + * + * Used for SNDCTL_SYSINFO. Return the number of mixer devices in the + * system. Gross hack! (There has to be a better way.) + */ +int +mixer_get_num_mixers(void) +{ + struct cdev *mdev; + int count = 0; + LIST_FOREACH(mdev, &mixer_cdevsw.d_devs, si_list) { + ++count; + } + + return count; +} +#endif /* !OSSV4_EXPERIMENT */ ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/mixer.h#2 (text+ko) ==== @@ -41,6 +41,10 @@ u_int32_t mix_getrecdevs(struct snd_mixer *m); void *mix_getdevinfo(struct snd_mixer *m); +#ifdef OSSV4_EXPERIMENT +int mixer_get_num_mixers(void); +#endif /* !OSSV4_EXPERIMENT */ + /* * this is a kludge to allow hiding of the struct snd_mixer definition * 512 should be enough for all architectures ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.c#2 (text+ko) ==== @@ -1120,6 +1120,70 @@ /************************************************************************/ +#ifdef OSSV4_EXPERIMENT +/** + * @brief Handle OSSv4 SNDCTL_SYSINFO ioctl. + * + * @param si Pointer to oss_sysinfo struct where information about the + * sound subsystem will be written/copied. + * + * This routine returns information about the sound system, such as the + * current OSS version, number of audio, MIDI, and mixer drivers, etc. + * Also includes a bitmask showing which of the above types of devices + * are open (busy). + * + * @author Ryan Beasley + */ +void +sound_oss_sysinfo(oss_sysinfo *si) +{ + static char si_product[] = "OSS/FreeBSD"; + static char si_version[] = "4.0.0a"; + + strncpy(si->product, si_product, sizeof(si->product)); + strncpy(si->version, si_version, sizeof(si->version)); + si->versionnum = SOUND_VERSION; + si->numaudios = (pcm_devclass != NULL) ? + devclass_get_count(pcm_devclass) : + 0; + si->numsynths = 0; /* OSSv4 docs: this field is obsolete */ + /** + * @todo Collect num{midis,timers}. + * + * Need access to sound/midi/midi.c::midistat_lock in order + * to safely touch midi_devices and get a head count of, well, + * MIDI devices. midistat_lock is a global static (i.e., local to + * midi.c), but midi_devices is a regular global; should the mutex + * be publicized, or is there another way to get this information? + * + * NB: MIDI/sequencer stuff is currently on hold. + */ + si->nummidis = 0; + si->numtimers = 0; + si->nummixers = mixer_get_num_mixers(); + si->numcards = 0; /* OSSv4 docs: Intended only for test apps; + API doesn't really have much of a concept + of cards. Shouldn't be used by + applications. */ + + /** + * @todo Fill in "busy devices" fields. + * + * si->openedaudio = bitmask of open/busy audio devices + * si->openedmidi = " MIDI devices + */ + bzero((void *)&si->openedaudio, sizeof(si->openedaudio)); + bzero((void *)&si->openedmidi, sizeof(si->openedmidi)); + + /* + * XXX Si->filler is a reserved array, but according to docs each + * element should be set to -1. + */ +} +#endif /* !OSSV4_EXPERIMENT */ + +/************************************************************************/ + static int sound_modevent(module_t mod, int type, void *data) { ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.h#2 (text+ko) ==== @@ -318,6 +318,10 @@ #define PCM_KLDSTRING(a) "" #endif +#ifdef OSSV4_EXPERIMENT +void sound_oss_sysinfo(oss_sysinfo *); +#endif /* !OSSV4_EXPERIMENT */ + #endif /* _KERNEL */ #endif /* _OS_H_ */ ==== //depot/projects/soc2006/rbeasley_sound/sys/sys/soundcard.h#2 (text+ko) ==== @@ -1437,4 +1437,54 @@ #define SOUND_PCM_MAPINBUF SNDCTL_DSP_MAPINBUF #define SOUND_PCM_MAPOUTBUF SNDCTL_DSP_MAPOUTBUF +/***********************************************************************/ + +/** + * XXX OSSv4 defines -- some bits taken straight out of the new + * sys/soundcard.h bundled with recent OSS releases. + * + * NB: These macros and structures will be reorganized and inserted + * in appropriate places throughout this file once the code begins + * to take shape. + */ +#define OSSV4_EXPERIMENT 1 +#ifdef OSSV4_EXPERIMENT + +#ifdef SOUND_VERSION +# undef SOUND_VERSION +# define SOUND_VERSION 0x040000 +#endif /* !SOUND_VERSION */ + +/** + * @struct oss_sysinfo + * @brief Argument for SNDCTL_SYSINFO ioctl. + * + * For use w/ the SNDCTL_SYSINFO ioctl available on audio (/dev/dsp*), + * mixer, and MIDI devices. + */ +typedef struct oss_sysinfo +{ + char product[32]; /* For example OSS/Free, OSS/Linux or OSS/Solaris */ + char version[32]; /* For example 4.0a */ + int versionnum; /* See OSS_GETVERSION */ + char options[128]; /* Reserved */ + + int numaudios; /* # of audio/dsp devices */ + int openedaudio[8]; /* Bit mask telling which audio devices are busy */ + + int numsynths; /* # of availavle synth devices */ + int nummidis; /* # of available MIDI ports */ + int numtimers; /* # of available timer devices */ + int nummixers; /* # of mixer devices */ + + int openedmidi[8]; /* Bit mask telling which midi devices are busy */ + int numcards; /* Number of sound cards in the system */ + int filler[241]; /* For future expansion (set to -1) */ +} oss_sysinfo; + +#define SNDCTL_SYSINFO _IOR ('X', 1, oss_sysinfo) +#define OSS_SYSINFO SNDCTL_SYSINFO /* Old name */ + +#endif /* !OSSV4_EXPERIMENT */ + #endif /* !_SYS_SOUNDCARD_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jun 14 11:50:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E3E316A474; Wed, 14 Jun 2006 11:50:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BAB3116A47B for ; Wed, 14 Jun 2006 11:50:08 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A38F043D62 for ; Wed, 14 Jun 2006 11:50:03 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5EBlefu082334 for ; Wed, 14 Jun 2006 11:47:40 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5EBldFU082325 for perforce@freebsd.org; Wed, 14 Jun 2006 11:47:39 GMT (envelope-from bushman@freebsd.org) Date: Wed, 14 Jun 2006 11:47:39 GMT Message-Id: <200606141147.k5EBldFU082325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 99219 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, 14 Jun 2006 11:50:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=99219 Change 99219 by bushman@bushman_nss_ldap_cached on 2006/06/14 11:47:06 All "hosts" source functionality is now split into the nss-modules (nss_files, nss_dns and nss_nis). Now these modules should be cleaned to avoid code duplication. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/devd.conf#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/hosts.allow#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/netstart#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/auditd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/bridge#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/cached#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/devd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/jail#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/netif#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/pf#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/glob.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/gen/_ctx_start.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/truncate.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libnssutil/hosts_name6.h#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_addrinfo.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_namadr.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_name6.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_name6.h#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/nss_dns.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/nss_files.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/Makefile#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_addrinfo.c#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_addrinfo.h#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_namadr.c#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_namadr.h#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_name6.c#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_name6.h#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nss_nis.c#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/adduser/adduser.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/hccontrol/hccontrol.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/config/config.y#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/config/main.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/config/mkmakefile.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/config/mkoptions.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cron/cron/do_command.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cron/cron/popen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mailwrapper/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mailwrapper/mailwrapper.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ntp/doc/ntp.conf.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/portsnap/portsnap/portsnap.sh#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/installUpgrade.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ypserv/Makefile.yp#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ypserv/yp_access.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ypserv/ypinit.8#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#2 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.285 2006/05/24 00:06:14 kris Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.288 2006/06/07 17:14:27 brueffer Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -74,7 +74,7 @@ #geli_da1_autodetach="NO" #geli_mirror_home_flags="-k /etc/geli/home.keys" -geli_swap_flags="-a aes -l 256 -s 4096 -d" # Options for GELI-encrypted +geli_swap_flags="-e aes -l 256 -s 4096 -d" # Options for GELI-encrypted # swap partitions. root_rw_mount="YES" # Set to NO to inhibit remounting root read-write. @@ -159,6 +159,9 @@ #ifconfig_fxp0_name="net0" # Change interface name from fxp0 to net0. #ipv4_addrs_fxp0="192.168.0.1/24 192.168.1.1-5/28" # example IPv4 address entry. # +#autobridge_interfaces="bridge0" # List of bridges to check +#autobridge_bridge0="tap* vlan0" # Interface glob to automatically add to the bridge +# # If you have any sppp(4) interfaces above, you might also want to set # the following parameters. Refer to spppcontrol(8) for their meaning. sppp_interfaces="" # List of sppp interfaces. @@ -546,6 +549,9 @@ #jail_example_ip="192.168.0.10" # Jail's IP number #jail_example_interface="" # Interface to create the IP alias on #jail_example_exec_start="/bin/sh /etc/rc" # command to execute in jail for starting +#jail_example_exec_afterstart0="/bin/sh command" # command to execute after the one for + # starting the jail. More than one can be + # specified using a trailing number #jail_example_exec_stop="/bin/sh /etc/rc.shutdown" # command to execute in jail for stopping #jail_example_devfs_enable="NO" # mount devfs in the jail #jail_example_fdescfs_enable="NO" # mount fdescfs in the jail ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/devd.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.32 2006/03/16 17:42:27 emax Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.33 2006/06/01 00:41:07 thompsa Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -28,17 +28,19 @@ # override these general rules. # -# For ethernet like devices start configuring the interface. Due to -# a historical accident, this script is called pccard_ether. +# Configure the interface on attach. Due to a historical accident, this +# script is called pccard_ether. # -attach 0 { - media-type "ethernet"; - action "/etc/pccard_ether $device-name start"; +notify 0 { + match "system" "IFNET"; + match "type" "ATTACH"; + action "/etc/pccard_ether $subsystem start"; }; -detach 0 { - media-type "ethernet"; - action "/etc/pccard_ether $device-name stop"; +notify 0 { + match "system" "IFNET"; + match "type" "DETACH"; + action "/etc/pccard_ether $subsystem stop"; }; # ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/hosts.allow#2 (text+ko) ==== @@ -1,6 +1,6 @@ # # hosts.allow access control file for "tcp wrapped" applications. -# $FreeBSD: src/etc/hosts.allow,v 1.21 2006/03/17 18:54:21 ru Exp $ +# $FreeBSD: src/etc/hosts.allow,v 1.22 2006/06/01 14:14:58 csjp Exp $ # # NOTE: The hosts.deny file is deprecated. # Place both 'allow' and 'deny' rules in the hosts.allow file. @@ -66,6 +66,7 @@ rpcbind : ALL : deny # NIS master server. Only local nets should have access +# (Since this is an RPC service, rpcbind needs to be considered) ypserv : localhost : allow ypserv : .unsafe.my.net.example.com : deny ypserv : .my.net.example.com : allow ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/netstart#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/netstart,v 1.66 2005/10/29 05:08:00 yar Exp $ +# $FreeBSD: src/etc/netstart,v 1.67 2006/05/30 02:10:01 brooks Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -37,7 +37,6 @@ . /etc/rc.subr load_rc_config 'XXX' -/etc/rc.d/pccard start /etc/rc.d/devd start /etc/rc.d/hostname start /etc/rc.d/ipmon start ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/Makefile#2 (text+ko) ==== @@ -1,12 +1,12 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.72 2006/05/18 15:29:27 flz Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.73 2006/06/01 11:01:54 thompsa Exp $ .include FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ apm apmd archdep atm1 atm2 atm3 auditd \ - bgfsck bluetooth bootparams bsnmpd \ + bgfsck bluetooth bootparams bridge bsnmpd \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ dmesg dumpon \ ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/auditd#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/auditd,v 1.1 2006/02/02 10:02:55 rwatson Exp $ +# $FreeBSD: src/etc/rc.d/auditd,v 1.2 2006/06/06 17:22:55 trhodes Exp $ # # Start up for the Audit daemon. # @@ -8,6 +8,7 @@ # PROVIDE: auditd # REQUIRE: syslogd # BEFORE: DAEMON +# KEYWORD: shutdown . /etc/rc.subr @@ -23,11 +24,7 @@ auditd_stop() { - if [ -f /var/run/auditd.pid ]; then - /usr/sbin/audit -t - else - echo "The audit daemon is not running"; - fi + /usr/sbin/audit -t } load_rc_config $name ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/cached#2 (text) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cached,v 1.1 2006/04/28 12:03:34 ume Exp $ +# $FreeBSD: src/etc/rc.d/cached,v 1.3 2006/06/06 15:34:50 ume Exp $ # # PROVIDE: cached @@ -21,6 +21,8 @@ rcvar=`set_rcvar` command=/usr/sbin/cached +extra_commands="flush" +flush_cmd="${command} -I all" cached_enable=${cached_enable:-"NO"} cached_pidfile=${cached_pidfile:-"/var/run/cached.pid"} ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/devd#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devd,v 1.8 2005/10/28 16:55:38 yar Exp $ +# $FreeBSD: src/etc/rc.d/devd,v 1.9 2006/06/01 00:41:07 thompsa Exp $ # # PROVIDE: devd -# REQUIRE: NETWORKING -# BEFORE: mountcritremote +# REQUIRE: netif +# BEFORE: NETWORKING mountcritremote # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/jail#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.32 2006/05/11 14:23:43 flz Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.34 2006/05/30 16:20:48 matteo Exp $ # # PROVIDE: jail @@ -36,6 +36,14 @@ eval _interface=\"\${jail_${_j}_interface:-${jail_interface}}\" eval _exec=\"\$jail_${_j}_exec\" eval _exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\" + + i=1 + while [ true ]; do + eval _exec_afterstart${i}=\"\${jail_${_j}_exec_afterstart${i}:-\${jail_exec_afterstart${i}}}\" + [ -z "$(eval echo \"\$_exec_afterstart${i}\")" ] && break + i=$((i + 1)) + done + eval _exec_stop=\"\${jail_${_j}_exec_stop:-${jail_exec_stop}}\" if [ -n "${_exec}" ]; then # simple/backward-compatible execution @@ -84,6 +92,19 @@ debug "$_j ruleset: $_ruleset" debug "$_j fstab: $_fstab" debug "$_j exec start: $_exec_start" + + i=1 + while [ true ]; do + eval out=\"\${_exec_afterstart${i}:-''}\" + + if [ -z "$out" ]; then + break; + fi + + debug "$_j exec after start #${i}: ${out}" + i=$((i + 1)) + done + debug "$_j exec stop: $_exec_stop" debug "$_j flags: $_flags" @@ -221,19 +242,32 @@ _tmp_jail=${_tmp_dir}/jail.$$ eval jail ${_flags} -i ${_rootdir} ${_hostname} \ ${_ip} ${_exec_start} > ${_tmp_jail} 2>&1 - if [ "$?" -eq 0 ] ; then - echo -n " $_hostname" - _jail_id=$(head -1 ${_tmp_jail}) - tail +2 ${_tmp_jail} >${_rootdir}/var/log/console.log - echo ${_jail_id} > /var/run/jail_${_jail}.id - else - jail_umount_fs - if [ -n "${jail_interface}" ]; then - ifconfig ${jail_interface} -alias ${jail_ip} + + if [ "$?" -eq 0 ] ; then + _jail_id=$(head -1 ${_tmp_jail}) + i=1 + while [ true ]; do + eval out=\"\${_exec_afterstart${i}:-''}\" + + if [ -z "$out" ]; then + break; fi - echo " cannot start jail \"${_jail}\": " - tail +2 ${_tmp_jail} + + jexec "${_jail_id}" ${out} + i=$((i + 1)) + done + + echo -n " $_hostname" + tail +2 ${_tmp_jail} >${_rootdir}/var/log/console.log + echo ${_jail_id} > /var/run/jail_${_jail}.id + else + jail_umount_fs + if [ -n "${jail_interface}" ]; then + ifconfig ${jail_interface} -alias ${jail_ip} fi + echo " cannot start jail \"${_jail}\": " + tail +2 ${_tmp_jail} + fi rm -f ${_tmp_jail} done rmdir ${_tmp_dir} ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/netif#2 (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.19 2006/02/13 20:08:31 imp Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.20 2006/06/01 11:01:54 thompsa Exp $ # # PROVIDE: netif @@ -71,6 +71,9 @@ # Resync ipfilter /etc/rc.d/ipfilter resync fi + if [ -f /etc/rc.d/bridge -a -n "$_cmdifn" ] ; then + /etc/rc.d/bridge start $_cmdifn + fi } network_stop() ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/pf#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pf,v 1.12 2005/11/10 10:40:15 rse Exp $ +# $FreeBSD: src/etc/rc.d/pf,v 1.13 2006/06/05 03:47:14 obrien Exp $ # # PROVIDE: pf @@ -40,7 +40,7 @@ pf_start() { echo "Enabling pf." - $pf_program -Fall > /dev/null 2>&1 + $pf_program -F all > /dev/null 2>&1 $pf_program -f "$pf_rules" $pf_flags if ! $pf_program -s info | grep -q "Enabled" ; then $pf_program -e ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getgrent.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.33 2006/04/28 12:03:35 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.34 2006/06/01 15:45:06 maxim Exp $"); #include "namespace.h" #include @@ -721,6 +721,7 @@ gid_t gid; char *buffer; size_t bufsize, linesize; + off_t pos; int rv, stayopen, *errnop; name = NULL; @@ -757,6 +758,7 @@ stayopen = st->stayopen; } rv = NS_NOTFOUND; + pos = ftello(st->fp); while ((line = fgetln(st->fp, &linesize)) != NULL) { if (line[linesize-1] == '\n') linesize--; @@ -768,10 +770,12 @@ * pointer for the member list terminator. */ if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) { + fseeko(st->fp, pos, SEEK_SET); *errnop = ERANGE; rv = NS_RETURN; break; } + pos = ftello(st->fp); memcpy(buffer, line, linesize); buffer[linesize] = '\0'; rv = __gr_parse_entry(buffer, linesize, grp, @@ -1183,6 +1187,7 @@ char *buffer, *p; void *discard; size_t bufsize, linesize; + off_t pos; int rv, stayopen, *errnop; #define set_lookup_type(x, y) do { \ @@ -1286,6 +1291,7 @@ break; } rv = NS_NOTFOUND; + pos = ftello(st->fp); while ((line = fgetln(st->fp, &linesize)) != NULL) { if (line[linesize-1] == '\n') linesize--; @@ -1316,10 +1322,12 @@ * pointer for the member list terminator. */ if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) { + fseeko(st->fp, pos, SEEK_SET); *errnop = ERANGE; rv = NS_RETURN; break; } + pos = ftello(st->fp); memcpy(buffer, line, linesize); buffer[linesize] = '\0'; rv = __gr_parse_entry(buffer, linesize, grp, ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/glob.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.24 2006/05/22 06:33:19 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.25 2006/06/05 18:22:13 delphij Exp $"); /* * glob(3) -- a superset of the one defined in POSIX 1003.2. @@ -167,19 +167,16 @@ #endif int -glob(pattern, flags, errfunc, pglob) - const char *pattern; - int flags, (*errfunc)(const char *, int); - glob_t *pglob; +glob(const char *pattern, int flags, int (*errfunc)(const char *, int), glob_t *pglob) { - const u_char *patnext; + const char *patnext; size_t limit; Char *bufnext, *bufend, patbuf[MAXPATHLEN], prot; mbstate_t mbs; wchar_t wc; size_t clen; - patnext = (u_char *) pattern; + patnext = pattern; if (!(flags & GLOB_APPEND)) { pglob->gl_pathc = 0; pglob->gl_pathv = NULL; @@ -244,10 +241,7 @@ * characters */ static int -globexp1(pattern, pglob, limit) - const Char *pattern; - glob_t *pglob; - size_t *limit; +globexp1(const Char *pattern, glob_t *pglob, size_t *limit) { const Char* ptr = pattern; int rv; @@ -270,11 +264,7 @@ * If it fails then it tries to glob the rest of the pattern and returns. */ static int -globexp2(ptr, pattern, pglob, rv, limit) - const Char *ptr, *pattern; - glob_t *pglob; - int *rv; - size_t *limit; +globexp2(const Char *ptr, const Char *pattern, glob_t *pglob, int *rv, size_t *limit) { int i; Char *lm, *ls; @@ -378,11 +368,7 @@ * expand tilde from the passwd file. */ static const Char * -globtilde(pattern, patbuf, patbuf_len, pglob) - const Char *pattern; - Char *patbuf; - size_t patbuf_len; - glob_t *pglob; +globtilde(const Char *pattern, Char *patbuf, size_t patbuf_len, glob_t *pglob) { struct passwd *pwd; char *h; @@ -448,10 +434,7 @@ * if things went well, nonzero if errors occurred. */ static int -glob0(pattern, pglob, limit) - const Char *pattern; - glob_t *pglob; - size_t *limit; +glob0(const Char *pattern, glob_t *pglob, size_t *limit) { const Char *qpatnext; int c, err; @@ -538,17 +521,13 @@ } static int -compare(p, q) - const void *p, *q; +compare(const void *p, const void *q) { return(strcmp(*(char **)p, *(char **)q)); } static int -glob1(pattern, pglob, limit) - Char *pattern; - glob_t *pglob; - size_t *limit; +glob1(Char *pattern, glob_t *pglob, size_t *limit) { Char pathbuf[MAXPATHLEN]; @@ -565,10 +544,8 @@ * meta characters. */ static int -glob2(pathbuf, pathend, pathend_last, pattern, pglob, limit) - Char *pathbuf, *pathend, *pathend_last, *pattern; - glob_t *pglob; - size_t *limit; +glob2(Char *pathbuf, Char *pathend, Char *pathend_last, Char *pattern, + glob_t *pglob, size_t *limit) { struct stat sb; Char *p, *q; @@ -625,10 +602,9 @@ } static int -glob3(pathbuf, pathend, pathend_last, pattern, restpattern, pglob, limit) - Char *pathbuf, *pathend, *pathend_last, *pattern, *restpattern; - glob_t *pglob; - size_t *limit; +glob3(Char *pathbuf, Char *pathend, Char *pathend_last, + Char *pattern, Char *restpattern, + glob_t *pglob, size_t *limit) { struct dirent *dp; DIR *dirp; @@ -668,7 +644,7 @@ else readdirfunc = readdir; while ((dp = (*readdirfunc)(dirp))) { - u_char *sc; + char *sc; Char *dc; wchar_t wc; size_t clen; @@ -679,7 +655,7 @@ continue; memset(&mbs, 0, sizeof(mbs)); dc = pathend; - sc = (u_char *) dp->d_name; + sc = dp->d_name; while (dc < pathend_last) { clen = mbrtowc(&wc, sc, MB_LEN_MAX, &mbs); if (clen == (size_t)-1 || clen == (size_t)-2) { @@ -724,10 +700,7 @@ * gl_pathv points to (gl_offs + gl_pathc + 1) items. */ static int -globextend(path, pglob, limit) - const Char *path; - glob_t *pglob; - size_t *limit; +globextend(const Char *path, glob_t *pglob, size_t *limit) { char **pathv; size_t i, newsize, len; @@ -778,8 +751,7 @@ * pattern causes a recursion level. */ static int -match(name, pat, patend) - Char *name, *pat, *patend; +match(Char *name, Char *pat, Char *patend) { int ok, negate_range; Char c, k; @@ -830,8 +802,7 @@ /* Free allocated data belonging to a glob_t structure. */ void -globfree(pglob) - glob_t *pglob; +globfree(glob_t *pglob) { size_t i; char **pp; @@ -847,9 +818,7 @@ } static DIR * -g_opendir(str, pglob) - Char *str; - glob_t *pglob; +g_opendir(Char *str, glob_t *pglob) { char buf[MAXPATHLEN]; @@ -867,10 +836,7 @@ } static int -g_lstat(fn, sb, pglob) - Char *fn; - struct stat *sb; - glob_t *pglob; +g_lstat(Char *fn, struct stat *sb, glob_t *pglob) { char buf[MAXPATHLEN]; @@ -884,10 +850,7 @@ } static int -g_stat(fn, sb, pglob) - Char *fn; - struct stat *sb; - glob_t *pglob; +g_stat(Char *fn, struct stat *sb, glob_t *pglob) { char buf[MAXPATHLEN]; @@ -901,10 +864,9 @@ } static Char * -g_strchr(str, ch) - Char *str; - wchar_t ch; +g_strchr(Char *str, wchar_t ch) { + do { if (*str == ch) return (str); @@ -913,10 +875,7 @@ } static int -g_Ctoc(str, buf, len) - const Char *str; - char *buf; - size_t len; +g_Ctoc(const Char *str, char *buf, size_t len) { mbstate_t mbs; size_t clen; @@ -937,9 +896,7 @@ #ifdef DEBUG static void -qprintf(str, s) - const char *str; - Char *s; +qprintf(const char *str, Char *s) { Char *p; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/gen/_ctx_start.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_ctx_start.S,v 1.3 2004/07/02 14:19:44 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_ctx_start.S,v 1.4 2006/06/05 14:59:33 kib Exp $"); /* * _ctx_start((void *func)(int arg1, ..., argn), @@ -41,10 +41,11 @@ ENTRY(_ctx_start) popl %eax /* get start function */ call *%eax /* call start function */ + PIC_PROLOGUE movl %esi, %esp /* * setup stack for completion routine; * ucp is now at top of stack */ - call _ctx_done /* should never return */ - call abort /* fubar */ + call PIC_PLT(_ctx_done) /* should never return */ + call PIC_PLT(abort) /* fubar */ ret ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/truncate.2#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)truncate.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/truncate.2,v 1.17 2005/01/20 09:17:05 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/truncate.2,v 1.18 2006/06/01 14:20:43 maxim Exp $ .\" -.Dd June 4, 1993 +.Dd June 1, 2006 .Dt TRUNCATE 2 .Os .Sh NAME @@ -69,6 +69,10 @@ the file must be open for writing. .Sh RETURN VALUES .Rv -std +If the file to be modified is not a directory or +a regular file, the +.Fn truncate +call has no effect and returns the value 0. .Sh ERRORS The .Fn truncate ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libnssutil/hosts_name6.h#2 (text+ko) ==== @@ -64,3 +64,10 @@ #define map_one map_addr_un.mau_one #define map_inaddr map_addr_un.mau_inaddr }; + +struct hostent * _hpcopy(struct hostent *hp, int *errp); +struct hostent * _hpmerge(struct hostent *hp1, struct hostent *hp2, int *errp); +#ifdef INET6 +struct hostent * _hpmapv6(struct hostent *hp, int *errp); +#endif +struct hostent * _hpsort(struct hostent *hp, res_state statp); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_addrinfo.c#2 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_namadr.c#2 (text+ko) ==== @@ -97,7 +97,12 @@ if (hed == NULL) return; hed->stayopen = 0; - _endhosthtent(hed); + + if (hed->hostf) { + (void) fclose(hed->hostf); + hed->hostf = NULL; + } + free(hed); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_name6.c#2 (text+ko) ==== @@ -1,0 +1,609 @@ +/* $KAME: name6.c,v 1.25 2000/06/26 16:44:40 itojun Exp $ */ + +/* + * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project 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 PROJECT 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 PROJECT 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) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +/* + * ++Copyright++ 1985, 1988, 1993 + * - + * Copyright (c) 1985, 1988, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 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 + * 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 + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * - + * Portions Copyright (c) 1993 by Digital Equipment Corporation. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies, and that + * the name of Digital Equipment Corporation not be used in advertising or + * publicity pertaining to distribution of the document or software without + * specific, written prior permission. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT + * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + * - + * --Copyright-- + */ + +/* + * Atsushi Onoe + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#ifdef INET6 +#include +#include +#include +#include +#include /* XXX */ +#endif + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "netdb_private.h" +#include "res_config.h" +#include "hosts_name6.h" + +#ifndef MAXALIASES +#define MAXALIASES 10 +#endif +#ifndef MAXADDRS +#define MAXADDRS 20 +#endif + +#ifdef INET6 +#define ADDRLEN(af) ((af) == AF_INET6 ? sizeof(struct in6_addr) : \ + sizeof(struct in_addr)) +#else +#define ADDRLEN(af) sizeof(struct in_addr) +#endif + +#define MAXPACKET (64*1024) + +typedef union { + HEADER hdr; + u_char buf[MAXPACKET]; +} querybuf; + +static struct hostent *getanswer(const querybuf *, int, const char *, int, + struct hostent *, int *); + +/* + * we don't need to take care about sorting, nor IPv4 mapped address here. + */ +static struct hostent * +getanswer(const querybuf *answer, int anslen, const char *qname, int qtype, + struct hostent *template, int *errp) +{ + const HEADER *hp; + const u_char *cp; + int n; + const u_char *eom, *erdata; + char *bp, *ep, **ap, **hap; + int type, class, ancount, qdcount; + int haveanswer, had_error; + char tbuf[MAXDNAME]; + const char *tname; + int (*name_ok)(const char *); + static char *h_addr_ptrs[MAXADDRS + 1]; + static char *host_aliases[MAXALIASES]; + static char hostbuf[8*1024]; + +#define BOUNDED_INCR(x) \ + do { \ + cp += x; \ + if (cp > eom) { \ + *errp = NO_RECOVERY; \ + return (NULL); \ + } \ + } while (0) + +#define BOUNDS_CHECK(ptr, count) \ + do { \ + if ((ptr) + (count) > eom) { \ + *errp = NO_RECOVERY; \ + return (NULL); \ + } \ + } while (0) + +/* XXX do {} while (0) cannot be put here */ +#define DNS_ASSERT(x) \ + { \ + if (!(x)) { \ + cp += n; \ + continue; \ + } \ + } + +/* XXX do {} while (0) cannot be put here */ +#define DNS_FATAL(x) \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 14 12:56:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1342C16A47B; Wed, 14 Jun 2006 12:56:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC03916A474 for ; Wed, 14 Jun 2006 12:56:26 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9473A43D46 for ; Wed, 14 Jun 2006 12:56:26 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5ECs32t094131 for ; Wed, 14 Jun 2006 12:54:03 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5ECs30G094128 for perforce@freebsd.org; Wed, 14 Jun 2006 12:54:03 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 14 Jun 2006 12:54:03 GMT Message-Id: <200606141254.k5ECs30G094128@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 99220 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, 14 Jun 2006 12:56:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=99220 Change 99220 by rdivacky@rdivacky_witten on 2006/06/14 12:53:58 First attempt to make linux programs work under 2.6. There's still the setpgid/setpgrp problem but I am working on it. Now we can run most of the programs but some coredumps. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_machdep.c#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#2 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_machdep.c#2 (text+ko) ==== @@ -496,9 +496,6 @@ } #endif - if (!args->stack) - return (EINVAL); - exit_signal = args->flags & 0x000000ff; if (exit_signal >= LINUX_NSIG) return (EINVAL); @@ -522,7 +519,11 @@ p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); td2 = FIRST_THREAD_IN_PROC(p2); - td2->td_frame->tf_rsp = PTROUT(args->stack); + /* XXX: in a case of stack = NULL we are supposed to COW calling process stack + * this is what normal fork() does so we just keep the tf_esp arg intact + */ + if (args->stack) + td2->td_frame->tf_rsp = PTROUT(args->stack); #ifdef DEBUG if (ldebug(clone)) ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#2 (text+ko) ==== @@ -334,9 +334,6 @@ } #endif - if (!args->stack) - return (EINVAL); - exit_signal = args->flags & 0x000000ff; if (exit_signal >= LINUX_NSIG) return (EINVAL); @@ -376,7 +373,11 @@ p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); td2 = FIRST_THREAD_IN_PROC(p2); - td2->td_frame->tf_esp = (unsigned int)args->stack; + /* XXX: in a case of stack = NULL we are supposed to COW calling process stack + * this is what normal fork() does so we just keep the tf_esp arg intact + */ + if (args->stack) + td2->td_frame->tf_esp = (unsigned int)args->stack; #ifdef DEBUG if (ldebug(clone)) From owner-p4-projects@FreeBSD.ORG Wed Jun 14 14:26:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 544D516A835; Wed, 14 Jun 2006 14:26:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 31E4B16A833 for ; Wed, 14 Jun 2006 14:26:21 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB59343D48 for ; Wed, 14 Jun 2006 14:26:20 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5EENvvJ000788 for ; Wed, 14 Jun 2006 14:23:57 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5EENvtU000785 for perforce@freebsd.org; Wed, 14 Jun 2006 14:23:57 GMT (envelope-from scottl@freebsd.org) Date: Wed, 14 Jun 2006 14:23:57 GMT Message-Id: <200606141423.k5EENvtU000785@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 99224 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, 14 Jun 2006 14:26:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=99224 Change 99224 by scottl@scottl-x64 on 2006/06/14 14:23:07 Expand the coverage of the SIM lock in xptioctl to protect xpt_path_free. Add a comment explaining why this is done. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#37 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#37 (text+ko) ==== @@ -1016,6 +1016,12 @@ return(0); } +/* + * Don't automatically grab the xpt softc lock here even though this is going + * through the xpt device. The xpt device is really just a back door for + * accessing other devices and SIMs, so the right thing to do is to grab + * the appropriate SIM lock once the bus/SIM is located. + */ static int xptioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td) { @@ -1080,10 +1086,10 @@ xpt_merge_ccb(ccb, inccb); ccb->ccb_h.cbfcnp = xptdone; cam_periph_runccb(ccb, NULL, 0, 0, NULL); - CAM_SIM_UNLOCK(bus->sim); bcopy(ccb, inccb, sizeof(union ccb)); xpt_free_path(ccb->ccb_h.path); xpt_free_ccb(ccb); + CAM_SIM_UNLOCK(bus->sim); break; case XPT_DEBUG: { From owner-p4-projects@FreeBSD.ORG Wed Jun 14 14:33:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8773B16A47B; Wed, 14 Jun 2006 14:33:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C1BD16A474 for ; Wed, 14 Jun 2006 14:33:36 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD87943D7B for ; Wed, 14 Jun 2006 14:33:35 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5EEVCiL001146 for ; Wed, 14 Jun 2006 14:31:12 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5EEV7u2001143 for perforce@freebsd.org; Wed, 14 Jun 2006 14:31:07 GMT (envelope-from scottl@freebsd.org) Date: Wed, 14 Jun 2006 14:31:07 GMT Message-Id: <200606141431.k5EEV7u2001143@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 99225 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, 14 Jun 2006 14:33:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=99225 Change 99225 by scottl@scottl-x64 on 2006/06/14 14:30:19 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/inckern.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/IQ31244#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SKYEYE#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/uart_cpu_sa1110.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/uart_dev_sa1110.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/winx32_wrap.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.arm#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#11 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#11 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.arm#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.post.mk#7 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#10 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.arm#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/crypto/via/padlock.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_panasonic.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_battery.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_thermal.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbdc_isa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus_cis.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cm/if_cm_isa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cm/smc90cx6.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cm/smc90cx6reg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cm/smc90cx6var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_novell.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_edvar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohci_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipw.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipwvar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_pci.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge_var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mxge/mcp_gen_header.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/mxge/mxge_mcp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/puc/pucdata.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ubsec/ubsec.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli_ctl.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/support/debug.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/support/sv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#1 branch .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#3 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_acl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_acl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_ag.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_alloc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_alloc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_alloc_btree.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_alloc_btree.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_arch.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_attr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_attr.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_attr_leaf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_attr_leaf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_attr_sf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_behavior.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_behavior.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_bit.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_bit.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_bmap.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_bmap_btree.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_btree.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_btree.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_buf_item.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_buf_item.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_cap.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_clnt.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_da_btree.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_da_btree.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dfrag.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dfrag.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dinode.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir2.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir2.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir2_block.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir2_block.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir2_data.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir2_data.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir2_leaf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir2_leaf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir2_node.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir2_node.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir2_sf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir2_sf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir2_trace.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir2_trace.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir_leaf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir_leaf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dir_sf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dmapi.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_dmops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_error.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_error.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_extfree_item.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_extfree_item.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_fs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_fsops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_fsops.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_ialloc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_ialloc_btree.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_ialloc_btree.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_iget.c#1 branch .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_imap.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_inode.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_inode.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_inode_item.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_inode_item.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_inum.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_iocore.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_iomap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_iomap.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_itable.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_itable.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_log.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_log_priv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_log_recover.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_mac.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_macros.c#2 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_macros.h#2 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_mount.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_mount.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_qmops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_quota.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_refcache.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_refcache.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_rename.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_rtalloc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_rw.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_rw.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_sb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_trans.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_trans.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_trans_ail.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_trans_buf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_trans_extfree.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_trans_inode.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_trans_item.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_trans_priv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_trans_space.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_types.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_utils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_utils.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfs_vnodeops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/xfsidbg.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_wakecode.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_wakeup.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_proto.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_syscall.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysent.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/syscalls.master#8 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/scottl-camlock/src/sys/isa/isa_common.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_clock.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_linker.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mbuf.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_switch.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_core.c#1 branch .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_rman.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_pipe.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sysv_msg.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sysv_sem.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sysv_shm.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mbuf.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket2.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_init.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#10 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ath_hal/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/geom/geom_bde/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/if_bridge/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/mxge/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/mxge/mxge/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/mxge/mxge_eth_z8e/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/mxge/mxge_ethp_z8e/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/netatalk/COPYRIGHT#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/netgraph.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_socket.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_dummynet.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/crypto.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/NOTES#9 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_trigger.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/_bus.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/bus.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sbus/sbus.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/firmware.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/protosw.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/rman.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sched.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/socketvar.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscallsubr.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysctl.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_meter.c#6 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#10 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.555 2006/06/05 20:35:25 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.556 2006/06/12 20:05:27 alc Exp $"); /* * Manages physical address maps. @@ -1006,17 +1006,22 @@ * Note: SMP coherent. Uses a ranged shootdown IPI. */ void -pmap_qenter(vm_offset_t sva, vm_page_t *m, int count) +pmap_qenter(vm_offset_t sva, vm_page_t *ma, int count) { - vm_offset_t va; + pt_entry_t *endpte, oldpte, *pte; - va = sva; - while (count-- > 0) { - pmap_kenter(va, VM_PAGE_TO_PHYS(*m)); - va += PAGE_SIZE; - m++; + oldpte = 0; + pte = vtopte(sva); + endpte = pte + count; + while (pte < endpte) { + oldpte |= *pte; + pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G | PG_RW | PG_V); + pte++; + ma++; } - pmap_invalidate_range(kernel_pmap, sva, va); + if ((oldpte & PG_V) != 0) + pmap_invalidate_range(kernel_pmap, sva, sva + count * + PAGE_SIZE); } /* ==== //depot/projects/scottl-camlock/src/sys/amd64/conf/DEFAULTS#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.5 2006/04/28 21:21:51 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.6 2006/06/12 04:21:49 imp Exp $ machine amd64 @@ -11,3 +11,6 @@ # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device + +# UART chips on this platform +device uart_ns8250 ==== //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#9 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.458 2006/05/17 20:45:44 marius Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.459 2006/06/13 13:12:56 davidxu Exp $ cpu HAMMER ident GENERIC @@ -28,6 +28,7 @@ #options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler +#options SCHED_CORE # CORE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols ==== //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#8 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.55 2006/05/14 18:49:24 marius Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.56 2006/06/12 20:38:17 jhb Exp $ # # @@ -221,13 +221,21 @@ # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) # (requires miibus) +# ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter +# iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters # nve: nVidia nForce MCP on-board Ethernet Networking +# ral: Ralink Technology IEEE 802.11 wireless adapter +# ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter device ed options ED_3C503 options ED_HPP options ED_SIC +device iwi +device ipw device nve # nVidia nForce MCP on-board Ethernet Networking +device ral +device ural device ath device ath_hal # Atheros HAL (includes binary component) @@ -556,6 +564,10 @@ options VM_KMEM_SIZE_MAX options VM_KMEM_SIZE_SCALE +# Enable NDIS binary driver support +options NDISAPI +device ndis + # The I/O device device io ==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_proto.h#5 (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.11 2006/05/10 18:19:51 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.12 2006/06/13 18:48:29 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_syscall.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.11 2006/05/10 18:19:51 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.12 2006/06/13 18:48:29 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp */ #define LINUX_SYS_exit 1 @@ -221,4 +221,4 @@ #define LINUX_SYS_linux_fremovexattr 237 #define LINUX_SYS_linux_fadvise64 250 #define LINUX_SYS_exit_group 252 -#define LINUX_SYS_MAXSYSCALL 268 +#define LINUX_SYS_MAXSYSCALL 311 ==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.11 2006/05/10 18:19:51 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.12 2006/06/13 18:48:29 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp */ #include @@ -21,178 +21,178 @@ struct sysent linux_sysent[] = { #define nosys linux_nosys { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = setup */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_NULL }, /* 2 = linux_fork */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_NULL }, /* 5 = linux_open */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ - { SYF_MPSAFE | AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_NULL }, /* 7 = linux_waitpid */ - { SYF_MPSAFE | AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_NULL }, /* 8 = linux_creat */ - { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_NULL }, /* 9 = linux_link */ - { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_NULL }, /* 10 = linux_unlink */ - { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_NULL }, /* 11 = linux_execve */ - { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_NULL }, /* 12 = linux_chdir */ + { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 5 = linux_open */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { SYF_MPSAFE | AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4 }, /* 7 = linux_waitpid */ + { SYF_MPSAFE | AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT }, /* 8 = linux_creat */ + { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ + { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ + { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 11 = linux_execve */ + { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ { SYF_MPSAFE | AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL }, /* 13 = linux_time */ - { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_NULL }, /* 14 = linux_mknod */ - { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ - { SYF_MPSAFE | AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_NULL }, /* 16 = linux_lchown16 */ + { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ + { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ + { SYF_MPSAFE | AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN }, /* 16 = linux_lchown16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 17 = break */ - { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_NULL }, /* 18 = linux_stat */ - { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_NULL }, /* 19 = linux_lseek */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_NULL }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_NULL }, /* 22 = linux_oldumount */ - { SYF_MPSAFE | AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_NULL }, /* 23 = linux_setuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid16, AUE_NULL }, /* 24 = linux_getuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_stime, AUE_NULL }, /* 25 = linux_stime */ - { SYF_MPSAFE | AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_NULL }, /* 26 = linux_ptrace */ + { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 18 = linux_stat */ + { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_GETPID }, /* 20 = linux_getpid */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ + { SYF_MPSAFE | AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID }, /* 23 = linux_setuid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid16, AUE_GETUID }, /* 24 = linux_getuid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY }, /* 25 = linux_stime */ + { SYF_MPSAFE | AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ { SYF_MPSAFE | AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL }, /* 27 = linux_alarm */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 28 = fstat */ { SYF_MPSAFE | 0, (sy_call_t *)linux_pause, AUE_NULL }, /* 29 = linux_pause */ - { SYF_MPSAFE | AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_NULL }, /* 30 = linux_utime */ + { SYF_MPSAFE | AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME }, /* 30 = linux_utime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = stty */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = gtty */ - { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_NULL }, /* 33 = linux_access */ - { SYF_MPSAFE | AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NULL }, /* 34 = linux_nice */ + { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ + { SYF_MPSAFE | AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE }, /* 34 = linux_nice */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = ftime */ - { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ - { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_NULL }, /* 37 = linux_kill */ - { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_NULL }, /* 38 = linux_rename */ - { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_NULL }, /* 39 = linux_mkdir */ - { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_NULL }, /* 40 = linux_rmdir */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_NULL }, /* 41 = dup */ - { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_NULL }, /* 42 = linux_pipe */ + { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ + { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ + { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 38 = linux_rename */ + { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 39 = linux_mkdir */ + { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 40 = linux_rmdir */ + { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ + { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ - { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_NULL }, /* 46 = linux_setgid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_NULL }, /* 47 = linux_getgid16 */ + { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ { SYF_MPSAFE | AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_geteuid16, AUE_NULL }, /* 49 = linux_geteuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getegid16, AUE_NULL }, /* 50 = linux_getegid16 */ - { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_NULL }, /* 52 = linux_umount */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID }, /* 49 = linux_geteuid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getegid16, AUE_GETEGID }, /* 50 = linux_getegid16 */ + { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = lock */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_NULL }, /* 54 = linux_ioctl */ - { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_NULL }, /* 55 = linux_fcntl */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ + { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = mpx */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 57 = setpgid */ + { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 57 = setpgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 58 = ulimit */ { SYF_MPSAFE | 0, (sy_call_t *)linux_olduname, AUE_NULL }, /* 59 = linux_olduname */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ { SYF_MPSAFE | AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 62 = linux_ustat */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_NULL }, /* 63 = dup2 */ - { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_NULL }, /* 64 = getppid */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_NULL }, /* 65 = getpgrp */ - { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_NULL }, /* 66 = setsid */ + { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 63 = dup2 */ + { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 64 = getppid */ + { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 65 = getpgrp */ + { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 66 = setsid */ { SYF_MPSAFE | AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL }, /* 67 = linux_sigaction */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sgetmask, AUE_NULL }, /* 68 = linux_sgetmask */ { SYF_MPSAFE | AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL }, /* 69 = linux_ssetmask */ - { SYF_MPSAFE | AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_NULL }, /* 70 = linux_setreuid16 */ - { SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_NULL }, /* 71 = linux_setregid16 */ + { SYF_MPSAFE | AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID }, /* 70 = linux_setreuid16 */ + { SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID }, /* 71 = linux_setregid16 */ { SYF_MPSAFE | AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL }, /* 72 = linux_sigsuspend */ { SYF_MPSAFE | AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL }, /* 73 = linux_sigpending */ - { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_NULL }, /* 74 = linux_sethostname */ - { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_NULL }, /* 75 = linux_setrlimit */ - { SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_NULL }, /* 76 = linux_old_getrlimit */ - { SYF_MPSAFE | AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_NULL }, /* 77 = linux_getrusage */ + { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 74 = linux_sethostname */ + { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 75 = linux_setrlimit */ + { SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT }, /* 76 = linux_old_getrlimit */ + { SYF_MPSAFE | AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE }, /* 77 = linux_getrusage */ { SYF_MPSAFE | AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL }, /* 78 = linux_gettimeofday */ - { SYF_MPSAFE | AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_NULL }, /* 79 = linux_settimeofday */ - { SYF_MPSAFE | AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_NULL }, /* 80 = linux_getgroups16 */ - { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_NULL }, /* 81 = linux_setgroups16 */ - { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_NULL }, /* 82 = linux_old_select */ - { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_NULL }, /* 83 = linux_symlink */ - { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_NULL }, /* 84 = linux_lstat */ - { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_NULL }, /* 85 = linux_readlink */ + { SYF_MPSAFE | AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY }, /* 79 = linux_settimeofday */ + { SYF_MPSAFE | AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS }, /* 80 = linux_getgroups16 */ + { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ + { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ + { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ + { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT }, /* 84 = linux_lstat */ + { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = linux_uselib */ - { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_NULL }, /* 87 = swapon */ - { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_NULL }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_NULL }, /* 89 = linux_readdir */ - { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_NULL }, /* 90 = linux_mmap */ - { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_NULL }, /* 91 = munmap */ - { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_NULL }, /* 92 = linux_truncate */ - { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_NULL }, /* 93 = linux_ftruncate */ - { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL }, /* 94 = fchmod */ - { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 95 = fchown */ - { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_NULL }, /* 96 = linux_getpriority */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_NULL }, /* 97 = setpriority */ + { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ + { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ + { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ + { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ + { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ + { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 93 = linux_ftruncate */ + { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 94 = fchmod */ + { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 95 = fchown */ + { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 96 = linux_getpriority */ + { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 97 = setpriority */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 98 = profil */ - { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_NULL }, /* 99 = linux_statfs */ - { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_NULL }, /* 100 = linux_fstatfs */ + { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 99 = linux_statfs */ + { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 100 = linux_fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 101 = ioperm */ { SYF_MPSAFE | AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL }, /* 102 = linux_socketcall */ { SYF_MPSAFE | AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 103 = linux_syslog */ - { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_NULL }, /* 104 = linux_setitimer */ - { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_NULL }, /* 105 = linux_getitimer */ - { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_NULL }, /* 106 = linux_newstat */ - { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_NULL }, /* 107 = linux_newlstat */ - { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_NULL }, /* 108 = linux_newfstat */ + { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 104 = linux_setitimer */ + { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 105 = linux_getitimer */ + { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 106 = linux_newstat */ + { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 107 = linux_newlstat */ + { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 108 = linux_newfstat */ { SYF_MPSAFE | 0, (sy_call_t *)linux_uname, AUE_NULL }, /* 109 = linux_uname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = iopl */ { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 111 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = idle */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 113 = vm86old */ - { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_NULL }, /* 114 = linux_wait4 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_NULL }, /* 115 = linux_swapoff */ + { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ { SYF_MPSAFE | AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 118 = fsync */ - { SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_NULL }, /* 119 = linux_sigreturn */ - { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_NULL }, /* 120 = linux_clone */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_NULL }, /* 121 = setdomainname */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ + { SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ + { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ + { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 121 = setdomainname */ { SYF_MPSAFE | AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 122 = linux_newuname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 123 = modify_ldt */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_NULL }, /* 124 = linux_adjtimex */ - { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_NULL }, /* 125 = linux_mprotect */ - { SYF_MPSAFE | AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_NULL }, /* 126 = linux_sigprocmask */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 124 = linux_adjtimex */ + { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 125 = linux_mprotect */ + { SYF_MPSAFE | AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK }, /* 126 = linux_sigprocmask */ { SYF_MPSAFE | 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 127 = linux_create_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 128 = linux_init_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 129 = linux_delete_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 130 = linux_get_kernel_syms */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_NULL }, /* 131 = linux_quotactl */ - { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_NULL }, /* 132 = getpgid */ - { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_NULL }, /* 133 = fchdir */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_NULL }, /* 134 = linux_bdflush */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 131 = linux_quotactl */ + { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 132 = getpgid */ + { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 133 = fchdir */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 134 = linux_bdflush */ { SYF_MPSAFE | AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 135 = linux_sysfs */ - { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_NULL }, /* 136 = linux_personality */ + { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 136 = linux_personality */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 137 = afs_syscall */ - { SYF_MPSAFE | AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_NULL }, /* 138 = linux_setfsuid16 */ - { SYF_MPSAFE | AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_NULL }, /* 139 = linux_setfsgid16 */ - { SYF_MPSAFE | AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_NULL }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_NULL }, /* 141 = linux_getdents */ - { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_NULL }, /* 142 = linux_select */ - { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_NULL }, /* 143 = flock */ - { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_NULL }, /* 144 = linux_msync */ - { SYF_MPSAFE | AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_NULL }, /* 145 = linux_readv */ - { SYF_MPSAFE | AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_NULL }, /* 146 = linux_writev */ - { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_NULL }, /* 147 = linux_getsid */ + { SYF_MPSAFE | AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */ + { SYF_MPSAFE | AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */ + { SYF_MPSAFE | AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ + { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */ + { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */ + { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */ + { SYF_MPSAFE | AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV }, /* 145 = linux_readv */ + { SYF_MPSAFE | AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV }, /* 146 = linux_writev */ + { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 147 = linux_getsid */ { SYF_MPSAFE | AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL }, /* 148 = linux_fdatasync */ - { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_NULL }, /* 149 = linux_sysctl */ - { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_NULL }, /* 150 = mlock */ - { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_NULL }, /* 151 = munlock */ - { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_NULL }, /* 152 = mlockall */ - { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_NULL }, /* 153 = munlockall */ - { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL }, /* 154 = sched_setparam */ - { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL }, /* 155 = sched_getparam */ - { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_NULL }, /* 156 = linux_sched_setscheduler */ - { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_NULL }, /* 157 = linux_sched_getscheduler */ + { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 149 = linux_sysctl */ + { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 150 = mlock */ + { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 151 = munlock */ + { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 152 = mlockall */ + { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 153 = munlockall */ + { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 154 = sched_setparam */ + { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 155 = sched_getparam */ + { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 156 = linux_sched_setscheduler */ + { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 157 = linux_sched_getscheduler */ { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 158 = sched_yield */ - { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_NULL }, /* 159 = linux_sched_get_priority_max */ - { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_NULL }, /* 160 = linux_sched_get_priority_min */ - { SYF_MPSAFE | AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_NULL }, /* 161 = linux_sched_rr_get_interval */ + { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 159 = linux_sched_get_priority_max */ + { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 160 = linux_sched_get_priority_min */ + { SYF_MPSAFE | AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 161 = linux_sched_rr_get_interval */ { SYF_MPSAFE | AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL }, /* 162 = linux_nanosleep */ { SYF_MPSAFE | AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 163 = linux_mremap */ - { SYF_MPSAFE | AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_NULL }, /* 164 = linux_setresuid16 */ - { SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_NULL }, /* 165 = linux_getresuid16 */ + { SYF_MPSAFE | AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID }, /* 164 = linux_setresuid16 */ + { SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID }, /* 165 = linux_getresuid16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 166 = vm86 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 167 = linux_query_module */ - { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_NULL }, /* 168 = poll */ + { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 168 = poll */ { SYF_MPSAFE | 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 169 = linux_nfsservctl */ - { SYF_MPSAFE | AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_NULL }, /* 170 = linux_setresgid16 */ - { SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_NULL }, /* 171 = linux_getresgid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_NULL }, /* 172 = linux_prctl */ + { SYF_MPSAFE | AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID }, /* 170 = linux_setresgid16 */ + { SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID }, /* 171 = linux_getresgid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 172 = linux_prctl */ { SYF_MPSAFE | AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */ { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */ { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */ @@ -200,48 +200,48 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 177 = linux_rt_sigtimedwait */ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 178 = linux_rt_sigqueueinfo */ { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 179 = linux_rt_sigsuspend */ - { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_NULL }, /* 180 = linux_pread */ - { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_NULL }, /* 181 = linux_pwrite */ - { SYF_MPSAFE | AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_NULL }, /* 182 = linux_chown16 */ - { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_NULL }, /* 183 = linux_getcwd */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_NULL }, /* 184 = linux_capget */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_NULL }, /* 185 = linux_capset */ + { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 180 = linux_pread */ + { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 181 = linux_pwrite */ + { SYF_MPSAFE | AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN }, /* 182 = linux_chown16 */ + { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 183 = linux_getcwd */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 184 = linux_capget */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 185 = linux_capset */ { SYF_MPSAFE | AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 186 = linux_sigaltstack */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_NULL }, /* 187 = linux_sendfile */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 187 = linux_sendfile */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 188 = getpmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 189 = putpmsg */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_NULL }, /* 190 = linux_vfork */ - { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_NULL }, /* 191 = linux_getrlimit */ - { SYF_MPSAFE | AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_NULL }, /* 192 = linux_mmap2 */ - { SYF_MPSAFE | AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_NULL }, /* 193 = linux_truncate64 */ - { SYF_MPSAFE | AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_NULL }, /* 194 = linux_ftruncate64 */ - { SYF_MPSAFE | AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_NULL }, /* 195 = linux_stat64 */ - { SYF_MPSAFE | AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_NULL }, /* 196 = linux_lstat64 */ - { SYF_MPSAFE | AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_NULL }, /* 197 = linux_fstat64 */ - { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_NULL }, /* 198 = linux_lchown */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid, AUE_NULL }, /* 199 = linux_getuid */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid, AUE_NULL }, /* 200 = linux_getgid */ - { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_NULL }, /* 201 = geteuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_NULL }, /* 202 = getegid */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_NULL }, /* 203 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_NULL }, /* 204 = setregid */ - { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_NULL }, /* 205 = linux_getgroups */ - { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_NULL }, /* 206 = linux_setgroups */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 190 = linux_vfork */ + { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 191 = linux_getrlimit */ + { SYF_MPSAFE | AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP }, /* 192 = linux_mmap2 */ + { SYF_MPSAFE | AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE }, /* 193 = linux_truncate64 */ + { SYF_MPSAFE | AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE }, /* 194 = linux_ftruncate64 */ + { SYF_MPSAFE | AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT }, /* 195 = linux_stat64 */ + { SYF_MPSAFE | AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT }, /* 196 = linux_lstat64 */ + { SYF_MPSAFE | AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT }, /* 197 = linux_fstat64 */ + { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 198 = linux_lchown */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid, AUE_GETUID }, /* 199 = linux_getuid */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid, AUE_GETGID }, /* 200 = linux_getgid */ + { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 201 = geteuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 202 = getegid */ + { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 203 = setreuid */ + { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 204 = setregid */ + { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 205 = linux_getgroups */ + { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 206 = linux_setgroups */ { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 207 = fchown */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_NULL }, /* 208 = setresuid */ - { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 209 = getresuid */ - { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_NULL }, /* 210 = setresgid */ - { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 211 = getresgid */ - { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_NULL }, /* 212 = linux_chown */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_NULL }, /* 213 = setuid */ - { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_NULL }, /* 214 = setgid */ - { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_NULL }, /* 215 = linux_setfsuid */ - { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_NULL }, /* 216 = linux_setfsgid */ - { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_NULL }, /* 217 = linux_pivot_root */ - { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_NULL }, /* 218 = linux_mincore */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_NULL }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_NULL }, /* 220 = linux_getdents64 */ - { SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_NULL }, /* 221 = linux_fcntl64 */ + { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 208 = setresuid */ + { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 209 = getresuid */ + { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 210 = setresgid */ + { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 211 = getresgid */ + { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 212 = linux_chown */ + { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 213 = setuid */ + { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 214 = setgid */ + { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 215 = linux_setfsuid */ + { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 216 = linux_setfsgid */ + { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */ + { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ + { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ + { SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 224 = gettid */ @@ -272,7 +272,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = linux_io_cancel */ { SYF_MPSAFE | 0, (sy_call_t *)linux_fadvise64, AUE_NULL }, /* 250 = linux_fadvise64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 251 = */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 252 = exit_group */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 252 = exit_group */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 253 = linux_lookup_dcookie */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 254 = linux_epoll_create */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 255 = linux_epoll_ctl */ @@ -288,4 +288,47 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 265 = linux_clock_gettime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 266 = linux_clock_getres */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 267 = linux_clock_nanosleep */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 268 = linux_statfs64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 269 = linux_fstatfs64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 270 = linux_tgkill */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 271 = linux_utimes */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 272 = linux_fadvise64_64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = linux_ni_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 274 = linux_mbind */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 275 = linux_get_mempolicy */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 276 = linux_set_mempolicy */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 277 = linux_mq_open */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 278 = linux_mq_unlink */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 279 = linux_mq_timedsend */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 280 = linux_mq_timedreceive */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 281 = linux_mq_notify */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 282 = linux_mq_getsetattr */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 283 = linux_kexec_load */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 284 = linux_waitid */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = linux_ni_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 286 = linux_add_key */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 287 = linux_request_key */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 288 = linux_keyctl */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 289 = linux_ioprio_set */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 290 = linux_ioprio_get */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 291 = linux_inotify_init */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 292 = linux_inotify_add_watch */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 294 = linux_migrate_pages */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 295 = linux_openat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 296 = linux_mkdirat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 297 = linux_mknodat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 298 = linux_fchownat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = linux_futimesat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 300 = linux_fstatat64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 301 = linux_unlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 302 = linux_renameat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 303 = linux_linkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 304 = linux_symlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 305 = linux_readlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 306 = linux_fchmodat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 307 = linux_faccessat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 308 = linux_pselect6 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 309 = linux_ppoll */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 310 = linux_unshare */ }; ==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/syscalls.master#5 (text+ko) ==== @@ -1,10 +1,10 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ; Processed to create linux_sysent.c, linux_proto.h and linux_syscall.h. -; Columns: number type nargs name alt{name,tag,rtyp}/comments +; Columns: number audit type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that @@ -14,15 +14,20 @@ ; type one of STD, OBSOL, UNIMPL ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: +; audit the audit event associated with the system call +; A value of AUE_NULL means no auditing, but it also means that +; there is no audit event for the call at this time. For the +; case where the event exists, but we don't want auditing, the +; event should be #defined to AUE_NULL in audit_kevents.h. ; altname name of system call if different ; alttag name of args struct tag if different from [o]`name'"_args" ; altrtyp return type if not int (bogus - syscalls always return int) ; for UNIMPL/OBSOL, name continues with comments ; types: -; STD always included +; AUE_NULL STD always included ; OBSOL obsolete, not included in system, only specifies name -; UNIMPL not implemented, placeholder only +; AUE_NULL UNIMPL not implemented, placeholder only #include "opt_compat.h" #include @@ -38,247 +43,244 @@ ; #ifdef's, etc. may be included, and are copied to the output files. 0 AUE_NULL UNIMPL setup -1 AUE_NULL MNOPROTO { void sys_exit(int rval); } exit \ +1 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit \ sys_exit_args void -2 AUE_NULL MSTD { int linux_fork(void); } +2 AUE_FORK MSTD { int linux_fork(void); } 3 AUE_NULL MNOPROTO { int read(int fd, char *buf, \ u_int nbyte); } 4 AUE_NULL MNOPROTO { int write(int fd, char *buf, \ u_int nbyte); } -5 AUE_NULL MSTD { int linux_open(char *path, l_int flags, \ +5 AUE_OPEN_RWTC MSTD { int linux_open(char *path, l_int flags, \ l_int mode); } -6 AUE_NULL MNOPROTO { int close(int fd); } -7 AUE_NULL MSTD { int linux_waitpid(l_pid_t pid, \ +6 AUE_CLOSE MNOPROTO { int close(int fd); } +7 AUE_WAIT4 MSTD { int linux_waitpid(l_pid_t pid, \ l_int *status, l_int options); } -8 AUE_NULL MSTD { int linux_creat(char *path, l_int mode); } -9 AUE_NULL MSTD { int linux_link(char *path, char *to); } -10 AUE_NULL MSTD { int linux_unlink(char *path); } -11 AUE_NULL MSTD { int linux_execve(char *path, char **argp, \ +8 AUE_O_CREAT MSTD { int linux_creat(char *path, \ + l_int mode); } +9 AUE_LINK MSTD { int linux_link(char *path, char *to); } +10 AUE_UNLINK MSTD { int linux_unlink(char *path); } +11 AUE_EXECVE MSTD { int linux_execve(char *path, char **argp, \ char **envp); } -12 AUE_NULL MSTD { int linux_chdir(char *path); } +12 AUE_CHDIR MSTD { int linux_chdir(char *path); } 13 AUE_NULL MSTD { int linux_time(l_time_t *tm); } -14 AUE_NULL MSTD { int linux_mknod(char *path, l_int mode, \ +14 AUE_MKNOD MSTD { int linux_mknod(char *path, l_int mode, \ l_dev_t dev); } -15 AUE_NULL MSTD { int linux_chmod(char *path, \ +15 AUE_CHMOD MSTD { int linux_chmod(char *path, \ l_mode_t mode); } -16 AUE_NULL MSTD { int linux_lchown16(char *path, \ +16 AUE_LCHOWN MSTD { int linux_lchown16(char *path, \ l_uid16_t uid, l_gid16_t gid); } 17 AUE_NULL UNIMPL break -18 AUE_NULL MSTD { int linux_stat(char *path, \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 14 14:34:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A1F216A49A; Wed, 14 Jun 2006 14:34:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E1BD16A482 for ; Wed, 14 Jun 2006 14:34:38 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8EF443D73 for ; Wed, 14 Jun 2006 14:34:37 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5EEWEj9001211 for ; Wed, 14 Jun 2006 14:32:14 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5EEWD3C001208 for perforce@freebsd.org; Wed, 14 Jun 2006 14:32:13 GMT (envelope-from scottl@freebsd.org) Date: Wed, 14 Jun 2006 14:32:13 GMT Message-Id: <200606141432.k5EEWD3C001208@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 99226 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, 14 Jun 2006 14:34:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=99226 Change 99226 by scottl@scottl-x64 on 2006/06/14 14:31:35 Add libcam so that it can be built properly Affected files ... .. //depot/projects/scottl-camlock/src/lib/libcam/Makefile#1 branch .. //depot/projects/scottl-camlock/src/lib/libcam/cam.3#1 branch .. //depot/projects/scottl-camlock/src/lib/libcam/cam_cdbparse.3#1 branch .. //depot/projects/scottl-camlock/src/lib/libcam/camlib.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libcam/camlib.h#1 branch .. //depot/projects/scottl-camlock/src/lib/libcam/scsi_cmdparse.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 14 15:42:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C92D816A47D; Wed, 14 Jun 2006 15:42:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8EA9916A41A for ; Wed, 14 Jun 2006 15:42:36 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4BC143D8A for ; Wed, 14 Jun 2006 15:42:04 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5EFdeho007576 for ; Wed, 14 Jun 2006 15:39:40 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5EFdcDH007573 for perforce@freebsd.org; Wed, 14 Jun 2006 15:39:38 GMT (envelope-from piso@freebsd.org) Date: Wed, 14 Jun 2006 15:39:38 GMT Message-Id: <200606141539.k5EFdcDH007573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 99229 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, 14 Jun 2006 15:42:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=99229 Change 99229 by piso@piso_newluxor on 2006/06/14 15:39:27 Finished converting all the INTR_FAST handlers to behave like a filter: on i386 everything compiles fine, now i'm going to find out what i broke on !i386. Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#2 edit .. //depot/projects/soc2006/intr_filter/arm/at91/at91_pio.c#2 edit .. //depot/projects/soc2006/intr_filter/arm/at91/at91_rtc.c#2 edit .. //depot/projects/soc2006/intr_filter/arm/at91/at91_st.c#2 edit .. //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0_ost.c#2 edit .. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321_timer.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/aac/aac.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/aac/aacvar.h#2 edit .. //depot/projects/soc2006/intr_filter/dev/adlink/adlink.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/cy/cy.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/cy/cy_isa.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/cy/cy_pci.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/cy/cyvar.h#2 edit .. //depot/projects/soc2006/intr_filter/dev/em/if_em.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/ppbus/pps.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/puc/puc.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/sio/sio.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_freebsd.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/uart/uart_core.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/zs/z8530var.h#2 edit .. //depot/projects/soc2006/intr_filter/dev/zs/zs.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/zs/zs_macio.c#2 edit .. //depot/projects/soc2006/intr_filter/i386/isa/clock.c#2 edit .. //depot/projects/soc2006/intr_filter/i386/isa/npx.c#2 edit .. //depot/projects/soc2006/intr_filter/pc98/cbus/clock.c#2 edit .. //depot/projects/soc2006/intr_filter/pc98/cbus/sio.c#2 edit .. //depot/projects/soc2006/intr_filter/powerpc/powermac/pswitch.c#2 edit .. //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#2 edit .. //depot/projects/soc2006/intr_filter/sparc64/sbus/sbus.c#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#2 (text+ko) ==== @@ -141,7 +141,7 @@ 0 /* quality */ }; -static void +static int clkintr(struct trapframe *frame) { @@ -158,6 +158,7 @@ } KASSERT(!using_lapic_timer, ("clk interrupt enabled with lapic timer")); hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); + return(FILTER_HANDLED); } int @@ -212,11 +213,13 @@ * Stat clock ticks can still be lost, causing minor loss of accuracy * in the statistics, but the stat clock will no longer stop. */ -static void +static int rtcintr(struct trapframe *frame) { + int flag = 0; while (rtcin(RTC_INTR) & RTCIR_PERIOD) { + flag = 1; if (profprocs != 0) { if (--pscnt == 0) pscnt = psdiv; @@ -225,6 +228,7 @@ if (pscnt == psdiv) statclock(TRAPF_USERMODE(frame)); } + return((flag)?FILTER_HANDLED:FILTER_STRAY); } #include "opt_ddb.h" @@ -755,6 +759,7 @@ * that it can drive hardclock(). Otherwise, change the 8254 * timecounter to user a simpler algorithm. */ + // XXX - FIX_INTR_FILTER if (!using_lapic_timer) { intr_add_handler("clk", 0, (driver_intr_t *)clkintr, NULL, INTR_TYPE_CLK | INTR_FAST, NULL); @@ -790,6 +795,7 @@ /* Enable periodic interrupts from the RTC. */ rtc_statusb |= RTCSB_PINTR; + // XXX - FIX_INTR_FILTER intr_add_handler("rtc", 8, (driver_intr_t *)rtcintr, NULL, INTR_TYPE_CLK | INTR_FAST, NULL); ==== //depot/projects/soc2006/intr_filter/arm/at91/at91_pio.c#2 (text) ==== @@ -81,7 +81,7 @@ static int at91_pio_probe(device_t dev); static int at91_pio_attach(device_t dev); static int at91_pio_detach(device_t dev); -static void at91_pio_intr(void *); +static int at91_pio_intr(void *); /* helper routines */ static int at91_pio_activate(device_t dev); @@ -124,8 +124,9 @@ * Activate the interrupt, but disable all interrupts in the hardware */ WR4(sc, PIO_IDR, 0xffffffff); + // XXX - FIX_INTR_FILTER err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_FAST, - at91_pio_intr, sc, &sc->intrhand); + (driver_intr_t *)at91_pio_intr, sc, &sc->intrhand); if (err) { AT91_PIO_LOCK_DESTROY(sc); goto out; @@ -193,7 +194,7 @@ return; } -static void +static int at91_pio_intr(void *xsc) { struct at91_pio_softc *sc = xsc; @@ -208,7 +209,7 @@ AT91_PIO_UNLOCK(sc); #endif wakeup(sc); - return; + return(FILTER_HANDLED); } static int ==== //depot/projects/soc2006/intr_filter/arm/at91/at91_rtc.c#2 (text) ==== @@ -80,7 +80,7 @@ static int at91_rtc_probe(device_t dev); static int at91_rtc_attach(device_t dev); static int at91_rtc_detach(device_t dev); -static void at91_rtc_intr(void *); +static int at91_rtc_intr(void *); /* helper routines */ static int at91_rtc_activate(device_t dev); @@ -110,8 +110,9 @@ * Activate the interrupt, but disable all interrupts in the hardware */ WR4(sc, RTC_IDR, 0xffffffff); + // XXX - FIX_INTR_FILTER err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_FAST, - at91_rtc_intr, sc, &sc->intrhand); + (driver_intr_t *)at91_rtc_intr, sc, &sc->intrhand); if (err) { AT91_RTC_LOCK_DESTROY(sc); goto out; @@ -173,7 +174,7 @@ return; } -static void +static int at91_rtc_intr(void *xsc) { struct at91_rtc_softc *sc = xsc; @@ -188,7 +189,7 @@ AT91_RTC_UNLOCK(sc); #endif wakeup(sc); - return; + return(FILTER_HANDLED); } /* ==== //depot/projects/soc2006/intr_filter/arm/at91/at91_st.c#2 (text) ==== @@ -140,7 +140,7 @@ #endif } -static void +static int clock_intr(void *arg) { struct trapframe *fp = arg; @@ -151,7 +151,9 @@ tot_count += 32768 / hz; #endif hardclock(TRAPF_USERMODE(fp), TRAPF_PC(fp)); + return(FILTER_HANDLED); } + return(FILTER_STRAY); } void @@ -173,11 +175,12 @@ /* The system timer shares the system irq (1) */ irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 1, 1, 1, RF_ACTIVE | RF_SHAREABLE); + // XXX - FIX_INTR_FILTER if (!irq) panic("Unable to allocate irq for the system timer"); else bus_setup_intr(dev, irq, INTR_TYPE_CLK | INTR_FAST, - clock_intr, NULL, &ih); + (driver_intr_t *)clock_intr, NULL, &ih); WR4(ST_PIMR, rel_value); ==== //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0_ost.c#2 (text+ko) ==== @@ -68,9 +68,9 @@ static int saost_attach(device_t); int gettick(void); -static void clockintr(void *); +static int clockintr(void *); #if 0 -static void statintr(void *); +static int statintr(void *); #endif void rtcinit(void); @@ -142,7 +142,7 @@ } -static void +static int clockintr(arg) void *arg; { @@ -185,10 +185,11 @@ #if 0 mtx_unlock_spin(&clock_lock); #endif + return(FILTER_HANDLED); } #if 0 -static void +static int statintr(arg) void *arg; { @@ -228,7 +229,7 @@ saost_sc->sc_statclock_count = nextmatch; statclock(TRAPF_USERMODE(frame)); - + return(FILTER_HANDLED); } #endif @@ -272,11 +273,13 @@ rid = 1; irq2 = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, RF_ACTIVE); - bus_setup_intr(dev, irq1, INTR_TYPE_CLK | INTR_FAST, clockintr, NULL, - &ih1); + // XXX - FIX_INTR_FILTER + bus_setup_intr(dev, irq1, INTR_TYPE_CLK | INTR_FAST, + (driver_intr_t *)clockintr, NULL, &ih1); #if 0 - bus_setup_intr(dev, irq2, INTR_TYPE_CLK | INTR_FAST, statintr, NULL - ,&ih2); + // XXX - FIX_INTR_FILTER + bus_setup_intr(dev, irq2, INTR_TYPE_CLK | INTR_FAST, + (driver_intr_t *)statintr, NULL, &ih2); #endif bus_space_write_4(saost_sc->sc_iot, saost_sc->sc_ioh, SAOST_SR, 0xf); bus_space_write_4(saost_sc->sc_iot, saost_sc->sc_ioh, SAOST_IR, 3); ==== //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321_timer.c#2 (text+ko) ==== @@ -134,7 +134,7 @@ DRIVER_MODULE(itimer, iq, i80321_timer_driver, i80321_timer_devclass, 0, 0); void counterhandler(void *); -void clockhandler(void *); +int clockhandler(void *); static __inline uint32_t @@ -334,11 +334,12 @@ irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, ICU_INT_TMR0, ICU_INT_TMR0, 1, RF_ACTIVE); + // XXX - FIX_INTR_FILTER if (!irq) panic("Unable to setup the clock irq handler.\n"); else bus_setup_intr(dev, irq, INTR_TYPE_CLK | INTR_FAST, - clockhandler, NULL, &ihl); + (driver_intr_t *)clockhandler, NULL, &ihl); tmr0_write(0); /* stop timer */ tisr_write(TISR_TMR0); /* clear interrupt */ @@ -402,7 +403,7 @@ * * Handle the hardclock interrupt. */ -void +int clockhandler(void *arg) { struct trapframe *frame = arg; @@ -413,7 +414,7 @@ if (i80321_hardclock_hook != NULL) (*i80321_hardclock_hook)(); - return; + return(FILTER_HANDLED); } void ==== //depot/projects/soc2006/intr_filter/dev/aac/aac.c#2 (text+ko) ==== @@ -311,14 +311,16 @@ return (EINVAL); } } else { + // XXX - FIX_INTR_FILTER if (bus_setup_intr(sc->aac_dev, sc->aac_irq, - INTR_FAST|INTR_TYPE_BIO, aac_fast_intr, + INTR_FAST|INTR_TYPE_BIO, + (driver_intr_t *)aac_fast_intr, sc, &sc->aac_intr)) { device_printf(sc->aac_dev, "can't set up FAST interrupt\n"); if (bus_setup_intr(sc->aac_dev, sc->aac_irq, INTR_MPSAFE|INTR_TYPE_BIO, - aac_fast_intr, sc, &sc->aac_intr)) { + aac_intr, sc, &sc->aac_intr)) { device_printf(sc->aac_dev, "can't set up MPSAFE interrupt\n"); return (EINVAL); @@ -780,8 +782,57 @@ mtx_unlock(&sc->aac_io_lock); } +int +aac_fast_intr(void *arg) +{ + struct aac_softc *sc; + u_int16_t reason; + int flag = 0; + + debug_called(2); + + sc = (struct aac_softc *)arg; + + /* + * Read the status register directly. This is faster than taking the + * driver lock and reading the queues directly. It also saves having + * to turn parts of the driver lock into a spin mutex, which would be + * ugly. + */ + reason = AAC_GET_ISTATUS(sc); + AAC_CLEAR_ISTATUS(sc, reason); + + /* handle completion processing */ + if (reason & AAC_DB_RESPONSE_READY) { + flag = 1; + taskqueue_enqueue_fast(taskqueue_fast, &sc->aac_task_complete); + } + + /* controller wants to talk to us */ + if (reason & (AAC_DB_PRINTF | AAC_DB_COMMAND_READY)) { + flag = 1; + /* + * XXX Make sure that we don't get fooled by strange messages + * that start with a NULL. + */ + if ((reason & AAC_DB_PRINTF) && + (sc->aac_common->ac_printf[0] == 0)) + sc->aac_common->ac_printf[0] = 32; + + /* + * This might miss doing the actual wakeup. However, the + * msleep that this is waking up has a timeout, so it will + * wake up eventually. AIFs and printfs are low enough + * priority that they can handle hanging out for a few seconds + * if needed. + */ + wakeup(sc->aifthread); + } + return((flag)?FILTER_HANDLED:FILTER_STRAY); +} + void -aac_fast_intr(void *arg) +aac_intr(void *arg) { struct aac_softc *sc; u_int16_t reason; ==== //depot/projects/soc2006/intr_filter/dev/aac/aacvar.h#2 (text+ko) ==== @@ -425,7 +425,8 @@ extern int aac_suspend(device_t dev); extern int aac_resume(device_t dev); extern void aac_new_intr(void *arg); -extern void aac_fast_intr(void *arg); +extern int aac_fast_intr(void *arg); +extern void aac_intr(void *arg); extern void aac_submit_bio(struct bio *bp); extern void aac_biodone(struct bio *bp); extern void aac_startio(struct aac_softc *sc); ==== //depot/projects/soc2006/intr_filter/dev/adlink/adlink.c#2 (text+ko) ==== @@ -115,7 +115,7 @@ static d_ioctl_t adlink_ioctl; static d_mmap_t adlink_mmap; -static void adlink_intr(void *arg); +static intr adlink_intr(void *arg); static struct cdevsw adlink_cdevsw = { .d_version = D_VERSION, @@ -124,7 +124,7 @@ .d_name = "adlink", }; -static void +static intr adlink_intr(void *arg) { struct softc *sc; @@ -134,7 +134,7 @@ sc = arg; u = bus_read_4(sc->res[0], 0x38); if (!(u & 0x00800000)) - return; + return; // XXX - FILTER_STRAY? bus_write_4(sc->res[0], 0x38, u | 0x003f4000); sc->sample += sc->p0->chunksize / 2; @@ -147,7 +147,7 @@ if (sc->p0->state != STATE_RUN) { printf("adlink: stopping %d\n", sc->p0->state); - return; + return; // XXX - FILTER_STRAY? } pg = pg->next; @@ -156,6 +156,7 @@ bus_write_4(sc->res[0], 0x24, pg->phys); bus_write_4(sc->res[0], 0x28, sc->p0->chunksize); wakeup(sc); + return(FILTER_HANDLED); } static int @@ -372,9 +373,10 @@ if (error) return (error); + // XXX - FIX_INTR_FILTER i = bus_setup_intr(self, sc->res[2], INTR_MPSAFE | INTR_TYPE_MISC | INTR_FAST, - adlink_intr, sc, &sc->intrhand); + (driver_intr_t *)adlink_intr, sc, &sc->intrhand); if (i) { printf("adlink: Couldn't get FAST intr\n"); i = bus_setup_intr(self, sc->res[2], ==== //depot/projects/soc2006/intr_filter/dev/cy/cy.c#2 (text+ko) ==== @@ -644,7 +644,7 @@ com->mcr_image |= com->mcr_rts); } -void +intr cyintr(void *vcom) { struct com_s *basecom; @@ -671,7 +671,7 @@ /* poll to see if it has any work */ status = cd_inb(iobase, CD1400_SVRR, cy_align); if (status == 0) - continue; + continue; // XXX - FILTER_STRAY? #ifdef CyDebug ++cy_svrr_probes; #endif @@ -1111,6 +1111,7 @@ swi_sched(cy_slow_ih, SWI_DELAY); COM_UNLOCK(); + return(FILTER_HANDLED); } static void ==== //depot/projects/soc2006/intr_filter/dev/cy/cy_isa.c#2 (text+ko) ==== @@ -132,8 +132,9 @@ device_printf(dev, "interrupt resource allocation failed\n"); goto fail; } - if (bus_setup_intr(dev, irq_res, INTR_TYPE_TTY | INTR_FAST, cyintr, - vsc, &irq_cookie) != 0) { + // XXX - FIX_INTR_FILTER + if (bus_setup_intr(dev, irq_res, INTR_TYPE_TTY | INTR_FAST, + (driver_intr_t *)cyintr, vsc, &irq_cookie) != 0) { device_printf(dev, "interrupt setup failed\n"); goto fail; } ==== //depot/projects/soc2006/intr_filter/dev/cy/cy_pci.c#2 (text+ko) ==== @@ -145,8 +145,9 @@ goto fail; } #ifdef CY_PCI_FASTINTR + // XXX - FIX_INTR_FILTER irq_setup = bus_setup_intr(dev, irq_res, INTR_TYPE_TTY | INTR_FAST, - cyintr, vsc, &irq_cookie); + (driver_intr_t *)cyintr, vsc, &irq_cookie); #else irq_setup = ENXIO; #endif ==== //depot/projects/soc2006/intr_filter/dev/cy/cyvar.h#2 (text+ko) ==== @@ -32,5 +32,5 @@ extern char cy_driver_name[]; void *cyattach_common(cy_addr cy_iobase, int cy_align); -driver_intr_t cyintr; +driver_filter_t cyintr; int cy_units(cy_addr cy_iobase, int cy_align); ==== //depot/projects/soc2006/intr_filter/dev/em/if_em.c#2 (text+ko) ==== @@ -257,7 +257,7 @@ static poll_handler_t em_poll; static void em_intr(void *); #else -static void em_intr_fast(void *); +static int em_intr_fast(void *); static void em_add_int_process_limit(struct em_softc *, const char *, const char *, int *, int); static void em_handle_rxtx(void *context, int pending); @@ -1202,7 +1202,7 @@ * Fast Interrupt Service routine * *********************************************************************/ -static void +static int em_intr_fast(void *arg) { struct em_softc *sc = arg; @@ -1215,11 +1215,11 @@ /* Hot eject? */ if (reg_icr == 0xffffffff) - return; + return(FILTER_STRAY); /* Definitely not our interrupt. */ if (reg_icr == 0x0) - return; + return(FILTER_STRAY); /* * Starting with the 82571 chip, bit 31 should be used to @@ -1227,7 +1227,7 @@ */ if (sc->hw.mac_type >= em_82571 && (reg_icr & E1000_ICR_INT_ASSERTED) == 0) - return; + return(FILTER_STRAY); /* * Mask interrupts until the taskqueue is finished running. This is @@ -1243,6 +1243,7 @@ if (reg_icr & E1000_ICR_RXO) sc->rx_overruns++; + return(FILTER_HANDLED); } #endif /* ! DEVICE_POLLING */ @@ -1991,8 +1992,9 @@ taskqueue_thread_enqueue, &sc->tq); taskqueue_start_threads(&sc->tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->dev)); + // XXX - FIX_INTR_FILTER if ((error = bus_setup_intr(dev, sc->res_interrupt, - INTR_TYPE_NET | INTR_FAST, em_intr_fast, sc, + INTR_TYPE_NET | INTR_FAST, (driver_intr_t *)em_intr_fast, sc, &sc->int_handler_tag)) != 0) { device_printf(dev, "Failed to register fast interrupt " "handler: %d\n", error); ==== //depot/projects/soc2006/intr_filter/dev/ppbus/pps.c#2 (text+ko) ==== @@ -51,7 +51,7 @@ void *intr_cookie; /* interrupt registration cookie */ }; -static void ppsintr(void *arg); +static int ppsintr(void *arg); static void ppshcpoll(void *arg); #define DEVTOSOFTC(dev) \ @@ -203,9 +203,11 @@ if (ppb_request_bus(ppbus, ppsdev, PPB_WAIT|PPB_INTR)) return (EINTR); + // XXX - FIX_INTR_FILTER /* attach the interrupt handler */ if ((error = bus_setup_intr(ppsdev, sc->intr_resource, - (INTR_TYPE_TTY | INTR_MPSAFE | INTR_FAST), ppsintr, + (INTR_TYPE_TTY | INTR_MPSAFE | INTR_FAST), + (driver_intr_t *)ppsintr, sc, &sc->intr_cookie))) { ppb_release_bus(ppbus, ppsdev); return (error); @@ -276,14 +278,14 @@ mtx_unlock_spin(&sc->mtx); } -static void +static int ppsintr(void *arg) { struct pps_data *sc = (struct pps_data *)arg; pps_capture(&sc->pps[0]); if (!(ppb_rstr(sc->ppbus) & nACK)) - return; + return(FILTER_STRAY); if (sc->pps[0].ppsparam.mode & PPS_ECHOASSERT) ppb_wctr(sc->ppbus, IRQENABLE | AUTOFEED); mtx_lock_spin(&sc->mtx); @@ -291,6 +293,7 @@ mtx_unlock_spin(&sc->mtx); if (sc->pps[0].ppsparam.mode & PPS_ECHOASSERT) ppb_wctr(sc->ppbus, IRQENABLE); + return(FILTER_HANDLED); } static int ==== //depot/projects/soc2006/intr_filter/dev/puc/puc.c#2 (text+ko) ==== @@ -125,7 +125,7 @@ return (bar); } -static void +static int puc_intr(void *arg) { struct puc_port *port; @@ -183,7 +183,9 @@ if (port->p_ihsrc[i] != NULL) (*port->p_ihsrc[i])(port->p_iharg); } + return(FILTER_HANDLED); } + return(FILTER_STRAY); } int @@ -311,12 +313,14 @@ sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid, RF_ACTIVE|RF_SHAREABLE); if (sc->sc_ires != NULL) { + // XXX - FIX_INTR_FILTER error = bus_setup_intr(dev, sc->sc_ires, - INTR_TYPE_TTY | INTR_FAST, puc_intr, sc, &sc->sc_icookie); + INTR_TYPE_TTY | INTR_FAST, (driver_intr_t *)puc_intr, + sc, &sc->sc_icookie); if (error) error = bus_setup_intr(dev, sc->sc_ires, - INTR_TYPE_TTY | INTR_MPSAFE, puc_intr, sc, - &sc->sc_icookie); + INTR_TYPE_TTY | INTR_MPSAFE, + (driver_intr_t *)puc_intr, sc, &sc->sc_icookie); else sc->sc_fastintr = 1; ==== //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#2 (text) ==== @@ -50,7 +50,7 @@ MALLOC_DEFINE(M_SCC, "SCC", "SCC driver"); -static void +static int scc_bfe_intr(void *arg) { struct scc_softc *sc = arg; @@ -88,7 +88,9 @@ else SCC_ICLEAR(sc, ch); } + return(FILTER_HANDLED); } + return(FILTER_STRAY); } int @@ -216,13 +218,14 @@ ch = &sc->sc_chan[c]; if (ch->ch_ires == NULL) continue; + // XXX - FIX_INTR_FILTER error = bus_setup_intr(dev, ch->ch_ires, - INTR_TYPE_TTY | INTR_FAST, scc_bfe_intr, sc, - &ch->ch_icookie); + INTR_TYPE_TTY | INTR_FAST, (driver_intr_t *)scc_bfe_intr, + sc, &ch->ch_icookie); if (error) { error = bus_setup_intr(dev, ch->ch_ires, - INTR_TYPE_TTY | INTR_MPSAFE, scc_bfe_intr, sc, - &ch->ch_icookie); + INTR_TYPE_TTY | INTR_MPSAFE, + (driver_intr_t *)scc_bfe_intr, sc, &ch->ch_icookie); } else sc->sc_fastintr = 1; @@ -521,8 +524,8 @@ continue; bus_teardown_intr(dev, ch->ch_ires, ch->ch_icookie); bus_setup_intr(dev, ch->ch_ires, - INTR_TYPE_TTY | INTR_MPSAFE, scc_bfe_intr, sc, - &ch->ch_icookie); + INTR_TYPE_TTY | INTR_MPSAFE, + (driver_intr_t *)scc_bfe_intr, sc, &ch->ch_icookie); } } ==== //depot/projects/soc2006/intr_filter/dev/sio/sio.c#2 (text+ko) ==== @@ -263,7 +263,7 @@ static int comopen(struct tty *tp, struct cdev *dev); static void sioinput(struct com_s *com); static void siointr1(struct com_s *com); -static void siointr(void *arg); +static int siointr(void *arg); static int commodem(struct tty *tp, int sigon, int sigoff); static int comparam(struct tty *tp, struct termios *t); static void siopoll(void *); @@ -1074,13 +1074,15 @@ rid = 0; com->irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); if (com->irqres) { + // XXX - FIX_INTR_FILTER ret = bus_setup_intr(dev, com->irqres, INTR_TYPE_TTY | INTR_FAST, - siointr, com, &com->cookie); + (driver_intr_t *)siointr, com, + &com->cookie); if (ret) { ret = bus_setup_intr(dev, com->irqres, INTR_TYPE_TTY, - siointr, com, &com->cookie); + (driver_intr_t *)siointr, com, &com->cookie); if (ret == 0) device_printf(dev, "unable to activate interrupt in fast mode - using normal mode\n"); } @@ -1378,7 +1380,7 @@ outb(com->modem_ctl_port, com->mcr_image |= MCR_RTS); } -static void +static int siointr(arg) void *arg; { @@ -1422,6 +1424,7 @@ } while (possibly_more_intrs); mtx_unlock_spin(&sio_lock); #endif /* COM_MULTIPORT */ + return(FILTER_HANDLED); } static struct timespec siots[8]; ==== //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_freebsd.c#2 (text+ko) ==== @@ -174,9 +174,11 @@ static TW_INT32 twa_detach(device_t dev); static TW_INT32 twa_shutdown(device_t dev); static TW_VOID twa_busdma_lock(TW_VOID *lock_arg, bus_dma_lock_op_t op); -static TW_VOID twa_pci_intr(TW_VOID *arg); #ifdef TW_OSLI_DEFERRED_INTR_USED +static int twa_pci_intr_fast(TW_VOID *arg); static TW_VOID twa_deferred_intr(TW_VOID *context, TW_INT32 pending); +#else +static TW_VOID twa_pci_intr(TW_VOID *arg); #endif /* TW_OSLI_DEFERRED_INTR_USED */ static TW_INT32 tw_osli_alloc_mem(struct twa_softc *sc); @@ -360,7 +362,12 @@ | INTR_FAST #endif /* TW_OSLI_DEFERRED_INTR_USED */ ) : 0) | INTR_TYPE_CAM, - twa_pci_intr, sc, &sc->intr_handle))) { +#ifdef TW_OSLI_DEFERRED_INTR_USED + (driver_intr_t *)twa_pci_intr_fast, +#else + twa_pci_intr, +#endif + sc, &sc->intr_handle))) { tw_osli_printf(sc, "error = %d", TW_CL_SEVERITY_ERROR_STRING, TW_CL_MESSAGE_SOURCE_FREEBSD_DRIVER, @@ -975,7 +982,28 @@ } +#ifdef TW_OSLI_DEFERRED_INTR_USED +/* + * Function name: twa_pci_intr_fast + * Description: Interrupt handler. Wrapper for twa_interrupt. + * + * Input: arg -- ptr to OSL internal ctlr context + * Output: FILTER_HANDLED or FILTER_STRAY + * Return value: None + */ +static int +twa_pci_intr_fast(TW_VOID *arg) +{ + struct twa_softc *sc = (struct twa_softc *)arg; + tw_osli_dbg_dprintf(10, sc, "entered"); + if (tw_cl_interrupt(&(sc->ctlr_handle))) { + tw_cl_deferred_interrupt(&(sc->ctlr_handle)); + return(FILTER_HANDLED); + } + return(FILTER_STRAY); +} +#else /* * Function name: twa_pci_intr * Description: Interrupt handler. Wrapper for twa_interrupt. @@ -991,15 +1019,9 @@ tw_osli_dbg_dprintf(10, sc, "entered"); if (tw_cl_interrupt(&(sc->ctlr_handle))) -#ifdef TW_OSLI_DEFERRED_INTR_USED - taskqueue_enqueue_fast(taskqueue_fast, - &(sc->deferred_intr_callback)); -#else /* TW_OSLI_DEFERRED_INTR_USED */ tw_cl_deferred_interrupt(&(sc->ctlr_handle)); -#endif /* TW_OSLI_DEFERRED_INTR_USED */ } - - +#endif #ifdef TW_OSLI_DEFERRED_INTR_USED ==== //depot/projects/soc2006/intr_filter/dev/uart/uart_core.c#2 (text+ko) ==== @@ -227,13 +227,14 @@ return (0); } -static void +static int uart_intr(void *arg) { struct uart_softc *sc = arg; - int ipend; + int flag = 0, ipend; while (!sc->sc_leaving && (ipend = UART_IPEND(sc)) != 0) { + flag = 1; if (ipend & SER_INT_OVERRUN) uart_intr_overrun(sc); if (ipend & SER_INT_BREAK) @@ -243,8 +244,9 @@ if (ipend & SER_INT_SIGCHG) uart_intr_sigchg(sc); if (ipend & SER_INT_TXIDLE) - uart_intr_txidle(sc); + uart_intr_txidle(sc); } + return((flag)?FILTER_HANDLED:FILTER_STRAY); } serdev_intr_t * @@ -400,13 +402,14 @@ sc->sc_ires = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_irid, RF_ACTIVE | RF_SHAREABLE); if (sc->sc_ires != NULL) { + // XXX - FIX_INTR_HANDLER error = bus_setup_intr(dev, - sc->sc_ires, INTR_TYPE_TTY | INTR_FAST, uart_intr, - sc, &sc->sc_icookie); + sc->sc_ires, INTR_TYPE_TTY | INTR_FAST, + (driver_intr_t *)uart_intr, sc, &sc->sc_icookie); if (error) error = bus_setup_intr(dev, sc->sc_ires, INTR_TYPE_TTY | INTR_MPSAFE, - uart_intr, sc, &sc->sc_icookie); + (driver_intr_t *)uart_intr, sc, &sc->sc_icookie); else sc->sc_fastintr = 1; ==== //depot/projects/soc2006/intr_filter/dev/zs/z8530var.h#2 (text+ko) ==== @@ -65,7 +65,7 @@ int zs_attach(device_t dev); int zs_probe(device_t dev); -void zs_intr(void *v); +int zs_intr(void *v); int zstty_attach(device_t dev); int zstty_probe(device_t dev); ==== //depot/projects/soc2006/intr_filter/dev/zs/zs.c#2 (text+ko) ==== @@ -197,7 +197,7 @@ return (0); } -void +int zs_intr(void *v) { struct zs_softc *sc = v; @@ -216,8 +216,11 @@ needsoft |= zstty_intr(sc->sc_child[0], rr3 >> 3); if ((rr3 & (ZSRR3_IP_B_RX | ZSRR3_IP_B_TX | ZSRR3_IP_B_STAT)) != 0) needsoft |= zstty_intr(sc->sc_child[1], rr3); - if (needsoft) + if (needsoft) { swi_sched(sc->sc_softih, 0); + return(FILTER_HANDLED); + } + return(FILTER_STRAY); } static void ==== //depot/projects/soc2006/intr_filter/dev/zs/zs_macio.c#2 (text+ko) ==== @@ -158,8 +158,9 @@ device_printf(dev, "could not allocate interrupt 1\n"); goto error; } + // XXX - FIX_INTR_FILTER if (bus_setup_intr(dev, sc->sc_irqres1, INTR_TYPE_TTY | INTR_FAST, - zs_intr, sc, &sc->sc_ih1) != 0) { + (driver_intr_t *)zs_intr, sc, &sc->sc_ih1) != 0) { device_printf(dev, "could not setup interrupt 1\n"); goto error; } @@ -170,8 +171,9 @@ device_printf(dev, "could not allocate interrupt 2\n"); goto error; } + // XXX - FIX_INTR_FILTER if (bus_setup_intr(dev, sc->sc_irqres2, INTR_TYPE_TTY | INTR_FAST, - zs_intr, sc, &sc->sc_ih2) != 0) { + (driver_intr_t *)zs_intr, sc, &sc->sc_ih2) != 0) { device_printf(dev, "could not setup interrupt 2\n"); goto error; } ==== //depot/projects/soc2006/intr_filter/i386/isa/clock.c#2 (text+ko) ==== @@ -155,7 +155,7 @@ 0 /* quality */ }; -static void +static int clkintr(struct trapframe *frame) { @@ -177,6 +177,7 @@ if (MCA_system) outb(0x61, inb(0x61) | 0x80); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 14 15:46:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF13016A47D; Wed, 14 Jun 2006 15:46:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B1E3216A41A for ; Wed, 14 Jun 2006 15:46:11 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F139543D6D for ; Wed, 14 Jun 2006 15:46:09 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5EFhkfH007965 for ; Wed, 14 Jun 2006 15:43:46 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5EFhjTF007962 for perforce@freebsd.org; Wed, 14 Jun 2006 15:43:45 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 14 Jun 2006 15:43:45 GMT Message-Id: <200606141543.k5EFhjTF007962@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 99230 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, 14 Jun 2006 15:46:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=99230 Change 99230 by rdivacky@rdivacky_witten on 2006/06/14 15:42:50 Forgot to commit this. This relates to the emul_path commit. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_util.c#2 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_util.c#2 (text+ko) ==== @@ -48,8 +48,6 @@ #include -const char linux_emul_path[] = "/compat/linux"; - /* * Search an alternate path before passing pathname arguments on * to system calls. Useful for keeping a separate 'emulation tree'. From owner-p4-projects@FreeBSD.ORG Wed Jun 14 18:47:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D16F16A47A; Wed, 14 Jun 2006 18:47:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4081616A41A for ; Wed, 14 Jun 2006 18:47:09 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E02643D46 for ; Wed, 14 Jun 2006 18:47:09 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5EIl8ED028982 for ; Wed, 14 Jun 2006 18:47:08 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5EIl8wN028979 for perforce@freebsd.org; Wed, 14 Jun 2006 18:47:08 GMT (envelope-from piso@freebsd.org) Date: Wed, 14 Jun 2006 18:47:08 GMT Message-Id: <200606141847.k5EIl8wN028979@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 99248 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, 14 Jun 2006 18:47:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=99248 Change 99248 by piso@piso_newluxor on 2006/06/14 18:46:37 Fixed compilation of cy Affected files ... .. //depot/projects/soc2006/intr_filter/dev/cy/cy.c#3 edit .. //depot/projects/soc2006/intr_filter/dev/cy/cy_pci.c#3 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/cy/cy.c#3 (text+ko) ==== @@ -644,7 +644,7 @@ com->mcr_image |= com->mcr_rts); } -intr +int cyintr(void *vcom) { struct com_s *basecom; ==== //depot/projects/soc2006/intr_filter/dev/cy/cy_pci.c#3 (text+ko) ==== @@ -153,7 +153,7 @@ #endif if (irq_setup != 0) irq_setup = bus_setup_intr(dev, irq_res, INTR_TYPE_TTY, - cyintr, vsc, &irq_cookie); + (driver_intr_t *)cyintr, vsc, &irq_cookie); if (irq_setup != 0) { device_printf(dev, "interrupt setup failed\n"); goto fail; From owner-p4-projects@FreeBSD.ORG Wed Jun 14 20:13:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F14D16A47D; Wed, 14 Jun 2006 20:13:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 43DF716A47B for ; Wed, 14 Jun 2006 20:13:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB4B343D49 for ; Wed, 14 Jun 2006 20:13:57 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5EKDvPa036614 for ; Wed, 14 Jun 2006 20:13:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5EKDvdH036611 for perforce@freebsd.org; Wed, 14 Jun 2006 20:13:57 GMT (envelope-from jb@freebsd.org) Date: Wed, 14 Jun 2006 20:13:57 GMT Message-Id: <200606142013.k5EKDvdH036611@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99251 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, 14 Jun 2006 20:13:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=99251 Change 99251 by jb@jb_freebsd2 on 2006/06/14 20:13:11 The syscall names are need by witness OR kdtrace. Affected files ... .. //depot/projects/dtrace/src/sys/conf/files#17 edit Differences ... ==== //depot/projects/dtrace/src/sys/conf/files#17 (text+ko) ==== @@ -1378,7 +1378,7 @@ kern/sys_pipe.c standard kern/sys_process.c standard kern/sys_socket.c standard -kern/syscalls.c optional witness kdtrace +kern/syscalls.c optional witness | kdtrace kern/sysv_ipc.c standard kern/sysv_msg.c optional sysvmsg kern/sysv_sem.c optional sysvsem From owner-p4-projects@FreeBSD.ORG Wed Jun 14 20:13:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC7B716A53D; Wed, 14 Jun 2006 20:13:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A09C416A4DA for ; Wed, 14 Jun 2006 20:13:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A1A843D48 for ; Wed, 14 Jun 2006 20:13:58 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5EKDwim036620 for ; Wed, 14 Jun 2006 20:13:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5EKDw8Z036617 for perforce@freebsd.org; Wed, 14 Jun 2006 20:13:58 GMT (envelope-from jb@freebsd.org) Date: Wed, 14 Jun 2006 20:13:58 GMT Message-Id: <200606142013.k5EKDw8Z036617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99252 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, 14 Jun 2006 20:13:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=99252 Change 99252 by jb@jb_freebsd2 on 2006/06/14 20:13:53 Forgot to check if the KDTRACE option was configured. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_synch.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_synch.c#5 (text+ko) ==== @@ -37,6 +37,7 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.280 2006/06/03 20:49:44 jhb Exp $"); +#include "opt_kdtrace.h" #include "opt_ktrace.h" #include From owner-p4-projects@FreeBSD.ORG Wed Jun 14 20:15:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA13816A47E; Wed, 14 Jun 2006 20:15:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC33516A41A for ; Wed, 14 Jun 2006 20:15:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FE8F43D49 for ; Wed, 14 Jun 2006 20:15:01 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5EKF1qP036710 for ; Wed, 14 Jun 2006 20:15:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5EKF0MC036699 for perforce@freebsd.org; Wed, 14 Jun 2006 20:15:00 GMT (envelope-from jb@freebsd.org) Date: Wed, 14 Jun 2006 20:15:00 GMT Message-Id: <200606142015.k5EKF0MC036699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99253 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, 14 Jun 2006 20:15:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=99253 Change 99253 by jb@jb_freebsd2 on 2006/06/14 20:14:49 On FreeBSD use a prototype that doesn't require CDDL code. See proc.h. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#19 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#19 (text) ==== @@ -2190,7 +2190,9 @@ DTRACE_VTIME_ACTIVE_TNF /* DTrace virtual time _and_ TNF */ } dtrace_vtime_state_t; +#if defined(sun) extern dtrace_vtime_state_t dtrace_vtime_active; +#endif extern void dtrace_vtime_switch(kthread_t *next); extern void dtrace_vtime_enable_tnf(void); extern void dtrace_vtime_disable_tnf(void); From owner-p4-projects@FreeBSD.ORG Wed Jun 14 20:52:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D7F516A47A; Wed, 14 Jun 2006 20:52:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F104716A41A; Wed, 14 Jun 2006 20:52:07 +0000 (UTC) (envelope-from jb@what-creek.com) Received: from what-creek.com (what-creek.com [66.111.37.70]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD80143D49; Wed, 14 Jun 2006 20:52:07 +0000 (GMT) (envelope-from jb@what-creek.com) Received: by what-creek.com (Postfix, from userid 102) id 3221078C1D; Wed, 14 Jun 2006 20:52:05 +0000 (GMT) Date: Wed, 14 Jun 2006 20:52:05 +0000 From: John Birrell To: John Baldwin Message-ID: <20060614205205.GA86553@what-creek.com> References: <200606130047.k5D0liTa052536@repoman.freebsd.org> <200606130930.46610.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200606130930.46610.jhb@freebsd.org> User-Agent: Mutt/1.4.2.1i Cc: perforce@freebsd.org Subject: Re: PERFORCE change 99099 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, 14 Jun 2006 20:52:08 -0000 On Tue, Jun 13, 2006 at 09:30:46AM -0400, John Baldwin wrote: > On Monday 12 June 2006 20:47, John Birrell wrote: > > http://perforce.freebsd.org/chv.cgi?CH=99099 > > > > Change 99099 by jb@jb_freebsd2 on 2006/06/13 00:47:28 > > > > Add hooks for DTrace to register a function to be called when > > the scheduler chooses a new thread to run. This is required for > > DTrace vtime. > > You should probably do this in mi_switch() in kern_synch.c rather than > in this macro. Looking further at this is seems that the code actually has to be inserted into each scheduler just before the call to cpu_switch because the schedulers are each capable of selecting a new thread right up to that time (see sched_switch). -- John Birrell From owner-p4-projects@FreeBSD.ORG Wed Jun 14 21:27:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AB1D16A47B; Wed, 14 Jun 2006 21:27:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 274D916A41A for ; Wed, 14 Jun 2006 21:27:34 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1A1343D45 for ; Wed, 14 Jun 2006 21:27:33 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5ELRXSc048973 for ; Wed, 14 Jun 2006 21:27:33 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5ELRXpv048970 for perforce@freebsd.org; Wed, 14 Jun 2006 21:27:33 GMT (envelope-from imp@freebsd.org) Date: Wed, 14 Jun 2006 21:27:33 GMT Message-Id: <200606142127.k5ELRXpv048970@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99256 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, 14 Jun 2006 21:27:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=99256 Change 99256 by imp@imp_lighthouse on 2006/06/14 21:26:47 hack Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/lib_AT91RM9200.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 14 23:49:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E276116A47D; Wed, 14 Jun 2006 23:49:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A69C416A47A for ; Wed, 14 Jun 2006 23:49:34 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73C5543D45 for ; Wed, 14 Jun 2006 23:49:34 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5ENnYXk058349 for ; Wed, 14 Jun 2006 23:49:34 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5ENnYdj058346 for perforce@freebsd.org; Wed, 14 Jun 2006 23:49:34 GMT (envelope-from imp@freebsd.org) Date: Wed, 14 Jun 2006 23:49:34 GMT Message-Id: <200606142349.k5ENnYdj058346@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99264 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, 14 Jun 2006 23:49:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=99264 Change 99264 by imp@imp_lighthouse on 2006/06/14 23:49:23 quick hack: the MCI part has a problem with byte order. It stores the bytes in the wrong order with a word in the buffers it reads and does a similar thing for write. Cope. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/sd-card.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/sd-card.c#3 (text+ko) ==== @@ -126,6 +126,13 @@ } #endif +inline static unsigned int +swap(unsigned int a) +{ + return (((a & 0xff) << 24) | ((a & 0xff00) << 8) | ((a & 0xff0000) >> 8) + | ((a & 0xff000000) >> 24)); +} + int MCI_read (char* dest, unsigned source, unsigned length) { @@ -134,6 +141,7 @@ unsigned offset = (unsigned)source % sectorLength; AT91S_MCIDeviceStatus status; int sizeToRead; + unsigned int *walker; //See if we are requested to read partial sectors, and have the capability to do so if ((length % sectorLength) && !(MCI_Device_Features.Read_Partial)) @@ -160,6 +168,13 @@ if (status != AT91C_READ_OK) return -1; + //* Wait MCI Device Ready + AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); + // Fix erratum in MCI part + for (walker = (unsigned int *)dest; + walker < (unsigned int *)(dest + sizeToRead); walker++) + *walker = swap(*walker); + //Update counters & pointers length -= sizeToRead; dest += sizeToRead; @@ -183,6 +198,14 @@ if (status != AT91C_READ_OK) return -1; + //* Wait MCI Device Ready + AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); + + // Fix erratum in MCI part + for (walker = (unsigned int *)dest; + walker < (unsigned int *)(dest + sizeToRead); walker++) + *walker = swap(*walker); + //Update counters & pointers length -= sizeToRead; dest += sizeToRead; From owner-p4-projects@FreeBSD.ORG Wed Jun 14 23:50:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D4D616A474; Wed, 14 Jun 2006 23:50:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 53EFD16A47A for ; Wed, 14 Jun 2006 23:50:36 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22A7B43D45 for ; Wed, 14 Jun 2006 23:50:36 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5ENoaon058458 for ; Wed, 14 Jun 2006 23:50:36 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5ENoZE2058455 for perforce@freebsd.org; Wed, 14 Jun 2006 23:50:35 GMT (envelope-from imp@freebsd.org) Date: Wed, 14 Jun 2006 23:50:35 GMT Message-Id: <200606142350.k5ENoZE2058455@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99265 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, 14 Jun 2006 23:50:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=99265 Change 99265 by imp@imp_lighthouse on 2006/06/14 23:49:59 Enough random hacks to get ramMonitor loading on the TCS board from the sd card. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootsd/main.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootsd/main.c#3 (text+ko) ==== @@ -76,26 +76,44 @@ unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 }; +#define REAL int main(void) { unsigned low_addr, high_addr; +#ifdef REAL + int i; +#endif - printf("\r\nTSC SD Card boot...\r\n"); + printf("\r\nTSC boot...\r\n"); SPI_InitFlash(); #ifdef TSC_FPGA + printf("Loading FPGA..."); AT91C_BASE_PIOC->PIO_PER = AT91C_PIO_PC7; AT91C_BASE_PIOC->PIO_OER = AT91C_PIO_PC7; AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC7; fpga_load(); AT91C_BASE_PIOC->PIO_SODR = AT91C_PIO_PC7; + printf("done\r\n"); #endif EMAC_Init(); sdcard_init(); low_addr = (mac[3] << 24) | (mac[2] << 16) | (mac[1] << 8) | mac[0]; high_addr = (mac[5] << 8) | mac[4]; SetMACAddress(low_addr, high_addr); - MCI_read((char *)0x20000000, 0, 16 << 20); - ((void(*)())0x20000000)(); + printf("Reading from card..."); +#ifdef REAL + for (i = 0; i < 7; i++) + { + MCI_read((char *)0x20000000 + ((i + 1) << 20), i << 20, 1 << 20); + printf("*"); + } + printf("\r\nStarting...\r\n"); + ((void(*)())(0x20000000 + (1 << 20)))(); +#else + MCI_read((char *)0x20000000, 0, 1 << 20); + printf("Found %s\r\n", (char *)0x20000000); + while (1); +#endif return (1); } From owner-p4-projects@FreeBSD.ORG Thu Jun 15 00:17:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F8FF16A47A; Thu, 15 Jun 2006 00:17:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C51F16A474 for ; Thu, 15 Jun 2006 00:17:11 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1073243D49 for ; Thu, 15 Jun 2006 00:17:11 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5F0HACr060684 for ; Thu, 15 Jun 2006 00:17:10 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5F0HA0D060681 for perforce@freebsd.org; Thu, 15 Jun 2006 00:17:10 GMT (envelope-from wsalamon@computer.org) Date: Thu, 15 Jun 2006 00:17:10 GMT Message-Id: <200606150017.k5F0HA0D060681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 99267 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, 15 Jun 2006 00:17:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=99267 Change 99267 by wsalamon@gretsch on 2006/06/15 00:16:51 Some updates for system calls already audited. Affected files ... .. //depot/projects/trustedbsd/audit3/notes/syscall_audit.tsv#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/notes/syscall_audit.tsv#5 (text+ko) ==== @@ -50,7 +50,7 @@ SYS_accept 30 Y N s, addr, fd; addrlen? SYS_getpeername 31 ? N if audited: s, name; namelen? SYS_getsockname 32 ? N if audited: s, name; namelen? -SYS_access 33 Y N path, mode +SYS_access 33 Y Y path, attr SYS_chflags 34 Y Y path, flags, attr SYS_fchflags 35 Y Y fd, attr, fflags SYS_sync 36 Y N @@ -74,7 +74,7 @@ SYS_ioctl 54 Y N d, request, argp? SYS_reboot 55 Y N how SYS_revoke 56 Y N path -SYS_symlink 57 Y N name1, name2 +SYS_symlink 57 Y Y path, attr, link SYS_readlink 58 Y N path, buf, bufsiz SYS_execve 59 Y N path, argv, envp? SYS_umask 60 Y N numask @@ -137,7 +137,7 @@ SYS_rename 128 Y N SYS_flock 131 Y N fd, operation, addr -SYS_mkfifo 132 Y N +SYS_mkfifo 132 Y Y path, attr, mode SYS_sendto 133 Y N SYS_shutdown 134 Y N SYS_socketpair 135 Y N @@ -148,7 +148,7 @@ SYS_adjtime 140 Y N SYS_setsid 147 Y N -SYS_quotactl 148 Y N +SYS_quotactl 148 Y Y path, attr, cmd, uid SYS_nfssvc 155 Y N @@ -171,7 +171,7 @@ SYS_stat 188 Y Y path, attr; sb? SYS_fstat 189 Y Y fd, attr; sb? SYS_lstat 190 Y Y path, attr; sb? -SYS_pathconf 191 Y N +SYS_pathconf 191 Y Y SYS_fpathconf 192 Y N SYS_getrlimit 194 N N SYS_setrlimit 195 Y N @@ -179,8 +179,8 @@ SYS_mmap 197 Y N addr, len, fd; prot?, flags? (see BSM) SYS___syscall 198 ? N the resulting syscall would still be audited SYS_lseek 199 N N Because read() is not audited, lseek isn't -SYS_truncate 200 Y N -SYS_ftruncate 201 Y N +SYS_truncate 200 Y Y path, attr +SYS_ftruncate 201 Y Y path, attr SYS___sysctl 202 Y N SYS_mlock 203 Y N SYS_munlock 204 Y N @@ -286,7 +286,7 @@ SYS_extattr_delete_fd 373 Y N SYS___setugid 374 ? N SYS_nfsclnt 375 ? N -SYS_eaccess 376 ? N +SYS_eaccess 376 Y Y path, attr SYS_nmount 378 Y Y iovec strings audited SYS_kse_exit 379 ? N SYS_kse_wakeup 380 ? N From owner-p4-projects@FreeBSD.ORG Thu Jun 15 00:21:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2621E16A4A0; Thu, 15 Jun 2006 00:21:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE7D116A494 for ; Thu, 15 Jun 2006 00:21:16 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A384443D58 for ; Thu, 15 Jun 2006 00:21:16 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5F0LG3w061095 for ; Thu, 15 Jun 2006 00:21:16 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5F0LGMO061092 for perforce@freebsd.org; Thu, 15 Jun 2006 00:21:16 GMT (envelope-from wsalamon@computer.org) Date: Thu, 15 Jun 2006 00:21:16 GMT Message-Id: <200606150021.k5F0LGMO061092@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 99268 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, 15 Jun 2006 00:21:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=99268 Change 99268 by wsalamon@gretsch on 2006/06/15 00:20:22 Use "ufs" for file system type. Also add tests for the nmount(2) system call. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/filesystem/tfilesys.c#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/filesystem/tfilesys.c#3 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include /* * Test the auditing of some of the filesystem-related system calls. @@ -45,12 +46,13 @@ int ret; int temp_fd; char tempname[32]; - struct statfs stat; + struct statfs sb; u_long count; u_long basep; u_long newstate; u_long nmatches; char buf[128]; + struct iovec iov[16]; AUT_INIT(); @@ -61,39 +63,92 @@ exit (-1); } /* Generate a success AUE_GETFSSTAT audit record */ - if (getfsstat(&stat, 1, MNT_NOWAIT)) + if (getfsstat(&sb, 1, MNT_NOWAIT) != 0) AUT_PERROR("getfsstat()"); aut_assert(AUE_GETFSSTAT); /* Generate a success AUE_STATFS audit record */ - if (statfs(tempname, &stat)) + if (statfs(tempname, &sb) != 0) AUT_PERROR("statfs()"); aut_assert(AUE_STATFS); /* Generate a success AUE_FSTATFS audit record */ - if (fstatfs(temp_fd, &stat)) + if (fstatfs(temp_fd, &sb) != 0) AUT_PERROR("fstatfs()"); aut_assert(AUE_FSTATFS); /* Generate a failure AUE_STATFS audit record */ - if (statfs("ANonExiSteNtFileName", &stat)) + if (statfs("ANonExiSteNtFileName", &sb) != 0) AUT_PERROR("statfs()"); /* Generate a failure AUE_FSTATFS audit record */ - if (fstatfs(1027309, &stat)) + if (fstatfs(1027309, &sb) != 0) AUT_PERROR("fstatfs()"); close(temp_fd); unlink(tempname); /* Generate an AUE_MOUNT audit record (but fail) */ - if (mount("hfs", "/tmp", MNT_UPDATE, NULL)) - AUT_PERROR("mount()"); + if (mount("ufs", "/", MNT_RDONLY, &sb) != 0) + AUT_PERROR("mount(/)"); + aut_assert(AUE_MOUNT); + + /* Generate an AUE_MOUNT audit record (but fail) */ + if (mount("cd9660", "/cdrom", MNT_RDONLY, NULL) != 0) + AUT_PERROR("mount(/cdrom)"); aut_assert(AUE_MOUNT); /* Generate an AUE_UMOUNT audit record (but fail) */ - if (unmount("/tmp", 0)) - AUT_PERROR("unmount()"); + if (unmount("/cdrom", 0) != 0) + AUT_PERROR("unmount(/cdrom)"); + aut_assert(AUE_UMOUNT); + + /* Generate an AUE_NMOUNT audit record (but fail) */ +#define FSTYPE "fstype" +#define CD "cd9660" +#define FSPATH "fspath" +#define PATH "/cdrom" +#define FSJUNK "fsjunk" +#define JUNK "/junk" + iov[0].iov_base = malloc(strlen(FSTYPE)); + iov[0].iov_base = FSTYPE; + iov[0].iov_len = strlen(FSTYPE); + iov[1].iov_base = malloc(strlen(CD)); + iov[1].iov_base = CD; + iov[1].iov_len = strlen(CD); + iov[2].iov_base = malloc(strlen(FSPATH)); + iov[2].iov_base = FSPATH; + iov[2].iov_len = strlen(FSPATH); + iov[3].iov_base = malloc(strlen(PATH)); + iov[3].iov_base = PATH; + iov[3].iov_len = strlen(PATH); + iov[4].iov_base = malloc(strlen(FSJUNK)); + iov[4].iov_base = FSJUNK; + iov[4].iov_len = strlen(FSJUNK); + iov[5].iov_base = malloc(strlen(JUNK)); + iov[5].iov_base = JUNK; + iov[5].iov_len = strlen(JUNK); + iov[4].iov_base = malloc(sizeof(sb)); + iov[4].iov_base = &sb; + iov[4].iov_len = sizeof(&sb); + iov[5].iov_base = malloc(sizeof(nmatches)); + iov[5].iov_base = &nmatches; + iov[5].iov_len = sizeof(nmatches); + iov[6].iov_base = malloc(strlen(FSJUNK)); + iov[6].iov_base = FSJUNK; + iov[6].iov_len = strlen(FSJUNK); + iov[7].iov_base = malloc(strlen(JUNK)); + iov[7].iov_base = JUNK; + iov[7].iov_len = strlen(JUNK); + if (nmount(&iov[0], 8, MNT_RDONLY) != 0) + AUT_PERROR("nmount()"); + aut_assert(AUE_NMOUNT); + + /* Generate another failure AUE_UMOUNT record; unmounting root fails * + * differently. + */ + if (unmount("/", 0)) + AUT_PERROR("unmount(/)"); aut_assert(AUE_UMOUNT); temp_fd = open("/", O_RDONLY, 0); From owner-p4-projects@FreeBSD.ORG Thu Jun 15 06:29:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A47EB16A479; Thu, 15 Jun 2006 06:29:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 818E916A47D for ; Thu, 15 Jun 2006 06:29:01 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51DAF43D45 for ; Thu, 15 Jun 2006 06:29:01 +0000 (GMT) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5F6T1SZ099655 for ; Thu, 15 Jun 2006 06:29:01 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5F6T1lO099650 for perforce@freebsd.org; Thu, 15 Jun 2006 06:29:01 GMT (envelope-from ryanb@FreeBSD.org) Date: Thu, 15 Jun 2006 06:29:01 GMT Message-Id: <200606150629.k5F6T1lO099650@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ryanb@FreeBSD.org using -f From: Ryan Beasley To: Perforce Change Reviews Cc: Subject: PERFORCE change 99283 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, 15 Jun 2006 06:29:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=99283 Change 99283 by ryanb@ryanb_yuki on 2006/06/15 06:28:44 Correct misuse of strncpy's length argument. Affected files ... .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.c#3 edit Differences ... ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.c#3 (text+ko) ==== @@ -1140,8 +1140,8 @@ static char si_product[] = "OSS/FreeBSD"; static char si_version[] = "4.0.0a"; - strncpy(si->product, si_product, sizeof(si->product)); - strncpy(si->version, si_version, sizeof(si->version)); + strncpy(si->product, si_product, sizeof(si->product) - 1); + strncpy(si->version, si_version, sizeof(si->version) - 1); si->versionnum = SOUND_VERSION; si->numaudios = (pcm_devclass != NULL) ? devclass_get_count(pcm_devclass) : From owner-p4-projects@FreeBSD.ORG Thu Jun 15 08:19:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A73516A479; Thu, 15 Jun 2006 08:19:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E98E16A494; Thu, 15 Jun 2006 08:19:43 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.10.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDA2043D79; Thu, 15 Jun 2006 08:19:37 +0000 (GMT) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (localhost [127.0.0.1]) by eva.fit.vutbr.cz (envelope-from xdivac02@eva.fit.vutbr.cz) (8.13.7/8.13.7) with ESMTP id k5F8JPNk034549 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Thu, 15 Jun 2006 10:19:25 +0200 (CEST) Received: (from xdivac02@localhost) by eva.fit.vutbr.cz (8.13.7/8.13.3/Submit) id k5F8JP3p034548; Thu, 15 Jun 2006 10:19:25 +0200 (CEST) Date: Thu, 15 Jun 2006 10:19:25 +0200 From: Divacky Roman To: John Baldwin Message-ID: <20060615081925.GB34336@stud.fit.vutbr.cz> References: <200606131712.k5DHCIjF063625@repoman.freebsd.org> <200606131344.08736.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200606131344.08736.jhb@freebsd.org> User-Agent: Mutt/1.4.2i X-Scanned-By: MIMEDefang 2.54 on 147.229.10.14 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 99144 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, 15 Jun 2006 08:19:43 -0000 On Tue, Jun 13, 2006 at 01:44:08PM -0400, John Baldwin wrote: > On Tuesday 13 June 2006 13:12, Roman Divacky wrote: > > http://perforce.freebsd.org/chv.cgi?CH=99144 > > > > Change 99144 by rdivacky@rdivacky_witten on 2006/06/13 17:12:02 > > > > Make the LINUXBASE path settable via sysctl. Useful when you have more then > one linux bases > > installed etc. > > Since you only check the one global variable, why did you make the sysctl's > try to handle per-prison paths? well... none of the per-prison variables is checkd against anywhere so I thought there's some magic behind and just copied the code from the other variables. can you explain me how this works? to me it seems either like unfinished work or nonsense :) thnx roman From owner-p4-projects@FreeBSD.ORG Thu Jun 15 09:38:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AF4A16A47A; Thu, 15 Jun 2006 09:38:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 55CF116A474 for ; Thu, 15 Jun 2006 09:38:54 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6FA943D46 for ; Thu, 15 Jun 2006 09:38:53 +0000 (GMT) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5F9criZ019895 for ; Thu, 15 Jun 2006 09:38:53 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5F9crRR019892 for perforce@freebsd.org; Thu, 15 Jun 2006 09:38:53 GMT (envelope-from ryanb@FreeBSD.org) Date: Thu, 15 Jun 2006 09:38:53 GMT Message-Id: <200606150938.k5F9crRR019892@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ryanb@FreeBSD.org using -f From: Ryan Beasley To: Perforce Change Reviews Cc: Subject: PERFORCE change 99294 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, 15 Jun 2006 09:38:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=99294 Change 99294 by ryanb@ryanb_yuki on 2006/06/15 09:38:35 Provide FreeBSD-specific vendor/version information (instead of example 4Front strings) via SNDCTL_SYSINFO ioctl. Fixed string termination bug (really!) in SNDCTL_SYSINFO handler (shouldn't assume static strings are shorter than fields, implying the terminating NUL would be included). Now keeping rough count of mixer devices in a global variable instead of iterating over mixer_cdevsw child devices. Affected files ... .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/mixer.c#3 edit .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/mixer.h#3 edit .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.c#4 edit Differences ... ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/mixer.c#3 (text+ko) ==== @@ -83,6 +83,13 @@ .d_name = "mixer", }; +#ifdef OSSV4_EXPERIMENT +/** + * Keeps a count of mixer devices; used only by OSSv4 SNDCTL_SYSINFO ioctl. + */ +int mixer_count = 0; +#endif + #ifdef USING_DEVFS static eventhandler_tag mixer_ehtag; #endif @@ -256,6 +263,10 @@ snddev = device_get_softc(dev); snddev->mixer_dev = pdev; +#ifdef OSSV4_EXPERIMENT + ++mixer_count; +#endif + return 0; bad: @@ -300,6 +311,10 @@ d->mixer_dev = NULL; +#ifdef OSSV4_EXPERIMENT + --mixer_count; +#endif + return 0; } @@ -558,25 +573,3 @@ SYSINIT(mixer_sysinit, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, mixer_sysinit, NULL); SYSUNINIT(mixer_sysuninit, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, mixer_sysuninit, NULL); #endif - -#ifdef OSSV4_EXPERIMENT -/** - * @brief Counts the number of mixers in the system. - * @returns Number of mixer devices - * - * Used for SNDCTL_SYSINFO. Return the number of mixer devices in the - * system. Gross hack! (There has to be a better way.) - */ -int -mixer_get_num_mixers(void) -{ - struct cdev *mdev; - int count = 0; - - LIST_FOREACH(mdev, &mixer_cdevsw.d_devs, si_list) { - ++count; - } - - return count; -} -#endif /* !OSSV4_EXPERIMENT */ ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/mixer.h#3 (text+ko) ==== @@ -42,7 +42,7 @@ void *mix_getdevinfo(struct snd_mixer *m); #ifdef OSSV4_EXPERIMENT -int mixer_get_num_mixers(void); +extern int mixer_count; #endif /* !OSSV4_EXPERIMENT */ /* ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.c#4 (text+ko) ==== @@ -1137,11 +1137,13 @@ void sound_oss_sysinfo(oss_sysinfo *si) { - static char si_product[] = "OSS/FreeBSD"; - static char si_version[] = "4.0.0a"; + static char si_product[] = "FreeBSD native OSS ABI"; + static char si_version[] = __XSTRING(__FreeBSD_version); strncpy(si->product, si_product, sizeof(si->product) - 1); + si->product[sizeof(si->product) - 1] = '\0'; strncpy(si->version, si_version, sizeof(si->version) - 1); + si->product[sizeof(si->product) - 1] = '\0'; si->versionnum = SOUND_VERSION; si->numaudios = (pcm_devclass != NULL) ? devclass_get_count(pcm_devclass) : @@ -1160,7 +1162,7 @@ */ si->nummidis = 0; si->numtimers = 0; - si->nummixers = mixer_get_num_mixers(); + si->nummixers = mixer_count; si->numcards = 0; /* OSSv4 docs: Intended only for test apps; API doesn't really have much of a concept of cards. Shouldn't be used by From owner-p4-projects@FreeBSD.ORG Thu Jun 15 13:28:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8460C16A47B; Thu, 15 Jun 2006 13:28:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D75A16A474 for ; Thu, 15 Jun 2006 13:28:45 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AB4F43D53 for ; Thu, 15 Jun 2006 13:28:45 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5FDSiLW046927 for ; Thu, 15 Jun 2006 13:28:45 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5FDSibq046924 for perforce@freebsd.org; Thu, 15 Jun 2006 13:28:44 GMT (envelope-from bushman@freebsd.org) Date: Thu, 15 Jun 2006 13:28:44 GMT Message-Id: <200606151328.k5FDSibq046924@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 99303 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, 15 Jun 2006 13:28:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=99303 Change 99303 by bushman@bushman_nss_ldap_cached on 2006/06/15 13:28:03 dns, nis and files module now use their own ***_hostent_data structures, instead of using the one, declared in libc (in netdb_private.h) some preparations to implement getipnodeby***() functions through gethostby***() functions were made Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_addrinfo.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_namadr.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_name6.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/nss_dns.h#1 add .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_hosts_namadr.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_hosts_name6.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/nss_files.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/nss_files.h#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_namadr.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_name6.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nss_nis.h#1 add .. //depot/projects/soc2006/nss_ldap_cached/tests/ipnode_emul/Makefile#1 add .. //depot/projects/soc2006/nss_ldap_cached/tests/ipnode_emul/hosts_list#1 add .. //depot/projects/soc2006/nss_ldap_cached/tests/ipnode_emul/ipnode_emul_test.c#1 add Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_addrinfo.c#3 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_namadr.c#3 (text+ko) ==== @@ -74,14 +74,13 @@ #include #include #include - #include "reentrant.h" #include "netdb_private.h" -#include "res_config.h" +#include "nss_dns.h" +#include "hosts_namadr.h" NETDB_THREAD_ALLOC(hostent) -NETDB_THREAD_ALLOC(hostent_data) -NETDB_THREAD_ALLOC(hostdata) +NETDB_THREAD_ALLOC(dns_hostent_data) static void hostent_free(void *ptr) @@ -90,26 +89,14 @@ } static void -hostent_data_free(void *ptr) +dns_hostent_data_free(void *ptr) { - struct hostent_data *hed = ptr; + struct dns_hostent_data *hed = ptr; if (hed == NULL) return; - hed->stayopen = 0; - - if (hed->hostf) { - (void) fclose(hed->hostf); - hed->hostf = NULL; - } - - free(hed); -} -static void -hostdata_free(void *ptr) -{ - free(ptr); + free(hed); } #define SPRINTF(x) ((size_t)sprintf x) @@ -507,7 +494,7 @@ size_t buflen; int *errnop, *h_errnop; struct hostent *hptr, he; - struct hostent_data *hed; + struct dns_hostent_data *hed; querybuf *buf; int n, type, error; res_state statp; @@ -523,7 +510,7 @@ *((struct hostent **)rval) = NULL; statp = __res_state(); - if ((hed = __hostent_data_init()) == NULL) { + if ((hed = __dns_hostent_data_init()) == NULL) { RES_SET_H_ERRNO(statp, NETDB_INTERNAL); *h_errnop = statp->res_h_errno; return (NS_NOTFOUND); @@ -588,7 +575,7 @@ int *errnop, *h_errnop; const u_char *uaddr; struct hostent *hptr, he; - struct hostent_data *hed; + struct dns_hostent_data *hed; int n; querybuf *buf; char qbuf[MAXDNAME+1], *qp; @@ -615,7 +602,7 @@ *((struct hostent **)rval) = NULL; statp = __res_state(); - if ((hed = __hostent_data_init()) == NULL) { + if ((hed = __dns_hostent_data_init()) == NULL) { RES_SET_H_ERRNO(statp, NETDB_INTERNAL); *h_errnop = statp->res_h_errno; return (NS_NOTFOUND); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_hosts_name6.c#3 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_hosts_namadr.c#2 (text+ko) ==== @@ -66,11 +66,37 @@ #include #include /* XXX */ #include /* XXX */ +#include "reentrant.h" #include "netdb_private.h" +#include "nss_files.h" #include "hosts_namadr.h" +NETDB_THREAD_ALLOC(hostent) +NETDB_THREAD_ALLOC(files_hostent_data) + +static void +hostent_free(void *ptr) +{ + free(ptr); +} + +static void +files_hostent_data_free(void *ptr) +{ + struct hostent_data *hed = ptr; + + if (hed == NULL) + return; + + if (hed->hostf) { + (void) fclose(hed->hostf); + hed->hostf = NULL; + } + free(hed); +} + static void -sethosthtent(int f, struct hostent_data *hed) +sethosthtent(int f, struct files_hostent_data *hed) { if (!hed->hostf) hed->hostf = fopen(_PATH_HOSTS, "r"); @@ -80,7 +106,7 @@ } static void -endhosthtent(struct hostent_data *hed) +endhosthtent(struct files_hostent_data *hed) { if (hed->hostf && !hed->stayopen) { (void) fclose(hed->hostf); @@ -89,7 +115,7 @@ } static int -gethostent_p(struct hostent *he, struct hostent_data *hed, int mapped, +gethostent_p(struct hostent *he, struct files_hostent_data *hed, int mapped, res_state statp) { char *p, *bp, *ep; @@ -182,7 +208,7 @@ size_t buflen; int *errnop, *h_errnop; struct hostent *hptr, he; - struct hostent_data *hed; + struct files_hostent_data *hed; char **cp; res_state statp; int error; @@ -198,7 +224,7 @@ *((struct hostent **)rval) = NULL; statp = __res_state(); - if ((hed = __hostent_data_init()) == NULL) { + if ((hed = __files_hostent_data_init()) == NULL) { RES_SET_H_ERRNO(statp, NETDB_INTERNAL); *h_errnop = statp->res_h_errno; return (NS_NOTFOUND); @@ -245,7 +271,7 @@ size_t buflen; int *errnop, *h_errnop; struct hostent *hptr, he; - struct hostent_data *hed; + struct files_hostent_data *hed; res_state statp; int error; @@ -261,7 +287,7 @@ *((struct hostent **)rval) = NULL; statp = __res_state(); - if ((hed = __hostent_data_init()) == NULL) { + if ((hed = __files_hostent_data_init()) == NULL) { RES_SET_H_ERRNO(statp, NETDB_INTERNAL); *h_errnop = statp->res_h_errno; return (NS_NOTFOUND); @@ -296,7 +322,7 @@ char *buffer; size_t buflen; int *errnop, *h_errnop; - struct hostent_data *hed; + struct files_hostent_data *hed; struct hostent *hptr, he; res_state statp; @@ -314,7 +340,7 @@ *h_errnop = statp->res_h_errno; return (NS_NOTFOUND); } - if ((hed = __hostent_data_init()) == NULL) { + if ((hed = __files_hostent_data_init()) == NULL) { RES_SET_H_ERRNO(statp, NETDB_INTERNAL); *h_errnop = statp->res_h_errno; return (NS_NOTFOUND); @@ -331,14 +357,14 @@ int __files_sethostent(void *rval, void *cb_data, va_list ap) { - struct hostent_data *hed; + struct files_hostent_data *hed; res_state statp; int f; f = va_arg(ap, int); statp = __res_state(); - if ((hed = __hostent_data_init()) == NULL) { + if ((hed = __files_hostent_data_init()) == NULL) { RES_SET_H_ERRNO(statp, NETDB_INTERNAL); return (NS_UNAVAIL); } @@ -351,11 +377,11 @@ int __files_endhostent(void *rval, void *cb_data, va_list ap) { - struct hostent_data *hed; + struct files_hostent_data *hed; res_state statp; statp = __res_state(); - if ((hed = __hostent_data_init()) == NULL) { + if ((hed = __files_hostent_data_init()) == NULL) { RES_SET_H_ERRNO(statp, NETDB_INTERNAL); return (NS_UNAVAIL); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/files_hosts_name6.c#2 (text+ko) ==== @@ -105,6 +105,20 @@ #include "netdb_private.h" #include "hosts_name6.h" +#ifndef _PATH_HOSTS +#define _PATH_HOSTS "/etc/hosts" +#endif + +#ifndef MAXALIASES +#define MAXALIASES 10 +#endif +#ifndef MAXADDRS +#define MAXADDRS 20 +#endif +#ifndef MAXDNAME +#define MAXDNAME 1025 +#endif + static FILE * _files_open(int *errp) { ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/nss_files.c#3 (text+ko) ==== @@ -78,6 +78,7 @@ {NSDB_HOSTS, "gethostbyaddr_r", __files_gethostbyaddr_r, NULL}, {NSDB_HOSTS, "ghbyname", __files_ghbyname, NULL}, {NSDB_HOSTS, "ghbyaddr", __files_ghbyaddr, NULL}, + {NSDB_HOSTS, "getaddrinfo", __files_getaddrinfo, NULL}, {NSDB_HOSTS_INTERNAL, "gethostent_r", __files_gethostent_r, NULL}, {NSDB_HOSTS_INTERNAL, "sethostent", __files_sethostent, NULL}, {NSDB_HOSTS_INTERNAL, "endhostent", __files_endhostent, NULL}, ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_files/nss_files.h#2 (text+ko) ==== @@ -30,3 +30,25 @@ nss_set_ent = 1, nss_end_ent = 2 }; + +#ifndef _MAXALIASES +#define _MAXALIASES 35 +#endif +#ifndef _MAXLINELEN +#define _MAXLINELEN 1024 +#endif +#ifndef _MAXADDRS +#define _MAXADDRS 35 +#endif +#ifndef _HOSTBUFSIZE +#define _HOSTBUFSIZE (8 * 1024) +#endif + +struct files_hostent_data { + uint32_t host_addr[4]; /* IPv4 or IPv6 */ + char *h_addr_ptrs[_MAXADDRS + 1]; + char *host_aliases[_MAXALIASES]; + char hostbuf[_HOSTBUFSIZE]; + FILE *hostf; + int stayopen; +}; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_namadr.c#2 (text+ko) ==== @@ -40,19 +40,41 @@ #include #include #include /* XXX */ -#ifdef YP +//#ifdef YP #include #include #include -#endif +//#endif #include #include +#include "reentrant.h" #include "netdb_private.h" +#include "nss_nis.h" +#include "hosts_namadr.h" + +NETDB_THREAD_ALLOC(hostent) +NETDB_THREAD_ALLOC(nis_hostent_data) + +static void +hostent_free(void *ptr) +{ + free(ptr); +} + +static void +nis_hostent_data_free(void *ptr) +{ + struct nis_hostent_data *hed = ptr; + + if (hed == NULL) + return; + free(hed); +} -#ifdef YP +//#ifdef YP static int _gethostbynis(const char *name, char *map, int af, struct hostent *he, - struct hostent_data *hed) + struct nis_hostent_data *hed) { char *p, *bp, *ep; char *cp, **q; @@ -164,7 +186,7 @@ static int _gethostbynisname_r(const char *name, int af, struct hostent *he, - struct hostent_data *hed) + struct nis_hostent_data *hed) { char *map; @@ -181,7 +203,7 @@ static int _gethostbynisaddr_r(const void *addr, socklen_t len, int af, - struct hostent *he, struct hostent_data *hed) + struct hostent *he, struct nis_hostent_data *hed) { char *map; char numaddr[46]; @@ -198,22 +220,22 @@ return (-1); return (_gethostbynis(numaddr, map, af, he, hed)); } -#endif /* YP */ +//#endif /* YP */ /* XXX _gethostbynisname/_gethostbynisaddr only used by getipnodeby*() */ struct hostent * _gethostbynisname(const char *name, int af) { -#ifdef YP +//#ifdef YP struct hostent *he; - struct hostent_data *hed; + struct nis_hostent_data *hed; u_long oresopt; int error; res_state statp; statp = __res_state(); if ((he = __hostent_init()) == NULL || - (hed = __hostent_data_init()) == NULL) { + (hed = __nis_hostent_data_init()) == NULL) { RES_SET_H_ERRNO(statp, NETDB_INTERNAL); return (NULL); } @@ -223,24 +245,24 @@ error = _gethostbynisname_r(name, af, he, hed); statp->options = oresopt; return (error == 0) ? he : NULL; -#else - return (NULL); -#endif +//#else +// return (NULL); +//#endif } struct hostent * _gethostbynisaddr(const void *addr, socklen_t len, int af) { -#ifdef YP +//#ifdef YP struct hostent *he; - struct hostent_data *hed; + struct nis_hostent_data *hed; u_long oresopt; int error; res_state statp; statp = __res_state(); if ((he = __hostent_init()) == NULL || - (hed = __hostent_data_init()) == NULL) { + (hed = __nis_hostent_data_init()) == NULL) { RES_SET_H_ERRNO(statp, NETDB_INTERNAL); return (NULL); } @@ -250,22 +272,22 @@ error = _gethostbynisaddr_r(addr, len, af, he, hed); statp->options = oresopt; return (error == 0) ? he : NULL; -#else - return (NULL); -#endif +//#else +// return (NULL); +//#endif } int __nis_gethostbyname2_r(void *rval, void *cb_data, va_list ap) { -#ifdef YP +//#ifdef YP const char *name; int af; char *buffer; size_t buflen; int *errnop, *h_errnop; struct hostent *hptr, he; - struct hostent_data *hed; + struct nis_hostent_data *hed; res_state statp; name = va_arg(ap, const char *); @@ -279,7 +301,7 @@ *((struct hostent **)rval) = NULL; statp = __res_state(); - if ((hed = __hostent_data_init()) == NULL) { + if ((hed = __nis_hostent_data_init()) == NULL) { RES_SET_H_ERRNO(statp, NETDB_INTERNAL); *h_errnop = statp->res_h_errno; return (NS_NOTFOUND); @@ -295,16 +317,16 @@ } *((struct hostent **)rval) = hptr; return (NS_SUCCESS); -#else - *((struct hostent **)rval) = NULL; - return (NS_UNAVAIL); -#endif +//#else +// *((struct hostent **)rval) = NULL; +// return (NS_UNAVAIL); +//#endif } int __nis_gethostbyaddr_r(void *rval, void *cb_data, va_list ap) { -#ifdef YP +//#ifdef YP const void *addr; socklen_t len; int af; @@ -312,7 +334,7 @@ size_t buflen; int *errnop, *h_errnop; struct hostent *hptr, he; - struct hostent_data *hed; + struct nis_hostent_data *hed; res_state statp; addr = va_arg(ap, const void *); @@ -327,7 +349,7 @@ *((struct hostent **)rval) = NULL; statp = __res_state(); - if ((hed = __hostent_data_init()) == NULL) { + if ((hed = __nis_hostent_data_init()) == NULL) { RES_SET_H_ERRNO(statp, NETDB_INTERNAL); *h_errnop = statp->res_h_errno; return (NS_NOTFOUND); @@ -343,8 +365,8 @@ } *((struct hostent **)rval) = hptr; return (NS_SUCCESS); -#else - *((struct hostent **)rval) = NULL; - return (NS_UNAVAIL); -#endif +//#else +// *((struct hostent **)rval) = NULL; + //return (NS_UNAVAIL); +//#endif } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_nis/nis_hosts_name6.c#2 (text+ko) ==== @@ -104,11 +104,11 @@ #include #include #include /* XXX */ -#ifdef YP +//#ifdef YP #include #include #include -#endif +//#endif #include #include #include "netdb_private.h" From owner-p4-projects@FreeBSD.ORG Thu Jun 15 18:42:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 918B616A47B; Thu, 15 Jun 2006 18:42:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D39E16A41A for ; Thu, 15 Jun 2006 18:42:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id D969643D45 for ; Thu, 15 Jun 2006 18:42:38 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k5FIgZgn049637; Thu, 15 Jun 2006 14:42:36 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: John Birrell Date: Thu, 15 Jun 2006 14:33:24 -0400 User-Agent: KMail/1.9.1 References: <200606130047.k5D0liTa052536@repoman.freebsd.org> <200606130930.46610.jhb@freebsd.org> <20060614205205.GA86553@what-creek.com> In-Reply-To: <20060614205205.GA86553@what-creek.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200606151433.24652.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Thu, 15 Jun 2006 14:42:37 -0400 (EDT) X-Virus-Scanned: ClamAV 0.87.1/1539/Wed Jun 14 10:21:49 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: perforce@freebsd.org Subject: Re: PERFORCE change 99099 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, 15 Jun 2006 18:42:39 -0000 On Wednesday 14 June 2006 16:52, John Birrell wrote: > On Tue, Jun 13, 2006 at 09:30:46AM -0400, John Baldwin wrote: > > On Monday 12 June 2006 20:47, John Birrell wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=99099 > > > > > > Change 99099 by jb@jb_freebsd2 on 2006/06/13 00:47:28 > > > > > > Add hooks for DTrace to register a function to be called when > > > the scheduler chooses a new thread to run. This is required for > > > DTrace vtime. > > > > You should probably do this in mi_switch() in kern_synch.c rather than > > in this macro. > > Looking further at this is seems that the code actually has to be > inserted into each scheduler just before the call to cpu_switch because > the schedulers are each capable of selecting a new thread right up > to that time (see sched_switch). Ah, yes, I didn't realize at first you needed to know what the new thread is. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Thu Jun 15 18:42:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DF3816A47F; Thu, 15 Jun 2006 18:42:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C69216A47D for ; Thu, 15 Jun 2006 18:42:42 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EB1643D45 for ; Thu, 15 Jun 2006 18:42:41 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k5FIgZgo049637; Thu, 15 Jun 2006 14:42:40 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Divacky Roman Date: Thu, 15 Jun 2006 14:35:04 -0400 User-Agent: KMail/1.9.1 References: <200606131712.k5DHCIjF063625@repoman.freebsd.org> <200606131344.08736.jhb@freebsd.org> <20060615081925.GB34336@stud.fit.vutbr.cz> In-Reply-To: <20060615081925.GB34336@stud.fit.vutbr.cz> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200606151435.04624.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Thu, 15 Jun 2006 14:42:40 -0400 (EDT) X-Virus-Scanned: ClamAV 0.87.1/1539/Wed Jun 14 10:21:49 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 99144 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, 15 Jun 2006 18:42:42 -0000 On Thursday 15 June 2006 04:19, Divacky Roman wrote: > On Tue, Jun 13, 2006 at 01:44:08PM -0400, John Baldwin wrote: > > On Tuesday 13 June 2006 13:12, Roman Divacky wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=99144 > > > > > > Change 99144 by rdivacky@rdivacky_witten on 2006/06/13 17:12:02 > > > > > > Make the LINUXBASE path settable via sysctl. Useful when you have more then > > one linux bases > > > installed etc. > > > > Since you only check the one global variable, why did you make the sysctl's > > try to handle per-prison paths? > > well... none of the per-prison variables is checkd against anywhere so I > thought there's some magic behind and just copied the code from the other > variables. > > can you explain me how this works? to me it seems either like unfinished work > or nonsense :) All the other per-prison variables are accessed via the linux_get_foo() functions (like uname, etc.) and those functions look in the prison. However, you are passing linux_emul_path directly to calls to kern_alternate_path() (see the CHECKALT macros). You would have to change those macros to instead call a linux_get_path() function that looked in the prison if you wanted different prisons to have their own compat paths. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Thu Jun 15 20:52:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 728DA16A479; Thu, 15 Jun 2006 20:52:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4DAE916A41A for ; Thu, 15 Jun 2006 20:52:00 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0111343D45 for ; Thu, 15 Jun 2006 20:52:00 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5FKpxgQ097607 for ; Thu, 15 Jun 2006 20:51:59 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5FKpxJu097604 for perforce@freebsd.org; Thu, 15 Jun 2006 20:51:59 GMT (envelope-from piso@freebsd.org) Date: Thu, 15 Jun 2006 20:51:59 GMT Message-Id: <200606152051.k5FKpxJu097604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 99318 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, 15 Jun 2006 20:52:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=99318 Change 99318 by piso@piso_newluxor on 2006/06/15 20:51:44 Make i386 aware of filters, checking the return code: -FILTER_STRAY: interrupt was not for us, ignore it -FILTER_HANDLED: interrupt completely served -FILTER_SCHEDULE_THREAD: there's more work to do, stamp this handler and schedule the ithread hanlder to run Legacy INTR_FAST were all changed to return FILTER_HANDLED or FILTER_STRAY, while legacy ithread handlers should work with no problem. Affected files ... .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#2 edit .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#2 (text+ko) ==== @@ -171,7 +171,8 @@ struct thread *td; struct intr_event *ie; struct intr_handler *ih; - int error, vector, thread; + int error, vector, thread, ret; + void *arg; td = curthread; @@ -210,27 +211,45 @@ return; } - /* - * Execute fast interrupt handlers directly. - * To support clock handlers, if a handler registers - * with a NULL argument, then we pass it a pointer to - * a trapframe as its argument. - */ td->td_intr_nesting_level++; - thread = 0; + thread = 0; critical_enter(); TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { - if (!(ih->ih_flags & IH_FAST)) { + /* + * Execute fast interrupt handlers directly. + * To support clock handlers, if a handler registers + * with a NULL argument, then we pass it a pointer to + * a trapframe as its argument. + */ + arg = ((ih->ih_argument == NULL) ? frame : ih->ih_argument); + + CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, + ih->ih_handler, arg, ih->ih_name); + + if (ih->ih_flags & IH_FAST) { + // XXX - actually should call ih_filter()... + ret = ((driver_filter_t *)ih->ih_handler)(arg); + } else { + /* old ithread handler */ thread = 1; continue; } - CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, - ih->ih_handler, ih->ih_argument == NULL ? frame : - ih->ih_argument, ih->ih_name); - if (ih->ih_argument == NULL) - ih->ih_handler(frame); - else - ih->ih_handler(ih->ih_argument); + + /* try with the next handler... */ + if (ret == FILTER_STRAY) + continue; + + /* interrupt served, get out of here... */ + if (ret == FILTER_HANDLED) { + thread = 0; + break; + } + + /* mark handler for later execution */ + if (ret == FILTER_SCHEDULE_THREAD) { + ih->ih_need = 1; + thread = 1; + } } /* ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#2 (text+ko) ==== @@ -636,6 +636,8 @@ continue; } + // XXX - with filters, we will execute only + // handlers marked in ih_need too... /* * For software interrupt threads, we only execute * handlers that have their need flag set. Hardware From owner-p4-projects@FreeBSD.ORG Thu Jun 15 20:55:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 766B616A47D; Thu, 15 Jun 2006 20:55:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17E6216A41A for ; Thu, 15 Jun 2006 20:55:02 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 952C643D46 for ; Thu, 15 Jun 2006 20:55:02 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5FKt21T097739 for ; Thu, 15 Jun 2006 20:55:02 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5FKt2Lc097726 for perforce@freebsd.org; Thu, 15 Jun 2006 20:55:02 GMT (envelope-from als@FreeBSD.org) Date: Thu, 15 Jun 2006 20:55:02 GMT Message-Id: <200606152055.k5FKt2Lc097726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 99319 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, 15 Jun 2006 20:55:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=99319 Change 99319 by als@als_head on 2006/06/15 20:53:30 initial import into jail2 branch. Affected files ... .. //depot/projects/jail2/doc/Makefile#1 branch .. //depot/projects/jail2/doc/README#1 branch .. //depot/projects/jail2/doc/bn_BD.ISO10646-1/Makefile#1 branch .. //depot/projects/jail2/doc/bn_BD.ISO10646-1/articles/Makefile#1 branch .. //depot/projects/jail2/doc/bn_BD.ISO10646-1/articles/Makefile.inc#1 branch .. //depot/projects/jail2/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/jail2/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/jail2/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#1 branch .. //depot/projects/jail2/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/Makefile#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/Makefile#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/Makefile#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/articles.ent#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/Makefile#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/Makefile#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/Makefile.inc#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/java-tomcat/Makefile#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/java-tomcat/article.sgml#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/laptop/Makefile#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/new-users/Makefile#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/releng/Makefile#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/releng/article.sgml#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/releng/extra.css#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/articles.ent#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/catalog#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/teams.ent#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#1 branch .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/Makefile#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/building-products/Makefile#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/building-products/article.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/console-server/Makefile#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/console-server/article.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/jail2/sys/Makefile#1 branch .. //depot/projects/jail2/sys/amd64/Makefile#1 branch .. //depot/projects/jail2/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/jail2/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/jail2/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/jail2/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/jail2/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/jail2/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/jail2/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/io.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/jail2/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/jail2/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/jail2/sys/amd64/amd64/support.S#1 branch .. //depot/projects/jail2/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/jail2/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/jail2/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/jail2/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/jail2/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/jail2/sys/amd64/conf/MAC#1 branch .. //depot/projects/jail2/sys/amd64/conf/Makefile#1 branch .. //depot/projects/jail2/sys/amd64/conf/NOTES#1 branch .. //depot/projects/jail2/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/jail2/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/jail2/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/jail2/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/jail2/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/jail2/sys/amd64/include/_bus.h#1 branch .. //depot/projects/jail2/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/jail2/sys/amd64/include/_limits.h#1 branch .. //depot/projects/jail2/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/jail2/sys/amd64/include/_types.h#1 branch .. //depot/projects/jail2/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/jail2/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/jail2/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/jail2/sys/amd64/include/asm.h#1 branch .. //depot/projects/jail2/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/jail2/sys/amd64/include/atomic.h#1 branch .. //depot/projects/jail2/sys/amd64/include/bus.h#1 branch .. //depot/projects/jail2/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/jail2/sys/amd64/include/clock.h#1 branch .. //depot/projects/jail2/sys/amd64/include/cpu.h#1 branch .. //depot/projects/jail2/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/jail2/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/jail2/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/jail2/sys/amd64/include/elf.h#1 branch .. //depot/projects/jail2/sys/amd64/include/endian.h#1 branch .. //depot/projects/jail2/sys/amd64/include/exec.h#1 branch .. //depot/projects/jail2/sys/amd64/include/float.h#1 branch .. //depot/projects/jail2/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/jail2/sys/amd64/include/fpu.h#1 branch .. //depot/projects/jail2/sys/amd64/include/frame.h#1 branch .. //depot/projects/jail2/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/jail2/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/jail2/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/jail2/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/jail2/sys/amd64/include/iodev.h#1 branch .. //depot/projects/jail2/sys/amd64/include/kdb.h#1 branch .. //depot/projects/jail2/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/jail2/sys/amd64/include/limits.h#1 branch .. //depot/projects/jail2/sys/amd64/include/md_var.h#1 branch .. //depot/projects/jail2/sys/amd64/include/memdev.h#1 branch .. //depot/projects/jail2/sys/amd64/include/metadata.h#1 branch .. //depot/projects/jail2/sys/amd64/include/minidump.h#1 branch .. //depot/projects/jail2/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/jail2/sys/amd64/include/mptable.h#1 branch .. //depot/projects/jail2/sys/amd64/include/mutex.h#1 branch .. //depot/projects/jail2/sys/amd64/include/param.h#1 branch .. //depot/projects/jail2/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/jail2/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/jail2/sys/amd64/include/pcb.h#1 branch .. //depot/projects/jail2/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/jail2/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/jail2/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/jail2/sys/amd64/include/pmap.h#1 branch .. //depot/projects/jail2/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/jail2/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/jail2/sys/amd64/include/proc.h#1 branch .. //depot/projects/jail2/sys/amd64/include/profile.h#1 branch .. //depot/projects/jail2/sys/amd64/include/psl.h#1 branch .. //depot/projects/jail2/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/jail2/sys/amd64/include/reg.h#1 branch .. //depot/projects/jail2/sys/amd64/include/reloc.h#1 branch .. //depot/projects/jail2/sys/amd64/include/resource.h#1 branch .. //depot/projects/jail2/sys/amd64/include/runq.h#1 branch .. //depot/projects/jail2/sys/amd64/include/segments.h#1 branch .. //depot/projects/jail2/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/jail2/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/jail2/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/jail2/sys/amd64/include/signal.h#1 branch .. //depot/projects/jail2/sys/amd64/include/smp.h#1 branch .. //depot/projects/jail2/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/jail2/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/jail2/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/jail2/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/jail2/sys/amd64/include/trap.h#1 branch .. //depot/projects/jail2/sys/amd64/include/tss.h#1 branch .. //depot/projects/jail2/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/jail2/sys/amd64/include/varargs.h#1 branch .. //depot/projects/jail2/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/jail2/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/jail2/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/jail2/sys/amd64/isa/clock.c#1 branch .. //depot/projects/jail2/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/jail2/sys/amd64/isa/icu.h#1 branch .. //depot/projects/jail2/sys/amd64/isa/isa.c#1 branch .. //depot/projects/jail2/sys/amd64/isa/isa.h#1 branch .. //depot/projects/jail2/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/jail2/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/jail2/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/jail2/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/jail2/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/jail2/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/jail2/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/jail2/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/jail2/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/jail2/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/jail2/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/jail2/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/jail2/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/jail2/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/jail2/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/jail2/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/jail2/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/jail2/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/jail2/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/jail2/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/jail2/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/jail2/sys/arm/arm/blockio.S#1 branch .. //depot/projects/jail2/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/jail2/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/jail2/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/jail2/sys/arm/arm/copystr.S#1 branch .. //depot/projects/jail2/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/jail2/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/jail2/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/jail2/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/jail2/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/jail2/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/jail2/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/jail2/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/jail2/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/jail2/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/jail2/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/jail2/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/jail2/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/jail2/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/jail2/sys/arm/arm/disassem.c#1 branch .. //depot/projects/jail2/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/jail2/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/jail2/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/jail2/sys/arm/arm/exception.S#1 branch .. //depot/projects/jail2/sys/arm/arm/fiq.c#1 branch .. //depot/projects/jail2/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/jail2/sys/arm/arm/fusu.S#1 branch .. //depot/projects/jail2/sys/arm/arm/genassym.c#1 branch .. //depot/projects/jail2/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/jail2/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/jail2/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/jail2/sys/arm/arm/inckern.S#1 branch .. //depot/projects/jail2/sys/arm/arm/intr.c#1 branch .. //depot/projects/jail2/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/jail2/sys/arm/arm/locore.S#1 branch .. //depot/projects/jail2/sys/arm/arm/machdep.c#1 branch .. //depot/projects/jail2/sys/arm/arm/mem.c#1 branch .. //depot/projects/jail2/sys/arm/arm/nexus.c#1 branch .. //depot/projects/jail2/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/jail2/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/jail2/sys/arm/arm/pmap.c#1 branch .. //depot/projects/jail2/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/jail2/sys/arm/arm/setstack.s#1 branch .. //depot/projects/jail2/sys/arm/arm/support.S#1 branch .. //depot/projects/jail2/sys/arm/arm/swtch.S#1 branch .. //depot/projects/jail2/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/jail2/sys/arm/arm/trap.c#1 branch .. //depot/projects/jail2/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/jail2/sys/arm/arm/undefined.c#1 branch .. //depot/projects/jail2/sys/arm/arm/vectors.S#1 branch .. //depot/projects/jail2/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/jail2/sys/arm/at91/at91.c#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/jail2/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/jail2/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/jail2/sys/arm/at91/at91var.h#1 branch .. //depot/projects/jail2/sys/arm/at91/files.at91#1 branch .. //depot/projects/jail2/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/jail2/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/jail2/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/jail2/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/jail2/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/jail2/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/jail2/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/jail2/sys/arm/at91/std.at91#1 branch .. //depot/projects/jail2/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/jail2/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/jail2/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/jail2/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/jail2/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/jail2/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/jail2/sys/arm/conf/IQ31244#1 branch .. //depot/projects/jail2/sys/arm/conf/KB920X#1 branch .. //depot/projects/jail2/sys/arm/conf/SIMICS#1 branch .. //depot/projects/jail2/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/jail2/sys/arm/include/_bus.h#1 branch .. //depot/projects/jail2/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/jail2/sys/arm/include/_limits.h#1 branch .. //depot/projects/jail2/sys/arm/include/_stdint.h#1 branch .. //depot/projects/jail2/sys/arm/include/_types.h#1 branch .. //depot/projects/jail2/sys/arm/include/armreg.h#1 branch .. //depot/projects/jail2/sys/arm/include/asm.h#1 branch .. //depot/projects/jail2/sys/arm/include/asmacros.h#1 branch .. //depot/projects/jail2/sys/arm/include/atomic.h#1 branch .. //depot/projects/jail2/sys/arm/include/blockio.h#1 branch .. //depot/projects/jail2/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/jail2/sys/arm/include/bus.h#1 branch .. //depot/projects/jail2/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/jail2/sys/arm/include/clock.h#1 branch .. //depot/projects/jail2/sys/arm/include/cpu.h#1 branch .. //depot/projects/jail2/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/jail2/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/jail2/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/jail2/sys/arm/include/disassem.h#1 branch .. //depot/projects/jail2/sys/arm/include/elf.h#1 branch .. //depot/projects/jail2/sys/arm/include/endian.h#1 branch .. //depot/projects/jail2/sys/arm/include/exec.h#1 branch .. //depot/projects/jail2/sys/arm/include/fiq.h#1 branch .. //depot/projects/jail2/sys/arm/include/float.h#1 branch .. //depot/projects/jail2/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/jail2/sys/arm/include/fp.h#1 branch .. //depot/projects/jail2/sys/arm/include/frame.h#1 branch .. //depot/projects/jail2/sys/arm/include/ieee.h#1 branch .. //depot/projects/jail2/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/jail2/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/jail2/sys/arm/include/intr.h#1 branch .. //depot/projects/jail2/sys/arm/include/katelib.h#1 branch .. //depot/projects/jail2/sys/arm/include/kdb.h#1 branch .. //depot/projects/jail2/sys/arm/include/limits.h#1 branch .. //depot/projects/jail2/sys/arm/include/machdep.h#1 branch .. //depot/projects/jail2/sys/arm/include/md_var.h#1 branch .. //depot/projects/jail2/sys/arm/include/memdev.h#1 branch .. //depot/projects/jail2/sys/arm/include/metadata.h#1 branch .. //depot/projects/jail2/sys/arm/include/mutex.h#1 branch .. //depot/projects/jail2/sys/arm/include/param.h#1 branch .. //depot/projects/jail2/sys/arm/include/pcb.h#1 branch .. //depot/projects/jail2/sys/arm/include/pcpu.h#1 branch .. //depot/projects/jail2/sys/arm/include/pmap.h#1 branch .. //depot/projects/jail2/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/jail2/sys/arm/include/proc.h#1 branch .. //depot/projects/jail2/sys/arm/include/profile.h#1 branch .. //depot/projects/jail2/sys/arm/include/psl.h#1 branch .. //depot/projects/jail2/sys/arm/include/pte.h#1 branch .. //depot/projects/jail2/sys/arm/include/ptrace.h#1 branch .. //depot/projects/jail2/sys/arm/include/reg.h#1 branch .. //depot/projects/jail2/sys/arm/include/reloc.h#1 branch .. //depot/projects/jail2/sys/arm/include/resource.h#1 branch .. //depot/projects/jail2/sys/arm/include/runq.h#1 branch .. //depot/projects/jail2/sys/arm/include/setjmp.h#1 branch .. //depot/projects/jail2/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/jail2/sys/arm/include/sigframe.h#1 branch .. //depot/projects/jail2/sys/arm/include/signal.h#1 branch .. //depot/projects/jail2/sys/arm/include/smp.h#1 branch .. //depot/projects/jail2/sys/arm/include/stdarg.h#1 branch .. //depot/projects/jail2/sys/arm/include/swi.h#1 branch .. //depot/projects/jail2/sys/arm/include/sysarch.h#1 branch .. //depot/projects/jail2/sys/arm/include/trap.h#1 branch .. //depot/projects/jail2/sys/arm/include/ucontext.h#1 branch .. //depot/projects/jail2/sys/arm/include/undefined.h#1 branch .. //depot/projects/jail2/sys/arm/include/utrap.h#1 branch .. //depot/projects/jail2/sys/arm/include/vmparam.h#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/jail2/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/jail2/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/jail2/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/jail2/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/jail2/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/jail2/sys/boot/Makefile#1 branch .. //depot/projects/jail2/sys/boot/README#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/jail2/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/jail2/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/jail2/sys/boot/common/bcache.c#1 branch .. //depot/projects/jail2/sys/boot/common/boot.c#1 branch .. //depot/projects/jail2/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/jail2/sys/boot/common/commands.c#1 branch .. //depot/projects/jail2/sys/boot/common/console.c#1 branch .. //depot/projects/jail2/sys/boot/common/dev_net.c#1 branch .. //depot/projects/jail2/sys/boot/common/dev_net.h#1 branch .. //depot/projects/jail2/sys/boot/common/devopen.c#1 branch .. //depot/projects/jail2/sys/boot/common/help.common#1 branch .. //depot/projects/jail2/sys/boot/common/interp.c#1 branch .. //depot/projects/jail2/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/jail2/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/jail2/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/jail2/sys/boot/common/isapnp.c#1 branch .. //depot/projects/jail2/sys/boot/common/isapnp.h#1 branch .. //depot/projects/jail2/sys/boot/common/load.c#1 branch .. //depot/projects/jail2/sys/boot/common/load_elf.c#1 branch .. //depot/projects/jail2/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/jail2/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/jail2/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/jail2/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/jail2/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/jail2/sys/boot/common/loader.8#1 branch .. //depot/projects/jail2/sys/boot/common/ls.c#1 branch .. //depot/projects/jail2/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/jail2/sys/boot/common/misc.c#1 branch .. //depot/projects/jail2/sys/boot/common/module.c#1 branch .. //depot/projects/jail2/sys/boot/common/newvers.sh#1 branch .. //depot/projects/jail2/sys/boot/common/panic.c#1 branch .. //depot/projects/jail2/sys/boot/common/pnp.c#1 branch .. //depot/projects/jail2/sys/boot/common/pnpdata#1 branch .. //depot/projects/jail2/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/jail2/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/jail2/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/jail2/sys/boot/common/ufsread.c#1 branch .. //depot/projects/jail2/sys/boot/efi/Makefile#1 branch .. //depot/projects/jail2/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/jail2/sys/boot/efi/include/README#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/jail2/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/copy.c#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/module.c#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/Makefile#1 branch .. //depot/projects/jail2/sys/boot/ficl/dict.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/jail2/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/float.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/jail2/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/jail2/sys/boot/ficl/loader.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/math64.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/math64.h#1 branch .. //depot/projects/jail2/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/jail2/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/search.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/jail2/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/jail2/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/jail2/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/jail2/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/jail2/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/jail2/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/jail2/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/jail2/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/jail2/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/jail2/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/jail2/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/jail2/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/jail2/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/jail2/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/jail2/sys/boot/ficl/stack.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/tools.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/unix.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/vm.c#1 branch .. //depot/projects/jail2/sys/boot/ficl/words.c#1 branch .. //depot/projects/jail2/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/jail2/sys/boot/forth/frames.4th#1 branch .. //depot/projects/jail2/sys/boot/forth/loader.4th#1 branch .. //depot/projects/jail2/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/jail2/sys/boot/forth/loader.conf#1 branch .. //depot/projects/jail2/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/jail2/sys/boot/forth/loader.rc#1 branch .. //depot/projects/jail2/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/jail2/sys/boot/forth/screen.4th#1 branch .. //depot/projects/jail2/sys/boot/forth/support.4th#1 branch .. //depot/projects/jail2/sys/boot/i386/Makefile#1 branch .. //depot/projects/jail2/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/jail2/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/jail2/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/jail2/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/jail2/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/jail2/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/jail2/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/jail2/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/jail2/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/jail2/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/jail2/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/jail2/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/jail2/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/jail2/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/jail2/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/jail2/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/jail2/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/jail2/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/jail2/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/jail2/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/jail2/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/jail2/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/jail2/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/jail2/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/jail2/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/jail2/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/jail2/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/jail2/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/jail2/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/jail2/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/jail2/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/jail2/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/jail2/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/jail2/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/jail2/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/jail2/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/jail2/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/jail2/sys/boot/i386/loader/version#1 branch .. //depot/projects/jail2/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/jail2/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/jail2/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/jail2/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/jail2/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/jail2/sys/boot/ia64/Makefile#1 branch .. //depot/projects/jail2/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/jail2/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/jail2/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/jail2/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/jail2/sys/boot/ia64/efi/version#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/bootinfo.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/copy.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/devicename.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/elf_freebsd.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/version#1 branch .. //depot/projects/jail2/sys/boot/ofw/Makefile#1 branch .. //depot/projects/jail2/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/jail2/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/jail2/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/jail2/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/jail2/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/jail2/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/jail2/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/jail2/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/jail2/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/jail2/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/jail2/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/jail2/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/jail2/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/jail2/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/jail2/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/jail2/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/jail2/sys/boot/pc98/Makefile#1 branch .. //depot/projects/jail2/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/jail2/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/jail2/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/jail2/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/jail2/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/jail2/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/jail2/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/jail2/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/jail2/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/jail2/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/jail2/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/jail2/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/jail2/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/jail2/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/jail2/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/jail2/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/jail2/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/jail2/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/jail2/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/jail2/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/jail2/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/jail2/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/jail2/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/jail2/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/jail2/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/jail2/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/jail2/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/jail2/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/jail2/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/jail2/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/jail2/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/jail2/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/jail2/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/jail2/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/jail2/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/jail2/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/jail2/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/jail2/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/jail2/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/jail2/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/jail2/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/jail2/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/jail2/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/jail2/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/jail2/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/jail2/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/jail2/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/jail2/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/jail2/sys/bsm/audit.h#1 branch .. //depot/projects/jail2/sys/bsm/audit_internal.h#1 branch .. //depot/projects/jail2/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/jail2/sys/bsm/audit_record.h#1 branch .. //depot/projects/jail2/sys/cam/cam.c#1 branch .. //depot/projects/jail2/sys/cam/cam.h#1 branch .. //depot/projects/jail2/sys/cam/cam_ccb.h#1 branch .. //depot/projects/jail2/sys/cam/cam_debug.h#1 branch .. //depot/projects/jail2/sys/cam/cam_periph.c#1 branch .. //depot/projects/jail2/sys/cam/cam_periph.h#1 branch .. //depot/projects/jail2/sys/cam/cam_queue.c#1 branch .. //depot/projects/jail2/sys/cam/cam_queue.h#1 branch .. //depot/projects/jail2/sys/cam/cam_sim.c#1 branch .. //depot/projects/jail2/sys/cam/cam_sim.h#1 branch .. //depot/projects/jail2/sys/cam/cam_xpt.c#1 branch .. //depot/projects/jail2/sys/cam/cam_xpt.h#1 branch .. //depot/projects/jail2/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/jail2/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/jail2/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/jail2/sys/coda/00READ#1 branch .. //depot/projects/jail2/sys/coda/README#1 branch .. //depot/projects/jail2/sys/coda/TODO#1 branch .. //depot/projects/jail2/sys/coda/cnode.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 15 21:19:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D45116A481; Thu, 15 Jun 2006 21:19:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0ED9516A47C; Thu, 15 Jun 2006 21:19:55 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6719A43D73; Thu, 15 Jun 2006 21:19:46 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k5FLJiYL050549; Thu, 15 Jun 2006 17:19:45 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Paolo Pisati Date: Thu, 15 Jun 2006 17:01:38 -0400 User-Agent: KMail/1.9.1 References: <200606152051.k5FKpxJu097604@repoman.freebsd.org> In-Reply-To: <200606152051.k5FKpxJu097604@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200606151701.39207.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Thu, 15 Jun 2006 17:19:45 -0400 (EDT) X-Virus-Scanned: ClamAV 0.87.1/1541/Thu Jun 15 15:36:31 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 99318 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, 15 Jun 2006 21:19:55 -0000 On Thursday 15 June 2006 16:51, Paolo Pisati wrote: > http://perforce.freebsd.org/chv.cgi?CH=99318 > > Change 99318 by piso@piso_newluxor on 2006/06/15 20:51:44 > > Make i386 aware of filters, checking the return code: > > -FILTER_STRAY: interrupt was not for us, > ignore it > > -FILTER_HANDLED: interrupt completely served > > -FILTER_SCHEDULE_THREAD: there's more work to do, > stamp this handler and schedule > the ithread hanlder to run > > Legacy INTR_FAST were all changed to return FILTER_HANDLED > or FILTER_STRAY, while legacy ithread handlers should work > with no problem. If you move all the code to handle fast interrupts to sys/kern/kern_intr.c first, then you only have to do this step once rather than N times. > Affected files ... > > .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#2 edit > .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#2 edit > > Differences ... > > ==== //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#2 (text+ko) ==== > > @@ -171,7 +171,8 @@ > struct thread *td; > struct intr_event *ie; > struct intr_handler *ih; > - int error, vector, thread; > + int error, vector, thread, ret; > + void *arg; > > td = curthread; > > @@ -210,27 +211,45 @@ > return; > } > > - /* > - * Execute fast interrupt handlers directly. > - * To support clock handlers, if a handler registers > - * with a NULL argument, then we pass it a pointer to > - * a trapframe as its argument. > - */ > td->td_intr_nesting_level++; > - thread = 0; > + thread = 0; > critical_enter(); > TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { > - if (!(ih->ih_flags & IH_FAST)) { > + /* > + * Execute fast interrupt handlers directly. > + * To support clock handlers, if a handler registers > + * with a NULL argument, then we pass it a pointer to > + * a trapframe as its argument. > + */ > + arg = ((ih->ih_argument == NULL) ? frame : ih->ih_argument); > + > + CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, > + ih->ih_handler, arg, ih->ih_name); > + > + if (ih->ih_flags & IH_FAST) { > + // XXX - actually should call ih_filter()... > + ret = ((driver_filter_t *)ih->ih_handler)(arg); > + } else { > + /* old ithread handler */ > thread = 1; > continue; > } > - CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, > - ih->ih_handler, ih->ih_argument == NULL ? frame : > - ih->ih_argument, ih->ih_name); > - if (ih->ih_argument == NULL) > - ih->ih_handler(frame); > - else > - ih->ih_handler(ih->ih_argument); > + > + /* try with the next handler... */ > + if (ret == FILTER_STRAY) > + continue; > + > + /* interrupt served, get out of here... */ > + if (ret == FILTER_HANDLED) { > + thread = 0; > + break; > + } > + > + /* mark handler for later execution */ > + if (ret == FILTER_SCHEDULE_THREAD) { > + ih->ih_need = 1; > + thread = 1; > + } > } > > /* > > ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#2 (text+ko) ==== > > @@ -636,6 +636,8 @@ > continue; > } > > + // XXX - with filters, we will execute only > + // handlers marked in ih_need too... > /* > * For software interrupt threads, we only execute > * handlers that have their need flag set. Hardware > -- John Baldwin From owner-p4-projects@FreeBSD.ORG Thu Jun 15 21:20:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9175D16A558; Thu, 15 Jun 2006 21:20:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6FF5E16A4D8 for ; Thu, 15 Jun 2006 21:20:36 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A08043D46 for ; Thu, 15 Jun 2006 21:20:36 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5FLKaHc000416 for ; Thu, 15 Jun 2006 21:20:36 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5FLKZPh000413 for perforce@freebsd.org; Thu, 15 Jun 2006 21:20:35 GMT (envelope-from als@FreeBSD.org) Date: Thu, 15 Jun 2006 21:20:35 GMT Message-Id: <200606152120.k5FLKZPh000413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 99322 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, 15 Jun 2006 21:20:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=99322 Change 99322 by als@als_head on 2006/06/15 21:20:09 remove wrong imported files. Affected files ... .. //depot/projects/jail2/doc/Makefile#2 delete .. //depot/projects/jail2/doc/README#2 delete .. //depot/projects/jail2/doc/bn_BD.ISO10646-1/Makefile#2 delete .. //depot/projects/jail2/doc/bn_BD.ISO10646-1/articles/Makefile#2 delete .. //depot/projects/jail2/doc/bn_BD.ISO10646-1/articles/Makefile.inc#2 delete .. //depot/projects/jail2/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#2 delete .. //depot/projects/jail2/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#2 delete .. //depot/projects/jail2/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#2 delete .. //depot/projects/jail2/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/Makefile#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/Makefile#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/Makefile.inc#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/euro/Makefile#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/euro/article.sgml#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/Makefile#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/post#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/articles/pxe/pre#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/authors.ent#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/catalog#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/license.sgml#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/teams.ent#2 delete .. //depot/projects/jail2/doc/da_DK.ISO8859-1/share/sgml/translators.ent#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/Makefile#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/Makefile#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/Makefile.inc#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/contributing/Makefile#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/laptop/Makefile#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/new-users/Makefile#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/Makefile#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/Makefile.inc#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/faq/Makefile#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/faq/book.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/Makefile#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/book.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/flyer/Makefile#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/flyer/flyer.tex#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/articles.ent#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/books.ent#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/catalog#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/teams.ent#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/translators.ent#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#2 delete .. //depot/projects/jail2/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/Makefile#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/Makefile#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/Makefile.inc#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/java-tomcat/Makefile#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/java-tomcat/article.sgml#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/laptop/Makefile#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/new-users/Makefile#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/releng/Makefile#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/releng/article.sgml#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/articles/releng/extra.css#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/articles.ent#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/catalog#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/teams.ent#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#2 delete .. //depot/projects/jail2/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/Makefile#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/Makefile#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/Makefile.inc#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/building-products/Makefile#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/building-products/article.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/console-server/Makefile#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/console-server/article.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributing/Makefile#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributing/article.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/Makefile#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/article.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#2 delete .. //depot/projects/jail2/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#2 delete .. //depot/projects/jail2/sys/doc/subsys/Doxyfile-libkern#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 15 21:26:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3412F16A484; Thu, 15 Jun 2006 21:26:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D821516A47E; Thu, 15 Jun 2006 21:26:36 +0000 (UTC) (envelope-from jb@what-creek.com) Received: from what-creek.com (what-creek.com [66.111.37.70]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDFAC43DAD; Thu, 15 Jun 2006 21:26:01 +0000 (GMT) (envelope-from jb@what-creek.com) Received: by what-creek.com (Postfix, from userid 102) id 1E1FF78C1D; Thu, 15 Jun 2006 21:25:59 +0000 (GMT) Date: Thu, 15 Jun 2006 21:25:59 +0000 From: John Birrell To: John Baldwin Message-ID: <20060615212558.GA37961@what-creek.com> References: <200606130047.k5D0liTa052536@repoman.freebsd.org> <200606130930.46610.jhb@freebsd.org> <20060614205205.GA86553@what-creek.com> <200606151433.24652.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200606151433.24652.jhb@freebsd.org> User-Agent: Mutt/1.4.2.1i Cc: perforce@freebsd.org Subject: Re: PERFORCE change 99099 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, 15 Jun 2006 21:26:37 -0000 On Thu, Jun 15, 2006 at 02:33:24PM -0400, John Baldwin wrote: > On Wednesday 14 June 2006 16:52, John Birrell wrote: > > On Tue, Jun 13, 2006 at 09:30:46AM -0400, John Baldwin wrote: > > > On Monday 12 June 2006 20:47, John Birrell wrote: > > > > http://perforce.freebsd.org/chv.cgi?CH=99099 > > > > > > > > Change 99099 by jb@jb_freebsd2 on 2006/06/13 00:47:28 > > > > > > > > Add hooks for DTrace to register a function to be called when > > > > the scheduler chooses a new thread to run. This is required for > > > > DTrace vtime. > > > > > > You should probably do this in mi_switch() in kern_synch.c rather than > > > in this macro. > > > > Looking further at this is seems that the code actually has to be > > inserted into each scheduler just before the call to cpu_switch because > > the schedulers are each capable of selecting a new thread right up > > to that time (see sched_switch). > > Ah, yes, I didn't realize at first you needed to know what the new thread is. What DTrace is doing is recording a timestamp when the thread starts running so that it knows the elapsed run-time of the thread. This is used with the timestamp action so that you can calculate in nanoseconds how long something took. -- John Birrell From owner-p4-projects@FreeBSD.ORG Thu Jun 15 22:31:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 333EE16A47C; Thu, 15 Jun 2006 22:31:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E66916A41A for ; Thu, 15 Jun 2006 22:31:07 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D17B43D45 for ; Thu, 15 Jun 2006 22:31:06 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5FMV6A3005649 for ; Thu, 15 Jun 2006 22:31:06 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5FMV65R005646 for perforce@freebsd.org; Thu, 15 Jun 2006 22:31:06 GMT (envelope-from als@FreeBSD.org) Date: Thu, 15 Jun 2006 22:31:06 GMT Message-Id: <200606152231.k5FMV65R005646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 99328 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, 15 Jun 2006 22:31:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=99328 Change 99328 by als@als_head on 2006/06/15 22:30:12 restore deleted file Affected files ... .. //depot/projects/jail2/sys/doc/subsys/Doxyfile-libkern#3 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jun 16 09:55:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D0B116A47B; Fri, 16 Jun 2006 09:55:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 92E8016A474; Fri, 16 Jun 2006 09:53:56 +0000 (UTC) (envelope-from flag@newluxor.wired.org) Received: from mail.oltrelinux.com (krisma.oltrelinux.com [194.242.226.43]) by mx1.FreeBSD.org (Postfix) with ESMTP id 05B8D43D46; Fri, 16 Jun 2006 09:53:55 +0000 (GMT) (envelope-from flag@newluxor.wired.org) Received: from newluxor.wired.org (ip-79-107.sn1.eutelia.it [62.94.79.107]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.oltrelinux.com (Postfix) with ESMTP id 84DA711B1F0; Fri, 16 Jun 2006 11:53:54 +0200 (CEST) Received: from newluxor.wired.org (localhost [127.0.0.1]) by newluxor.wired.org (8.13.6/8.13.6) with ESMTP id k5G9rOHN001930; Fri, 16 Jun 2006 11:53:24 +0200 (CEST) (envelope-from flag@newluxor.wired.org) Received: (from flag@localhost) by newluxor.wired.org (8.13.6/8.13.6/Submit) id k5G9rONE001929; Fri, 16 Jun 2006 11:53:24 +0200 (CEST) (envelope-from flag) Date: Fri, 16 Jun 2006 11:53:18 +0200 From: Paolo Pisati To: John Baldwin Message-ID: <20060616095318.GA1916@tin.it> References: <200606152051.k5FKpxJu097604@repoman.freebsd.org> <200606151701.39207.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200606151701.39207.jhb@freebsd.org> User-Agent: Mutt/1.4.2.1i X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at krisma.oltrelinux.com Cc: Perforce Change Reviews , Paolo Pisati Subject: Re: PERFORCE change 99318 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, 16 Jun 2006 09:55:58 -0000 On Thu, Jun 15, 2006 at 05:01:38PM -0400, John Baldwin wrote: > > If you move all the code to handle fast interrupts to sys/kern/kern_intr.c > first, then you only have to do this step once rather than N times. yep, it's the next step. bye -- Paolo Piso's first law: nothing works as expected! From owner-p4-projects@FreeBSD.ORG Fri Jun 16 11:20:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A28B16A47A; Fri, 16 Jun 2006 11:20:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3291F16A474 for ; Fri, 16 Jun 2006 11:20:53 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0FD843D4C for ; Fri, 16 Jun 2006 11:20:52 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5GBKq2g078547 for ; Fri, 16 Jun 2006 11:20:52 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5GBKm9u078544 for perforce@freebsd.org; Fri, 16 Jun 2006 11:20:48 GMT (envelope-from piso@freebsd.org) Date: Fri, 16 Jun 2006 11:20:48 GMT Message-Id: <200606161120.k5GBKm9u078544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 99348 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, 16 Jun 2006 11:20:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=99348 Change 99348 by piso@piso_newluxor on 2006/06/16 11:20:15 IFC Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/pmap.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/conf/GENERIC#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/conf/NOTES#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/inckern.S#2 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/pmap.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/IQ31244#2 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/KB920X#2 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/SIMICS#2 integrate .. //depot/projects/soc2006/intr_filter/arm/conf/SKYEYE#2 integrate .. //depot/projects/soc2006/intr_filter/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/soc2006/intr_filter/conf/Makefile.arm#2 integrate .. //depot/projects/soc2006/intr_filter/conf/NOTES#2 integrate .. //depot/projects/soc2006/intr_filter/conf/files#2 integrate .. //depot/projects/soc2006/intr_filter/conf/kern.post.mk#2 integrate .. //depot/projects/soc2006/intr_filter/conf/options#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpivar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/bge/if_bge.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cm/if_cm_isa.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cm/smc90cx6reg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ed/if_ed.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ed/if_edvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/soc2006/intr_filter/dev/mxge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge_var.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/mxge/mcp_gen_header.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/mxge/mxge_mcp.h#1 branch .. //depot/projects/soc2006/intr_filter/dev/myri10ge/eth_z8e.dat.gz.uu#2 delete .. //depot/projects/soc2006/intr_filter/dev/myri10ge/ethp_z8e.dat.gz.uu#2 delete .. //depot/projects/soc2006/intr_filter/dev/myri10ge/if_myri10ge.c#2 delete .. //depot/projects/soc2006/intr_filter/dev/myri10ge/if_myri10ge_var.h#2 delete .. //depot/projects/soc2006/intr_filter/dev/myri10ge/mcp_gen_header.h#2 delete .. //depot/projects/soc2006/intr_filter/dev/myri10ge/myri10ge_mcp.h#2 delete .. //depot/projects/soc2006/intr_filter/dev/puc/pucdata.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_trans.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/soc2006/intr_filter/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/conf/DEFAULTS#2 integrate .. //depot/projects/soc2006/intr_filter/i386/conf/GENERIC#3 integrate .. //depot/projects/soc2006/intr_filter/i386/conf/NOTES#2 integrate .. //depot/projects/soc2006/intr_filter/i386/conf/XBOX#2 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/pmap.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_proto.h#2 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/syscalls.master#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/conf/GENERIC#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/conf/SKI#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/pmap.c#2 integrate .. //depot/projects/soc2006/intr_filter/isa/isa_common.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_clock.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_event.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_linker.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mbuf.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_module.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_switch.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_synch.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sysctl.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_4bsd.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_core.c#1 branch .. //depot/projects/soc2006/intr_filter/kern/sched_ule.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_firmware.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_rman.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/sys_pipe.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_msg.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_sem.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/sysv_shm.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_mbuf.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_socket.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_socket2.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_syscalls.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_usrreq.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_cache.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/vfs_init.c#2 integrate .. //depot/projects/soc2006/intr_filter/modules/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/geom/geom_bde/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/modules/mxge/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/mxge/mxge/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/mxge/mxge_eth_z8e/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/mxge/mxge_ethp_z8e/Makefile#1 branch .. //depot/projects/soc2006/intr_filter/modules/myri10ge/Makefile#2 delete .. //depot/projects/soc2006/intr_filter/modules/myri10ge/myri10ge/Makefile#2 delete .. //depot/projects/soc2006/intr_filter/modules/myri10ge/myri10ge_eth_z8e/Makefile#2 delete .. //depot/projects/soc2006/intr_filter/modules/myri10ge/myri10ge_ethp_z8e/Makefile#2 delete .. //depot/projects/soc2006/intr_filter/net/bpf.c#2 integrate .. //depot/projects/soc2006/intr_filter/net/bpf.h#2 integrate .. //depot/projects/soc2006/intr_filter/net/if.c#2 integrate .. //depot/projects/soc2006/intr_filter/net/if_bridge.c#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_socket.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_fw2.c#2 integrate .. //depot/projects/soc2006/intr_filter/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/soc2006/intr_filter/pc98/conf/GENERIC#2 integrate .. //depot/projects/soc2006/intr_filter/pc98/conf/NOTES#2 integrate .. //depot/projects/soc2006/intr_filter/posix4/ksched.c#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/conf/GENERIC#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/conf/GENERIC#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/_bus.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/bus.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/soc2006/intr_filter/sys/firmware.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/rman.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/sched.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/socketvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/syscallsubr.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/sysctl.h#2 integrate .. //depot/projects/soc2006/intr_filter/vm/pmap.h#2 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_fault.c#2 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_map.c#2 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_meter.c#2 integrate Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.555 2006/06/05 20:35:25 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.557 2006/06/15 01:01:05 ups Exp $"); /* * Manages physical address maps. @@ -1006,17 +1006,22 @@ * Note: SMP coherent. Uses a ranged shootdown IPI. */ void -pmap_qenter(vm_offset_t sva, vm_page_t *m, int count) +pmap_qenter(vm_offset_t sva, vm_page_t *ma, int count) { - vm_offset_t va; + pt_entry_t *endpte, oldpte, *pte; - va = sva; - while (count-- > 0) { - pmap_kenter(va, VM_PAGE_TO_PHYS(*m)); - va += PAGE_SIZE; - m++; + oldpte = 0; + pte = vtopte(sva); + endpte = pte + count; + while (pte < endpte) { + oldpte |= *pte; + pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G | PG_RW | PG_V); + pte++; + ma++; } - pmap_invalidate_range(kernel_pmap, sva, va); + if ((oldpte & PG_V) != 0) + pmap_invalidate_range(kernel_pmap, sva, sva + count * + PAGE_SIZE); } /* @@ -2351,15 +2356,13 @@ * but is *MUCH* faster than pmap_enter... */ -vm_page_t -pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - vm_page_t mpte) +void +pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { PMAP_LOCK(pmap); - mpte = pmap_enter_quick_locked(pmap, va, m, prot, mpte); + (void) pmap_enter_quick_locked(pmap, va, m, prot, NULL); PMAP_UNLOCK(pmap); - return (mpte); } static vm_page_t ==== //depot/projects/soc2006/intr_filter/amd64/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.5 2006/04/28 21:21:51 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.6 2006/06/12 04:21:49 imp Exp $ machine amd64 @@ -11,3 +11,6 @@ # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device + +# UART chips on this platform +device uart_ns8250 ==== //depot/projects/soc2006/intr_filter/amd64/conf/GENERIC#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.458 2006/05/17 20:45:44 marius Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.460 2006/06/15 19:58:52 netchild Exp $ cpu HAMMER ident GENERIC @@ -28,6 +28,7 @@ #options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler +#options SCHED_CORE # CORE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols @@ -45,7 +46,6 @@ options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework options GEOM_GPT # GUID Partition Tables. -options COMPAT_43 # Needed by COMPAT_LINUX32 options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 ==== //depot/projects/soc2006/intr_filter/amd64/conf/NOTES#2 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.55 2006/05/14 18:49:24 marius Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.56 2006/06/12 20:38:17 jhb Exp $ # # @@ -221,13 +221,21 @@ # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) # (requires miibus) +# ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter +# iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters # nve: nVidia nForce MCP on-board Ethernet Networking +# ral: Ralink Technology IEEE 802.11 wireless adapter +# ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter device ed options ED_3C503 options ED_HPP options ED_SIC +device iwi +device ipw device nve # nVidia nForce MCP on-board Ethernet Networking +device ral +device ural device ath device ath_hal # Atheros HAL (includes binary component) @@ -556,6 +564,10 @@ options VM_KMEM_SIZE_MAX options VM_KMEM_SIZE_SCALE +# Enable NDIS binary driver support +options NDISAPI +device ndis + # The I/O device device io ==== //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_proto.h#2 (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.11 2006/05/10 18:19:51 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.12 2006/06/13 18:48:29 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.11 2006/05/10 18:19:51 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.12 2006/06/13 18:48:29 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp */ #define LINUX_SYS_exit 1 @@ -221,4 +221,4 @@ #define LINUX_SYS_linux_fremovexattr 237 #define LINUX_SYS_linux_fadvise64 250 #define LINUX_SYS_exit_group 252 -#define LINUX_SYS_MAXSYSCALL 268 +#define LINUX_SYS_MAXSYSCALL 311 ==== //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.11 2006/05/10 18:19:51 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.12 2006/06/13 18:48:29 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp */ #include @@ -21,178 +21,178 @@ struct sysent linux_sysent[] = { #define nosys linux_nosys { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = setup */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_NULL }, /* 2 = linux_fork */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_NULL }, /* 5 = linux_open */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ - { SYF_MPSAFE | AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_NULL }, /* 7 = linux_waitpid */ - { SYF_MPSAFE | AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_NULL }, /* 8 = linux_creat */ - { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_NULL }, /* 9 = linux_link */ - { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_NULL }, /* 10 = linux_unlink */ - { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_NULL }, /* 11 = linux_execve */ - { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_NULL }, /* 12 = linux_chdir */ + { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 5 = linux_open */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { SYF_MPSAFE | AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4 }, /* 7 = linux_waitpid */ + { SYF_MPSAFE | AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT }, /* 8 = linux_creat */ + { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ + { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ + { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 11 = linux_execve */ + { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ { SYF_MPSAFE | AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL }, /* 13 = linux_time */ - { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_NULL }, /* 14 = linux_mknod */ - { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ - { SYF_MPSAFE | AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_NULL }, /* 16 = linux_lchown16 */ + { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ + { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ + { SYF_MPSAFE | AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN }, /* 16 = linux_lchown16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 17 = break */ - { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_NULL }, /* 18 = linux_stat */ - { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_NULL }, /* 19 = linux_lseek */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_NULL }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_NULL }, /* 22 = linux_oldumount */ - { SYF_MPSAFE | AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_NULL }, /* 23 = linux_setuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid16, AUE_NULL }, /* 24 = linux_getuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_stime, AUE_NULL }, /* 25 = linux_stime */ - { SYF_MPSAFE | AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_NULL }, /* 26 = linux_ptrace */ + { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 18 = linux_stat */ + { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_GETPID }, /* 20 = linux_getpid */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ + { SYF_MPSAFE | AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID }, /* 23 = linux_setuid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid16, AUE_GETUID }, /* 24 = linux_getuid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY }, /* 25 = linux_stime */ + { SYF_MPSAFE | AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ { SYF_MPSAFE | AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL }, /* 27 = linux_alarm */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 28 = fstat */ { SYF_MPSAFE | 0, (sy_call_t *)linux_pause, AUE_NULL }, /* 29 = linux_pause */ - { SYF_MPSAFE | AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_NULL }, /* 30 = linux_utime */ + { SYF_MPSAFE | AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME }, /* 30 = linux_utime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = stty */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = gtty */ - { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_NULL }, /* 33 = linux_access */ - { SYF_MPSAFE | AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NULL }, /* 34 = linux_nice */ + { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ + { SYF_MPSAFE | AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE }, /* 34 = linux_nice */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = ftime */ - { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ - { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_NULL }, /* 37 = linux_kill */ - { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_NULL }, /* 38 = linux_rename */ - { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_NULL }, /* 39 = linux_mkdir */ - { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_NULL }, /* 40 = linux_rmdir */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_NULL }, /* 41 = dup */ - { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_NULL }, /* 42 = linux_pipe */ + { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ + { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ + { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 38 = linux_rename */ + { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 39 = linux_mkdir */ + { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 40 = linux_rmdir */ + { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ + { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ - { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_NULL }, /* 46 = linux_setgid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_NULL }, /* 47 = linux_getgid16 */ + { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ { SYF_MPSAFE | AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_geteuid16, AUE_NULL }, /* 49 = linux_geteuid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getegid16, AUE_NULL }, /* 50 = linux_getegid16 */ - { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_NULL }, /* 52 = linux_umount */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID }, /* 49 = linux_geteuid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getegid16, AUE_GETEGID }, /* 50 = linux_getegid16 */ + { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = lock */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_NULL }, /* 54 = linux_ioctl */ - { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_NULL }, /* 55 = linux_fcntl */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ + { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = mpx */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 57 = setpgid */ + { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 57 = setpgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 58 = ulimit */ { SYF_MPSAFE | 0, (sy_call_t *)linux_olduname, AUE_NULL }, /* 59 = linux_olduname */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ { SYF_MPSAFE | AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 62 = linux_ustat */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_NULL }, /* 63 = dup2 */ - { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_NULL }, /* 64 = getppid */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_NULL }, /* 65 = getpgrp */ - { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_NULL }, /* 66 = setsid */ + { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 63 = dup2 */ + { SYF_MPSAFE | 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 64 = getppid */ + { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 65 = getpgrp */ + { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 66 = setsid */ { SYF_MPSAFE | AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL }, /* 67 = linux_sigaction */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sgetmask, AUE_NULL }, /* 68 = linux_sgetmask */ { SYF_MPSAFE | AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL }, /* 69 = linux_ssetmask */ - { SYF_MPSAFE | AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_NULL }, /* 70 = linux_setreuid16 */ - { SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_NULL }, /* 71 = linux_setregid16 */ + { SYF_MPSAFE | AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID }, /* 70 = linux_setreuid16 */ + { SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID }, /* 71 = linux_setregid16 */ { SYF_MPSAFE | AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL }, /* 72 = linux_sigsuspend */ { SYF_MPSAFE | AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL }, /* 73 = linux_sigpending */ - { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_NULL }, /* 74 = linux_sethostname */ - { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_NULL }, /* 75 = linux_setrlimit */ - { SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_NULL }, /* 76 = linux_old_getrlimit */ - { SYF_MPSAFE | AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_NULL }, /* 77 = linux_getrusage */ + { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 74 = linux_sethostname */ + { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 75 = linux_setrlimit */ + { SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT }, /* 76 = linux_old_getrlimit */ + { SYF_MPSAFE | AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE }, /* 77 = linux_getrusage */ { SYF_MPSAFE | AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL }, /* 78 = linux_gettimeofday */ - { SYF_MPSAFE | AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_NULL }, /* 79 = linux_settimeofday */ - { SYF_MPSAFE | AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_NULL }, /* 80 = linux_getgroups16 */ - { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_NULL }, /* 81 = linux_setgroups16 */ - { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_NULL }, /* 82 = linux_old_select */ - { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_NULL }, /* 83 = linux_symlink */ - { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_NULL }, /* 84 = linux_lstat */ - { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_NULL }, /* 85 = linux_readlink */ + { SYF_MPSAFE | AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY }, /* 79 = linux_settimeofday */ + { SYF_MPSAFE | AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS }, /* 80 = linux_getgroups16 */ + { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ + { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ + { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ + { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT }, /* 84 = linux_lstat */ + { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = linux_uselib */ - { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_NULL }, /* 87 = swapon */ - { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_NULL }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_NULL }, /* 89 = linux_readdir */ - { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_NULL }, /* 90 = linux_mmap */ - { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_NULL }, /* 91 = munmap */ - { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_NULL }, /* 92 = linux_truncate */ - { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_NULL }, /* 93 = linux_ftruncate */ - { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL }, /* 94 = fchmod */ - { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 95 = fchown */ - { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_NULL }, /* 96 = linux_getpriority */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_NULL }, /* 97 = setpriority */ + { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ + { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ + { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ + { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ + { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ + { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 93 = linux_ftruncate */ + { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 94 = fchmod */ + { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 95 = fchown */ + { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 96 = linux_getpriority */ + { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 97 = setpriority */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 98 = profil */ - { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_NULL }, /* 99 = linux_statfs */ - { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_NULL }, /* 100 = linux_fstatfs */ + { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 99 = linux_statfs */ + { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 100 = linux_fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 101 = ioperm */ { SYF_MPSAFE | AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL }, /* 102 = linux_socketcall */ { SYF_MPSAFE | AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 103 = linux_syslog */ - { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_NULL }, /* 104 = linux_setitimer */ - { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_NULL }, /* 105 = linux_getitimer */ - { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_NULL }, /* 106 = linux_newstat */ - { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_NULL }, /* 107 = linux_newlstat */ - { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_NULL }, /* 108 = linux_newfstat */ + { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 104 = linux_setitimer */ + { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 105 = linux_getitimer */ + { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 106 = linux_newstat */ + { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 107 = linux_newlstat */ + { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 108 = linux_newfstat */ { SYF_MPSAFE | 0, (sy_call_t *)linux_uname, AUE_NULL }, /* 109 = linux_uname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = iopl */ { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 111 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = idle */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 113 = vm86old */ - { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_NULL }, /* 114 = linux_wait4 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_NULL }, /* 115 = linux_swapoff */ + { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ { SYF_MPSAFE | AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 118 = fsync */ - { SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_NULL }, /* 119 = linux_sigreturn */ - { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_NULL }, /* 120 = linux_clone */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_NULL }, /* 121 = setdomainname */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ + { SYF_MPSAFE | AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ + { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ + { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 121 = setdomainname */ { SYF_MPSAFE | AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 122 = linux_newuname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 123 = modify_ldt */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_NULL }, /* 124 = linux_adjtimex */ - { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_NULL }, /* 125 = linux_mprotect */ - { SYF_MPSAFE | AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_NULL }, /* 126 = linux_sigprocmask */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 124 = linux_adjtimex */ + { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 125 = linux_mprotect */ + { SYF_MPSAFE | AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK }, /* 126 = linux_sigprocmask */ { SYF_MPSAFE | 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 127 = linux_create_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 128 = linux_init_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 129 = linux_delete_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 130 = linux_get_kernel_syms */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_NULL }, /* 131 = linux_quotactl */ - { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_NULL }, /* 132 = getpgid */ - { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_NULL }, /* 133 = fchdir */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_NULL }, /* 134 = linux_bdflush */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 131 = linux_quotactl */ + { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 132 = getpgid */ + { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 133 = fchdir */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 134 = linux_bdflush */ { SYF_MPSAFE | AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 135 = linux_sysfs */ - { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_NULL }, /* 136 = linux_personality */ + { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 136 = linux_personality */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 137 = afs_syscall */ - { SYF_MPSAFE | AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_NULL }, /* 138 = linux_setfsuid16 */ - { SYF_MPSAFE | AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_NULL }, /* 139 = linux_setfsgid16 */ - { SYF_MPSAFE | AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_NULL }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_NULL }, /* 141 = linux_getdents */ - { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_NULL }, /* 142 = linux_select */ - { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_NULL }, /* 143 = flock */ - { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_NULL }, /* 144 = linux_msync */ - { SYF_MPSAFE | AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_NULL }, /* 145 = linux_readv */ - { SYF_MPSAFE | AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_NULL }, /* 146 = linux_writev */ - { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_NULL }, /* 147 = linux_getsid */ + { SYF_MPSAFE | AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */ + { SYF_MPSAFE | AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */ + { SYF_MPSAFE | AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ + { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */ + { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */ + { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */ + { SYF_MPSAFE | AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV }, /* 145 = linux_readv */ + { SYF_MPSAFE | AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV }, /* 146 = linux_writev */ + { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 147 = linux_getsid */ { SYF_MPSAFE | AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL }, /* 148 = linux_fdatasync */ - { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_NULL }, /* 149 = linux_sysctl */ - { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_NULL }, /* 150 = mlock */ - { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_NULL }, /* 151 = munlock */ - { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_NULL }, /* 152 = mlockall */ - { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_NULL }, /* 153 = munlockall */ - { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL }, /* 154 = sched_setparam */ - { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL }, /* 155 = sched_getparam */ - { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_NULL }, /* 156 = linux_sched_setscheduler */ - { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_NULL }, /* 157 = linux_sched_getscheduler */ + { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 149 = linux_sysctl */ + { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 150 = mlock */ + { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 151 = munlock */ + { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 152 = mlockall */ + { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 153 = munlockall */ + { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 154 = sched_setparam */ + { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 155 = sched_getparam */ + { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 156 = linux_sched_setscheduler */ + { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 157 = linux_sched_getscheduler */ { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 158 = sched_yield */ - { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_NULL }, /* 159 = linux_sched_get_priority_max */ - { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_NULL }, /* 160 = linux_sched_get_priority_min */ - { SYF_MPSAFE | AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_NULL }, /* 161 = linux_sched_rr_get_interval */ + { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 159 = linux_sched_get_priority_max */ + { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 160 = linux_sched_get_priority_min */ + { SYF_MPSAFE | AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 161 = linux_sched_rr_get_interval */ { SYF_MPSAFE | AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL }, /* 162 = linux_nanosleep */ { SYF_MPSAFE | AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 163 = linux_mremap */ - { SYF_MPSAFE | AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_NULL }, /* 164 = linux_setresuid16 */ - { SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_NULL }, /* 165 = linux_getresuid16 */ + { SYF_MPSAFE | AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID }, /* 164 = linux_setresuid16 */ + { SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID }, /* 165 = linux_getresuid16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 166 = vm86 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 167 = linux_query_module */ - { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_NULL }, /* 168 = poll */ + { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 168 = poll */ { SYF_MPSAFE | 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 169 = linux_nfsservctl */ - { SYF_MPSAFE | AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_NULL }, /* 170 = linux_setresgid16 */ - { SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_NULL }, /* 171 = linux_getresgid16 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_NULL }, /* 172 = linux_prctl */ + { SYF_MPSAFE | AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID }, /* 170 = linux_setresgid16 */ + { SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID }, /* 171 = linux_getresgid16 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 172 = linux_prctl */ { SYF_MPSAFE | AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */ { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */ { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */ @@ -200,48 +200,48 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 177 = linux_rt_sigtimedwait */ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 178 = linux_rt_sigqueueinfo */ { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 179 = linux_rt_sigsuspend */ - { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_NULL }, /* 180 = linux_pread */ - { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_NULL }, /* 181 = linux_pwrite */ - { SYF_MPSAFE | AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_NULL }, /* 182 = linux_chown16 */ - { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_NULL }, /* 183 = linux_getcwd */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_NULL }, /* 184 = linux_capget */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_NULL }, /* 185 = linux_capset */ + { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 180 = linux_pread */ + { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 181 = linux_pwrite */ + { SYF_MPSAFE | AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN }, /* 182 = linux_chown16 */ + { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 183 = linux_getcwd */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 184 = linux_capget */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 185 = linux_capset */ { SYF_MPSAFE | AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 186 = linux_sigaltstack */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_NULL }, /* 187 = linux_sendfile */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 187 = linux_sendfile */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 188 = getpmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 189 = putpmsg */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_NULL }, /* 190 = linux_vfork */ - { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_NULL }, /* 191 = linux_getrlimit */ - { SYF_MPSAFE | AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_NULL }, /* 192 = linux_mmap2 */ - { SYF_MPSAFE | AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_NULL }, /* 193 = linux_truncate64 */ - { SYF_MPSAFE | AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_NULL }, /* 194 = linux_ftruncate64 */ - { SYF_MPSAFE | AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_NULL }, /* 195 = linux_stat64 */ - { SYF_MPSAFE | AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_NULL }, /* 196 = linux_lstat64 */ - { SYF_MPSAFE | AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_NULL }, /* 197 = linux_fstat64 */ - { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_NULL }, /* 198 = linux_lchown */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid, AUE_NULL }, /* 199 = linux_getuid */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid, AUE_NULL }, /* 200 = linux_getgid */ - { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_NULL }, /* 201 = geteuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_NULL }, /* 202 = getegid */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_NULL }, /* 203 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_NULL }, /* 204 = setregid */ - { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_NULL }, /* 205 = linux_getgroups */ - { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_NULL }, /* 206 = linux_setgroups */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 190 = linux_vfork */ + { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 191 = linux_getrlimit */ + { SYF_MPSAFE | AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP }, /* 192 = linux_mmap2 */ + { SYF_MPSAFE | AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE }, /* 193 = linux_truncate64 */ + { SYF_MPSAFE | AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE }, /* 194 = linux_ftruncate64 */ + { SYF_MPSAFE | AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT }, /* 195 = linux_stat64 */ + { SYF_MPSAFE | AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT }, /* 196 = linux_lstat64 */ + { SYF_MPSAFE | AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT }, /* 197 = linux_fstat64 */ + { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 198 = linux_lchown */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getuid, AUE_GETUID }, /* 199 = linux_getuid */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid, AUE_GETGID }, /* 200 = linux_getgid */ + { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 201 = geteuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 202 = getegid */ + { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 203 = setreuid */ + { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 204 = setregid */ + { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 205 = linux_getgroups */ + { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 206 = linux_setgroups */ { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 207 = fchown */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_NULL }, /* 208 = setresuid */ - { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 209 = getresuid */ - { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_NULL }, /* 210 = setresgid */ - { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 211 = getresgid */ - { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_NULL }, /* 212 = linux_chown */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_NULL }, /* 213 = setuid */ - { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_NULL }, /* 214 = setgid */ - { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_NULL }, /* 215 = linux_setfsuid */ - { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_NULL }, /* 216 = linux_setfsgid */ - { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_NULL }, /* 217 = linux_pivot_root */ - { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_NULL }, /* 218 = linux_mincore */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_NULL }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_NULL }, /* 220 = linux_getdents64 */ - { SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_NULL }, /* 221 = linux_fcntl64 */ + { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 208 = setresuid */ + { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 209 = getresuid */ + { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 210 = setresgid */ + { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 211 = getresgid */ + { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 212 = linux_chown */ + { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 213 = setuid */ + { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 214 = setgid */ + { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 215 = linux_setfsuid */ + { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 216 = linux_setfsgid */ + { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */ + { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ + { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ + { SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 224 = gettid */ @@ -272,7 +272,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = linux_io_cancel */ { SYF_MPSAFE | 0, (sy_call_t *)linux_fadvise64, AUE_NULL }, /* 250 = linux_fadvise64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 251 = */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 252 = exit_group */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 252 = exit_group */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 253 = linux_lookup_dcookie */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 254 = linux_epoll_create */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 255 = linux_epoll_ctl */ @@ -288,4 +288,47 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 265 = linux_clock_gettime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 266 = linux_clock_getres */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 267 = linux_clock_nanosleep */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 268 = linux_statfs64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 269 = linux_fstatfs64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 270 = linux_tgkill */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 271 = linux_utimes */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 272 = linux_fadvise64_64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = linux_ni_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 274 = linux_mbind */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 275 = linux_get_mempolicy */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 276 = linux_set_mempolicy */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 277 = linux_mq_open */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 278 = linux_mq_unlink */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 279 = linux_mq_timedsend */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 280 = linux_mq_timedreceive */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 281 = linux_mq_notify */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 282 = linux_mq_getsetattr */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 283 = linux_kexec_load */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 284 = linux_waitid */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = linux_ni_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 286 = linux_add_key */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 287 = linux_request_key */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 288 = linux_keyctl */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 289 = linux_ioprio_set */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 290 = linux_ioprio_get */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 291 = linux_inotify_init */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 292 = linux_inotify_add_watch */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 294 = linux_migrate_pages */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 295 = linux_openat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 296 = linux_mkdirat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 297 = linux_mknodat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 298 = linux_fchownat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = linux_futimesat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 300 = linux_fstatat64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 301 = linux_unlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 302 = linux_renameat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 303 = linux_linkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 304 = linux_symlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 305 = linux_readlinkat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 306 = linux_fchmodat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 307 = linux_faccessat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 308 = linux_pselect6 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 309 = linux_ppoll */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 310 = linux_unshare */ }; ==== //depot/projects/soc2006/intr_filter/amd64/linux32/syscalls.master#2 (text+ko) ==== @@ -1,10 +1,10 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.10 2006/06/13 18:43:55 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ; Processed to create linux_sysent.c, linux_proto.h and linux_syscall.h. -; Columns: number type nargs name alt{name,tag,rtyp}/comments +; Columns: number audit type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that @@ -14,15 +14,20 @@ ; type one of STD, OBSOL, UNIMPL ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: +; audit the audit event associated with the system call +; A value of AUE_NULL means no auditing, but it also means that +; there is no audit event for the call at this time. For the +; case where the event exists, but we don't want auditing, the +; event should be #defined to AUE_NULL in audit_kevents.h. ; altname name of system call if different ; alttag name of args struct tag if different from [o]`name'"_args" ; altrtyp return type if not int (bogus - syscalls always return int) ; for UNIMPL/OBSOL, name continues with comments ; types: -; STD always included +; AUE_NULL STD always included ; OBSOL obsolete, not included in system, only specifies name -; UNIMPL not implemented, placeholder only +; AUE_NULL UNIMPL not implemented, placeholder only #include "opt_compat.h" #include @@ -38,247 +43,244 @@ ; #ifdef's, etc. may be included, and are copied to the output files. 0 AUE_NULL UNIMPL setup -1 AUE_NULL MNOPROTO { void sys_exit(int rval); } exit \ +1 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit \ sys_exit_args void -2 AUE_NULL MSTD { int linux_fork(void); } +2 AUE_FORK MSTD { int linux_fork(void); } 3 AUE_NULL MNOPROTO { int read(int fd, char *buf, \ u_int nbyte); } 4 AUE_NULL MNOPROTO { int write(int fd, char *buf, \ u_int nbyte); } -5 AUE_NULL MSTD { int linux_open(char *path, l_int flags, \ +5 AUE_OPEN_RWTC MSTD { int linux_open(char *path, l_int flags, \ l_int mode); } -6 AUE_NULL MNOPROTO { int close(int fd); } -7 AUE_NULL MSTD { int linux_waitpid(l_pid_t pid, \ +6 AUE_CLOSE MNOPROTO { int close(int fd); } +7 AUE_WAIT4 MSTD { int linux_waitpid(l_pid_t pid, \ l_int *status, l_int options); } -8 AUE_NULL MSTD { int linux_creat(char *path, l_int mode); } -9 AUE_NULL MSTD { int linux_link(char *path, char *to); } -10 AUE_NULL MSTD { int linux_unlink(char *path); } -11 AUE_NULL MSTD { int linux_execve(char *path, char **argp, \ +8 AUE_O_CREAT MSTD { int linux_creat(char *path, \ + l_int mode); } +9 AUE_LINK MSTD { int linux_link(char *path, char *to); } +10 AUE_UNLINK MSTD { int linux_unlink(char *path); } +11 AUE_EXECVE MSTD { int linux_execve(char *path, char **argp, \ char **envp); } -12 AUE_NULL MSTD { int linux_chdir(char *path); } +12 AUE_CHDIR MSTD { int linux_chdir(char *path); } 13 AUE_NULL MSTD { int linux_time(l_time_t *tm); } -14 AUE_NULL MSTD { int linux_mknod(char *path, l_int mode, \ +14 AUE_MKNOD MSTD { int linux_mknod(char *path, l_int mode, \ l_dev_t dev); } -15 AUE_NULL MSTD { int linux_chmod(char *path, \ +15 AUE_CHMOD MSTD { int linux_chmod(char *path, \ l_mode_t mode); } -16 AUE_NULL MSTD { int linux_lchown16(char *path, \ +16 AUE_LCHOWN MSTD { int linux_lchown16(char *path, \ l_uid16_t uid, l_gid16_t gid); } 17 AUE_NULL UNIMPL break -18 AUE_NULL MSTD { int linux_stat(char *path, \ - struct linux_stat *up); } -19 AUE_NULL MSTD { int linux_lseek(l_uint fdes, l_off_t off, \ +18 AUE_STAT MSTD { int linux_stat(char *path, \ + struct linux_stat *up); } +19 AUE_LSEEK MSTD { int linux_lseek(l_uint fdes, l_off_t off, \ l_int whence); } -20 AUE_NULL MSTD { int linux_getpid(void); } -21 AUE_NULL STD { int linux_mount(char *specialfile, \ +20 AUE_GETPID MSTD { int linux_getpid(void); } +21 AUE_MOUNT STD { int linux_mount(char *specialfile, \ char *dir, char *filesystemtype, \ l_ulong rwflag, void *data); } -22 AUE_NULL STD { int linux_oldumount(char *path); } -23 AUE_NULL MSTD { int linux_setuid16(l_uid16_t uid); } -24 AUE_NULL MSTD { int linux_getuid16(void); } -25 AUE_NULL MSTD { int linux_stime(void); } -26 AUE_NULL MSTD { int linux_ptrace(l_long req, l_long pid, \ +22 AUE_UMOUNT STD { int linux_oldumount(char *path); } +23 AUE_SETUID MSTD { int linux_setuid16(l_uid16_t uid); } +24 AUE_GETUID MSTD { int linux_getuid16(void); } +25 AUE_SETTIMEOFDAY MSTD { int linux_stime(void); } +26 AUE_PTRACE MSTD { int linux_ptrace(l_long req, l_long pid, \ l_long addr, l_long data); } 27 AUE_NULL MSTD { int linux_alarm(l_uint secs); } 28 AUE_NULL UNIMPL fstat 29 AUE_NULL MSTD { int linux_pause(void); } -30 AUE_NULL MSTD { int linux_utime(char *fname, \ +30 AUE_UTIME MSTD { int linux_utime(char *fname, \ struct l_utimbuf *times); } 31 AUE_NULL UNIMPL stty 32 AUE_NULL UNIMPL gtty -33 AUE_NULL MSTD { int linux_access(char *path, l_int flags); } -34 AUE_NULL MSTD { int linux_nice(l_int inc); } +33 AUE_ACCESS MSTD { int linux_access(char *path, l_int flags); } +34 AUE_NICE MSTD { int linux_nice(l_int inc); } 35 AUE_NULL UNIMPL ftime -36 AUE_NULL MNOPROTO { int sync(void); } -37 AUE_NULL MSTD { int linux_kill(l_int pid, l_int signum); } -38 AUE_NULL MSTD { int linux_rename(char *from, char *to); } -39 AUE_NULL MSTD { int linux_mkdir(char *path, l_int mode); } -40 AUE_NULL MSTD { int linux_rmdir(char *path); } -41 AUE_NULL MNOPROTO { int dup(u_int fd); } -42 AUE_NULL MSTD { int linux_pipe(l_ulong *pipefds); } +36 AUE_SYNC MNOPROTO { int sync(void); } +37 AUE_KILL MSTD { int linux_kill(l_int pid, l_int signum); } +38 AUE_RENAME MSTD { int linux_rename(char *from, char *to); } +39 AUE_MKDIR MSTD { int linux_mkdir(char *path, l_int mode); } +40 AUE_RMDIR MSTD { int linux_rmdir(char *path); } +41 AUE_DUP MNOPROTO { int dup(u_int fd); } +42 AUE_PIPE MSTD { int linux_pipe(l_ulong *pipefds); } 43 AUE_NULL MSTD { int linux_times(struct l_times_argv *buf); } 44 AUE_NULL UNIMPL prof 45 AUE_NULL STD { int linux_brk(l_ulong dsend); } -46 AUE_NULL MSTD { int linux_setgid16(l_gid16_t gid); } -47 AUE_NULL MSTD { int linux_getgid16(void); } +46 AUE_SETGID MSTD { int linux_setgid16(l_gid16_t gid); } +47 AUE_GETGID MSTD { int linux_getgid16(void); } 48 AUE_NULL MSTD { int linux_signal(l_int sig, \ l_handler_t handler); } -49 AUE_NULL MSTD { int linux_geteuid16(void); } -50 AUE_NULL MSTD { int linux_getegid16(void); } -51 AUE_NULL MNOPROTO { int acct(char *path); } -52 AUE_NULL STD { int linux_umount(char *path, l_int flags); } +49 AUE_GETEUID MSTD { int linux_geteuid16(void); } +50 AUE_GETEGID MSTD { int linux_getegid16(void); } +51 AUE_ACCT MNOPROTO { int acct(char *path); } +52 AUE_UMOUNT STD { int linux_umount(char *path, l_int flags); } 53 AUE_NULL UNIMPL lock -54 AUE_NULL STD { int linux_ioctl(l_uint fd, l_uint cmd, \ +54 AUE_IOCTL STD { int linux_ioctl(l_uint fd, l_uint cmd, \ uintptr_t arg); } -55 AUE_NULL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \ +55 AUE_FCNTL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \ uintptr_t arg); } 56 AUE_NULL UNIMPL mpx -57 AUE_NULL MNOPROTO { int setpgid(int pid, int pgid); } +57 AUE_SETPGRP MNOPROTO { int setpgid(int pid, int pgid); } 58 AUE_NULL UNIMPL ulimit 59 AUE_NULL MSTD { int linux_olduname(void); } -60 AUE_NULL MNOPROTO { int umask(int newmask); } -61 AUE_NULL MNOPROTO { int chroot(char *path); } +60 AUE_UMASK MNOPROTO { int umask(int newmask); } +61 AUE_CHROOT MNOPROTO { int chroot(char *path); } 62 AUE_NULL MSTD { int linux_ustat(l_dev_t dev, \ struct l_ustat *ubuf); } -63 AUE_NULL MNOPROTO { int dup2(u_int from, u_int to); } -64 AUE_NULL MNOPROTO { int getppid(void); } -65 AUE_NULL MNOPROTO { int getpgrp(void); } -66 AUE_NULL MNOPROTO { int setsid(void); } +63 AUE_DUP2 MNOPROTO { int dup2(u_int from, u_int to); } +64 AUE_GETPPID MNOPROTO { int getppid(void); } +65 AUE_GETPGRP MNOPROTO { int getpgrp(void); } +66 AUE_SETSID MNOPROTO { int setsid(void); } 67 AUE_NULL MSTD { int linux_sigaction(l_int sig, \ l_osigaction_t *nsa, \ l_osigaction_t *osa); } 68 AUE_NULL MSTD { int linux_sgetmask(void); } 69 AUE_NULL MSTD { int linux_ssetmask(l_osigset_t mask); } -70 AUE_NULL MSTD { int linux_setreuid16(l_uid16_t ruid, \ +70 AUE_SETREUID MSTD { int linux_setreuid16(l_uid16_t ruid, \ l_uid16_t euid); } -71 AUE_NULL MSTD { int linux_setregid16(l_gid16_t rgid, \ +71 AUE_SETREGID MSTD { int linux_setregid16(l_gid16_t rgid, \ l_gid16_t egid); } 72 AUE_NULL MSTD { int linux_sigsuspend(l_int hist0, \ l_int hist1, l_osigset_t mask); } 73 AUE_NULL MSTD { int linux_sigpending(l_osigset_t *mask); } -74 AUE_NULL MSTD { int linux_sethostname(char *hostname, \ +74 AUE_SYSCTL MSTD { int linux_sethostname(char *hostname, \ u_int len); } -75 AUE_NULL MSTD { int linux_setrlimit(l_uint resource, \ +75 AUE_SETRLIMIT MSTD { int linux_setrlimit(l_uint resource, \ struct l_rlimit *rlim); } -76 AUE_NULL MSTD { int linux_old_getrlimit(l_uint resource, \ +76 AUE_GETRLIMIT MSTD { int linux_old_getrlimit(l_uint resource, \ struct l_rlimit *rlim); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 16 13:08:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 598B016A47D; Fri, 16 Jun 2006 13:08:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 34D6916A47B for ; Fri, 16 Jun 2006 13:08:13 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED72043D46 for ; Fri, 16 Jun 2006 13:08:12 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5GD8CKf094100 for ; Fri, 16 Jun 2006 13:08:12 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5GD8COZ094097 for perforce@freebsd.org; Fri, 16 Jun 2006 13:08:12 GMT (envelope-from brueffer@freebsd.org) Date: Fri, 16 Jun 2006 13:08:12 GMT Message-Id: <200606161308.k5GD8COZ094097@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 99354 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, 16 Jun 2006 13:08:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=99354 Change 99354 by brueffer@brueffer_serenity on 2006/06/16 13:07:22 Typo fixed. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#9 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#9 $ .\" .Dd May 1, 2005 .Dt AUDIT.LOG 5 @@ -218,7 +218,7 @@ .It Li "Protocol" Ta "1 byte" Ta "IP protocol number" .It Li "Checksum" Ta "2 bytes" Ta "IP header checksum, network byte order" .It Li "Source Address" Ta "4 bytes" Ta "IPv4 source address" -.It Li "Desintation Address" Ta "4 bytes" Ta "IPv4 destination address" +.It Li "Destination Address" Ta "4 bytes" Ta "IPv4 destination address" .El .Ss Expanded ip Token The From owner-p4-projects@FreeBSD.ORG Fri Jun 16 16:18:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0995216A4D2; Fri, 16 Jun 2006 16:18:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BEB0C16A4CE for ; Fri, 16 Jun 2006 16:18:15 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B102E43D5A for ; Fri, 16 Jun 2006 16:18:14 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5GGIEpG010252 for ; Fri, 16 Jun 2006 16:18:14 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5GGIEGK010249 for perforce@freebsd.org; Fri, 16 Jun 2006 16:18:14 GMT (envelope-from bushman@freebsd.org) Date: Fri, 16 Jun 2006 16:18:14 GMT Message-Id: <200606161618.k5GGIEGK010249@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 99359 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, 16 Jun 2006 16:18:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=99359 Change 99359 by bushman@bushman_nss_ldap_cached on 2006/06/16 16:17:34 Experimental version of gethostbyname() function with IPv4-IPv6 mapping moved outside of nss-modules implemented. gethostbyaddr() is on the way. getipnodeby***() functions versions, which work completely through gethostby**() functions, are ready. All these prototypes will be soon merged into the system source code branch. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/tests/ghby_emul/Makefile#1 add .. //depot/projects/soc2006/nss_ldap_cached/tests/ghby_emul/ghby_emul_test.c#1 add .. //depot/projects/soc2006/nss_ldap_cached/tests/ghby_emul/hosts_list#1 add .. //depot/projects/soc2006/nss_ldap_cached/tests/ipnode_emul/Makefile#2 edit .. //depot/projects/soc2006/nss_ldap_cached/tests/ipnode_emul/hosts_list#2 edit .. //depot/projects/soc2006/nss_ldap_cached/tests/ipnode_emul/ipnode_emul_test.c#2 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/tests/ipnode_emul/Makefile#2 (text+ko) ==== @@ -2,6 +2,7 @@ PROG= ipnode_emul_test SRCS= ipnode_emul_test.c +CFLAGS+= -g MAN= ==== //depot/projects/soc2006/nss_ldap_cached/tests/ipnode_emul/hosts_list#2 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/tests/ipnode_emul/ipnode_emul_test.c#2 (text+ko) ==== @@ -1,13 +1,873 @@ +#define INET6 1 + +#include +#include +#include +#include +#include +#ifdef INET6 +#include +#include +#include +#include +#include /* XXX */ +#endif +#include +#include #include #include #include +#include #include #include +#include #include #define WS " \t\n\r" +#ifndef MAXALIASES +#define MAXALIASES 10 +#endif +#ifndef MAXADDRS +#define MAXADDRS 20 +#endif +#ifndef MAXDNAME +#define MAXDNAME 1025 +#endif + +union inx_addr { + struct in_addr in_addr; +#ifdef INET6 + struct in6_addr in6_addr; +#endif + struct { + u_char mau_zero[10]; + u_char mau_one[2]; + struct in_addr mau_inaddr; + } map_addr_un; +#define map_zero map_addr_un.mau_zero +#define map_one map_addr_un.mau_one +#define map_inaddr map_addr_un.mau_inaddr +}; + +#ifdef INET6 +#define ADDRLEN(af) ((af) == AF_INET6 ? sizeof(struct in6_addr) : \ + sizeof(struct in_addr)) +#else +#define ADDRLEN(af) sizeof(struct in_addr) +#endif + +#define MAPADDR(ab, ina) \ +do { \ + memcpy(&(ab)->map_inaddr, ina, sizeof(struct in_addr)); \ + memset((ab)->map_zero, 0, sizeof((ab)->map_zero)); \ + memset((ab)->map_one, 0xff, sizeof((ab)->map_one)); \ +} while (0) + +#define MAPADDRENABLED(flags) \ + (((flags) & AI_V4MAPPED) || \ + (((flags) & AI_V4MAPPED_CFG) && _mapped_addr_enabled())) + +struct __res_state_ext { + union res_sockaddr_union nsaddrs[MAXNS]; + struct sort_list { + int af; + union { + struct in_addr ina; + struct in6_addr in6a; + } addr, mask; + } sort_list[MAXRESOLVSORT]; + char nsuffix[64]; + char nsuffix2[64]; +}; + +struct policyqueue { + TAILQ_ENTRY(policyqueue) pc_entry; +#ifdef INET6 + struct in6_addrpolicy pc_policy; +#endif +}; +TAILQ_HEAD(policyhead, policyqueue); + +#define AIO_SRCFLAG_DEPRECATED 0x1 + +struct hp_order { + union { + struct sockaddr_storage aiou_ss; + struct sockaddr aiou_sa; + } aio_src_un; +#define aio_srcsa aio_src_un.aiou_sa + u_int32_t aio_srcflag; + int aio_srcscope; + int aio_dstscope; + struct policyqueue *aio_srcpolicy; + struct policyqueue *aio_dstpolicy; + union { + struct sockaddr_storage aiou_ss; + struct sockaddr aiou_sa; + } aio_un; +#define aio_sa aio_un.aiou_sa + int aio_matchlen; + char *aio_h_addr; +}; + +static int +_mapped_addr_enabled(void) +{ + /* implementation dependent check */ +#if defined(__KAME__) && defined(IPV6CTL_MAPPED_ADDR) + int mib[4]; + size_t len; + int val; + + mib[0] = CTL_NET; + mib[1] = PF_INET6; + mib[2] = IPPROTO_IPV6; + mib[3] = IPV6CTL_MAPPED_ADDR; + len = sizeof(val); + if (sysctl(mib, 4, &val, &len, 0, 0) == 0 && val != 0) + return 1; +#endif /* __KAME__ && IPV6CTL_MAPPED_ADDR */ + return 0; +} + static int +matchlen(struct sockaddr *src, struct sockaddr *dst) +{ + int match = 0; + u_char *s, *d; + u_char *lim, r; + int addrlen; + + switch (src->sa_family) { +#ifdef INET6 + case AF_INET6: + s = (u_char *)&((struct sockaddr_in6 *)src)->sin6_addr; + d = (u_char *)&((struct sockaddr_in6 *)dst)->sin6_addr; + addrlen = sizeof(struct in6_addr); + lim = s + addrlen; + break; +#endif + case AF_INET: + s = (u_char *)&((struct sockaddr_in *)src)->sin_addr; + d = (u_char *)&((struct sockaddr_in *)dst)->sin_addr; + addrlen = sizeof(struct in_addr); + lim = s + addrlen; + break; + default: + return(0); + } + + while (s < lim) + if ((r = (*d++ ^ *s++)) != 0) { + while (r < addrlen * 8) { + match++; + r <<= 1; + } + break; + } else + match += 8; + return(match); +} + +static int +comp_dst(const void *arg1, const void *arg2) +{ + const struct hp_order *dst1 = arg1, *dst2 = arg2; + + /* + * Rule 1: Avoid unusable destinations. + * XXX: we currently do not consider if an appropriate route exists. + */ + if (dst1->aio_srcsa.sa_family != AF_UNSPEC && + dst2->aio_srcsa.sa_family == AF_UNSPEC) { + return(-1); + } + if (dst1->aio_srcsa.sa_family == AF_UNSPEC && + dst2->aio_srcsa.sa_family != AF_UNSPEC) { + return(1); + } + + /* Rule 2: Prefer matching scope. */ + if (dst1->aio_dstscope == dst1->aio_srcscope && + dst2->aio_dstscope != dst2->aio_srcscope) { + return(-1); + } + if (dst1->aio_dstscope != dst1->aio_srcscope && + dst2->aio_dstscope == dst2->aio_srcscope) { + return(1); + } + + /* Rule 3: Avoid deprecated addresses. */ + if (dst1->aio_srcsa.sa_family != AF_UNSPEC && + dst2->aio_srcsa.sa_family != AF_UNSPEC) { + if (!(dst1->aio_srcflag & AIO_SRCFLAG_DEPRECATED) && + (dst2->aio_srcflag & AIO_SRCFLAG_DEPRECATED)) { + return(-1); + } + if ((dst1->aio_srcflag & AIO_SRCFLAG_DEPRECATED) && + !(dst2->aio_srcflag & AIO_SRCFLAG_DEPRECATED)) { + return(1); + } + } + + /* Rule 4: Prefer home addresses. */ + /* XXX: not implemented yet */ + + /* Rule 5: Prefer matching label. */ +#ifdef INET6 + if (dst1->aio_srcpolicy && dst1->aio_dstpolicy && + dst1->aio_srcpolicy->pc_policy.label == + dst1->aio_dstpolicy->pc_policy.label && + (dst2->aio_srcpolicy == NULL || dst2->aio_dstpolicy == NULL || + dst2->aio_srcpolicy->pc_policy.label != + dst2->aio_dstpolicy->pc_policy.label)) { + return(-1); + } + if (dst2->aio_srcpolicy && dst2->aio_dstpolicy && + dst2->aio_srcpolicy->pc_policy.label == + dst2->aio_dstpolicy->pc_policy.label && + (dst1->aio_srcpolicy == NULL || dst1->aio_dstpolicy == NULL || + dst1->aio_srcpolicy->pc_policy.label != + dst1->aio_dstpolicy->pc_policy.label)) { + return(1); + } +#endif + + /* Rule 6: Prefer higher precedence. */ +#ifdef INET6 + if (dst1->aio_dstpolicy && + (dst2->aio_dstpolicy == NULL || + dst1->aio_dstpolicy->pc_policy.preced > + dst2->aio_dstpolicy->pc_policy.preced)) { + return(-1); + } + if (dst2->aio_dstpolicy && + (dst1->aio_dstpolicy == NULL || + dst2->aio_dstpolicy->pc_policy.preced > + dst1->aio_dstpolicy->pc_policy.preced)) { + return(1); + } +#endif + + /* Rule 7: Prefer native transport. */ + /* XXX: not implemented yet */ + + /* Rule 8: Prefer smaller scope. */ + if (dst1->aio_dstscope >= 0 && + dst1->aio_dstscope < dst2->aio_dstscope) { + return(-1); + } + if (dst2->aio_dstscope >= 0 && + dst2->aio_dstscope < dst1->aio_dstscope) { + return(1); + } + + /* + * Rule 9: Use longest matching prefix. + * We compare the match length in a same AF only. + */ + if (dst1->aio_sa.sa_family == dst2->aio_sa.sa_family) { + if (dst1->aio_matchlen > dst2->aio_matchlen) { + return(-1); + } + if (dst1->aio_matchlen < dst2->aio_matchlen) { + return(1); + } + } + + /* Rule 10: Otherwise, leave the order unchanged. */ + return(-1); +} + + +/* + * Copy from scope.c. + * XXX: we should standardize the functions and link them as standard + * library. + */ +static void +free_addrselectpolicy(struct policyhead *head) +{ + struct policyqueue *ent, *nent; + + for (ent = TAILQ_FIRST(head); ent; ent = nent) { + nent = TAILQ_NEXT(ent, pc_entry); + TAILQ_REMOVE(head, ent, pc_entry); + free(ent); + } +} + +static int +gai_addr2scopetype(struct sockaddr *sa) +{ +#ifdef INET6 + struct sockaddr_in6 *sa6; +#endif + struct sockaddr_in *sa4; + + switch(sa->sa_family) { +#ifdef INET6 + case AF_INET6: + sa6 = (struct sockaddr_in6 *)sa; + if (IN6_IS_ADDR_MULTICAST(&sa6->sin6_addr)) { + /* just use the scope field of the multicast address */ + return(sa6->sin6_addr.s6_addr[2] & 0x0f); + } + /* + * Unicast addresses: map scope type to corresponding scope + * value defined for multcast addresses. + * XXX: hardcoded scope type values are bad... + */ + if (IN6_IS_ADDR_LOOPBACK(&sa6->sin6_addr)) + return(1); /* node local scope */ + if (IN6_IS_ADDR_LINKLOCAL(&sa6->sin6_addr)) + return(2); /* link-local scope */ + if (IN6_IS_ADDR_SITELOCAL(&sa6->sin6_addr)) + return(5); /* site-local scope */ + return(14); /* global scope */ + break; +#endif + case AF_INET: + /* + * IPv4 pseudo scoping according to RFC 3484. + */ + sa4 = (struct sockaddr_in *)sa; + /* IPv4 autoconfiguration addresses have link-local scope. */ + if (((u_char *)&sa4->sin_addr)[0] == 169 && + ((u_char *)&sa4->sin_addr)[1] == 254) + return(2); + /* Private addresses have site-local scope. */ + if (((u_char *)&sa4->sin_addr)[0] == 10 || + (((u_char *)&sa4->sin_addr)[0] == 172 && + (((u_char *)&sa4->sin_addr)[1] & 0xf0) == 16) || + (((u_char *)&sa4->sin_addr)[0] == 192 && + ((u_char *)&sa4->sin_addr)[1] == 168)) + return(14); /* XXX: It should be 5 unless NAT */ + /* Loopback addresses have link-local scope. */ + if (((u_char *)&sa4->sin_addr)[0] == 127) + return(2); + return(14); + break; + default: + errno = EAFNOSUPPORT; /* is this a good error? */ + return(-1); + } +} + +static int +get_addrselectpolicy(struct policyhead *head) +{ +#ifdef INET6 + int mib[] = { CTL_NET, PF_INET6, IPPROTO_IPV6, IPV6CTL_ADDRCTLPOLICY }; + size_t l; + char *buf; + struct in6_addrpolicy *pol, *ep; + + if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, &l, NULL, 0) < 0) + return (0); + if ((buf = malloc(l)) == NULL) + return (0); + if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, &l, NULL, 0) < 0) { + free(buf); + return (0); + } + + ep = (struct in6_addrpolicy *)(buf + l); + for (pol = (struct in6_addrpolicy *)buf; pol + 1 <= ep; pol++) { + struct policyqueue *new; + + if ((new = malloc(sizeof(*new))) == NULL) { + free_addrselectpolicy(head); /* make the list empty */ + break; + } + new->pc_policy = *pol; + TAILQ_INSERT_TAIL(head, new, pc_entry); + } + + free(buf); + return (1); +#else + return (0); +#endif +} + +static struct policyqueue * +match_addrselectpolicy(struct sockaddr *addr, struct policyhead *head) +{ +#ifdef INET6 + struct policyqueue *ent, *bestent = NULL; + struct in6_addrpolicy *pol; + int matchlen, bestmatchlen = -1; + u_char *mp, *ep, *k, *p, m; + struct sockaddr_in6 key; + + switch(addr->sa_family) { + case AF_INET6: + key = *(struct sockaddr_in6 *)addr; + break; + case AF_INET: + /* convert the address into IPv4-mapped IPv6 address. */ + memset(&key, 0, sizeof(key)); + key.sin6_family = AF_INET6; + key.sin6_len = sizeof(key); + key.sin6_addr.s6_addr[10] = 0xff; + key.sin6_addr.s6_addr[11] = 0xff; + memcpy(&key.sin6_addr.s6_addr[12], + &((struct sockaddr_in *)addr)->sin_addr, 4); + break; + default: + return(NULL); + } + + for (ent = TAILQ_FIRST(head); ent; ent = TAILQ_NEXT(ent, pc_entry)) { + pol = &ent->pc_policy; + matchlen = 0; + + mp = (u_char *)&pol->addrmask.sin6_addr; + ep = mp + 16; /* XXX: scope field? */ + k = (u_char *)&key.sin6_addr; + p = (u_char *)&pol->addr.sin6_addr; + for (; mp < ep && *mp; mp++, k++, p++) { + m = *mp; + if ((*k & m) != *p) + goto next; /* not match */ + if (m == 0xff) /* short cut for a typical case */ + matchlen += 8; + else { + while (m >= 0x80) { + matchlen++; + m <<= 1; + } + } + } + + /* matched. check if this is better than the current best. */ + if (matchlen > bestmatchlen) { + bestent = ent; + bestmatchlen = matchlen; + } + + next: + continue; + } + + return(bestent); +#else + return(NULL); +#endif + +} + +static void +set_source(struct hp_order *aio, struct policyhead *ph) +{ + struct sockaddr_storage ss = aio->aio_un.aiou_ss; + socklen_t srclen; + int s; + + /* set unspec ("no source is available"), just in case */ + aio->aio_srcsa.sa_family = AF_UNSPEC; + aio->aio_srcscope = -1; + + switch(ss.ss_family) { + case AF_INET: + ((struct sockaddr_in *)&ss)->sin_port = htons(1); + break; +#ifdef INET6 + case AF_INET6: + ((struct sockaddr_in6 *)&ss)->sin6_port = htons(1); + break; +#endif + default: /* ignore unsupported AFs explicitly */ + return; + } + + /* open a socket to get the source address for the given dst */ + if ((s = _socket(ss.ss_family, SOCK_DGRAM, IPPROTO_UDP)) < 0) + return; /* give up */ + if (_connect(s, (struct sockaddr *)&ss, ss.ss_len) < 0) + goto cleanup; + srclen = ss.ss_len; + if (_getsockname(s, &aio->aio_srcsa, &srclen) < 0) { + aio->aio_srcsa.sa_family = AF_UNSPEC; + goto cleanup; + } + aio->aio_srcscope = gai_addr2scopetype(&aio->aio_srcsa); + aio->aio_srcpolicy = match_addrselectpolicy(&aio->aio_srcsa, ph); + aio->aio_matchlen = matchlen(&aio->aio_srcsa, (struct sockaddr *)&ss); +#ifdef INET6 + if (ss.ss_family == AF_INET6) { + struct in6_ifreq ifr6; + u_int32_t flags6; + + /* XXX: interface name should not be hardcoded */ + strncpy(ifr6.ifr_name, "lo0", sizeof(ifr6.ifr_name)); + memset(&ifr6, 0, sizeof(ifr6)); + memcpy(&ifr6.ifr_addr, &ss, ss.ss_len); + if (_ioctl(s, SIOCGIFAFLAG_IN6, &ifr6) == 0) { + flags6 = ifr6.ifr_ifru.ifru_flags6; + if ((flags6 & IN6_IFF_DEPRECATED)) + aio->aio_srcflag |= AIO_SRCFLAG_DEPRECATED; + } + } +#endif + + cleanup: + _close(s); + return; +} + +/* + * Private utility functions + */ + +/* + * _hpcopy: allocate and copy hostent structure + */ +static struct hostent * +_hpcopy(struct hostent *hp, int *errp) +{ + struct hostent *nhp; + char *cp, **pp; + int size, addrsize; + int nalias = 0, naddr = 0; + int al_off; + int i; + + if (hp == NULL) + return hp; + + /* count size to be allocated */ + size = sizeof(struct hostent); + if (hp->h_name != NULL) + size += strlen(hp->h_name) + 1; + if ((pp = hp->h_aliases) != NULL) { + for (i = 0; *pp != NULL; i++, pp++) { + if (**pp != '\0') { + size += strlen(*pp) + 1; + nalias++; + } + } + } + /* adjust alignment */ + size = ALIGN(size); + al_off = size; + size += sizeof(char *) * (nalias + 1); + addrsize = ALIGN(hp->h_length); + if ((pp = hp->h_addr_list) != NULL) { + while (*pp++ != NULL) + naddr++; + } + size += addrsize * naddr; + size += sizeof(char *) * (naddr + 1); + + /* copy */ + if ((nhp = (struct hostent *)malloc(size)) == NULL) { + *errp = TRY_AGAIN; + return NULL; + } + cp = (char *)&nhp[1]; + if (hp->h_name != NULL) { + nhp->h_name = cp; + strcpy(cp, hp->h_name); + cp += strlen(cp) + 1; + } else + nhp->h_name = NULL; + nhp->h_aliases = (char **)((char *)nhp + al_off); + if ((pp = hp->h_aliases) != NULL) { + for (i = 0; *pp != NULL; pp++) { + if (**pp != '\0') { + nhp->h_aliases[i++] = cp; + strcpy(cp, *pp); + cp += strlen(cp) + 1; + } + } + } + nhp->h_aliases[nalias] = NULL; + cp = (char *)&nhp->h_aliases[nalias + 1]; + nhp->h_addrtype = hp->h_addrtype; + nhp->h_length = hp->h_length; + nhp->h_addr_list = (char **)cp; + if ((pp = hp->h_addr_list) != NULL) { + cp = (char *)&nhp->h_addr_list[naddr + 1]; + for (i = 0; *pp != NULL; pp++) { + nhp->h_addr_list[i++] = cp; + memcpy(cp, *pp, hp->h_length); + cp += addrsize; + } + } + nhp->h_addr_list[naddr] = NULL; + return nhp; +} + +/* + * _hpaddr: construct hostent structure with one address + */ +static struct hostent * +_hpaddr(int af, const char *name, void *addr, int *errp) +{ + struct hostent *hp, hpbuf; + char *addrs[2]; + + hp = &hpbuf; + hp->h_name = (char *)name; + hp->h_aliases = NULL; + hp->h_addrtype = af; + hp->h_length = ADDRLEN(af); + hp->h_addr_list = addrs; + addrs[0] = (char *)addr; + addrs[1] = NULL; + return _hpcopy(hp, errp); +} + +/* + * _hpmerge: merge 2 hostent structure, arguments will be freed + */ +static struct hostent * +_hpmerge(struct hostent *hp1, struct hostent *hp2, int *errp) +{ + int i, j; + int naddr, nalias; + char **pp; + struct hostent *hp, hpbuf; + char *aliases[MAXALIASES + 1], *addrs[MAXADDRS + 1]; + union inx_addr addrbuf[MAXADDRS]; + + if (hp1 == NULL) + return _hpcopy(hp2, errp); + if (hp2 == NULL) + return _hpcopy(hp1, errp); + +#define HP(i) (i == 1 ? hp1 : hp2) + hp = &hpbuf; + hp->h_name = (hp1->h_name != NULL ? hp1->h_name : hp2->h_name); + hp->h_aliases = aliases; + nalias = 0; + for (i = 1; i <= 2; i++) { + if ((pp = HP(i)->h_aliases) == NULL) + continue; + for (; nalias < MAXALIASES && *pp != NULL; pp++) { + /* check duplicates */ + for (j = 0; j < nalias; j++) + if (strcasecmp(*pp, aliases[j]) == 0) + break; + if (j == nalias) + aliases[nalias++] = *pp; + } + } + aliases[nalias] = NULL; +#ifdef INET6 + if (hp1->h_length != hp2->h_length) { + hp->h_addrtype = AF_INET6; + hp->h_length = sizeof(struct in6_addr); + } else { +#endif + hp->h_addrtype = hp1->h_addrtype; + hp->h_length = hp1->h_length; +#ifdef INET6 + } +#endif + hp->h_addr_list = addrs; + naddr = 0; + for (i = 1; i <= 2; i++) { + if ((pp = HP(i)->h_addr_list) == NULL) + continue; + if (HP(i)->h_length == hp->h_length) { + while (naddr < MAXADDRS && *pp != NULL) + addrs[naddr++] = *pp++; + } else { + /* copy IPv4 addr as mapped IPv6 addr */ + while (naddr < MAXADDRS && *pp != NULL) { + MAPADDR(&addrbuf[naddr], *pp++); + addrs[naddr] = (char *)&addrbuf[naddr]; + naddr++; + } + } + } + addrs[naddr] = NULL; + hp = _hpcopy(hp, errp); +/* TODO: as we definitely shouldn't free hp2, it's not necessary to free hp1 here (IMHO) */ +// freehostent(hp1); + /* NOTE: we don't need this, as it was received from gethostbyname2 */ +// freehostent(hp2); + return hp; +} + +/* + * _hpmapv6: convert IPv4 hostent into IPv4-mapped IPv6 addresses + */ +#ifdef INET6 +static struct hostent * +_hpmapv6(struct hostent *hp, int *errp) +{ + struct hostent hp6; + + if (hp == NULL) + return NULL; + if (hp->h_addrtype == AF_INET6) + return _hpcopy(hp, errp); + + /* make dummy hostent to convert IPv6 address */ +// if ((hp6 = (struct hostent *)malloc(sizeof(struct hostent))) == NULL) { +// *errp = TRY_AGAIN; +// return NULL; +// } + memset(&hp6, 0, sizeof(struct hostent)); + hp6.h_addrtype = AF_INET6; + hp6.h_length = sizeof(struct in6_addr); + return _hpmerge(&hp6, hp, errp); +} +#endif + +/* + * _hpsort: sort address by sortlist + */ +static struct hostent * +_hpsort(struct hostent *hp, res_state statp) +{ + int i, j, n; + u_char *ap, *sp, *mp, **pp; + char t; + char order[MAXADDRS]; + int nsort = statp->nsort; + + if (hp == NULL || hp->h_addr_list[1] == NULL || nsort == 0) + return hp; + for (i = 0; (ap = (u_char *)hp->h_addr_list[i]); i++) { + for (j = 0; j < nsort; j++) { +#ifdef INET6 + if (statp->_u._ext.ext->sort_list[j].af != + hp->h_addrtype) + continue; + sp = (u_char *)&statp->_u._ext.ext->sort_list[j].addr; + mp = (u_char *)&statp->_u._ext.ext->sort_list[j].mask; +#else + sp = (u_char *)&statp->sort_list[j].addr; + mp = (u_char *)&statp->sort_list[j].mask; +#endif + for (n = 0; n < hp->h_length; n++) { + if ((ap[n] & mp[n]) != sp[n]) + break; + } + if (n == hp->h_length) + break; + } + order[i] = j; + } + n = i; + pp = (u_char **)hp->h_addr_list; + for (i = 0; i < n - 1; i++) { + for (j = i + 1; j < n; j++) { + if (order[i] > order[j]) { + ap = pp[i]; + pp[i] = pp[j]; + pp[j] = ap; + t = order[i]; + order[i] = order[j]; + order[j] = t; + } + } + } + return hp; +} + +/* + * _hpreorder: sort address by default address selection + */ +static struct hostent * +_hpreorder(struct hostent *hp) +{ + struct hp_order *aio; + int i, n; + char *ap; + struct sockaddr *sa; + struct policyhead policyhead; + + if (hp == NULL) + return hp; + + switch (hp->h_addrtype) { + case AF_INET: +#ifdef INET6 + case AF_INET6: +#endif + break; + default: + free_addrselectpolicy(&policyhead); + return hp; + } + + /* count the number of addrinfo elements for sorting. */ + for (n = 0; hp->h_addr_list[n] != NULL; n++) + ; + + /* + * If the number is small enough, we can skip the reordering process. + */ + if (n <= 1) + return hp; + + /* allocate a temporary array for sort and initialization of it. */ + if ((aio = malloc(sizeof(*aio) * n)) == NULL) + return hp; /* give up reordering */ + memset(aio, 0, sizeof(*aio) * n); + + /* retrieve address selection policy from the kernel */ + TAILQ_INIT(&policyhead); + if (!get_addrselectpolicy(&policyhead)) { + /* no policy is installed into kernel, we don't sort. */ + free(aio); + return hp; + } + + for (i = 0; i < n; i++) { + ap = hp->h_addr_list[i]; + aio[i].aio_h_addr = ap; + sa = &aio[i].aio_sa; + switch (hp->h_addrtype) { + case AF_INET: + sa->sa_family = AF_INET; + sa->sa_len = sizeof(struct sockaddr_in); + memcpy(&((struct sockaddr_in *)sa)->sin_addr, ap, + sizeof(struct in_addr)); + break; +#ifdef INET6 + case AF_INET6: + if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)ap)) { + sa->sa_family = AF_INET; + sa->sa_len = sizeof(struct sockaddr_in); + memcpy(&((struct sockaddr_in *)sa)->sin_addr, + &ap[12], sizeof(struct in_addr)); + } else { + sa->sa_family = AF_INET6; + sa->sa_len = sizeof(struct sockaddr_in6); + memcpy(&((struct sockaddr_in6 *)sa)->sin6_addr, + ap, sizeof(struct in6_addr)); + } + break; +#endif + } + aio[i].aio_dstscope = gai_addr2scopetype(sa); + aio[i].aio_dstpolicy = match_addrselectpolicy(sa, &policyhead); + set_source(&aio[i], &policyhead); + } + + /* perform sorting. */ + qsort(aio, n, sizeof(*aio), comp_dst); + + /* reorder the h_addr_list. */ + for (i = 0; i < n; i++) + hp->h_addr_list[i] = aio[i].aio_h_addr; + + /* cleanup and return */ + free(aio); + free_addrselectpolicy(&policyhead); + return hp; +} + + +static int hostent_cmp(struct hostent *he1, struct hostent *he2) { if (he1 == he2) @@ -55,10 +915,185 @@ } static struct hostent * -getipnodebyname_emul(const char *name, int af, int flags, int *error_num) +getipnodebyname_emul(const char *name, int af, int flags, int *errp) +{ + struct hostent *hp; + union inx_addr addrbuf; + res_state statp; + u_long options; + + switch (af) { + case AF_INET: +#ifdef INET6 + case AF_INET6: +#endif + break; + default: + *errp = NO_RECOVERY; + return NULL; + } + + if (flags & AI_ADDRCONFIG) { + int s; + + if ((s = _socket(af, SOCK_DGRAM, 0)) < 0) + return NULL; + /* + * TODO: + * Note that implementation dependent test for address + * configuration should be done everytime called + * (or apropriate interval), + * because addresses will be dynamically assigned or deleted. + */ + _close(s); + } + +#ifdef INET6 + /* special case for literal address */ + if (inet_pton(AF_INET6, name, &addrbuf) == 1) { + if (af != AF_INET6) { + *errp = HOST_NOT_FOUND; + return NULL; + } + return _hpaddr(af, name, &addrbuf, errp); + } +#endif + if (inet_aton(name, (struct in_addr *)&addrbuf) == 1) { + if (af != AF_INET) { + if (MAPADDRENABLED(flags)) { + MAPADDR(&addrbuf, &addrbuf.in_addr); + } else { + *errp = HOST_NOT_FOUND; + return NULL; + } + } + return _hpaddr(af, name, &addrbuf, errp); + } + + + statp = __res_state(); + if ((statp->options & RES_INIT) == 0) { + if (res_ninit(statp) < 0) { + *errp = NETDB_INTERNAL; + return NULL; + } + } + + options = statp->options; + statp->options &= ~RES_USE_INET6; + + hp = gethostbyname2(name, af); + hp = _hpcopy(hp, errp); +// hp = _ghbyname(name, af, flags, errp); + +#ifdef INET6 + if (af == AF_INET6 && ((flags & AI_ALL) || hp == NULL) && + MAPADDRENABLED(flags)) { +// struct hostent *hp2 = _ghbyname(name, AF_INET, flags, errp); + struct hostent *hp2 = gethostbyname2(name, AF_INET); + if (hp == NULL) + if (hp2 == NULL) + *errp = statp->res_h_errno; + else + hp = _hpmapv6(hp2, errp); + else { + if (hp2 && strcmp(hp->h_name, hp2->h_name) != 0) { + /* NOTE: don't need to do that, as it was + * received from gethostbyname2 */ +// freehostent(hp2); + hp2 = NULL; + } + + if (hp2 != NULL) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 16 16:22:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF90F16A47C; Fri, 16 Jun 2006 16:22:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A563616A474; Fri, 16 Jun 2006 16:22:24 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.10.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33A3A43D46; Fri, 16 Jun 2006 16:22:22 +0000 (GMT) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (localhost [127.0.0.1]) by eva.fit.vutbr.cz (envelope-from xdivac02@eva.fit.vutbr.cz) (8.13.7/8.13.7) with ESMTP id k5GGMGAs042368 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Fri, 16 Jun 2006 18:22:16 +0200 (CEST) Received: (from xdivac02@localhost) by eva.fit.vutbr.cz (8.13.7/8.13.3/Submit) id k5GGMGd1042367; Fri, 16 Jun 2006 18:22:16 +0200 (CEST) Date: Fri, 16 Jun 2006 18:22:16 +0200 From: Divacky Roman To: John Baldwin Message-ID: <20060616162216.GA42257@stud.fit.vutbr.cz> References: <200606131712.k5DHCIjF063625@repoman.freebsd.org> <200606131344.08736.jhb@freebsd.org> <20060615081925.GB34336@stud.fit.vutbr.cz> <200606151435.04624.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200606151435.04624.jhb@freebsd.org> User-Agent: Mutt/1.4.2i X-Scanned-By: MIMEDefang 2.54 on 147.229.10.14 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 99144 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, 16 Jun 2006 16:22:25 -0000 On Thu, Jun 15, 2006 at 02:35:04PM -0400, John Baldwin wrote: > On Thursday 15 June 2006 04:19, Divacky Roman wrote: > > On Tue, Jun 13, 2006 at 01:44:08PM -0400, John Baldwin wrote: > > > On Tuesday 13 June 2006 13:12, Roman Divacky wrote: > > > > http://perforce.freebsd.org/chv.cgi?CH=99144 > > > > > > > > Change 99144 by rdivacky@rdivacky_witten on 2006/06/13 17:12:02 > > > > > > > > Make the LINUXBASE path settable via sysctl. Useful when you have more > then > > > one linux bases > > > > installed etc. > > > > > > Since you only check the one global variable, why did you make the > sysctl's > > > try to handle per-prison paths? > > > > well... none of the per-prison variables is checkd against anywhere so I > > thought there's some magic behind and just copied the code from the other > > variables. > > > > can you explain me how this works? to me it seems either like unfinished > work > > or nonsense :) > > All the other per-prison variables are accessed via the linux_get_foo() > functions (like uname, etc.) and those functions look in the prison. However, > you are passing linux_emul_path directly to calls to kern_alternate_path() > (see the CHECKALT macros). You would have to change those macros to instead > call a linux_get_path() function that looked in the prison if you wanted > different prisons to have their own compat paths. the emul_path is used in just 3 places, 2 are in linprocfs and 1 in linuxolator I'll commit update to it, pls review it then From owner-p4-projects@FreeBSD.ORG Fri Jun 16 20:22:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3C9616A47B; Fri, 16 Jun 2006 20:22:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D12F616A479 for ; Fri, 16 Jun 2006 20:22:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9094943D49 for ; Fri, 16 Jun 2006 20:22:24 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5GKMOwm033185 for ; Fri, 16 Jun 2006 20:22:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5GKMOsM033182 for perforce@freebsd.org; Fri, 16 Jun 2006 20:22:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 16 Jun 2006 20:22:24 GMT Message-Id: <200606162022.k5GKMOsM033182@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 99366 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, 16 Jun 2006 20:22:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=99366 Change 99366 by rwatson@rwatson_peppercorn on 2006/06/16 20:21:24 Forward declare struct timeval, which appears in the audit token generation API. On some systems, this isn't implicitly defined due to prior includes (such as FreeBSD 4.x). Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#18 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#17 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#18 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -220,6 +220,7 @@ struct sockaddr_in; struct sockaddr_in6; struct sockaddr_un; +struct timeval; #if defined(_KERNEL) || defined(KERNEL) struct vnode_au_info; #endif From owner-p4-projects@FreeBSD.ORG Fri Jun 16 20:25:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2235F16A47A; Fri, 16 Jun 2006 20:25:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA65916A479 for ; Fri, 16 Jun 2006 20:25:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59AA343D58 for ; Fri, 16 Jun 2006 20:25:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5GKPS16033918 for ; Fri, 16 Jun 2006 20:25:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5GKPSHe033915 for perforce@freebsd.org; Fri, 16 Jun 2006 20:25:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 16 Jun 2006 20:25:28 GMT Message-Id: <200606162025.k5GKPSHe033915@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 99367 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, 16 Jun 2006 20:25:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=99367 Change 99367 by rwatson@rwatson_peppercorn on 2006/06/16 20:24:42 Nested include sys/time.h since it is required, rathe than forward declare -- the arguments aren't struct timeval *, they're plain struct timeval. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#19 (text+ko) ==== @@ -30,12 +30,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#19 $ */ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ +#include /* struct timeval */ + /* * Token type identifiers. */ @@ -220,7 +222,6 @@ struct sockaddr_in; struct sockaddr_in6; struct sockaddr_un; -struct timeval; #if defined(_KERNEL) || defined(KERNEL) struct vnode_au_info; #endif From owner-p4-projects@FreeBSD.ORG Fri Jun 16 20:30:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5B7116A494; Fri, 16 Jun 2006 20:30:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8C1B316A484 for ; Fri, 16 Jun 2006 20:30:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A31D43D48 for ; Fri, 16 Jun 2006 20:30:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5GKUaUQ035541 for ; Fri, 16 Jun 2006 20:30:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5GKUZaq035538 for perforce@freebsd.org; Fri, 16 Jun 2006 20:30:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 16 Jun 2006 20:30:35 GMT Message-Id: <200606162030.k5GKUZaq035538@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 99369 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, 16 Jun 2006 20:30:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=99369 Change 99369 by rwatson@rwatson_pemaquid on 2006/06/16 20:30:33 Use inttypes.h, this is more universally available than stdint.h (i.e., FreeBSD 4.x). Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#21 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#21 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#20 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#21 $ */ #ifndef _LIBBSM_H_ @@ -43,7 +43,7 @@ #include #include -#include /* Required for audit.h. */ +#include /* Required for audit.h. */ #include /* Required for clock_t on Linux. */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#12 $ */ /* @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Fri Jun 16 20:36:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3638516A47E; Fri, 16 Jun 2006 20:36:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1118116A474 for ; Fri, 16 Jun 2006 20:36:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B168143D46 for ; Fri, 16 Jun 2006 20:36:44 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5GKaibc035864 for ; Fri, 16 Jun 2006 20:36:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5GKai1s035861 for perforce@freebsd.org; Fri, 16 Jun 2006 20:36:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 16 Jun 2006 20:36:44 GMT Message-Id: <200606162036.k5GKai1s035861@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 99371 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, 16 Jun 2006 20:36:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=99371 Change 99371 by hselasky@hselasky_mini_itx on 2006/06/16 20:36:37 Abstracted scanning of USB config descriptors into the routine "usb_desc_foreach()". Added extra range checking in case the code is compiled on an embedded system without virtual memory adresses. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#6 (text+ko) ==== @@ -258,121 +258,125 @@ #define ADD_BYTES(ptr,len) ((void *)(((u_int8_t *)(ptr)) + (len))) +usb_descriptor_t * +usbd_desc_foreach(usb_config_descriptor_t *cd, usb_descriptor_t *desc) +{ + void *end; + + if (cd == NULL) { + return NULL; + } + + end = ADD_BYTES(cd, UGETW(cd->wTotalLength)); + + if (desc == NULL) { + desc = ADD_BYTES(cd, 0); + } else { + desc = ADD_BYTES(desc, desc->bLength); + } + return (((((void *)desc) >= ((void *)cd)) && + (((void *)desc) < end) && + (ADD_BYTES(desc,desc->bLength) >= ((void *)cd)) && + (ADD_BYTES(desc,desc->bLength) <= end) && + (desc->bLength >= sizeof(*desc))) ? desc : NULL); +} + usb_hid_descriptor_t * usbd_get_hdesc(usb_config_descriptor_t *cd, usb_interface_descriptor_t *id) { - void *end = ADD_BYTES(cd, UGETW(cd->wTotalLength)); + usb_descriptor_t *desc = (void *)id; - if((id == NULL) || - (((void *)id) < ((void *)cd)) || - (((void *)id) >= end)) - { - return NULL; + if(desc == NULL) { + return NULL; } - for(id = ADD_BYTES(id, id->bLength); - (((void *)id) < end) && - (ADD_BYTES(id, USB_HID_DESCRIPTOR_SIZE(0)) <= end) && - (ADD_BYTES(id, id->bLength) <= end); - id = ADD_BYTES(id, id->bLength)) + while ((desc = usbd_desc_foreach(cd, desc))) { - if(id->bDescriptorType == UDESC_HID) + if ((desc->bDescriptorType == UDESC_HID) && + (desc->bLength >= USB_HID_DESCRIPTOR_SIZE(0))) { - return (void *)id; + return (void *)desc; } - if(id->bDescriptorType == UDESC_INTERFACE) + + if (desc->bDescriptorType == UDESC_INTERFACE) { break; } } - return (0); + return NULL; } usb_interface_descriptor_t * -usbd_find_idesc(usb_config_descriptor_t *cd, int iface_index, int alt_index) +usbd_find_idesc(usb_config_descriptor_t *cd, u_int16_t iface_index, + u_int16_t alt_index) { - void *end = ADD_BYTES(cd, UGETW(cd->wTotalLength)); + usb_descriptor_t *desc = NULL; usb_interface_descriptor_t *id; - int curidx, lastidx, curaidx = 0; + u_int16_t curidx = 0xFFFF; + u_int16_t lastidx = 0xFFFF; + u_int16_t curaidx = 0; - curidx = lastidx = -1; - - for(id = ADD_BYTES(cd, 0); - (((void *)id) < end) && - (ADD_BYTES(id,USB_INTERFACE_DESCRIPTOR_SIZE) <= end) && - (ADD_BYTES(id,id->bLength) <= end); - id = ADD_BYTES(id, id->bLength)) + while ((desc = usbd_desc_foreach(cd, desc))) { - PRINTFN(4,("iface_index=%d(%d) alt_index=%d(%d) len=%d " - "type=%d\n", - iface_index, curidx, alt_index, curaidx, - id->bLength, id->bDescriptorType)); + if ((desc->bDescriptorType == UDESC_INTERFACE) && + (desc->bLength >= sizeof(*id))) + { + id = (void *)desc; - if(id->bLength == 0) + if(id->bInterfaceNumber != lastidx) + { + lastidx = id->bInterfaceNumber; + curidx++; + curaidx = 0; + } + else { - /* bad descriptor */ - break; + curaidx++; } - if(id->bDescriptorType == UDESC_INTERFACE) + if((iface_index == curidx) && (alt_index == curaidx)) { - if(id->bInterfaceNumber != lastidx) - { - lastidx = id->bInterfaceNumber; - curidx++; - curaidx = 0; - } - else - { - curaidx++; - } - if((iface_index == curidx) && (alt_index == curaidx)) - { - return (id); - } + return (id); } + } } return (NULL); } usb_endpoint_descriptor_t * -usbd_find_edesc(usb_config_descriptor_t *cd, int iface_index, int alt_index, - int endptidx) +usbd_find_edesc(usb_config_descriptor_t *cd, u_int16_t iface_index, + u_int16_t alt_index, u_int16_t endptidx) { - void *end = ADD_BYTES(cd, UGETW(cd->wTotalLength)); + usb_descriptor_t *desc = NULL; usb_interface_descriptor_t *d; - usb_endpoint_descriptor_t *ed; - int curidx; + u_int16_t curidx = 0; d = usbd_find_idesc(cd, iface_index, alt_index); if(d == NULL) { - return (NULL); + return NULL; } + if(endptidx >= d->bNumEndpoints) /* quick exit */ { - return (NULL); + return NULL; } - curidx = 0; - for(ed = ADD_BYTES(d, d->bLength); - (((void *)ed) < end) && - (ADD_BYTES(ed, USB_ENDPOINT_DESCRIPTOR_SIZE) <= end) && - (ADD_BYTES(ed, ed->bLength) <= end); - ed = ADD_BYTES(ed, ed->bLength)) - { - if((ed->bLength == 0) || - (ed->bDescriptorType == UDESC_INTERFACE)) - { - /* bad descriptor */ - break; + + desc = ((void *)d); + + while ((desc = usbd_desc_foreach(cd, desc))) { + + if(desc->bDescriptorType == UDESC_INTERFACE) { + break; + } + + if (desc->bDescriptorType == UDESC_ENDPOINT) { + + if (curidx == endptidx) { + return ((desc->bLength >= USB_ENDPOINT_DESCRIPTOR_SIZE) ? + ((void *)d) : NULL); } - if(ed->bDescriptorType == UDESC_ENDPOINT) - { - if(curidx == endptidx) - { - return (ed); - } - curidx++; - } + curidx++; + } } return (NULL); } @@ -380,20 +384,10 @@ usb_descriptor_t * usbd_find_descriptor(usb_config_descriptor_t *cd, int type, int subtype) { - void *end = ADD_BYTES(cd, UGETW(cd->wTotalLength)); - usb_descriptor_t *desc; + usb_descriptor_t *desc = NULL; + + while ((desc = usbd_desc_foreach(cd, desc))) { - for(desc = ADD_BYTES(cd, 0); - (((void *)desc) < end) && - (ADD_BYTES(desc, sizeof(usb_descriptor_t)) <= end) && - (ADD_BYTES(desc, desc->bLength) <= end); - desc = ADD_BYTES(desc, desc->bLength)) - { - if(desc->bLength == 0) - { - /* bad descriptor */ - break; - } if((desc->bDescriptorType == type) && ((subtype == USBD_SUBTYPE_ANY) || (subtype == desc->bDescriptorSubtype))) @@ -405,24 +399,23 @@ } int -usbd_get_no_alts(usb_config_descriptor_t *cd, int ifaceno) +usbd_get_no_alts(usb_config_descriptor_t *cd, u_int8_t ifaceno) { - void *end = ADD_BYTES(cd, UGETW(cd->wTotalLength)); - int n; + usb_descriptor_t *desc = NULL; + usb_interface_descriptor_t *id; + int n = 0; + + while ((desc = usbd_desc_foreach(cd, desc))) { - for(n = 0; - (((void *)cd) < end) && - (ADD_BYTES(cd,USB_INTERFACE_DESCRIPTOR_SIZE) <= end) && - (ADD_BYTES(cd,cd->bLength) <= end); - cd = ADD_BYTES(cd, cd->bLength)) - { - if((((usb_interface_descriptor_t *)cd)->bDescriptorType == UDESC_INTERFACE) && - (((usb_interface_descriptor_t *)cd)->bInterfaceNumber == ifaceno)) - { - n++; - } + if ((desc->bDescriptorType == UDESC_INTERFACE) && + (desc->bLength >= sizeof(*id))) { + id = (void *)desc; + if (id->bInterfaceNumber == ifaceno) { + n++; + } + } } - return (n); + return n; } static void @@ -473,8 +466,8 @@ struct usbd_pipe *pipe = &udev->pipes[0]; struct usbd_pipe *pipe_end = &udev->pipes_end[0]; usb_interface_descriptor_t *id; - usb_endpoint_descriptor_t *ed; - void *end; + usb_endpoint_descriptor_t *ed = NULL; + usb_descriptor_t *desc; u_int8_t nendpt; if(iface == NULL) @@ -521,36 +514,29 @@ nendpt = id->bNumEndpoints; PRINTFN(4,("found idesc nendpt=%d\n", nendpt)); - ed = ADD_BYTES(id, id->bLength); - end = ADD_BYTES(udev->cdesc, UGETW(udev->cdesc->wTotalLength)); + desc = (void *)id; while(nendpt--) { PRINTFN(10,("endpt=%d\n", nendpt)); - while(ADD_BYTES(ed,USB_ENDPOINT_DESCRIPTOR_SIZE) <= end) + while ((desc = usbd_desc_foreach(udev->cdesc, desc))) { - PRINTFN(10,("ed=%p end=%p " - "len=%d type=%d\n", - ed, end, ed->bLength, - ed->bDescriptorType)); - - if((ADD_BYTES(ed, ed->bLength) <= end) && - (ed->bLength != 0) && - (ed->bDescriptorType == UDESC_ENDPOINT)) + if ((desc->bDescriptorType == UDESC_ENDPOINT) && + (desc->bLength >= USB_ENDPOINT_DESCRIPTOR_SIZE)) { goto found; } - if((ed->bLength == 0) || - (ed->bDescriptorType == UDESC_INTERFACE)) + if (desc->bDescriptorType == UDESC_INTERFACE) { break; } - ed = ADD_BYTES(ed, ed->bLength); } goto error; found: + ed = (void *)desc; + if(udev->speed == USB_SPEED_HIGH) { u_int16_t mps; @@ -598,7 +584,6 @@ } pipe++; } - ed = ADD_BYTES(ed, ed->bLength); } return (USBD_NORMAL_COMPLETION); ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#10 (text+ko) ==== @@ -531,16 +531,19 @@ void usbd_delay_ms(struct usbd_device *udev, u_int ms); +usb_descriptor_t * +usbd_desc_foreach(usb_config_descriptor_t *cd, usb_descriptor_t *desc); + struct usb_hid_descriptor; struct usb_hid_descriptor * usbd_get_hdesc(usb_config_descriptor_t *cd, usb_interface_descriptor_t *id); usb_interface_descriptor_t * -usbd_find_idesc(usb_config_descriptor_t *cd, int iface_index, int alt_index); +usbd_find_idesc(usb_config_descriptor_t *cd, u_int16_t iface_index, u_int16_t alt_index); usb_endpoint_descriptor_t * -usbd_find_edesc(usb_config_descriptor_t *cd, int iface_index, int alt_index, - int endptidx); +usbd_find_edesc(usb_config_descriptor_t *cd, u_int16_t iface_index, u_int16_t alt_index, + u_int16_t endptidx); usb_descriptor_t * usbd_find_descriptor(usb_config_descriptor_t *cd, int type, int subtype); @@ -548,7 +551,7 @@ #define USBD_SUBTYPE_ANY (-1) int -usbd_get_no_alts(usb_config_descriptor_t *cd, int ifaceno); +usbd_get_no_alts(usb_config_descriptor_t *cd, u_int8_t ifaceno); usbd_status usbd_search_and_set_config(struct usbd_device *udev, int no, int msg); From owner-p4-projects@FreeBSD.ORG Sat Jun 17 05:17:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CDDF16A47E; Sat, 17 Jun 2006 05:17:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BD4F016A47C for ; Sat, 17 Jun 2006 05:17:55 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 883C443D48 for ; Sat, 17 Jun 2006 05:17:55 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5H5HtKE096307 for ; Sat, 17 Jun 2006 05:17:55 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5H5Htea096304 for perforce@freebsd.org; Sat, 17 Jun 2006 05:17:55 GMT (envelope-from csjp@freebsd.org) Date: Sat, 17 Jun 2006 05:17:55 GMT Message-Id: <200606170517.k5H5Htea096304@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 99398 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, 17 Jun 2006 05:17:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=99398 Change 99398 by csjp@csjp_rnd01 on 2006/06/17 05:17:00 KSE is not supported in the sun4v branch. Do not bother processing KSE related system calls. This un-breaks buildworld on sun4v Affected files ... .. //depot/projects/kmacy_sun4v/src/usr.bin/kdump/kdump.c#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/usr.bin/kdump/kdump.c#4 (text+ko) ==== @@ -728,12 +728,14 @@ mountflagsname ((int)*ip); ip++; narg--; +#if 0 } else if (ktr->ktr_code == SYS_kse_thr_interrupt) { print_number(ip,narg,c); (void)putchar(','); ksethrcmdname ((int)*ip); ip++; narg--; +#endif /* XXX KSE */ } else if (ktr->ktr_code == SYS_thr_create) { print_number(ip,narg,c); print_number(ip,narg,c); From owner-p4-projects@FreeBSD.ORG Sat Jun 17 05:37:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB72316A47D; Sat, 17 Jun 2006 05:37:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F23116A47A for ; Sat, 17 Jun 2006 05:37:20 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 307EB43D4C for ; Sat, 17 Jun 2006 05:37:20 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5H5bKgl097112 for ; Sat, 17 Jun 2006 05:37:20 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5H5bJu0097109 for perforce@freebsd.org; Sat, 17 Jun 2006 05:37:19 GMT (envelope-from scottl@freebsd.org) Date: Sat, 17 Jun 2006 05:37:19 GMT Message-Id: <200606170537.k5H5bJu0097109@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 99400 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, 17 Jun 2006 05:37:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=99400 Change 99400 by scottl@scottl-wv1u on 2006/06/17 05:36:56 Basic locking for the pass(4) driver. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#7 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#7 (text+ko) ==== @@ -106,7 +106,7 @@ static struct cdevsw pass_cdevsw = { .d_version = D_VERSION, - .d_flags = D_NEEDGIANT, + .d_flags = 0, .d_open = passopen, .d_close = passclose, .d_ioctl = passioctl, @@ -334,8 +334,10 @@ softc = (struct pass_softc *)periph->softc; s = splsoftcam(); + mtx_lock(periph->sim->mtx); if (softc->flags & PASS_FLAG_INVALID) { splx(s); + mtx_unlock(periph->sim->mtx); return(ENXIO); } @@ -345,6 +347,7 @@ error = securelevel_gt(td->td_ucred, 1); if (error) { splx(s); + mtx_unlock(periph->sim->mtx); return(error); } @@ -353,6 +356,7 @@ */ if (((flags & FWRITE) == 0) || ((flags & FREAD) == 0)) { splx(s); + mtx_unlock(periph->sim->mtx); return(EPERM); } @@ -363,11 +367,13 @@ xpt_print_path(periph->path); printf("can't do nonblocking accesss\n"); splx(s); + mtx_unlock(periph->sim->mtx); return(EINVAL); } if ((error = cam_periph_lock(periph, PRIBIO | PCATCH)) != 0) { splx(s); + mtx_unlock(periph->sim->mtx); return (error); } @@ -380,6 +386,7 @@ } cam_periph_unlock(periph); + mtx_unlock(periph->sim->mtx); return (error); } @@ -397,13 +404,17 @@ softc = (struct pass_softc *)periph->softc; - if ((error = cam_periph_lock(periph, PRIBIO)) != 0) + mtx_lock(periph->sim->mtx); + if ((error = cam_periph_lock(periph, PRIBIO)) != 0) { + mtx_unlock(periph->sim->mtx); return (error); + } softc->flags &= ~PASS_FLAG_OPEN; cam_periph_unlock(periph); cam_periph_release(periph); + mtx_unlock(periph->sim->mtx); return (0); } @@ -458,6 +469,7 @@ return(ENXIO); softc = (struct pass_softc *)periph->softc; + mtx_lock(periph->sim->mtx); error = 0; @@ -524,6 +536,7 @@ break; } + mtx_unlock(periph->sim->mtx); return(error); } From owner-p4-projects@FreeBSD.ORG Sat Jun 17 06:29:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51C0116A47D; Sat, 17 Jun 2006 06:29:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D67016A47C for ; Sat, 17 Jun 2006 06:29:27 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D494043D46 for ; Sat, 17 Jun 2006 06:29:26 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5H6TQSi000426 for ; Sat, 17 Jun 2006 06:29:26 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5H6TQih000418 for perforce@freebsd.org; Sat, 17 Jun 2006 06:29:26 GMT (envelope-from scottl@freebsd.org) Date: Sat, 17 Jun 2006 06:29:26 GMT Message-Id: <200606170629.k5H6TQih000418@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 99403 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, 17 Jun 2006 06:29:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=99403 Change 99403 by scottl@scottl-wv1u on 2006/06/17 06:28:52 Oops, a needed header slipped out. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#8 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#8 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Sat Jun 17 06:29:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE0B716A53F; Sat, 17 Jun 2006 06:29:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 73E2B16A482 for ; Sat, 17 Jun 2006 06:29:27 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47BFD43D45 for ; Sat, 17 Jun 2006 06:29:27 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5H6TR9X000437 for ; Sat, 17 Jun 2006 06:29:27 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5H6TQlo000434 for perforce@freebsd.org; Sat, 17 Jun 2006 06:29:26 GMT (envelope-from scottl@freebsd.org) Date: Sat, 17 Jun 2006 06:29:26 GMT Message-Id: <200606170629.k5H6TQlo000434@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 99404 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, 17 Jun 2006 06:29:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=99404 Change 99404 by scottl@scottl-wv1u on 2006/06/17 06:29:15 Provide minimal locking for ses(4). Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#6 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#6 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -182,7 +183,7 @@ .d_close = sesclose, .d_ioctl = sesioctl, .d_name = "ses", - .d_flags = D_NEEDGIANT, + .d_flags = 0, }; static void @@ -419,14 +420,17 @@ splx(s); return (ENXIO); } + mtx_lock(periph->sim->mtx); if ((error = cam_periph_lock(periph, PRIBIO | PCATCH)) != 0) { splx(s); + mtx_unlock(periph->sim->mtx); return (error); } splx(s); if (cam_periph_acquire(periph) != CAM_REQ_CMP) { cam_periph_unlock(periph); + mtx_unlock(periph->sim->mtx); return (ENXIO); } @@ -459,6 +463,7 @@ cam_periph_release(periph); } cam_periph_unlock(periph); + mtx_unlock(periph->sim->mtx); return (error); } @@ -477,13 +482,17 @@ softc = (struct ses_softc *)periph->softc; - if ((error = cam_periph_lock(periph, PRIBIO)) != 0) + mtx_lock(periph->sim->mtx); + if ((error = cam_periph_lock(periph, PRIBIO)) != 0) { + mtx_unlock(periph->sim->mtx); return (error); + } softc->ses_flags &= ~SES_FLAG_OPEN; cam_periph_unlock(periph); cam_periph_release(periph); + mtx_unlock(periph->sim->mtx); return (0); } @@ -541,14 +550,17 @@ CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("entering sesioctl\n")); + mtx_lock(periph->sim->mtx); ssc = (struct ses_softc *)periph->softc; /* * Now check to see whether we're initialized or not. */ if ((ssc->ses_flags & SES_FLAG_INITIALIZED) == 0) { + mtx_unlock(periph->sim->mtx); return (ENXIO); } + mtx_unlock(periph->sim->mtx); error = 0; @@ -578,22 +590,34 @@ break; case SESIOC_GETOBJMAP: + /* + * XXX Dropping the lock while copying multiple segments is + * bogus. + */ + mtx_lock(periph->sim->mtx); for (uobj = addr, i = 0; i != ssc->ses_nobjects; i++, uobj++) { obj.obj_id = i; obj.subencid = ssc->ses_objmap[i].subenclosure; obj.object_type = ssc->ses_objmap[i].enctype; + mtx_unlock(periph->sim->mtx); error = copyout(&obj, uobj, sizeof (ses_object)); + mtx_lock(periph->sim->mtx); if (error) { break; } } + mtx_unlock(periph->sim->mtx); break; case SESIOC_GETENCSTAT: + mtx_lock(periph->sim->mtx); error = (*ssc->ses_vec.get_encstat)(ssc, 1); - if (error) + if (error) { + mtx_unlock(periph->sim->mtx); break; + } tmp = ssc->ses_encstat & ~ENCI_SVALID; + mtx_unlock(periph->sim->mtx); error = copyout(&tmp, addr, sizeof (ses_encstat)); ssc->ses_encstat = tmp; break; @@ -602,7 +626,9 @@ error = copyin(addr, &tmp, sizeof (ses_encstat)); if (error) break; + mtx_lock(periph->sim->mtx); error = (*ssc->ses_vec.set_encstat)(ssc, tmp, 1); + mtx_unlock(periph->sim->mtx); break; case SESIOC_GETOBJSTAT: @@ -613,7 +639,9 @@ error = EINVAL; break; } + mtx_lock(periph->sim->mtx); error = (*ssc->ses_vec.get_objstat)(ssc, &objs, 1); + mtx_unlock(periph->sim->mtx); if (error) break; error = copyout(&objs, addr, sizeof (ses_objstat)); @@ -632,7 +660,9 @@ error = EINVAL; break; } + mtx_lock(periph->sim->mtx); error = (*ssc->ses_vec.set_objstat)(ssc, &objs, 1); + mtx_unlock(periph->sim->mtx); /* * Always (for now) invalidate entry. @@ -642,11 +672,15 @@ case SESIOC_INIT: + mtx_lock(periph->sim->mtx); error = (*ssc->ses_vec.init_enc)(ssc); + mtx_unlock(periph->sim->mtx); break; default: + mtx_lock(periph->sim->mtx); error = cam_periph_ioctl(periph, cmd, arg_addr, seserror); + mtx_unlock(periph->sim->mtx); break; } return (error); From owner-p4-projects@FreeBSD.ORG Sat Jun 17 08:57:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3C5416A47D; Sat, 17 Jun 2006 08:57:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B01CC16A47B for ; Sat, 17 Jun 2006 08:57:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70FE243D45 for ; Sat, 17 Jun 2006 08:57:34 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5H8vYIM017133 for ; Sat, 17 Jun 2006 08:57:34 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5H8vYVk017130 for perforce@freebsd.org; Sat, 17 Jun 2006 08:57:34 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 17 Jun 2006 08:57:34 GMT Message-Id: <200606170857.k5H8vYVk017130@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 99406 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, 17 Jun 2006 08:57:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=99406 Change 99406 by rdivacky@rdivacky_witten on 2006/06/17 08:56:59 Change the emulpath sysctl to be per-prison. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linprocfs/linprocfs.c#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.c#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_util.c#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_util.h#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#3 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#3 (text+ko) ==== @@ -1018,7 +1018,7 @@ ELFOSABI_LINUX, EM_386, "Linux", - linux_emul_path, + "/compat/linux/", "/lib/ld-linux.so.1", &elf_linux_sysvec, NULL, @@ -1029,7 +1029,7 @@ ELFOSABI_LINUX, EM_386, "Linux", - linux_emul_path, + "/compat/linux/", "/lib/ld-linux.so.2", &elf_linux_sysvec, NULL, ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linprocfs/linprocfs.c#2 (text+ko) ==== @@ -281,7 +281,9 @@ char *dlep, *flep, *mntto, *mntfrom, *fstype; size_t lep_len; int error; + char linux_emul_path[LINUX_NAME_MAX]; + linux_get_emul_path(td, linux_emul_path); /* resolve symlinks etc. in the emulation tree prefix */ NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, linux_emul_path, td); flep = NULL; ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.c#3 (text+ko) ==== @@ -90,7 +90,7 @@ static int linux_sysctl_linux_emul_path(SYSCTL_HANDLER_ARGS) { - char emul_path[LINUX_NAME_MAX]; + static char emul_path[LINUX_NAME_MAX]; int error; Elf32_Brandinfo **brandinfo; @@ -99,10 +99,39 @@ if (error || req->newptr == NULL) return (error); error = linux_set_emul_path(req->td, emul_path); - for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; - ++brandinfo) - if (elf32_insert_brand_entry(*brandinfo) < 0) - error = EINVAL; + { + static Elf32_Brandinfo linux_brand = { + ELFOSABI_LINUX, + EM_386, + "Linux", + emul_path, + "/lib/ld-linux.so.1", + &elf_linux_sysvec, + NULL, + BI_CAN_EXEC_DYN, + }; + static Elf32_Brandinfo linux_glibc2brand = { + ELFOSABI_LINUX, + EM_386, + "Linux", + emul_path, + "/lib/ld-linux.so.2", + &elf_linux_sysvec, + NULL, + BI_CAN_EXEC_DYN, + }; + + Elf32_Brandinfo *local_linux_brandlist[] = { + &linux_brand, + &linux_glibc2brand, + NULL + }; + + for (brandinfo = &local_linux_brandlist[0]; *brandinfo != NULL; + ++brandinfo) + if (elf32_insert_brand_entry(*brandinfo) < 0) + error = EINVAL; + } return (error); } ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_util.c#3 (text+ko) ==== @@ -47,6 +47,12 @@ #include #include +#ifdef COMPAT_LINUX32 +#include +#else +#include +#endif +#include /* * Search an alternate path before passing pathname arguments on @@ -64,6 +70,9 @@ char **pbuf; int cflag; { + char linux_emul_path[LINUX_NAME_MAX]; + + linux_get_emul_path(td, linux_emul_path); return (kern_alternate_path(td, linux_emul_path, path, pathseg, pbuf, cflag)); @@ -83,8 +92,6 @@ printf("\n"); } -MALLOC_DECLARE(M_LINUX); - struct device_element { TAILQ_ENTRY(device_element) list; ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_util.h#2 (text+ko) ==== @@ -75,8 +75,6 @@ return p; } -extern const char linux_emul_path[]; - int linux_emul_convpath(struct thread *, char *, enum uio_seg, char **, int); #define LCONVPATH(td, upath, pathp, i) \ ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#3 (text+ko) ==== @@ -858,7 +858,7 @@ ELFOSABI_LINUX, EM_386, "Linux", - linux_emul_path, + "/compat/linux/", "/lib/ld-linux.so.1", &elf_linux_sysvec, NULL, @@ -869,7 +869,7 @@ ELFOSABI_LINUX, EM_386, "Linux", - linux_emul_path, + "/compat/linux/", "/lib/ld-linux.so.2", &elf_linux_sysvec, NULL, From owner-p4-projects@FreeBSD.ORG Sat Jun 17 09:18:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 135AF16A4AB; Sat, 17 Jun 2006 09:18:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E303516A4A7 for ; Sat, 17 Jun 2006 09:18:00 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 909F743D48 for ; Sat, 17 Jun 2006 09:18:00 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5H9I0jh019505 for ; Sat, 17 Jun 2006 09:18:00 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5H9I0Mm019502 for perforce@freebsd.org; Sat, 17 Jun 2006 09:18:00 GMT (envelope-from clem1@FreeBSD.org) Date: Sat, 17 Jun 2006 09:18:00 GMT Message-Id: <200606170918.k5H9I0Mm019502@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 99407 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, 17 Jun 2006 09:18:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=99407 Change 99407 by clem1@clem1_ipv6vulns on 2006/06/17 09:17:07 packet manipulation python library source tree. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/Makefile#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/PKG-INFO#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/README.txt#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/__init__.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/__init__.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/dhcpv4.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/ethernet.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/icmpv4.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/icmpv6.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/ipsec.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/ipv4.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/ipv6.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/localhost.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/nd6.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/tcp.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/udp.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/udpv4.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/pcs.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/setup.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/tests/chaintest.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/tests/etherping.out#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/tests/ethertest.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/tests/icmpv4test.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/tests/ipv4test.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/tests/ipv6test.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/tests/loopping.out#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/tests/loopping6.out#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/tests/tlv.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/tests/udpv4test.py#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 17 09:24:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53D0216A47B; Sat, 17 Jun 2006 09:24:10 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F5C316A474 for ; Sat, 17 Jun 2006 09:24:10 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4AF643D45 for ; Sat, 17 Jun 2006 09:24:09 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5H9O9po019999 for ; Sat, 17 Jun 2006 09:24:09 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5H9O9u3019996 for perforce@freebsd.org; Sat, 17 Jun 2006 09:24:09 GMT (envelope-from clem1@FreeBSD.org) Date: Sat, 17 Jun 2006 09:24:09 GMT Message-Id: <200606170924.k5H9O9u3019996@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 99409 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, 17 Jun 2006 09:24:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=99409 Change 99409 by clem1@clem1_ipv6vulns on 2006/06/17 09:23:18 futo - fuzz specified command line parameters of a specified application. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/futo/DESCRIPTION#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/futo/TODO#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/futo/futo.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/futo/ping6.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/futo/traceroute6.py#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 17 11:01:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E50C016A47A; Sat, 17 Jun 2006 11:01:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C3DF816A479 for ; Sat, 17 Jun 2006 11:01:14 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5290743D46 for ; Sat, 17 Jun 2006 11:01:14 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HB1EDx030860 for ; Sat, 17 Jun 2006 11:01:14 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HB1Djp030857 for perforce@freebsd.org; Sat, 17 Jun 2006 11:01:13 GMT (envelope-from clem1@FreeBSD.org) Date: Sat, 17 Jun 2006 11:01:13 GMT Message-Id: <200606171101.k5HB1Djp030857@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 99414 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, 17 Jun 2006 11:01:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=99414 Change 99414 by clem1@clem1_ipv6vulns on 2006/06/17 11:00:35 Local fuzzer improvement (setsockopt with IPV6_RTHDR). Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/global/funcs.c#2 edit .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/include/fuzzer.h#2 edit .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/include/setsockopt.h#2 edit .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/rand/rand.c#2 edit .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/setsockopt/main.c#2 edit .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/setsockopt/setsockopt.c#2 edit Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/global/funcs.c#2 (text+ko) ==== @@ -97,6 +97,11 @@ fprintf(fd, " returned %d\n", d); goto end; break; + case 'S': + s = va_arg(ap, char *); + fprintf(fd, " returned %s\n", s); + goto end; + break; default: break; } ==== //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/include/fuzzer.h#2 (text+ko) ==== @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #define PAYLOAD_SIZE_MAX 104096 ==== //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/include/setsockopt.h#2 (text+ko) ==== @@ -62,6 +62,7 @@ void ssf_mtu(int); void ssf_ipsec(int); void ssf_mcast(int); +void ssf_rthdr(int); void ssf_others(int); void ssf_pr(int); void ssf_icmp6(int); ==== //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/rand/rand.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ char *randipv6(void){ char *ip, *p; int i; - p = ip = malloc(16); + p = ip = malloc(32); if(ip == NULL){ fprintf(stderr, "randipv6(): malloc failled.\n"); exit(EXIT_FAILURE); ==== //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/setsockopt/main.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ int sock; unsigned int occ = 40; /* nb operation by socket. */ printf("ssf - setsockopt() ipv6 fuzzer.\n"); + srand(randseed()); while(1){ sock = getsock(); ssf_main(sock, occ); ==== //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/setsockopt/setsockopt.c#2 (text+ko) ==== @@ -177,6 +177,73 @@ } /* + * routing extension header setsockopt fuzzer. + */ +void ssf_rthdr(int sock){ + int on = 1; + char payload[PAYLOAD_SIZE_MAX]; + struct in6_addr v6; + struct cmsghdr *cmsg = NULL; + struct ip6_rthdr *rthdr; + int optlen, optname = IPV6_RTHDR, i, ret, segments; + unsigned int optval; + + fuzzlog("setsockopt", "ddddd", sock, IPPROTO_IPV6, IPV6_RECVRTHDR, on, sizeof(int)); + ret = setsockopt(sock, IPPROTO_IPV6, IPV6_RECVRTHDR, &on, sizeof(int)); + fuzzlog("", "r", ret); + + switch(rand() % 5){ + case 0: + optlen = rand(); + optval = (unsigned int)randaddr(); + break; + case 1: + optlen = rand() % PAYLOAD_SIZE_MAX; + randpayload(payload, optlen); + optval = (unsigned int)&payload; + break; + case 2: + case 3: + segments = rand() % 127; + optlen = CMSG_SPACE(inet6_rth_space(IPV6_RTHDR_TYPE_0, segments)); + cmsg = malloc(optlen); + if(cmsg == NULL) + return; + cmsg->cmsg_len = CMSG_LEN(rand()); + cmsg->cmsg_level = IPPROTO_IPV6; + cmsg->cmsg_type = IPV6_RTHDR; + rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg); + rthdr = inet6_rth_init((void *)rthdr, optlen, + IPV6_RTHDR_TYPE_0, segments); + if(rthdr == NULL) + return; + for(i = 0; i < segments; i++){ + inet_pton(AF_INET6, (char *)randipv6(), &v6); + inet6_rth_add(rthdr, &v6); + } + optlen = (rthdr->ip6r_len + 1) << 3; + optval = (unsigned int)&rthdr; + break; + case 4: + cmsg = (struct cmsghdr *)payload; + cmsg->cmsg_level = IPPROTO_IPV6; + cmsg->cmsg_type = IPV6_RTHDR; + cmsg->cmsg_len = CMSG_LEN(rand()); + randpayload(payload + sizeof(struct cmsghdr), rand()); + optlen = rand(); + optval = (unsigned int)&payload; + break; + default: + break; + } + + fuzzlog("setsockopt", "dddad", sock, IPPROTO_IPV6, optname, optval, optlen); + ret = setsockopt(sock, IPPROTO_IPV6, optname, (void *)optval, optlen); + fuzzlog("", "r", ret); + return; +} + +/* * ipsec related options setsockopt fuzzer. */ void ssf_ipsec(int sock){ @@ -351,14 +418,14 @@ break; case 4: optname = IPV6_JOIN_GROUP; - inet_pton(AF_INET6, randmcast(), &im.ipv6mr_multiaddr); + inet_pton(AF_INET6, (char *)randmcast(), &im.ipv6mr_multiaddr); im.ipv6mr_interface = rand(); optval = (unsigned int)&im; optlen = sizeof(struct ipv6_mreq); break; case 5: optname = IPV6_LEAVE_GROUP; - inet_pton(AF_INET6, randmcast(), &im.ipv6mr_multiaddr); + inet_pton(AF_INET6, (char *)randmcast(), &im.ipv6mr_multiaddr); im.ipv6mr_interface = rand(); optval = (unsigned int)&im; optlen = sizeof(struct ipv6_mreq); @@ -626,7 +693,7 @@ if(!sock) sock = getsock(); for(i = 0; i < occ; i++){ /* XXX: adjust rand() range if you add ssf_ function. */ - switch(rand() % 12){ + switch(rand() % 13){ case 0: ssf_ss(sock); break; @@ -660,6 +727,9 @@ case 11: ssf_ipsec(sock); break; + case 12: + ssf_rthdr(sock); + break; default: ssf_ss(sock); break; From owner-p4-projects@FreeBSD.ORG Sat Jun 17 11:07:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BB9216A47B; Sat, 17 Jun 2006 11:07:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6777016A474 for ; Sat, 17 Jun 2006 11:07:22 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 351EE43D45 for ; Sat, 17 Jun 2006 11:07:22 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HB7MWu032531 for ; Sat, 17 Jun 2006 11:07:22 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HB7LgO032528 for perforce@freebsd.org; Sat, 17 Jun 2006 11:07:21 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 17 Jun 2006 11:07:21 GMT Message-Id: <200606171107.k5HB7LgO032528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 99415 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, 17 Jun 2006 11:07:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=99415 Change 99415 by rdivacky@rdivacky_witten on 2006/06/17 11:06:37 Modulification of linprocfs and linsysfs on amd64. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/modules/Makefile#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/modules/linprocfs/Makefile#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/modules/linsysfs/Makefile#2 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/modules/Makefile#3 (text+ko) ==== @@ -468,6 +468,8 @@ _ips= ips _ipw= ipw _iwi= iwi +_linprocfs= linprocfs +_linsysfs= linsysfs _linux= linux _mly= mly _ndis= ndis ==== //depot/projects/soc2006/rdivacky_linuxolator/modules/linprocfs/Makefile#2 (text+ko) ==== @@ -7,4 +7,8 @@ linprocfs.c \ opt_compat.h +.if ${MACHINE_ARCH} == "amd64" +CFLAGS+=-DCOMPAT_LINUX32 +.endif + .include ==== //depot/projects/soc2006/rdivacky_linuxolator/modules/linsysfs/Makefile#2 (text) ==== @@ -8,4 +8,8 @@ linsysfs.c \ opt_compat.h +.if ${MACHINE_ARCH} == "amd64" +CFLAGS+=-DCOMPAT_LINUX32 +.endif + .include From owner-p4-projects@FreeBSD.ORG Sat Jun 17 11:30:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C516216A47D; Sat, 17 Jun 2006 11:30:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 881B016A479 for ; Sat, 17 Jun 2006 11:30:54 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55CE343D46 for ; Sat, 17 Jun 2006 11:30:54 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HBUsi5033762 for ; Sat, 17 Jun 2006 11:30:54 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HBUrrp033759 for perforce@freebsd.org; Sat, 17 Jun 2006 11:30:53 GMT (envelope-from clem1@FreeBSD.org) Date: Sat, 17 Jun 2006 11:30:53 GMT Message-Id: <200606171130.k5HBUrrp033759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 99418 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, 17 Jun 2006 11:30:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=99418 Change 99418 by clem1@clem1_ipv6vulns on 2006/06/17 11:30:42 free your malloc, dude! Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/setsockopt/setsockopt.c#3 edit Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/fuzzers/local/setsockopt/setsockopt.c#3 (text+ko) ==== @@ -182,6 +182,7 @@ void ssf_rthdr(int sock){ int on = 1; char payload[PAYLOAD_SIZE_MAX]; + char *ip = NULL; struct in6_addr v6; struct cmsghdr *cmsg = NULL; struct ip6_rthdr *rthdr; @@ -218,8 +219,10 @@ if(rthdr == NULL) return; for(i = 0; i < segments; i++){ - inet_pton(AF_INET6, (char *)randipv6(), &v6); + ip = (char *)randipv6(); + inet_pton(AF_INET6, ip, &v6); inet6_rth_add(rthdr, &v6); + free(ip); } optlen = (rthdr->ip6r_len + 1) << 3; optval = (unsigned int)&rthdr; @@ -239,7 +242,9 @@ fuzzlog("setsockopt", "dddad", sock, IPPROTO_IPV6, optname, optval, optlen); ret = setsockopt(sock, IPPROTO_IPV6, optname, (void *)optval, optlen); - fuzzlog("", "r", ret); + fuzzlog("", "r", ret);; + if(cmsg != NULL && (char *)cmsg != payload) + free(cmsg); return; } From owner-p4-projects@FreeBSD.ORG Sat Jun 17 14:20:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E654A16A47E; Sat, 17 Jun 2006 14:20:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C265316A479 for ; Sat, 17 Jun 2006 14:20:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D39F43D46 for ; Sat, 17 Jun 2006 14:20:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HEKWSd052959 for ; Sat, 17 Jun 2006 14:20:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HEKVTB052956 for perforce@freebsd.org; Sat, 17 Jun 2006 14:20:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 17 Jun 2006 14:20:31 GMT Message-Id: <200606171420.k5HEKVTB052956@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 99425 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, 17 Jun 2006 14:20:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=99425 Change 99425 by rwatson@rwatson_peppercorn on 2006/06/17 14:20:29 Update HISTORY for FreeBSD 4.x build tweaks. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#14 (text+ko) ==== @@ -3,6 +3,9 @@ - Adopted Solaris-compatible format for subject32_ex and subject64_ex tokens, which previously did not correctly implement variable length address storage. +- Prefer inttypes.h to stdint.h; enhance queue.h detection to test for + TAILQ_FOREACH_SAFE(), which is present in recent BSD queue.h's, but not + older ones. OpenBSM now builds on some FreeBSD 4.x version. OpenBSM 1.0 alpha 6 @@ -171,4 +174,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#13 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#14 $ From owner-p4-projects@FreeBSD.ORG Sat Jun 17 14:29:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E285516A47D; Sat, 17 Jun 2006 14:29:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A5EDA16A47A for ; Sat, 17 Jun 2006 14:29:44 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EDF743D46 for ; Sat, 17 Jun 2006 14:29:44 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HETij9053479 for ; Sat, 17 Jun 2006 14:29:44 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HEThoo053476 for perforce@freebsd.org; Sat, 17 Jun 2006 14:29:43 GMT (envelope-from gabor@FreeBSD.org) Date: Sat, 17 Jun 2006 14:29:43 GMT Message-Id: <200606171429.k5HEThoo053476@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 99426 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, 17 Jun 2006 14:29:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=99426 Change 99426 by gabor@spitfire on 2006/06/17 14:29:41 Create my branch for working on ports infrastructure improvements Affected files ... .. //depot/projects/soc2006/gabor_ports/.cvsignore#1 branch .. //depot/projects/soc2006/gabor_ports/CHANGES#1 branch .. //depot/projects/soc2006/gabor_ports/COPYRIGHT#1 branch .. //depot/projects/soc2006/gabor_ports/KNOBS#1 branch .. //depot/projects/soc2006/gabor_ports/LEGAL#1 branch .. //depot/projects/soc2006/gabor_ports/MOVED#1 branch .. //depot/projects/soc2006/gabor_ports/Makefile#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.apache.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.autotools.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.database.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.emacs.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gcc.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gnome.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gnustep.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gstreamer.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.java.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.kde.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.linux-rpm.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.local.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.mail.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.openssl.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.php.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.post.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.pre.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.subdir.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.python.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.ruby.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sdl.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#1 branch .. //depot/projects/soc2006/gabor_ports/Mk/bsd.tcl.mk#1 branch .. //depot/projects/soc2006/gabor_ports/README#1 branch .. //depot/projects/soc2006/gabor_ports/Templates/README.category#1 branch .. //depot/projects/soc2006/gabor_ports/Templates/README.port#1 branch .. //depot/projects/soc2006/gabor_ports/Templates/README.top#1 branch .. //depot/projects/soc2006/gabor_ports/Templates/config.guess#1 branch .. //depot/projects/soc2006/gabor_ports/Templates/config.sub#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/make_index#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/make_readmes#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/4/bindist/README#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/4/bindist/delete#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/4/bindist/dirlist#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/4/bindist/files/usr/bin/uname#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/4/mkbindist.conf#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/5/bindist/files/usr/bin/uname#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/5/mkbindist.conf#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/README#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/mlist#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/portbuild.conf#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/allgohans#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/bothlogs#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/buildenv#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/buildfailure#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/buildscript#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/buildsuccess#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/checkmachines#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/checkmachines.sh#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/chopindex#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/claim-chroot#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/clean-chroot#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/cleanup-chroots#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/comparelogs#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/cpdistfiles#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/cppackages#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/docppackages#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dodistfiles#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dologs#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackages#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackages.wrapper#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dopackages2#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/dosetupnode#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/flushsquid#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/getmachine#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/keeprestr#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/makeduds#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/makeindex#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/makeparallel#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/makerestr#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/makeworld#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/mkbindist#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/pdispatch#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/pnohang.c#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/pollmachine#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/portbuild#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processfail#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processlogs#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processlogs2#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/processonelog#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/prunebad#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/prunefailure#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/prunepkgs#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/ptimeout.c#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/releasemachine#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/reportload#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/reportload.sh#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/setupnode#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/stats#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/portbuild/scripts/updatefailure#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/MOVEDlint.awk#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/README#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/README.patchtool#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/README.portsearch#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/addport#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/bad-pkgdescrs.sh#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/bump_revision.pl#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/check-latest-link#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/checkcats.py#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/checknewver.sh#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/checksize.sh#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/checksum.sh#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/chkdepschain.py#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/chkmodules.pl#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/chkorigin.sh#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/chkversion.pl#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/close-pr#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/consistency-check#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/distclean.sh#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/distinfochecker#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/domakedescribe#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/doportlint#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/getpr#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/gnomedepends.py#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/mkptools/mkpbuild#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/mkptools/mkpclean#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/mkptools/mkpextr#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/mkptools/mkpinstall#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/mkptools/mkpmerge#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/mkptools/mkppackage#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/mkptools/mkpskel#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/modulesupdate#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/parse-kdump.tcl#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/patchtool.py#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/pkg-stash/pkg-list.sh#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/pkg-stash/pkg-stash.pl#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/plist#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/portsearch#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/portsvar.sh#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/prdone#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/prpatch#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/release/Makefile#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/release/README#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/release/checkdeps.pl#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/release/config#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/release/doit.sh#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/release/oneshot.pl#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/release/scrubindex.pl#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/release/setup.sh#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/rmport#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/security-check.awk#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/splitpatch.pl#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/sunshar.rb#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/sunshar/Makefile#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/sunshar/sunshar.1#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/tindex#1 branch .. //depot/projects/soc2006/gabor_ports/Tools/scripts/update-patches#1 branch .. //depot/projects/soc2006/gabor_ports/UPDATING#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 17 14:34:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA9AE16A47A; Sat, 17 Jun 2006 14:34:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 96EB116A474 for ; Sat, 17 Jun 2006 14:34:51 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CFAF43D46 for ; Sat, 17 Jun 2006 14:34:51 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HEYpdM053747 for ; Sat, 17 Jun 2006 14:34:51 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HEYox8053744 for perforce@freebsd.org; Sat, 17 Jun 2006 14:34:50 GMT (envelope-from bushman@freebsd.org) Date: Sat, 17 Jun 2006 14:34:50 GMT Message-Id: <200606171434.k5HEYox8053744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 99427 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, 17 Jun 2006 14:34:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=99427 Change 99427 by bushman@bushman_nss_ldap_cached on 2006/06/17 14:34:21 changes in the resolver-related parts that allow painless code migration from libc to nss-modules Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/getaddrinfo.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/gethostnamadr.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/name6.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/netdb_private.h#3 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/getaddrinfo.c#2 (text+ko) ==== @@ -93,11 +93,11 @@ #include #include -#include "res_config.h" +//#include "res_config.h" -#ifdef DEBUG -#include -#endif +//#ifdef DEBUG +//#include +//#endif #include #include @@ -127,14 +127,6 @@ }; #endif -struct policyqueue { - TAILQ_ENTRY(policyqueue) pc_entry; -#ifdef INET6 - struct in6_addrpolicy pc_policy; -#endif -}; -TAILQ_HEAD(policyhead, policyqueue); - static const struct afd { int a_af; int a_addrlen; @@ -161,6 +153,14 @@ {0, 0, 0, 0, NULL, NULL, 0}, }; +struct policyqueue { + TAILQ_ENTRY(policyqueue) pc_entry; +#ifdef INET6 + struct in6_addrpolicy pc_policy; +#endif +}; +TAILQ_HEAD(policyhead, policyqueue); + struct explore { int e_af; int e_socktype; @@ -219,22 +219,6 @@ { 0 } }; -struct res_target { - struct res_target *next; - const char *name; /* domain name */ - int qclass, qtype; /* class and type of query */ - u_char *answer; /* buffer to put answer */ - int anslen; /* size of answer buffer */ - int n; /* result length */ -}; - -#define MAXPACKET (64*1024) - -typedef union { - HEADER hdr; - u_char buf[MAXPACKET]; -} querybuf; - static int str2number(const char *); static int explore_null(const struct addrinfo *, const char *, struct addrinfo **); @@ -267,7 +251,7 @@ struct policyhead *); static int matchlen(struct sockaddr *, struct sockaddr *); -static struct addrinfo *getanswer(const querybuf *, int, const char *, int, +/*static struct addrinfo *getanswer(const querybuf *, int, const char *, int, const struct addrinfo *, res_state); #if defined(RESOLVSORT) static int addr4sort(struct addrinfo *, res_state); @@ -281,17 +265,17 @@ #ifdef YP static struct addrinfo *_yphostent(char *, const struct addrinfo *); static int _yp_getaddrinfo(void *, void *, va_list); -#endif +#endif*/ #ifdef NS_CACHING static int addrinfo_id_func(char *, size_t *, va_list, void *); static int addrinfo_marshal_func(char *, size_t *, void *, va_list, void *); static int addrinfo_unmarshal_func(char *, size_t, void *, va_list, void *); #endif -static int res_queryN(const char *, struct res_target *, res_state); +/*static int res_queryN(const char *, struct res_target *, res_state); static int res_searchN(const char *, struct res_target *, res_state); static int res_querydomainN(const char *, const char *, - struct res_target *, res_state); + struct res_target *, res_state);*/ /* XXX macros that make external reference is BAD. */ @@ -1730,9 +1714,6 @@ addrinfo_unmarshal_func); #endif static const ns_dtab dtab[] = { - NS_FILES_CB(_files_getaddrinfo, NULL) - { NSSRC_DNS, _dns_getaddrinfo, NULL }, /* force -DHESIOD */ - NS_NIS_CB(_yp_getaddrinfo, NULL) #ifdef NS_CACHING NS_CACHE_CB(&cache_info) #endif @@ -1776,997 +1757,3 @@ freeaddrinfo(result); return error; } - -#ifdef DEBUG -static const char AskedForGot[] = - "gethostby*.getanswer: asked for \"%s\", got \"%s\""; -#endif - -static struct addrinfo * -getanswer(const querybuf *answer, int anslen, const char *qname, int qtype, - const struct addrinfo *pai, res_state res) -{ - struct addrinfo sentinel, *cur; - struct addrinfo ai; - const struct afd *afd; - char *canonname; - const HEADER *hp; - const u_char *cp; - int n; - const u_char *eom; - char *bp, *ep; - int type, class, ancount, qdcount; - int haveanswer, had_error; - char tbuf[MAXDNAME]; - int (*name_ok)(const char *); - char hostbuf[8*1024]; - - memset(&sentinel, 0, sizeof(sentinel)); - cur = &sentinel; - - canonname = NULL; - eom = answer->buf + anslen; - switch (qtype) { - case T_A: - case T_AAAA: - case T_ANY: /*use T_ANY only for T_A/T_AAAA lookup*/ - name_ok = res_hnok; - break; - default: - return (NULL); /* XXX should be abort(); */ - } - /* - * find first satisfactory answer - */ - hp = &answer->hdr; - ancount = ntohs(hp->ancount); - qdcount = ntohs(hp->qdcount); - bp = hostbuf; - ep = hostbuf + sizeof hostbuf; - cp = answer->buf + HFIXEDSZ; - if (qdcount != 1) { - RES_SET_H_ERRNO(res, NO_RECOVERY); - return (NULL); - } - n = dn_expand(answer->buf, eom, cp, bp, ep - bp); - if ((n < 0) || !(*name_ok)(bp)) { - RES_SET_H_ERRNO(res, NO_RECOVERY); - return (NULL); - } - cp += n + QFIXEDSZ; - if (qtype == T_A || qtype == T_AAAA || qtype == T_ANY) { - /* res_send() has already verified that the query name is the - * same as the one we sent; this just gets the expanded name - * (i.e., with the succeeding search-domain tacked on). - */ - n = strlen(bp) + 1; /* for the \0 */ - if (n >= MAXHOSTNAMELEN) { - RES_SET_H_ERRNO(res, NO_RECOVERY); - return (NULL); - } - canonname = bp; - bp += n; - /* The qname can be abbreviated, but h_name is now absolute. */ - qname = canonname; - } - haveanswer = 0; - had_error = 0; - while (ancount-- > 0 && cp < eom && !had_error) { - n = dn_expand(answer->buf, eom, cp, bp, ep - bp); - if ((n < 0) || !(*name_ok)(bp)) { - had_error++; - continue; - } - cp += n; /* name */ - type = _getshort(cp); - cp += INT16SZ; /* type */ - class = _getshort(cp); - cp += INT16SZ + INT32SZ; /* class, TTL */ - n = _getshort(cp); - cp += INT16SZ; /* len */ - if (class != C_IN) { - /* XXX - debug? syslog? */ - cp += n; - continue; /* XXX - had_error++ ? */ - } - if ((qtype == T_A || qtype == T_AAAA || qtype == T_ANY) && - type == T_CNAME) { - n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf); - if ((n < 0) || !(*name_ok)(tbuf)) { - had_error++; - continue; - } - cp += n; - /* Get canonical name. */ - n = strlen(tbuf) + 1; /* for the \0 */ - if (n > ep - bp || n >= MAXHOSTNAMELEN) { - had_error++; - continue; - } - strlcpy(bp, tbuf, ep - bp); - canonname = bp; - bp += n; - continue; - } - if (qtype == T_ANY) { - if (!(type == T_A || type == T_AAAA)) { - cp += n; - continue; - } - } else if (type != qtype) { -#ifdef DEBUG - if (type != T_KEY && type != T_SIG) - syslog(LOG_NOTICE|LOG_AUTH, - "gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"", - qname, p_class(C_IN), p_type(qtype), - p_type(type)); -#endif - cp += n; - continue; /* XXX - had_error++ ? */ - } - switch (type) { - case T_A: - case T_AAAA: - if (strcasecmp(canonname, bp) != 0) { -#ifdef DEBUG - syslog(LOG_NOTICE|LOG_AUTH, - AskedForGot, canonname, bp); -#endif - cp += n; - continue; /* XXX - had_error++ ? */ - } - if (type == T_A && n != INADDRSZ) { - cp += n; - continue; - } - if (type == T_AAAA && n != IN6ADDRSZ) { - cp += n; - continue; - } -#ifdef FILTER_V4MAPPED - if (type == T_AAAA) { - struct in6_addr in6; - memcpy(&in6, cp, sizeof(in6)); - if (IN6_IS_ADDR_V4MAPPED(&in6)) { - cp += n; - continue; - } - } -#endif - if (!haveanswer) { - int nn; - - canonname = bp; - nn = strlen(bp) + 1; /* for the \0 */ - bp += nn; - } - - /* don't overwrite pai */ - ai = *pai; - ai.ai_family = (type == T_A) ? AF_INET : AF_INET6; - afd = find_afd(ai.ai_family); - if (afd == NULL) { - cp += n; - continue; - } - cur->ai_next = get_ai(&ai, afd, (const char *)cp); - if (cur->ai_next == NULL) - had_error++; - while (cur && cur->ai_next) - cur = cur->ai_next; - cp += n; - break; - default: - abort(); - } - if (!had_error) - haveanswer++; - } - if (haveanswer) { -#if defined(RESOLVSORT) - /* - * We support only IPv4 address for backward - * compatibility against gethostbyname(3). - */ - if (res->nsort && qtype == T_A) { - if (addr4sort(&sentinel, res) < 0) { - freeaddrinfo(sentinel.ai_next); - RES_SET_H_ERRNO(res, NO_RECOVERY); - return NULL; - } - } -#endif /*RESOLVSORT*/ - if (!canonname) - (void)get_canonname(pai, sentinel.ai_next, qname); - else - (void)get_canonname(pai, sentinel.ai_next, canonname); - RES_SET_H_ERRNO(res, NETDB_SUCCESS); - return sentinel.ai_next; - } - - RES_SET_H_ERRNO(res, NO_RECOVERY); - return NULL; -} - -#ifdef RESOLVSORT -struct addr_ptr { - struct addrinfo *ai; - int aval; -}; - -static int -addr4sort(struct addrinfo *sentinel, res_state res) -{ - struct addrinfo *ai; - struct addr_ptr *addrs, addr; - struct sockaddr_in *sin; - int naddrs, i, j; - int needsort = 0; - - if (!sentinel) - return -1; - naddrs = 0; - for (ai = sentinel->ai_next; ai; ai = ai->ai_next) - naddrs++; - if (naddrs < 2) - return 0; /* We don't need sorting. */ - if ((addrs = malloc(sizeof(struct addr_ptr) * naddrs)) == NULL) - return -1; - i = 0; - for (ai = sentinel->ai_next; ai; ai = ai->ai_next) { - sin = (struct sockaddr_in *)ai->ai_addr; - for (j = 0; (unsigned)j < res->nsort; j++) { - if (res->sort_list[j].addr.s_addr == - (sin->sin_addr.s_addr & res->sort_list[j].mask)) - break; - } - addrs[i].ai = ai; - addrs[i].aval = j; - if (needsort == 0 && i > 0 && j < addrs[i - 1].aval) - needsort = i; - i++; - } - if (!needsort) { - free(addrs); - return 0; - } - - while (needsort < naddrs) { - for (j = needsort - 1; j >= 0; j--) { - if (addrs[j].aval > addrs[j+1].aval) { - addr = addrs[j]; - addrs[j] = addrs[j + 1]; - addrs[j + 1] = addr; - } else - break; - } - needsort++; - } - - ai = sentinel; - for (i = 0; i < naddrs; ++i) { - ai->ai_next = addrs[i].ai; - ai = ai->ai_next; - } - ai->ai_next = NULL; - free(addrs); - return 0; -} -#endif /*RESOLVSORT*/ - -/*ARGSUSED*/ -static int -_dns_getaddrinfo(void *rv, void *cb_data, va_list ap) -{ - struct addrinfo *ai; - querybuf *buf, *buf2; - const char *hostname; - const struct addrinfo *pai; - struct addrinfo sentinel, *cur; - struct res_target q, q2; - res_state res; - - hostname = va_arg(ap, char *); - pai = va_arg(ap, const struct addrinfo *); - - memset(&q, 0, sizeof(q)); - memset(&q2, 0, sizeof(q2)); - memset(&sentinel, 0, sizeof(sentinel)); - cur = &sentinel; - - buf = malloc(sizeof(*buf)); - if (!buf) { - RES_SET_H_ERRNO(res, NETDB_INTERNAL); - return NS_NOTFOUND; - } - buf2 = malloc(sizeof(*buf2)); - if (!buf2) { - free(buf); - RES_SET_H_ERRNO(res, NETDB_INTERNAL); - return NS_NOTFOUND; - } - - switch (pai->ai_family) { - case AF_UNSPEC: - q.name = hostname; - q.qclass = C_IN; - q.qtype = T_A; - q.answer = buf->buf; - q.anslen = sizeof(buf->buf); - q.next = &q2; - q2.name = hostname; - q2.qclass = C_IN; - q2.qtype = T_AAAA; - q2.answer = buf2->buf; - q2.anslen = sizeof(buf2->buf); - break; - case AF_INET: - q.name = hostname; - q.qclass = C_IN; - q.qtype = T_A; - q.answer = buf->buf; - q.anslen = sizeof(buf->buf); - break; - case AF_INET6: - q.name = hostname; - q.qclass = C_IN; - q.qtype = T_AAAA; - q.answer = buf->buf; - q.anslen = sizeof(buf->buf); - break; - default: - free(buf); - free(buf2); - return NS_UNAVAIL; - } - - res = __res_state(); - if ((res->options & RES_INIT) == 0 && res_ninit(res) == -1) { - RES_SET_H_ERRNO(res, NETDB_INTERNAL); - free(buf); - free(buf2); - return NS_NOTFOUND; - } - - if (res_searchN(hostname, &q, res) < 0) { - free(buf); - free(buf2); - return NS_NOTFOUND; - } - /* prefer IPv6 */ - if (q.next) { - ai = getanswer(buf2, q2.n, q2.name, q2.qtype, pai, res); - if (ai) { - cur->ai_next = ai; - while (cur && cur->ai_next) - cur = cur->ai_next; - } - } - ai = getanswer(buf, q.n, q.name, q.qtype, pai, res); - if (ai) - cur->ai_next = ai; - free(buf); - free(buf2); - if (sentinel.ai_next == NULL) - switch (res->res_h_errno) { - case HOST_NOT_FOUND: - return NS_NOTFOUND; - case TRY_AGAIN: - return NS_TRYAGAIN; - default: - return NS_UNAVAIL; - } - *((struct addrinfo **)rv) = sentinel.ai_next; - return NS_SUCCESS; -} - -static void -_sethtent(FILE **hostf) -{ - if (!*hostf) - *hostf = fopen(_PATH_HOSTS, "r"); - else - rewind(*hostf); -} - -static void -_endhtent(FILE **hostf) -{ - if (*hostf) { - (void) fclose(*hostf); - *hostf = NULL; - } -} - -static struct addrinfo * -_gethtent(FILE **hostf, const char *name, const struct addrinfo *pai) -{ - char *p; - char *cp, *tname, *cname; - struct addrinfo hints, *res0, *res; - int error; - const char *addr; - char hostbuf[8*1024]; - - if (!*hostf && !(*hostf = fopen(_PATH_HOSTS, "r"))) - return (NULL); -again: - if (!(p = fgets(hostbuf, sizeof hostbuf, *hostf))) - return (NULL); - if (*p == '#') - goto again; - cp = strpbrk(p, "#\n"); - if (cp != NULL) - *cp = '\0'; - if (!(cp = strpbrk(p, " \t"))) - goto again; - *cp++ = '\0'; - addr = p; - cname = NULL; - /* if this is not something we're looking for, skip it. */ - while (cp && *cp) { - if (*cp == ' ' || *cp == '\t') { - cp++; - continue; - } - tname = cp; - if (cname == NULL) - cname = cp; - if ((cp = strpbrk(cp, " \t")) != NULL) - *cp++ = '\0'; - if (strcasecmp(name, tname) == 0) - goto found; - } - goto again; - -found: - /* we should not glob socktype/protocol here */ - memset(&hints, 0, sizeof(hints)); - hints.ai_family = pai->ai_family; - hints.ai_socktype = SOCK_DGRAM; - hints.ai_protocol = 0; - hints.ai_flags = AI_NUMERICHOST; - error = getaddrinfo(addr, "0", &hints, &res0); - if (error) - goto again; -#ifdef FILTER_V4MAPPED - /* XXX should check all items in the chain */ - if (res0->ai_family == AF_INET6 && - IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)res0->ai_addr)->sin6_addr)) { - freeaddrinfo(res0); - goto again; - } -#endif - for (res = res0; res; res = res->ai_next) { - /* cover it up */ - res->ai_flags = pai->ai_flags; - res->ai_socktype = pai->ai_socktype; - res->ai_protocol = pai->ai_protocol; - - if (pai->ai_flags & AI_CANONNAME) { - if (get_canonname(pai, res, cname) != 0) { - freeaddrinfo(res0); - goto again; - } - } - } - return res0; -} - -/*ARGSUSED*/ -static int -_files_getaddrinfo(void *rv, void *cb_data, va_list ap) -{ - const char *name; - const struct addrinfo *pai; - struct addrinfo sentinel, *cur; - struct addrinfo *p; - FILE *hostf = NULL; - - name = va_arg(ap, char *); - pai = va_arg(ap, struct addrinfo *); - - memset(&sentinel, 0, sizeof(sentinel)); - cur = &sentinel; - - _sethtent(&hostf); - while ((p = _gethtent(&hostf, name, pai)) != NULL) { - cur->ai_next = p; - while (cur && cur->ai_next) - cur = cur->ai_next; - } - _endhtent(&hostf); - - *((struct addrinfo **)rv) = sentinel.ai_next; - if (sentinel.ai_next == NULL) - return NS_NOTFOUND; - return NS_SUCCESS; -} - -#ifdef YP -/*ARGSUSED*/ -static struct addrinfo * -_yphostent(char *line, const struct addrinfo *pai) -{ - struct addrinfo sentinel, *cur; - struct addrinfo hints, *res, *res0; - int error; - char *p = line; - const char *addr, *canonname; - char *nextline; - char *cp; - - addr = canonname = NULL; - - memset(&sentinel, 0, sizeof(sentinel)); - cur = &sentinel; - -nextline: - /* terminate line */ - cp = strchr(p, '\n'); - if (cp) { - *cp++ = '\0'; - nextline = cp; - } else - nextline = NULL; - - cp = strpbrk(p, " \t"); - if (cp == NULL) { - if (canonname == NULL) - return (NULL); - else - goto done; - } - *cp++ = '\0'; - - addr = p; - - while (cp && *cp) { - if (*cp == ' ' || *cp == '\t') { - cp++; - continue; - } - if (!canonname) - canonname = cp; - if ((cp = strpbrk(cp, " \t")) != NULL) - *cp++ = '\0'; - } - - hints = *pai; - hints.ai_flags = AI_NUMERICHOST; - error = getaddrinfo(addr, NULL, &hints, &res0); - if (error == 0) { - for (res = res0; res; res = res->ai_next) { - /* cover it up */ - res->ai_flags = pai->ai_flags; - - if (pai->ai_flags & AI_CANONNAME) - (void)get_canonname(pai, res, canonname); - } - } else - res0 = NULL; - if (res0) { - cur->ai_next = res0; - while (cur && cur->ai_next) - cur = cur->ai_next; - } - - if (nextline) { - p = nextline; - goto nextline; - } - -done: - return sentinel.ai_next; -} - -/*ARGSUSED*/ -static int -_yp_getaddrinfo(void *rv, void *cb_data, va_list ap) -{ - struct addrinfo sentinel, *cur; - struct addrinfo *ai = NULL; - char *ypbuf; - int ypbuflen, r; - const char *name; - const struct addrinfo *pai; - char *ypdomain; - - if (_yp_check(&ypdomain) == 0) - return NS_UNAVAIL; - - name = va_arg(ap, char *); - pai = va_arg(ap, const struct addrinfo *); - - memset(&sentinel, 0, sizeof(sentinel)); - cur = &sentinel; - - /* hosts.byname is only for IPv4 (Solaris8) */ - if (pai->ai_family == PF_UNSPEC || pai->ai_family == PF_INET) { - r = yp_match(ypdomain, "hosts.byname", name, - (int)strlen(name), &ypbuf, &ypbuflen); - if (r == 0) { - struct addrinfo ai4; - - ai4 = *pai; - ai4.ai_family = AF_INET; - ai = _yphostent(ypbuf, &ai4); - if (ai) { - cur->ai_next = ai; - while (cur && cur->ai_next) - cur = cur->ai_next; - } - free(ypbuf); - } - } - - /* ipnodes.byname can hold both IPv4/v6 */ - r = yp_match(ypdomain, "ipnodes.byname", name, - (int)strlen(name), &ypbuf, &ypbuflen); - if (r == 0) { - ai = _yphostent(ypbuf, pai); - if (ai) - cur->ai_next = ai; - free(ypbuf); - } - - if (sentinel.ai_next == NULL) { - RES_SET_H_ERRNO(__res_state(), HOST_NOT_FOUND); - return NS_NOTFOUND; - } - *((struct addrinfo **)rv) = sentinel.ai_next; - return NS_SUCCESS; -} -#endif - -/* resolver logic */ - -/* - * Formulate a normal query, send, and await answer. - * Returned answer is placed in supplied buffer "answer". - * Perform preliminary check of answer, returning success only - * if no error is indicated and the answer count is nonzero. - * Return the size of the response on success, -1 on error. - * Error number is left in h_errno. - * - * Caller must parse answer and determine whether it answers the question. - */ -static int -res_queryN(const char *name, struct res_target *target, res_state res) -{ - u_char *buf; - HEADER *hp; - int n; - u_int oflags; - struct res_target *t; - int rcode; - int ancount; - - rcode = NOERROR; - ancount = 0; - - buf = malloc(MAXPACKET); - if (!buf) { - RES_SET_H_ERRNO(res, NETDB_INTERNAL); - return -1; - } - - for (t = target; t; t = t->next) { - int class, type; - u_char *answer; - int anslen; - - hp = (HEADER *)(void *)t->answer; - - /* make it easier... */ - class = t->qclass; - type = t->qtype; - answer = t->answer; - anslen = t->anslen; - - oflags = res->_flags; - -again: - hp->rcode = NOERROR; /* default */ - -#ifdef DEBUG - if (res->options & RES_DEBUG) - printf(";; res_query(%s, %d, %d)\n", name, class, type); -#endif - - n = res_nmkquery(res, QUERY, name, class, type, NULL, 0, NULL, - buf, MAXPACKET); - if (n > 0 && (res->_flags & RES_F_EDNS0ERR) == 0 && - (res->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0U) - n = res_nopt(res, n, buf, MAXPACKET, anslen); - if (n <= 0) { -#ifdef DEBUG - if (res->options & RES_DEBUG) - printf(";; res_query: mkquery failed\n"); -#endif - free(buf); - RES_SET_H_ERRNO(res, NO_RECOVERY); - return (n); - } - n = res_nsend(res, buf, n, answer, anslen); - if (n < 0) { - /* - * if the query choked with EDNS0, retry - * without EDNS0 - */ - if ((res->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) - != 0U && - ((oflags ^ res->_flags) & RES_F_EDNS0ERR) != 0) { - res->_flags |= RES_F_EDNS0ERR; - if (res->options & RES_DEBUG) - printf(";; res_nquery: retry without EDNS0\n"); - goto again; - } - rcode = hp->rcode; /* record most recent error */ -#ifdef DEBUG - if (res->options & RES_DEBUG) - printf(";; res_query: send error\n"); -#endif - continue; - } - - if (n > anslen) - hp->rcode = FORMERR; /* XXX not very informative */ - if (hp->rcode != NOERROR || ntohs(hp->ancount) == 0) { - rcode = hp->rcode; /* record most recent error */ -#ifdef DEBUG - if (res->options & RES_DEBUG) - printf(";; rcode = %u, ancount=%u\n", hp->rcode, - ntohs(hp->ancount)); -#endif - continue; - } - - ancount += ntohs(hp->ancount); - - t->n = n; - } - - free(buf); - - if (ancount == 0) { - switch (rcode) { - case NXDOMAIN: - RES_SET_H_ERRNO(res, HOST_NOT_FOUND); - break; - case SERVFAIL: - RES_SET_H_ERRNO(res, TRY_AGAIN); - break; - case NOERROR: - RES_SET_H_ERRNO(res, NO_DATA); - break; - case FORMERR: - case NOTIMP: - case REFUSED: - default: - RES_SET_H_ERRNO(res, NO_RECOVERY); - break; - } - return (-1); - } - return (ancount); -} - -/* - * Formulate a normal query, send, and retrieve answer in supplied buffer. - * Return the size of the response on success, -1 on error. - * If enabled, implement search rules until answer or unrecoverable failure - * is detected. Error code, if any, is left in h_errno. - */ -static int -res_searchN(const char *name, struct res_target *target, res_state res) -{ - const char *cp, * const *domain; - HEADER *hp = (HEADER *)(void *)target->answer; /*XXX*/ - u_int dots; - int trailing_dot, ret, saved_herrno; - int got_nodata = 0, got_servfail = 0, root_on_list = 0; - int tried_as_is = 0; - int searched = 0; - char abuf[MAXDNAME]; - - errno = 0; - RES_SET_H_ERRNO(res, HOST_NOT_FOUND); /* default, if we never query */ - dots = 0; - for (cp = name; *cp; cp++) - dots += (*cp == '.'); - trailing_dot = 0; - if (cp > name && *--cp == '.') - trailing_dot++; - - /* - * if there aren't any dots, it could be a user-level alias - */ - if (!dots && - (cp = res_hostalias(res, name, abuf, sizeof(abuf))) != NULL) - return (res_queryN(cp, target, res)); - - /* - * If there are enough dots in the name, let's just give it a - * try 'as is'. The threshold can be set with the "ndots" option. - * Also, query 'as is', if there is a trailing dot in the name. - */ - saved_herrno = -1; - if (dots >= res->ndots || trailing_dot) { - ret = res_querydomainN(name, NULL, target, res); - if (ret > 0 || trailing_dot) - return (ret); - if (errno == ECONNREFUSED) { - RES_SET_H_ERRNO(res, TRY_AGAIN); - return (-1); - } - switch (res->res_h_errno) { - case NO_DATA: - case HOST_NOT_FOUND: - break; - case TRY_AGAIN: - if (hp->rcode == SERVFAIL) - break; - /* FALLTHROUGH */ - default: - return (-1); - } - saved_herrno = res->res_h_errno; - tried_as_is++; - } - - /* - * We do at least one level of search if - * - there is no dot and RES_DEFNAME is set, or - * - there is at least one dot, there is no trailing dot, - * and RES_DNSRCH is set. - */ - if ((!dots && (res->options & RES_DEFNAMES)) || - (dots && !trailing_dot && (res->options & RES_DNSRCH))) { - int done = 0; - - for (domain = (const char * const *)res->dnsrch; - *domain && !done; - domain++) { - searched = 1; - - if (domain[0][0] == '\0' || - (domain[0][0] == '.' && domain[0][1] == '\0')) - root_on_list++; - - if (root_on_list && tried_as_is) - continue; - - ret = res_querydomainN(name, *domain, target, res); - if (ret > 0) - return (ret); - - /* - * If no server present, give up. - * If name isn't found in this domain, - * keep trying higher domains in the search list - * (if that's enabled). - * On a NO_DATA error, keep trying, otherwise - * a wildcard entry of another type could keep us >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 17 15:04:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C434C16A47E; Sat, 17 Jun 2006 15:04:29 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F86D16A479 for ; Sat, 17 Jun 2006 15:04:29 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3DC2743D48 for ; Sat, 17 Jun 2006 15:04:29 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HF4Tur057825 for ; Sat, 17 Jun 2006 15:04:29 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HF4SPY057822 for perforce@freebsd.org; Sat, 17 Jun 2006 15:04:28 GMT (envelope-from als@FreeBSD.org) Date: Sat, 17 Jun 2006 15:04:28 GMT Message-Id: <200606171504.k5HF4SPY057822@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 99429 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, 17 Jun 2006 15:04:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=99429 Change 99429 by als@als_head on 2006/06/17 15:03:58 update to HEAD Affected files ... .. //depot/projects/jail2/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/jail2/sys/ddb/db_sym.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/driver.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/ak452x.c#1 branch .. //depot/projects/jail2/sys/dev/sound/pci/ak452x.h#1 branch .. //depot/projects/jail2/sys/dev/sound/pci/envy24.c#1 branch .. //depot/projects/jail2/sys/dev/sound/pci/envy24.h#1 branch .. //depot/projects/jail2/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/jail2/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/jail2/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/jail2/sys/kern/kern_tc.c#2 integrate .. //depot/projects/jail2/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/jail2/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/jail2/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/jail2/sys/modules/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/ppc/Makefile#1 branch .. //depot/projects/jail2/sys/modules/sound/driver/ak452x/Makefile#1 branch .. //depot/projects/jail2/sys/modules/sound/driver/envy24/Makefile#1 branch .. //depot/projects/jail2/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/jail2/sys/sys/protosw.h#2 integrate .. //depot/projects/jail2/sys/tools/fw_stub.awk#2 integrate .. //depot/projects/jail2/sys/vm/vm_map.c#2 integrate Differences ... ==== //depot/projects/jail2/sys/contrib/pf/net/if_pfsync.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.27 2006/06/14 11:11:54 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.28 2006/06/16 10:25:06 mlaier Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.46 2005/02/20 15:58:38 mcbride Exp $ */ /* @@ -102,6 +102,8 @@ #include "opt_carp.h" #ifdef DEV_CARP #define NCARP 1 +#else +#define NCARP 0 #endif #else #include "carp.h" ==== //depot/projects/jail2/sys/ddb/db_sym.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_sym.c,v 1.36 2005/01/06 01:34:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_sym.c,v 1.37 2006/06/16 16:17:52 kib Exp $"); #include #include @@ -230,7 +230,6 @@ c_db_sym_t ret = C_DB_SYM_NULL, sym; newdiff = diff = ~0; - db_last_symtab = 0; for (i = 0; i < db_nsymtab; i++) { sym = X_db_search_symbol(&db_symtabs[i], val, strategy, &newdiff); if (newdiff < diff) { ==== //depot/projects/jail2/sys/dev/sound/driver.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/driver.c,v 1.15 2006/01/23 11:58:01 joel Exp $ + * $FreeBSD: src/sys/dev/sound/driver.c,v 1.16 2006/06/17 09:38:08 netchild Exp $ */ #include @@ -63,7 +63,6 @@ MODULE_DEPEND(snd_driver, snd_ds1, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_emu10k1, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_es137x, 1, 1, 1); -MODULE_DEPEND(snd_driver, snd_es1888, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_ess, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_fm801, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_gusc, 1, 1, 1); ==== //depot/projects/jail2/sys/i386/acpica/acpi_wakeup.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_wakeup.c,v 1.43 2006/06/10 08:20:17 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_wakeup.c,v 1.44 2006/06/16 14:04:21 mjacob Exp $"); #include #include @@ -333,8 +333,8 @@ /* Copy the wake code into our low page and save its physical addr. */ bcopy(wakecode, (void *)sc->acpi_wakeaddr, sizeof(wakecode)); if (bootverbose) { - device_printf(sc->acpi_dev, "wakeup code va %#x pa %#x\n", - acpi_wakeaddr, sc->acpi_wakephys); + device_printf(sc->acpi_dev, "wakeup code va %#x pa %#jx\n", + acpi_wakeaddr, (uintmax_t)sc->acpi_wakephys); } } ==== //depot/projects/jail2/sys/i386/i386/db_trace.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/db_trace.c,v 1.70 2005/12/23 21:33:55 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/db_trace.c,v 1.72 2006/06/16 11:49:37 yar Exp $"); #include #include @@ -201,26 +201,30 @@ db_numargs(fp) struct i386_frame *fp; { - int *argp; + char *argp; int inst; int args; - argp = (int *)db_get_value((int)&fp->f_retaddr, 4, FALSE); + argp = (char *)db_get_value((int)&fp->f_retaddr, 4, FALSE); /* * XXX etext is wrong for LKMs. We should attempt to interpret * the instruction at the return address in all cases. This * may require better fault handling. */ - if (argp < (int *)btext || argp >= (int *)etext) { - args = 5; + if (argp < btext || argp >= etext) { + args = -1; } else { +retry: inst = db_get_value((int)argp, 4, FALSE); if ((inst & 0xff) == 0x59) /* popl %ecx */ args = 1; else if ((inst & 0xffff) == 0xc483) /* addl $Ibs, %esp */ args = ((inst >> 16) & 0xff) / 4; - else - args = 5; + else if ((inst & 0xf8ff) == 0xc089) { /* movl %eax, %Reg */ + argp += 2; + goto retry; + } else + args = -1; } return (args); } @@ -233,15 +237,19 @@ int *argp; db_addr_t callpc; { + int n = narg >= 0 ? narg : 5; + db_printf("%s(", name); - while (narg) { + while (n) { if (argnp) db_printf("%s=", *argnp++); db_printf("%r", db_get_value((int)argp, 4, FALSE)); argp++; - if (--narg != 0) + if (--n != 0) db_printf(","); } + if (narg < 0) + db_printf(",..."); db_printf(") at "); db_printsym(callpc, DB_STGY_PROC); db_printf("\n"); ==== //depot/projects/jail2/sys/kern/kern_sysctl.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.169 2006/02/16 15:40:35 andre Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.170 2006/06/16 07:36:18 yar Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1135,10 +1135,6 @@ /* * Wire the user space destination buffer. If set to a value greater than * zero, the len parameter limits the maximum amount of wired memory. - * - * XXX - The len parameter is currently ignored due to the lack of - * a place to save it in the sysctl_req structure so that the matching - * amount of memory can be unwired in the sysctl exit code. */ int sysctl_wire_old_buffer(struct sysctl_req *req, size_t len) ==== //depot/projects/jail2/sys/kern/kern_tc.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.175 2006/03/15 20:22:32 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.176 2006/06/16 20:29:05 dwmalone Exp $"); #include "opt_ntp.h" @@ -97,6 +97,7 @@ NULL, 0, sysctl_kern_boottime, "S,timeval", "System boottime"); SYSCTL_NODE(_kern, OID_AUTO, timecounter, CTLFLAG_RW, 0, ""); +SYSCTL_NODE(_kern_timecounter, OID_AUTO, tc, CTLFLAG_RW, 0, ""); static int timestepwarnings; SYSCTL_INT(_kern_timecounter, OID_AUTO, stepwarnings, CTLFLAG_RW, @@ -133,6 +134,26 @@ return SYSCTL_OUT(req, &boottime, sizeof(boottime)); } +static int +sysctl_kern_timecounter_get(SYSCTL_HANDLER_ARGS) +{ + u_int ncount; + struct timecounter *tc = arg1; + + ncount = tc->tc_get_timecount(tc); + return sysctl_handle_int(oidp, &ncount, sizeof(ncount), req); +} + +static int +sysctl_kern_timecounter_freq(SYSCTL_HANDLER_ARGS) +{ + u_int64_t freq; + struct timecounter *tc = arg1; + + freq = tc->tc_frequency; + return sysctl_handle_int(oidp, &freq, sizeof(freq), req); +} + /* * Return the difference between the timehands' counter value now and what * was when we copied it to the timehands' offset_count. @@ -309,6 +330,7 @@ tc_init(struct timecounter *tc) { u_int u; + struct sysctl_oid *tc_root; u = tc->tc_frequency / tc->tc_counter_mask; /* XXX: We need some margin here, 10% is a guess */ @@ -330,6 +352,24 @@ tc->tc_next = timecounters; timecounters = tc; /* + * Set up sysctl tree for this counter. + */ + tc_root = SYSCTL_ADD_NODE(NULL, + SYSCTL_STATIC_CHILDREN(_kern_timecounter_tc), OID_AUTO, tc->tc_name, + CTLFLAG_RW, 0, "timecounter description"); + SYSCTL_ADD_UINT(NULL, SYSCTL_CHILDREN(tc_root), OID_AUTO, + "mask", CTLFLAG_RD, &(tc->tc_counter_mask), 0, + "mask for implemented bits"); + SYSCTL_ADD_PROC(NULL, SYSCTL_CHILDREN(tc_root), OID_AUTO, + "counter", CTLTYPE_UINT | CTLFLAG_RD, tc, sizeof(*tc), + sysctl_kern_timecounter_get, "IU", "current timecounter value"); + SYSCTL_ADD_PROC(NULL, SYSCTL_CHILDREN(tc_root), OID_AUTO, + "frequency", CTLTYPE_QUAD | CTLFLAG_RD, tc, sizeof(*tc), + sysctl_kern_timecounter_freq, "IU", "timecounter frequency"); + SYSCTL_ADD_INT(NULL, SYSCTL_CHILDREN(tc_root), OID_AUTO, + "quality", CTLFLAG_RD, &(tc->tc_quality), 0, + "goodness of time counter"); + /* * Never automatically use a timecounter with negative quality. * Even though we run on the dummy counter, switching here may be * worse since this timecounter may not be monotonous. ==== //depot/projects/jail2/sys/kern/subr_kdb.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.21 2006/04/04 00:40:20 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_kdb.c,v 1.22 2006/06/17 02:58:18 emaste Exp $"); #include "opt_kdb.h" @@ -89,7 +89,7 @@ #ifdef SMP static int kdb_stop_cpus = 1; SYSCTL_INT(_debug_kdb, OID_AUTO, stop_cpus, CTLTYPE_INT | CTLFLAG_RW, - &kdb_stop_cpus, 0, ""); + &kdb_stop_cpus, 0, "stop other CPUs when entering the debugger"); TUNABLE_INT("debug.kdb.stop_cpus", &kdb_stop_cpus); #endif ==== //depot/projects/jail2/sys/kern/uipc_usrreq.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.168 2006/06/13 14:33:35 maxim Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.169 2006/06/16 22:11:49 rwatson Exp $"); #include "opt_mac.h" @@ -1039,16 +1039,6 @@ } } -#ifdef notdef -void -unp_abort(struct unpcb *unp) -{ - - unp_detach(unp); - UNP_UNLOCK_ASSERT(); -} -#endif - /* * unp_pcblist() assumes that UNIX domain socket memory is never reclaimed * by the zone (UMA_ZONE_NOFREE), and as such potentially stale pointers @@ -1190,14 +1180,6 @@ unp_disconnect(unp); } -#ifdef notdef -void -unp_drain(void) -{ - -} -#endif - static void unp_freerights(struct file **rp, int fdcount) { ==== //depot/projects/jail2/sys/kern/vfs_cache.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.105 2006/04/16 18:38:30 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.106 2006/06/16 05:09:28 csjp Exp $"); #include #include @@ -771,11 +771,9 @@ buf = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); fdp = td->td_proc->p_fd; - mtx_lock(&Giant); FILEDESC_LOCK(fdp); error = vn_fullpath1(td, vn, fdp->fd_rdir, buf, retbuf, MAXPATHLEN); FILEDESC_UNLOCK(fdp); - mtx_unlock(&Giant); if (!error) *freebuf = buf; @@ -795,8 +793,6 @@ int error, i, slash_prefixed; struct namecache *ncp; - mtx_assert(&Giant, MA_OWNED); - bp = buf + buflen - 1; *bp = '\0'; error = 0; ==== //depot/projects/jail2/sys/modules/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.498 2006/06/13 13:53:52 gallatin Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.500 2006/06/16 12:51:53 nyan Exp $ .include @@ -190,6 +190,7 @@ ${_pmc} \ portalfs \ ppbus \ + ${_ppc} \ ppi \ pps \ procfs \ @@ -373,6 +374,7 @@ _pccard= pccard _pcfclock= pcfclock _pecoff= pecoff +_ppc= ppc _pst= pst _puc= puc _ray= ray @@ -475,6 +477,7 @@ _ndis= ndis _nve= nve _pccard= pccard +_ppc= ppc _rr232x= rr232x _safe= safe _scsi_low= scsi_low ==== //depot/projects/jail2/sys/security/audit/audit_bsm_token.c#2 (text) ==== @@ -30,8 +30,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#15 $ - * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.3 2006/06/05 13:13:02 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#17 $ + * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.4 2006/06/17 13:53:04 wsalamon Exp $ */ #include @@ -609,7 +609,7 @@ * terminal ID * port ID 4 bytes/8 bytes (32-bit/64-bit value) * address type-len 4 bytes - * machine address 16 bytes + * machine address 4/16 bytes */ token_t * au_to_process32_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, @@ -618,7 +618,12 @@ token_t *t; u_char *dptr = NULL; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * sizeof(u_int32_t)); + if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * + sizeof(u_int32_t)); + else + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * + sizeof(u_int32_t)); ADD_U_CHAR(dptr, AUT_PROCESS32_EX); ADD_U_INT32(dptr, auid); @@ -631,10 +636,11 @@ ADD_U_INT32(dptr, tid->at_port); ADD_U_INT32(dptr, tid->at_type); ADD_U_INT32(dptr, tid->at_addr[0]); - ADD_U_INT32(dptr, tid->at_addr[1]); - ADD_U_INT32(dptr, tid->at_addr[2]); - ADD_U_INT32(dptr, tid->at_addr[3]); - + if (tid->at_type == AU_IPv6) { + ADD_U_INT32(dptr, tid->at_addr[1]); + ADD_U_INT32(dptr, tid->at_addr[2]); + ADD_U_INT32(dptr, tid->at_addr[3]); + } return (t); } @@ -938,7 +944,7 @@ * terminal ID * port ID 4 bytes/8 bytes (32-bit/64-bit value) * address type/length 4 bytes - * machine address 16 bytes + * machine address 4/16 bytes */ token_t * au_to_subject32_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, @@ -947,7 +953,12 @@ token_t *t; u_char *dptr = NULL; - GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * sizeof(u_int32_t)); + if (tid->at_type == AU_IPv6) + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 13 * + sizeof(u_int32_t)); + else + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + 10 * + sizeof(u_int32_t)); ADD_U_CHAR(dptr, AUT_SUBJECT32_EX); ADD_U_INT32(dptr, auid); @@ -960,10 +971,11 @@ ADD_U_INT32(dptr, tid->at_port); ADD_U_INT32(dptr, tid->at_type); ADD_U_INT32(dptr, tid->at_addr[0]); - ADD_U_INT32(dptr, tid->at_addr[1]); - ADD_U_INT32(dptr, tid->at_addr[2]); - ADD_U_INT32(dptr, tid->at_addr[3]); - + if (tid->at_type == AU_IPv6) { + ADD_U_INT32(dptr, tid->at_addr[1]); + ADD_U_INT32(dptr, tid->at_addr[2]); + ADD_U_INT32(dptr, tid->at_addr[3]); + } return (t); } ==== //depot/projects/jail2/sys/sys/protosw.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)protosw.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/protosw.h,v 1.53 2006/06/07 13:09:04 rwatson Exp $ + * $FreeBSD: src/sys/sys/protosw.h,v 1.54 2006/06/16 22:31:56 rwatson Exp $ */ #ifndef _SYS_PROTOSW_H_ @@ -249,7 +249,6 @@ /* * All nonvoid pru_*() functions below return EOPNOTSUPP. */ - void pru_abort_notsupp(struct socket *so); int pru_accept_notsupp(struct socket *so, struct sockaddr **nam); int pru_attach_notsupp(struct socket *so, int proto, struct thread *td); ==== //depot/projects/jail2/sys/tools/fw_stub.awk#2 (text+ko) ==== @@ -25,7 +25,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/sys/tools/fw_stub.awk,v 1.2 2006/01/30 16:32:08 mlaier Exp $ +# $FreeBSD: src/sys/tools/fw_stub.awk,v 1.3 2006/06/16 21:06:03 jhb Exp $ # # Script to generate module .c file from a list of firmware images @@ -125,7 +125,8 @@ printc("\nstatic int\n"\ opt_m "_fw_modevent(module_t mod, int type, void *unused)\ {\ - struct firmware *fp;\ + struct firmware *fp, *parent;\ + int error;\ switch (type) {\ case MOD_LOAD:"); @@ -136,11 +137,7 @@ # '-', '.' and '/' are converted to '_' by ld/objcopy gsub(/-|\.|\//, "_", symb); - if (file_i == 0) - reg = "\t\tfp = "; - else - reg = "\t\t(void)"; - + reg = "\t\tfp = "; reg = reg "firmware_register(\"" short "\", _binary_" symb "_start , "; reg = reg "(size_t)(_binary_" symb "_end - _binary_" symb "_start), "; reg = reg version ", "; @@ -148,21 +145,37 @@ if (file_i == 0) reg = reg "NULL);"; else - reg = reg "fp);"; + reg = reg "parent);"; printc(reg); + + printc("\t\tif (fp == NULL)"); + printc("\t\t\tgoto fail_" file_i ";"); + if (file_i == 0) + printc("\t\tparent = fp;"); } -printc("\t\treturn (0);\ - case MOD_UNLOAD:"); +printc("\t\treturn (0);"); + +for (file_i = num_files - 1; file_i > 0; file_i--) { + printc("\tfail_" file_i ":") + printc("\t\t(void)firmware_unregister(\"" shortnames[file_i - 1] "\");"); +} + +printc("\tfail_0:"); +printc("\t\treturn (ENXIO);"); + +printc("\tcase MOD_UNLOAD:"); for (file_i = 1; file_i < num_files; file_i++) { - printc("\t\tfirmware_unregister(\"" shortnames[file_i] "\");"); + printc("\t\terror = firmware_unregister(\"" shortnames[file_i] "\");"); + printc("\t\tif (error)"); + printc("\t\t\treturn (error);"); } -printc("\t\tfirmware_unregister(\"" shortnames[0] "\");"); +printc("\t\terror = firmware_unregister(\"" shortnames[0] "\");"); -printc("\t\treturn (0);\ +printc("\t\treturn (error);\ }\ return (EINVAL);\ }\ ==== //depot/projects/jail2/sys/vm/vm_map.c#2 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.376 2006/06/14 17:48:45 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.377 2006/06/17 08:45:01 alc Exp $"); #include #include @@ -1489,7 +1489,7 @@ */ if ((flags & MAP_PREFAULT_MADVISE) && cnt.v_free_count < cnt.v_free_reserved) { - size = ptoa(tmpidx); + psize = tmpidx; break; } if ((p->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL && @@ -1512,8 +1512,8 @@ } } if (p_start != NULL) - pmap_enter_object(map->pmap, start, addr + size, p_start, - prot); + pmap_enter_object(map->pmap, start, addr + ptoa(psize), + p_start, prot); if (are_queues_locked) vm_page_unlock_queues(); unlock_return: From owner-p4-projects@FreeBSD.ORG Sat Jun 17 15:53:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FF6216A47B; Sat, 17 Jun 2006 15:53:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BF68B16A474 for ; Sat, 17 Jun 2006 15:53:35 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D04343D45 for ; Sat, 17 Jun 2006 15:53:35 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HFrZYe067292 for ; Sat, 17 Jun 2006 15:53:35 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HFrUZ3067289 for perforce@freebsd.org; Sat, 17 Jun 2006 15:53:30 GMT (envelope-from als@FreeBSD.org) Date: Sat, 17 Jun 2006 15:53:30 GMT Message-Id: <200606171553.k5HFrUZ3067289@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 99434 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, 17 Jun 2006 15:53:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=99434 Change 99434 by als@als_head on 2006/06/17 15:53:03 Initial import jail2 into PerForce. With additionaly to last published fixed build world and implementated per jail file handle limit. Affected files ... .. //depot/projects/jail2/sys/amd64/amd64/dump_machdep.c#2 edit .. //depot/projects/jail2/sys/amd64/amd64/minidump_machdep.c#2 edit .. //depot/projects/jail2/sys/arm/arm/dump_machdep.c#2 edit .. //depot/projects/jail2/sys/compat/linprocfs/linprocfs.c#2 edit .. //depot/projects/jail2/sys/compat/linux/linux_mib.c#2 edit .. //depot/projects/jail2/sys/compat/linux/linux_misc.c#2 edit .. //depot/projects/jail2/sys/compat/linux/linux_stats.c#2 edit .. //depot/projects/jail2/sys/compat/svr4/svr4_stat.c#2 edit .. //depot/projects/jail2/sys/conf/NOTES#2 edit .. //depot/projects/jail2/sys/conf/files#2 edit .. //depot/projects/jail2/sys/conf/options#2 edit .. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 edit .. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_nat.c#2 edit .. //depot/projects/jail2/sys/ddb/db_command.c#2 edit .. //depot/projects/jail2/sys/ddb/db_ps.c#2 edit .. //depot/projects/jail2/sys/dev/firewire/firewire.c#2 edit .. //depot/projects/jail2/sys/dev/hwpmc/hwpmc_mod.c#2 edit .. //depot/projects/jail2/sys/dev/syscons/daemon/daemon_saver.c#2 edit .. //depot/projects/jail2/sys/fs/procfs/procfs_status.c#2 edit .. //depot/projects/jail2/sys/geom/vinum/geom_vinum_drive.c#2 edit .. //depot/projects/jail2/sys/i386/i386/dump_machdep.c#2 edit .. //depot/projects/jail2/sys/i386/i386/minidump_machdep.c#2 edit .. //depot/projects/jail2/sys/i386/i386/pmap.c#2 edit .. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_socksys.c#2 edit .. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_stat.c#2 edit .. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_sysvec.c#2 edit .. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_xenix.c#2 edit .. //depot/projects/jail2/sys/ia64/ia64/dump_machdep.c#2 edit .. //depot/projects/jail2/sys/isofs/cd9660/cd9660_rrip.c#2 edit .. //depot/projects/jail2/sys/kern/imgact_elf.c#2 edit .. //depot/projects/jail2/sys/kern/init_main.c#2 edit .. //depot/projects/jail2/sys/kern/kern_descrip.c#2 edit .. //depot/projects/jail2/sys/kern/kern_exec.c#2 edit .. //depot/projects/jail2/sys/kern/kern_exit.c#2 edit .. //depot/projects/jail2/sys/kern/kern_fork.c#2 edit .. //depot/projects/jail2/sys/kern/kern_jail.c#2 edit .. //depot/projects/jail2/sys/kern/kern_jail2_common.c#1 add .. //depot/projects/jail2/sys/kern/kern_jail2_disk.c#1 add .. //depot/projects/jail2/sys/kern/kern_jail2_network.c#1 add .. //depot/projects/jail2/sys/kern/kern_jail2_resource.c#1 add .. //depot/projects/jail2/sys/kern/kern_ktrace.c#2 edit .. //depot/projects/jail2/sys/kern/kern_linker.c#2 edit .. //depot/projects/jail2/sys/kern/kern_mib.c#2 edit .. //depot/projects/jail2/sys/kern/kern_proc.c#2 edit .. //depot/projects/jail2/sys/kern/kern_prot.c#2 edit .. //depot/projects/jail2/sys/kern/kern_resource.c#2 edit .. //depot/projects/jail2/sys/kern/kern_sig.c#2 edit .. //depot/projects/jail2/sys/kern/sysv_ipc.c#2 edit .. //depot/projects/jail2/sys/kern/sysv_msg.c#2 edit .. //depot/projects/jail2/sys/kern/sysv_sem.c#2 edit .. //depot/projects/jail2/sys/kern/sysv_shm.c#2 edit .. //depot/projects/jail2/sys/kern/uipc_socket.c#2 edit .. //depot/projects/jail2/sys/kern/uipc_usrreq.c#3 edit .. //depot/projects/jail2/sys/kern/vfs_mount.c#2 edit .. //depot/projects/jail2/sys/kern/vfs_syscalls.c#2 edit .. //depot/projects/jail2/sys/net/if.c#2 edit .. //depot/projects/jail2/sys/net/if.c.new#1 add .. //depot/projects/jail2/sys/net/rtsock.c#2 edit .. //depot/projects/jail2/sys/net/rtsock.c.new#1 add .. //depot/projects/jail2/sys/net80211/ieee80211_ioctl.c#2 edit .. //depot/projects/jail2/sys/netinet/in_pcb.c#2 edit .. //depot/projects/jail2/sys/netinet/ip_fw2.c#2 edit .. //depot/projects/jail2/sys/netinet/raw_ip.c#2 edit .. //depot/projects/jail2/sys/netinet/tcp_usrreq.c#2 edit .. //depot/projects/jail2/sys/netinet/udp_usrreq.c#2 edit .. //depot/projects/jail2/sys/netinet6/icmp6.c#2 edit .. //depot/projects/jail2/sys/netinet6/in6.c#2 edit .. //depot/projects/jail2/sys/netinet6/in6_ifattach.c#2 edit .. //depot/projects/jail2/sys/netinet6/in6_pcb.c#2 edit .. //depot/projects/jail2/sys/nfsclient/bootp_subr.c#2 edit .. //depot/projects/jail2/sys/nfsclient/nfs_vfsops.c#2 edit .. //depot/projects/jail2/sys/sparc64/sparc64/dump_machdep.c#2 edit .. //depot/projects/jail2/sys/sys/ipc.h#2 edit .. //depot/projects/jail2/sys/sys/jail.h#2 edit .. //depot/projects/jail2/sys/sys/jail2.h#1 add .. //depot/projects/jail2/sys/sys/jail2_disks.h#1 add .. //depot/projects/jail2/sys/sys/jail2_file.h#1 add .. //depot/projects/jail2/sys/sys/jail2_flags.h#1 add .. //depot/projects/jail2/sys/sys/jail2_ipc.h#1 add .. //depot/projects/jail2/sys/sys/jail2_limits.h#1 add .. //depot/projects/jail2/sys/sys/jail2_network.h#1 add .. //depot/projects/jail2/sys/sys/jail2_task.h#1 add .. //depot/projects/jail2/sys/sys/kernel.h#2 edit .. //depot/projects/jail2/sys/sys/resourcevar.h#2 edit .. //depot/projects/jail2/sys/sys/systm.h#2 edit .. //depot/projects/jail2/sys/ufs/ufs/dinode.h#2 edit .. //depot/projects/jail2/sys/ufs/ufs/ufs_vnops.c#2 edit .. //depot/projects/jail2/sys/vm/vm_object.c#2 edit .. //depot/projects/jail2/sys/vm/vm_pageout.c#2 edit Differences ... ==== //depot/projects/jail2/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ==== @@ -39,6 +39,10 @@ #include #include +#ifdef JAIL +#include +#endif + CTASSERT(sizeof(struct kerneldumpheader) == 512); int do_minidump = 1; @@ -118,7 +122,7 @@ kdh->dumplength = htod64(dumplen); kdh->dumptime = htod64(time_second); kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, hostname, sizeof(kdh->hostname)); + strncpy(kdh->hostname, hostname(), sizeof(kdh->hostname)); strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); if (panicstr != NULL) strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); ==== //depot/projects/jail2/sys/amd64/amd64/minidump_machdep.c#2 (text) ==== @@ -42,6 +42,10 @@ #include #include +#ifdef JAIL +#include +#endif + CTASSERT(sizeof(struct kerneldumpheader) == 512); /* @@ -94,7 +98,7 @@ kdh->dumplength = htod64(dumplen); kdh->dumptime = htod64(time_second); kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, hostname, sizeof(kdh->hostname)); + strncpy(kdh->hostname, hostname(), sizeof(kdh->hostname)); strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); if (panicstr != NULL) strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); ==== //depot/projects/jail2/sys/arm/arm/dump_machdep.c#2 (text+ko) ==== @@ -41,6 +41,10 @@ #include #include +#ifdef JAIL +#include +#endif + CTASSERT(sizeof(struct kerneldumpheader) == 512); /* @@ -116,7 +120,7 @@ kdh->dumplength = htod64(dumplen); kdh->dumptime = htod64(time_second); kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, hostname, sizeof(kdh->hostname)); + strncpy(kdh->hostname, hostname(), sizeof(kdh->hostname)); strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); if (panicstr != NULL) strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); ==== //depot/projects/jail2/sys/compat/linprocfs/linprocfs.c#2 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include @@ -68,6 +67,10 @@ #include #include +#ifdef JAIL +#include +#endif + #include #include @@ -688,8 +691,11 @@ struct vnode *rvp; char *fullpath = "unknown"; char *freepath = NULL; - +#ifdef JAIL rvp = jailed(p->p_ucred) ? p->p_fd->fd_jdir : p->p_fd->fd_rdir; +#else + rvp = p->p_fd->fd_rdir; +#endif vn_fullpath(td, rvp, &fullpath, &freepath); sbuf_printf(sb, "%s", fullpath); if (freepath) ==== //depot/projects/jail2/sys/compat/linux/linux_mib.c#2 (text+ko) ==== @@ -35,10 +35,13 @@ #include #include #include -#include #include #include +#ifdef JAIL +#include +#endif + #include "opt_compat.h" #ifdef COMPAT_LINUX32 @@ -123,12 +126,14 @@ 0, 0, linux_sysctl_oss_version, "I", "Linux OSS version"); +#ifdef JAIL /* * Returns holding the prison mutex if return non-NULL. */ static struct prison * linux_get_prison(struct thread *td) { + register struct prison *pr; register struct linux_prison *lpr; @@ -137,7 +142,7 @@ return (NULL); pr = td->td_ucred->cr_prison; mtx_lock(&pr->pr_mtx); - if (pr->pr_linux == NULL) { + if (jailed(td->td_ucred)) { /* * If we don't have a linux prison structure yet, allocate * one. We have to handle the race where another thread @@ -153,16 +158,19 @@ free(lpr, M_PRISON); } return (pr); + } +#endif void linux_get_osname(struct thread *td, char *dst) { +#ifdef JAIL register struct prison *pr; register struct linux_prison *lpr; pr = td->td_ucred->cr_prison; - if (pr != NULL) { + if (jailed(td->td_ucred)) { mtx_lock(&pr->pr_mtx); if (pr->pr_linux != NULL) { lpr = (struct linux_prison *)pr->pr_linux; @@ -174,7 +182,7 @@ } mtx_unlock(&pr->pr_mtx); } - +#endif mtx_lock(&osname_lock); bcopy(linux_osname, dst, LINUX_MAX_UTSNAME); mtx_unlock(&osname_lock); @@ -183,6 +191,7 @@ int linux_set_osname(struct thread *td, char *osname) { +#ifdef JAIL struct prison *pr; struct linux_prison *lpr; @@ -196,6 +205,11 @@ strcpy(linux_osname, osname); mtx_unlock(&osname_lock); } +#else + mtx_lock(&osname_lock); + strcpy(linux_osname, osname); + mtx_unlock(&osname_lock); +#endif return (0); } @@ -203,11 +217,12 @@ void linux_get_osrelease(struct thread *td, char *dst) { +#ifdef JAIL register struct prison *pr; struct linux_prison *lpr; pr = td->td_ucred->cr_prison; - if (pr != NULL) { + if (jailed(td->td_ucred)) { mtx_lock(&pr->pr_mtx); if (pr->pr_linux != NULL) { lpr = (struct linux_prison *)pr->pr_linux; @@ -220,7 +235,7 @@ } mtx_unlock(&pr->pr_mtx); } - +#endif mtx_lock(&osname_lock); bcopy(linux_osrelease, dst, LINUX_MAX_UTSNAME); mtx_unlock(&osname_lock); @@ -229,6 +244,7 @@ int linux_set_osrelease(struct thread *td, char *osrelease) { +#ifdef JAIL struct prison *pr; struct linux_prison *lpr; @@ -242,6 +258,11 @@ strcpy(linux_osrelease, osrelease); mtx_unlock(&osname_lock); } +#else + mtx_lock(&osname_lock); + strcpy(linux_osrelease, osrelease); + mtx_unlock(&osname_lock); +#endif return (0); } @@ -249,12 +270,14 @@ int linux_get_oss_version(struct thread *td) { + int version; +#ifdef JAIL register struct prison *pr; register struct linux_prison *lpr; - int version; + pr = td->td_ucred->cr_prison; - if (pr != NULL) { + if (jailed(td->td_ucred)) { mtx_lock(&pr->pr_mtx); if (pr->pr_linux != NULL) { lpr = (struct linux_prison *)pr->pr_linux; @@ -266,7 +289,7 @@ } mtx_unlock(&pr->pr_mtx); } - +#endif mtx_lock(&osname_lock); version = linux_oss_version; mtx_unlock(&osname_lock); @@ -276,6 +299,7 @@ int linux_set_oss_version(struct thread *td, int oss_version) { +#ifdef JAIL struct prison *pr; struct linux_prison *lpr; @@ -289,6 +313,11 @@ linux_oss_version = oss_version; mtx_unlock(&osname_lock); } +#else + mtx_lock(&osname_lock); + linux_oss_version = oss_version; + mtx_unlock(&osname_lock); +#endif return (0); } ==== //depot/projects/jail2/sys/compat/linux/linux_misc.c#2 (text+ko) ==== @@ -39,7 +39,6 @@ #if defined(__i386__) #include #endif -#include #include #include #include @@ -63,6 +62,10 @@ #include #include +#ifdef JAIL +#include +#endif + #include #include #include @@ -699,7 +702,11 @@ bzero(&utsname, sizeof(utsname)); strlcpy(utsname.sysname, osname, LINUX_MAX_UTSNAME); +#ifdef JAIL getcredhostname(td->td_ucred, utsname.nodename, LINUX_MAX_UTSNAME); +#else + strlcpy(utsname.nodename, hostname, LINUX_MAX_UTSNAME); +#endif strlcpy(utsname.release, osrelease, LINUX_MAX_UTSNAME); strlcpy(utsname.version, version, LINUX_MAX_UTSNAME); for (p = utsname.version; *p != '\0'; ++p) ==== //depot/projects/jail2/sys/compat/linux/linux_stats.c#2 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -49,6 +48,10 @@ #include #include +#ifdef JAIL +#include +#endif + #ifdef COMPAT_LINUX32 #include #include ==== //depot/projects/jail2/sys/compat/svr4/svr4_stat.c#2 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -44,6 +43,10 @@ #include #include +#ifdef JAIL +#include +#endif + #include #include @@ -397,7 +400,11 @@ memset(&sut, 0, sizeof(sut)); strlcpy(sut.sysname, ostype, sizeof(sut.sysname)); +#ifdef JAIL getcredhostname(td->td_ucred, sut.nodename, sizeof(sut.nodename)); +#else + strlcpy(sut.nodename, hostname(), sizeof(sut.nodename)); +#endif strlcpy(sut.release, osrelease, sizeof(sut.release)); strlcpy(sut.version, version, sizeof(sut.version)); strlcpy(sut.machine, machine, sizeof(sut.machine)); @@ -426,7 +433,12 @@ break; case SVR4_SI_HOSTNAME: - str = hostname; + /* XXXX */ +#ifdef JAIL + str = td->td_ucred->cr_prison->pr_host; +#else + str = hostname(); +#endif break; case SVR4_SI_RELEASE: ==== //depot/projects/jail2/sys/conf/NOTES#2 (text+ko) ==== @@ -281,7 +281,9 @@ options SYSVSHM options SYSVSEM options SYSVMSG - +# +# Enable Jail +options JAIL ##################################################################### # DEBUGGING OPTIONS ==== //depot/projects/jail2/sys/conf/files#2 (text+ko) ==== @@ -1283,6 +1283,10 @@ kern/kern_idle.c standard kern/kern_intr.c standard kern/kern_jail.c standard +kern/kern_jail2_common.c optional jail +kern/kern_jail2_network.c optional jail +kern/kern_jail2_resource.c optional jail +kern/kern_jail2_disk.c optional jail kern/kern_kse.c standard kern/kern_kthread.c standard kern/kern_ktr.c optional ktr ==== //depot/projects/jail2/sys/conf/options#2 (text+ko) ==== @@ -723,3 +723,6 @@ # XFS XFS + +# JAIL +JAIL opt_global.h ==== //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 (text+ko) ==== @@ -107,6 +107,10 @@ #endif extern int ip_optcopy __P((struct ip *, struct ip *)); +#ifdef JAIL +#include +#endif + #if (__FreeBSD_version > 460000) extern int path_mtu_discovery; #endif @@ -460,7 +464,7 @@ friostat_t fio; #if (BSD >= 199306) && defined(_KERNEL) - if ((securelevel >= 3) && (mode & FWRITE)) + if ((securelevel() >= 3) && (mode & FWRITE)) return EPERM; #endif ==== //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_nat.c#2 (text+ko) ==== @@ -104,6 +104,10 @@ #endif /* END OF INCLUDES */ +#ifdef JAIL +#include +#endif + #undef SOCKADDR_IN #define SOCKADDR_IN struct sockaddr_in @@ -622,7 +626,7 @@ ipnat_t natd; #if (BSD >= 199306) && defined(_KERNEL) - if ((securelevel >= 3) && (mode & FWRITE)) + if ((securelevel() >= 3) && (mode & FWRITE)) return EPERM; #endif ==== //depot/projects/jail2/sys/ddb/db_command.c#2 (text+ko) ==== @@ -564,7 +564,7 @@ * since we're in DDB. */ /* sx_slock(&allproc_lock); */ - LIST_FOREACH(p, &allproc, p_list) + FOREACH_PROC_IN_SYSTEM(p) if (p->p_pid == pid) break; /* sx_sunlock(&allproc_lock); */ ==== //depot/projects/jail2/sys/ddb/db_ps.c#2 (text+ko) ==== @@ -32,7 +32,6 @@ #include #include -#include #include #include #include @@ -42,6 +41,10 @@ #include #include +#ifdef JAIL +#include +#endif + #include static void dumpthread(volatile struct proc *p, volatile struct thread *td, @@ -179,8 +182,10 @@ /* Cheated here and didn't compare pgid's. */ if (p->p_flag & P_CONTROLT) strlcat(state, "+", sizeof(state)); +#ifdef JAIL if (cred != NULL && jailed(cred)) strlcat(state, "J", sizeof(state)); +#endif db_printf(" %-6.6s ", state); if (p->p_flag & P_HADTHREADS) #ifdef __LP64__ ==== //depot/projects/jail2/sys/dev/firewire/firewire.c#2 (text+ko) ==== @@ -66,6 +66,10 @@ #include #endif +#ifdef JAIL +#include +#endif + struct crom_src_buf { struct crom_src src; struct crom_chunk root; @@ -649,7 +653,7 @@ crom_add_simple_text(src, root, &buf->vendor, "FreeBSD Project"); crom_add_entry(root, CSRKEY_HW, __FreeBSD_version); #endif - crom_add_simple_text(src, root, &buf->hw, hostname); + crom_add_simple_text(src, root, &buf->hw, hostname()); } /* ==== //depot/projects/jail2/sys/dev/hwpmc/hwpmc_mod.c#2 (text+ko) ==== @@ -30,7 +30,6 @@ #include #include -#include #include #include #include @@ -53,6 +52,10 @@ #include #include +#ifdef JAIL +#include +#endif + #include /* needs to be after */ #include @@ -2783,8 +2786,11 @@ KASSERT(td == curthread, ("[pmc,%d] td != curthread", __LINE__)); - +#ifdef JAIL if (suser(td) || jailed(td->td_ucred)) { +#else + if (suser(td)) { +#endif error = EPERM; break; } @@ -2920,9 +2926,13 @@ */ if (PMC_IS_SYSTEM_MODE(mode)) { +#ifdef JAIL if (jailed(curthread->td_ucred)) error = EPERM; else if (suser(curthread) && +#else + if (suser(curthread) && +#endif (pmc_unprivileged_syspmcs == 0)) error = EPERM; } ==== //depot/projects/jail2/sys/dev/syscons/daemon/daemon_saver.c#2 (text+ko) ==== @@ -37,6 +37,10 @@ #include #include +#ifdef JAIL +#include +#endif + #include #include @@ -350,10 +354,12 @@ static int daemon_init(video_adapter_t *adp) { - messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + + messagelen = strlen(hostname()) + 3 + strlen(ostype) + 1 + strlen(osrelease); + message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK); - sprintf(message, "%s - %s %s", hostname, ostype, osrelease); + sprintf(message, "%s - %s %s", hostname(), ostype, osrelease); + blanked = 0; switch (adp->va_mode) { case M_PC98_80x25: @@ -364,7 +370,6 @@ attr_mask = ~0; break; } - return 0; } ==== //depot/projects/jail2/sys/fs/procfs/procfs_status.c#2 (text+ko) ==== @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -53,6 +52,10 @@ #include #include +#ifdef JAIL +#include +#endif + #include #include #include @@ -155,7 +158,8 @@ for (i = 0; i < cr->cr_ngroups; i++) { sbuf_printf(sb, ",%lu", (u_long)cr->cr_groups[i]); } - + +#ifdef JAIL if (jailed(p->p_ucred)) { mtx_lock(&p->p_ucred->cr_prison->pr_mtx); sbuf_printf(sb, " %s", p->p_ucred->cr_prison->pr_host); @@ -163,6 +167,9 @@ } else { sbuf_printf(sb, " -"); } +#else + sbuf_printf(sb, " -"); +#endif PROC_UNLOCK(p); sbuf_printf(sb, "\n"); ==== //depot/projects/jail2/sys/geom/vinum/geom_vinum_drive.c#2 (text+ko) ==== @@ -42,6 +42,10 @@ #include #include +#ifdef JAIL +#include +#endif + #include #include #include @@ -61,8 +65,8 @@ vhdr = g_malloc(sizeof(*vhdr), M_WAITOK | M_ZERO); vhdr->magic = GV_MAGIC; vhdr->config_length = GV_CFG_LEN; - - bcopy(hostname, vhdr->label.sysname, GV_HOSTNAME_LEN); + + bcopy(hostname(), vhdr->label.sysname, GV_HOSTNAME_LEN); strncpy(vhdr->label.name, d->name, GV_MAXDRIVENAME); microtime(&vhdr->label.date_of_birth); ==== //depot/projects/jail2/sys/i386/i386/dump_machdep.c#2 (text+ko) ==== @@ -39,6 +39,10 @@ #include #include +#ifdef JAIL +#include +#endif + CTASSERT(sizeof(struct kerneldumpheader) == 512); int do_minidump = 1; @@ -118,7 +122,7 @@ kdh->dumplength = htod64(dumplen); kdh->dumptime = htod64(time_second); kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, hostname, sizeof(kdh->hostname)); + strncpy(kdh->hostname, hostname(), sizeof(kdh->hostname)); strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); if (panicstr != NULL) strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); ==== //depot/projects/jail2/sys/i386/i386/minidump_machdep.c#2 (text) ==== @@ -42,6 +42,10 @@ #include #include +#ifdef JAIL +#include +#endif + CTASSERT(sizeof(struct kerneldumpheader) == 512); /* @@ -92,7 +96,7 @@ kdh->dumplength = htod64(dumplen); kdh->dumptime = htod64(time_second); kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, hostname, sizeof(kdh->hostname)); + strncpy(kdh->hostname, hostname(), sizeof(kdh->hostname)); strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); if (panicstr != NULL) strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); ==== //depot/projects/jail2/sys/i386/i386/pmap.c#2 (text+ko) ==== @@ -3401,7 +3401,7 @@ int index; sx_slock(&allproc_lock); - LIST_FOREACH(p, &allproc, p_list) { + FOREACH_PROC_IN_SYSTEM(p) { if (p->p_pid != pid) continue; ==== //depot/projects/jail2/sys/i386/ibcs2/ibcs2_socksys.c#2 (text+ko) ==== @@ -29,10 +29,13 @@ #include #include #include -#include #include #include +#ifdef JAIL +#include +#endif + #include #include @@ -150,8 +153,6 @@ int len; /* Get the domain name */ - getcredhostname(td->td_ucred, hname, sizeof(hname)); - dptr = index(hname, '.'); if ( dptr ) dptr++; @@ -177,12 +178,17 @@ if ((error = suser(td))) return (error); + + /* Get the host's unqualified name (strip off the domain) */ +#ifdef JAIL + getcredhostname(td->td_ucred, hname, sizeof(hname)); +#else + strlcpy(hname, hostname, sizeof(hname)); +#endif /* W/out a hostname a domain-name is nonsense */ - if ( strlen(hostname) == 0 ) + if ( strlen(hname) == 0 ) return EINVAL; - /* Get the host's unqualified name (strip off the domain) */ - snprintf(hname, sizeof(hname), "%s", hostname); ptr = index(hname, '.'); if ( ptr != NULL ) { ptr++; ==== //depot/projects/jail2/sys/i386/ibcs2/ibcs2_stat.c#2 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -44,6 +43,10 @@ #include #include +#ifdef JAIL +#include +#endif + #include #include #include @@ -210,8 +213,13 @@ IBCS2_UNAME_RELEASE, sizeof(sut.release) - 1); strncpy(sut.version, IBCS2_UNAME_VERSION, sizeof(sut.version) - 1); +#ifdef JAIL getcredhostname(td->td_ucred, machine_name, sizeof(machine_name) - 1); +#else + strlcpy(machine_name, hostname, sizeof(machine_name) - 1); +#endif + p = index(machine_name, '.'); if ( p ) *p = '\0'; ==== //depot/projects/jail2/sys/i386/ibcs2/ibcs2_sysvec.c#2 (text+ko) ==== @@ -110,7 +110,7 @@ case MOD_UNLOAD: /* if this was an ELF module we'd use elf_brand_inuse()... */ sx_slock(&allproc_lock); - LIST_FOREACH(p, &allproc, p_list) { + FOREACH_PROC_IN_SYSTEM(p) { if (p->p_sysent == &ibcs2_svr3_sysvec) { rval = EBUSY; break; ==== //depot/projects/jail2/sys/i386/ibcs2/ibcs2_xenix.c#2 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -44,6 +43,10 @@ #include #include +#ifdef JAIL +#include +#endif + #include #include @@ -171,8 +174,12 @@ bzero(&ibcs2_sco_uname, sizeof(struct ibcs2_sco_utsname)); strncpy(ibcs2_sco_uname.sysname, ostype, sizeof(ibcs2_sco_uname.sysname) - 1); +#ifdef JAIL getcredhostname(td->td_ucred, ibcs2_sco_uname.nodename, sizeof(ibcs2_sco_uname.nodename) - 1); +#else + strlcpy(ibcs2_sco_uname.nodename, hostname(), sizeof(ibcs2_sco_uname.nodename)-1); +#endif strncpy(ibcs2_sco_uname.release, osrelease, sizeof(ibcs2_sco_uname.release) - 1); strncpy(ibcs2_sco_uname.kernelid, version, ==== //depot/projects/jail2/sys/ia64/ia64/dump_machdep.c#2 (text+ko) ==== @@ -39,6 +39,10 @@ #include #include +#ifdef JAIL +#include +#endif + CTASSERT(sizeof(struct kerneldumpheader) == 512); /* @@ -73,7 +77,7 @@ kdh->dumplength = htod64(dumplen); kdh->dumptime = htod64(time_second); kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, hostname, sizeof(kdh->hostname)); + strncpy(kdh->hostname, hostname(), sizeof(kdh->hostname)); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 17 19:20:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CA8816A47E; Sat, 17 Jun 2006 19:20:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C4C6616A47A for ; Sat, 17 Jun 2006 19:20:02 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24F7143D72 for ; Sat, 17 Jun 2006 19:19:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HJJv5X094976 for ; Sat, 17 Jun 2006 19:19:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HJJvxu094972 for perforce@freebsd.org; Sat, 17 Jun 2006 19:19:57 GMT (envelope-from imp@freebsd.org) Date: Sat, 17 Jun 2006 19:19:57 GMT Message-Id: <200606171919.k5HJJvxu094972@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99447 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, 17 Jun 2006 19:20:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=99447 Change 99447 by imp@imp_lighthouse on 2006/06/17 19:19:32 iic panics when I boot with it, so disable it for now. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KB920X#30 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#30 (text+ko) ==== @@ -97,5 +97,5 @@ device at91_spi # SPI: device at91_ssc # iic -device iic -device iicbus +# device iic +# device iicbus From owner-p4-projects@FreeBSD.ORG Sat Jun 17 19:22:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A515716A47C; Sat, 17 Jun 2006 19:22:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 80E1D16A474 for ; Sat, 17 Jun 2006 19:22:04 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B26143D67 for ; Sat, 17 Jun 2006 19:22:01 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HJM1SM095166 for ; Sat, 17 Jun 2006 19:22:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HJM0rf095163 for perforce@freebsd.org; Sat, 17 Jun 2006 19:22:00 GMT (envelope-from imp@freebsd.org) Date: Sat, 17 Jun 2006 19:22:00 GMT Message-Id: <200606171922.k5HJM0rf095163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99448 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, 17 Jun 2006 19:22:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=99448 Change 99448 by imp@imp_lighthouse on 2006/06/17 19:21:02 checkpoint my attempts to boot off the sd card. I can read up to address 0x14000 (81920) on the card, then it dies. No clue why this is happening. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootsd/main.c#4 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#11 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/mci_device.c#3 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/mci_device.h#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/sd-card.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootsd/main.c#4 (text+ko) ==== @@ -76,7 +76,7 @@ unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 }; -#define REAL +// #define REAL int main(void) { @@ -103,13 +103,12 @@ SetMACAddress(low_addr, high_addr); printf("Reading from card..."); #ifdef REAL - for (i = 0; i < 7; i++) - { - MCI_read((char *)0x20000000 + ((i + 1) << 20), i << 20, 1 << 20); - printf("*"); + for (i = 0x80; i < 10 * 2048; i++) { + MCI_read((char *)0x20000000, i << 9, 1 << 9); + printf("*"); } printf("\r\nStarting...\r\n"); - ((void(*)())(0x20000000 + (1 << 20)))(); + ((void(*)())(0x20000000))(); #else MCI_read((char *)0x20000000, 0, 1 << 20); printf("Found %s\r\n", (char *)0x20000000); ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#11 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/mci_device.c#3 (text+ko) ==== @@ -17,6 +17,8 @@ #include "mci_device.h" +#include "lib.h" + //*---------------------------------------------------------------------------- //* \fn AT91F_MCI_SendCommand //* \brief Generic function to send a command to the MMC or SDCard @@ -44,10 +46,8 @@ // if the command is SEND_OP_COND the CRC error flag is always present (cf : R3 response) if ( (Cmd != AT91C_SDCARD_APP_OP_COND_CMD) && (Cmd != AT91C_MMC_SEND_OP_COND_CMD) ) return ((AT91C_BASE_MCI->MCI_SR) & AT91C_MCI_SR_ERROR); - else { - if (error != AT91C_MCI_RCRCE) - return ((AT91C_BASE_MCI->MCI_SR) & AT91C_MCI_SR_ERROR); - } + if (error != AT91C_MCI_RCRCE) + return ((AT91C_BASE_MCI->MCI_SR) & AT91C_MCI_SR_ERROR); } return AT91C_CMD_SEND_OK; } @@ -109,20 +109,18 @@ unsigned int status) { // If End of Tx Buffer Empty interrupt occurred - if ( status & AT91C_MCI_TXBUFE ) { + if (pMCI_Device->pMCI_DeviceDesc->state == AT91C_MCI_TX_SINGLE_BLOCK && status & AT91C_MCI_TXBUFE) { AT91C_BASE_MCI->MCI_IDR = AT91C_MCI_TXBUFE; AT91C_BASE_PDC_MCI->PDC_PTCR = AT91C_PDC_TXTDIS; - pMCI_Device->pMCI_DeviceDesc->state = AT91C_MCI_IDLE; - } // End of if AT91C_MCI_TXBUFF - + } // End of if AT91C_MCI_TXBUFF + // If End of Rx Buffer Full interrupt occurred - if ( status & AT91C_MCI_RXBUFF ) { + if (pMCI_Device->pMCI_DeviceDesc->state == AT91C_MCI_RX_SINGLE_BLOCK && status & AT91C_MCI_RXBUFF) { AT91C_BASE_MCI->MCI_IDR = AT91C_MCI_RXBUFF; AT91C_BASE_PDC_MCI->PDC_PTCR = AT91C_PDC_RXTDIS; pMCI_Device->pMCI_DeviceDesc->state = AT91C_MCI_IDLE; } // End of if AT91C_MCI_RXBUFF - } //*---------------------------------------------------------------------------- @@ -137,29 +135,42 @@ int sizeToRead) { //////////////////////////////////////////////////////////////////////////////////////////// - if (pMCI_Device->pMCI_DeviceDesc->state != AT91C_MCI_IDLE) - return AT91C_READ_ERROR; + if (pMCI_Device->pMCI_DeviceDesc->state != AT91C_MCI_IDLE) { + printf("1 state is 0x%x\r\n", pMCI_Device->pMCI_DeviceDesc->state); + return AT91C_READ_ERROR; + } + if ((AT91F_MCI_GetStatus(pMCI_Device, pMCI_Device->pMCI_DeviceFeatures->Relative_Card_Address) & AT91C_SR_READY_FOR_DATA) != - AT91C_SR_READY_FOR_DATA) - return AT91C_READ_ERROR; + AT91C_SR_READY_FOR_DATA) { + printf("2\r\n"); + return AT91C_READ_ERROR; + } - if ( (src + sizeToRead) > pMCI_Device->pMCI_DeviceFeatures->Memory_Capacity ) - return AT91C_READ_ERROR; + if ( (src + sizeToRead) > pMCI_Device->pMCI_DeviceFeatures->Memory_Capacity ) { + printf("3\r\n"); + return AT91C_READ_ERROR; + } // If source does not fit a begin of a block - if ( (src % pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length) != 0 ) - return AT91C_READ_ERROR; + if ( (src % pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length) != 0 ) { + printf("4\r\n"); + return AT91C_READ_ERROR; + } // Test if the MMC supports Partial Read Block // ALWAYS SUPPORTED IN SD Memory Card if( (sizeToRead < pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length) - && (pMCI_Device->pMCI_DeviceFeatures->Read_Partial == 0x00) ) - return AT91C_READ_ERROR; + && (pMCI_Device->pMCI_DeviceFeatures->Read_Partial == 0x00) ) { + printf("5\r\n"); + return AT91C_READ_ERROR; + } - if( sizeToRead > pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length) - return AT91C_READ_ERROR; + if( sizeToRead > pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length) { + printf("6\r\n"); + return AT91C_READ_ERROR; + } //////////////////////////////////////////////////////////////////////////////////////////// // Init Mode Register @@ -512,7 +523,7 @@ AT91F_MCI_SendCommand(pMCI_Device, AT91C_GO_IDLE_STATE_CMD, AT91C_NO_ARGUMENT); - if(AT91F_MCI_SDCard_GetOCR(pMCI_Device) == AT91C_INIT_ERROR) + if (AT91F_MCI_SDCard_GetOCR(pMCI_Device) == AT91C_INIT_ERROR) return AT91C_INIT_ERROR; if (AT91F_MCI_SDCard_GetCID(pMCI_Device,tab_response) == AT91C_CMD_SEND_OK) { @@ -530,23 +541,22 @@ pMCI_Device->pMCI_DeviceFeatures->Write_Block_Misalignment = (tab_response[1] >> AT91C_CSD_WR_B_MIS_S) & AT91C_CSD_WR_B_MIS_M; //// Compute Memory Capacity - // compute MULT - mult = 1 << ( ((tab_response[2] >> AT91C_CSD_C_SIZE_M_S) & AT91C_CSD_C_SIZE_M_M) + 2 ); - // compute MSB of C_SIZE - blocknr = ((tab_response[1] >> AT91C_CSD_CSIZE_H_S) & AT91C_CSD_CSIZE_H_M) << 2; - // compute MULT * (LSB of C-SIZE + MSB already computed + 1) = BLOCKNR - blocknr = mult * ( ( blocknr + ( (tab_response[2] >> AT91C_CSD_CSIZE_L_S) & AT91C_CSD_CSIZE_L_M) ) + 1 ); + // compute MULT + mult = 1 << ( ((tab_response[2] >> AT91C_CSD_C_SIZE_M_S) & AT91C_CSD_C_SIZE_M_M) + 2 ); + // compute MSB of C_SIZE + blocknr = ((tab_response[1] >> AT91C_CSD_CSIZE_H_S) & AT91C_CSD_CSIZE_H_M) << 2; + // compute MULT * (LSB of C-SIZE + MSB already computed + 1) = BLOCKNR + blocknr = mult * ( ( blocknr + ( (tab_response[2] >> AT91C_CSD_CSIZE_L_S) & AT91C_CSD_CSIZE_L_M) ) + 1 ); - pMCI_Device->pMCI_DeviceFeatures->Memory_Capacity = pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length * blocknr; + pMCI_Device->pMCI_DeviceFeatures->Memory_Capacity = pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length * blocknr; //// End of Compute Memory Capacity - if( AT91F_MCI_SDCard_SetBusWidth(pMCI_Device) == AT91C_CMD_SEND_OK ) - { + if (AT91F_MCI_SDCard_SetBusWidth(pMCI_Device) == AT91C_CMD_SEND_OK) { if (AT91F_MCI_SetBlocklength(pMCI_Device,pMCI_Device->pMCI_DeviceFeatures->Max_Read_DataBlock_Length) == AT91C_CMD_SEND_OK) - return AT91C_INIT_OK; + return AT91C_INIT_OK; } } } } - return AT91C_INIT_ERROR; + return AT91C_INIT_ERROR; } ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/mci_device.h#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/sd-card.c#4 (text+ko) ==== @@ -57,6 +57,9 @@ } while( !(status & AT91C_MCI_NOTBUSY) && (timeout>0) ); + if (timeout == 0) + printf("Timeout, status is 0x%x\r\n", status); + //TODO: Make interrupts work! AT91F_MCI_Handler(); } @@ -134,7 +137,7 @@ } int -MCI_read (char* dest, unsigned source, unsigned length) +MCI_read(char* dest, unsigned source, unsigned length) { unsigned sectorLength = MCI_Device.pMCI_DeviceFeatures->Max_Read_DataBlock_Length; // unsigned sector = (unsigned)source / sectorLength; @@ -143,6 +146,10 @@ int sizeToRead; unsigned int *walker; + printf("Reading 0x%x bytes into ARM Addr 0x%x from card offset 0x%x\r\n", + length, dest, source); + + //See if we are requested to read partial sectors, and have the capability to do so if ((length % sectorLength) && !(MCI_Device_Features.Read_Partial)) //Return error if appropriat @@ -155,8 +162,7 @@ return MCI_UNSUPP_OFFSET_ERROR; //If the address we're trying to read != sector boundary - if (offset) - { + if (offset) { //* Wait MCI Device Ready AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); @@ -165,8 +171,10 @@ //Do the writing status = AT91F_MCI_ReadBlock(&MCI_Device, source, (unsigned int*)dest, sizeToRead); //TODO:Status checking - if (status != AT91C_READ_OK) - return -1; + if (status != AT91C_READ_OK) { + printf("STATUS is 0x%x\r\n", status); + return -1; + } //* Wait MCI Device Ready AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); @@ -185,7 +193,7 @@ while (length) { //See if we've got at least a sector to read - if (length > sectorLength) + if (length > sectorLength) sizeToRead = sectorLength; //Else just write the remainder else @@ -194,9 +202,14 @@ AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); //Do the writing status = AT91F_MCI_ReadBlock(&MCI_Device, source, (unsigned int*)dest, sizeToRead); + printf("Reading 0x%x Addr 0x%x card 0x%x\r\n", + sizeToRead, dest, source); + //TODO:Status checking - if (status != AT91C_READ_OK) + if (status != AT91C_READ_OK) { + printf("STATUS is 0x%x\r\n", status); return -1; + } //* Wait MCI Device Ready AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); @@ -371,7 +384,8 @@ { int status; - status = ( AT91C_BASE_MCI->MCI_SR & AT91C_BASE_MCI->MCI_IMR ); +// status = ( AT91C_BASE_MCI->MCI_SR & AT91C_BASE_MCI->MCI_IMR ); + status = AT91C_BASE_MCI->MCI_SR; AT91F_MCI_Device_Handler(&MCI_Device,status); } From owner-p4-projects@FreeBSD.ORG Sat Jun 17 19:24:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CBBC16A47A; Sat, 17 Jun 2006 19:24:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1333E16A47B for ; Sat, 17 Jun 2006 19:24:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 938FA43D6B for ; Sat, 17 Jun 2006 19:24:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HJO4tr095257 for ; Sat, 17 Jun 2006 19:24:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HJO47P095254 for perforce@freebsd.org; Sat, 17 Jun 2006 19:24:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 17 Jun 2006 19:24:04 GMT Message-Id: <200606171924.k5HJO47P095254@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 99450 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, 17 Jun 2006 19:24:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=99450 Change 99450 by rwatson@rwatson_sesame on 2006/06/17 19:23:58 Test for LIST_FIRST and TAILQ_FOREACH_SAFE in queue.h; FreeBSD 4.x offers the former but not latter, so we must use the compat queue.h on FreeBSD 4.x. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#21 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#23 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#21 (xtext) ==== @@ -22936,8 +22936,8 @@ # sys/queue.h exists on most systems, but its capabilities vary a great deal. -# test for LIST_FIRST, which appears to not exist in all of them, and is -# necessary for OpenBSM. +# test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in +# all of them, and are necessary for OpenBSM. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22951,13 +22951,13 @@ main () { - struct foo { - LIST_ENTRY(foo) foo_entries; - }; - LIST_HEAD(, foo) foo_list; - struct foo *foo; - foo = LIST_FIRST(&foo_list); + #ifndef LIST_FIRST + #error LIST_FIRST missing + #endif + #ifndef TAILQ_FOREACH_SAFE + #error TAILQ_FOREACH_SAFE + #endif ; return 0; ==== //depot/projects/trustedbsd/openbsm/configure.ac#23 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a6], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#22 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#23 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -59,18 +59,18 @@ AC_CHECK_FUNCS([bzero ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul]) # sys/queue.h exists on most systems, but its capabilities vary a great deal. -# test for LIST_FIRST, which appears to not exist in all of them, and is -# necessary for OpenBSM. +# test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in +# all of them, and are necessary for OpenBSM. AC_TRY_LINK([ #include ], [ - struct foo { - LIST_ENTRY(foo) foo_entries; - }; - LIST_HEAD(, foo) foo_list; - struct foo *foo; - foo = LIST_FIRST(&foo_list); + #ifndef LIST_FIRST + #error LIST_FIRST missing + #endif + #ifndef TAILQ_FOREACH_SAFE + #error TAILQ_FOREACH_SAFE + #endif ], [ AC_DEFINE(HAVE_FULL_QUEUE_H,, Define if queue.h includes LIST_FIRST) ]) From owner-p4-projects@FreeBSD.ORG Sat Jun 17 19:40:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF48E16A47E; Sat, 17 Jun 2006 19:40:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E22216A47B for ; Sat, 17 Jun 2006 19:40:25 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A6A143D4C for ; Sat, 17 Jun 2006 19:40:25 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HJePVe096082 for ; Sat, 17 Jun 2006 19:40:25 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HJeP3K096079 for perforce@freebsd.org; Sat, 17 Jun 2006 19:40:25 GMT (envelope-from wsalamon@computer.org) Date: Sat, 17 Jun 2006 19:40:25 GMT Message-Id: <200606171940.k5HJeP3K096079@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 99452 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, 17 Jun 2006 19:40:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=99452 Change 99452 by wsalamon@vh1 on 2006/06/17 19:39:30 Add the remaining ACL events, and the EXTATTR events. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#38 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#38 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#37 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#38 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -383,7 +383,24 @@ #define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ -#define AUE_SYSARCH 406 /* FreeBSD. */ +#define AUE_ACL_GET_LINK 406 /* FreeBSD. */ +#define AUE_ACL_SET_LINK 407 /* FreeBSD. */ +#define AUE_ACL_DELETE_LINK 408 /* FreeBSD. */ +#define AUE_ACL_CHECK_LINK 409 /* FreeBSD. */ +#define AUE_SYSARCH 410 /* FreeBSD. */ +#define AUE_EXTATTRCTL 411 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FILE 412 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FILE 413 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FILE 414 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FILE 415 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FD 416 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FD 417 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FD 418 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FD 419 /* FreeBSD. */ +#define AUE_EXTATTR_GET_LINK 420 /* FreeBSD. */ +#define AUE_EXTATTR_SET_LINK 421 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_LINK 422 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 423 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-p4-projects@FreeBSD.ORG Sat Jun 17 19:46:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6063316A47C; Sat, 17 Jun 2006 19:46:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B25116A474 for ; Sat, 17 Jun 2006 19:46:34 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0781F43D45 for ; Sat, 17 Jun 2006 19:46:34 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HJkX1J096391 for ; Sat, 17 Jun 2006 19:46:33 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HJkXr3096388 for perforce@freebsd.org; Sat, 17 Jun 2006 19:46:33 GMT (envelope-from wsalamon@computer.org) Date: Sat, 17 Jun 2006 19:46:33 GMT Message-Id: <200606171946.k5HJkXr3096388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 99453 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, 17 Jun 2006 19:46:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=99453 Change 99453 by wsalamon@vh1 on 2006/06/17 19:45:45 Integrate the new audit events from OpenBSM. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#21 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#21 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#20 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#21 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -383,7 +383,24 @@ #define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ -#define AUE_SYSARCH 406 /* FreeBSD. */ +#define AUE_ACL_GET_LINK 406 /* FreeBSD. */ +#define AUE_ACL_SET_LINK 407 /* FreeBSD. */ +#define AUE_ACL_DELETE_LINK 408 /* FreeBSD. */ +#define AUE_ACL_CHECK_LINK 409 /* FreeBSD. */ +#define AUE_SYSARCH 410 /* FreeBSD. */ +#define AUE_EXTATTRCTL 411 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FILE 412 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FILE 413 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FILE 414 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FILE 415 /* FreeBSD. */ +#define AUE_EXTATTR_GET_FD 416 /* FreeBSD. */ +#define AUE_EXTATTR_SET_FD 417 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_FD 418 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_FD 419 /* FreeBSD. */ +#define AUE_EXTATTR_GET_LINK 420 /* FreeBSD. */ +#define AUE_EXTATTR_SET_LINK 421 /* FreeBSD. */ +#define AUE_EXTATTR_LIST_LINK 422 /* FreeBSD. */ +#define AUE_EXTATTR_DELETE_LINK 423 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-p4-projects@FreeBSD.ORG Sat Jun 17 19:48:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1674A16A494; Sat, 17 Jun 2006 19:48:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D12C016A481 for ; Sat, 17 Jun 2006 19:48:41 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F08B43D6D for ; Sat, 17 Jun 2006 19:48:37 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HJmbxx096579 for ; Sat, 17 Jun 2006 19:48:37 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HJmbMC096576 for perforce@freebsd.org; Sat, 17 Jun 2006 19:48:37 GMT (envelope-from imp@freebsd.org) Date: Sat, 17 Jun 2006 19:48:37 GMT Message-Id: <200606171948.k5HJmbMC096576@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99455 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, 17 Jun 2006 19:48:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=99455 Change 99455 by imp@imp_lighthouse on 2006/06/17 19:48:09 Detect what state the boot loader left the RMII bit before we frob the device. This allows us to let the boot loader cope and to then boot the same kernel on RMII and MII boards. Change #ifdef to if to cope later. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#51 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#51 (text+ko) ==== @@ -96,6 +96,7 @@ int txcur; /* current tx map pointer */ bus_addr_t rx_desc_phys; eth_rx_desc_t *rx_descs; + int use_rmii; struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */ }; @@ -174,6 +175,8 @@ if (err) goto out; + sc->use_rmii = (RD4(sc, ETH_CFG) & ETH_CFG_RMII) == ETH_CFG_RMII; + /* calling atestop before ifp is set is OK */ atestop(sc); ATE_LOCK_INIT(sc); @@ -182,6 +185,7 @@ ate_get_mac(sc, eaddr); ate_set_mac(sc, eaddr); + sc->ifp = ifp = if_alloc(IFT_ETHER); if (mii_phy_probe(dev, &sc->miibus, ate_ifmedia_upd, ate_ifmedia_sts)) { device_printf(dev, "Cannot find my PHY.\n"); @@ -693,11 +697,11 @@ * to this chip. Select the right one based on a compile-time * option. */ -#ifdef ATE_USE_RMII - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_RMII); -#else - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_RMII); -#endif + if (sc->use_rmii) + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_RMII); + else + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_RMII); + /* * Turn on the multicast hash, and write 0's to it. */ From owner-p4-projects@FreeBSD.ORG Sat Jun 17 20:24:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1C7E16A47B; Sat, 17 Jun 2006 20:24:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 593FD16A479 for ; Sat, 17 Jun 2006 20:24:26 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 09B0B43D66 for ; Sat, 17 Jun 2006 20:24:25 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HKOPjn000412 for ; Sat, 17 Jun 2006 20:24:25 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HKOPJb000409 for perforce@freebsd.org; Sat, 17 Jun 2006 20:24:25 GMT (envelope-from imp@freebsd.org) Date: Sat, 17 Jun 2006 20:24:25 GMT Message-Id: <200606172024.k5HKOPJb000409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99461 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, 17 Jun 2006 20:24:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=99461 Change 99461 by imp@imp_Speedy on 2006/06/17 20:23:29 Now with RAM disks Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KBRAM#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 17 20:29:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11BB616A47D; Sat, 17 Jun 2006 20:29:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E289716A47B for ; Sat, 17 Jun 2006 20:29:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 124EF43D64 for ; Sat, 17 Jun 2006 20:29:33 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HKTWk4001137 for ; Sat, 17 Jun 2006 20:29:32 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HKTWLn001134 for perforce@freebsd.org; Sat, 17 Jun 2006 20:29:32 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 17 Jun 2006 20:29:32 GMT Message-Id: <200606172029.k5HKTWLn001134@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 99462 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, 17 Jun 2006 20:29:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=99462 Change 99462 by kmacy@kmacy_storage:sun4v_work on 2006/06/17 20:28:53 fix hv_cnputchar to return error code fix console to handle H_EWOULDBLOCK Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hcall.S#8 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hvcons.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hcall.S#8 (text+ko) ==== @@ -402,9 +402,8 @@ ENTRY(hv_cnputchar) mov CONS_WRITE, %o5 ta FAST_TRAP - tst %o0 retl - movnz %xcc, -1, %o0 + nop SET_SIZE(hv_cnputchar) /* ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hvcons.c#5 (text+ko) ==== @@ -46,7 +46,7 @@ #include #include -#define HVCN_POLL_FREQ 4 +#define HVCN_POLL_FREQ 10 static d_open_t hvcn_open; @@ -64,6 +64,7 @@ static struct resource *hvcn_irq; static void *hvcn_intrhand; +static int prevchar = 0; static int polltime; static struct callout_handle hvcn_timeouthandle = CALLOUT_HANDLE_INITIALIZER(&hvcn_timeouthandle); @@ -243,7 +244,6 @@ int error; error = 0; - do { if (c == '\n') error = hv_cnputchar('\r'); @@ -266,21 +266,23 @@ static void hvcn_tty_start(struct tty *tp) { - int error; + int c; - if (tp->t_state & (TS_TIMEOUT | TS_BUSY | TS_TTSTOP)) { - ttwwakeup(tp); - return; - } + if (!(tp->t_state & (TS_TIMEOUT | TS_BUSY | TS_TTSTOP))) { + tp->t_state |= TS_BUSY; + + if (prevchar && (hv_cnputchar(prevchar) != H_EWOULDBLOCK)) + prevchar = 0; + while (tp->t_outq.c_cc != 0) { + c = prevchar = getc(&tp->t_outq); - tp->t_state |= TS_BUSY; - error = 0; - while (tp->t_outq.c_cc != 0 && error != H_EWOULDBLOCK) - error = hv_cnputchar(getc(&tp->t_outq)); - - tp->t_state &= ~TS_BUSY; - - ttwwakeup(tp); + if (hv_cnputchar(prevchar) == H_EWOULDBLOCK) + break; + prevchar = 0; + } + tp->t_state &= ~TS_BUSY; + ttwwakeup(tp); + } } static void @@ -303,8 +305,9 @@ while ((c = hvcncheckc(NULL)) != -1) if (tp->t_state & TS_ISOPEN) ttyld_rint(tp, c); - + if (tp->t_outq.c_cc != 0 || prevchar != 0) + hvcn_tty_start(tp); } static void From owner-p4-projects@FreeBSD.ORG Sat Jun 17 20:41:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3503516A47C; Sat, 17 Jun 2006 20:41:49 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC6AD16A479 for ; Sat, 17 Jun 2006 20:41:48 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F12543D45 for ; Sat, 17 Jun 2006 20:41:48 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HKfmsd005330 for ; Sat, 17 Jun 2006 20:41:48 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HKfmC9005327 for perforce@freebsd.org; Sat, 17 Jun 2006 20:41:48 GMT (envelope-from clem1@FreeBSD.org) Date: Sat, 17 Jun 2006 20:41:48 GMT Message-Id: <200606172041.k5HKfmC9005327@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 99463 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, 17 Jun 2006 20:41:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=99463 Change 99463 by clem1@clem1_ipv6vulns on 2006/06/17 20:41:06 icmp6 improvements plus basic samples, new connectors and python bpf wrapper. Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/bpf/bpfmodule.c#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/icmpv6.py#2 edit .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/nd6.py#2 delete .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/pseudoipv6.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/pcs.py#2 edit .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/ping6.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/samples/rawping6.py#1 add .. //depot/projects/soc2006/clem1_ipv6vulns/pcs/setup.py#2 edit Differences ... ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/packets/icmpv6.py#2 (text+ko) ==== @@ -36,15 +36,122 @@ import pcs import struct +from pseudoipv6 import * +ND_ROUTER_SOLICIT = 133 +ND_ROUTER_ADVERT = 134 +ND_NEIGHBOR_SOLICIT = 135 +ND_NEIGHBOR_ADVERT = 136 +ND_REDIRECT = 137 +ICMP6_ROUTER_RENUMBERING = 138 +ICMP6_WRUREQUEST = 139 +ICMP6_WRUREPLY = 140 +ICMP6_DST_UNREACH = 1 +ICMP6_PACKET_TOO_BIG = 2 +ICMP6_TIME_EXCEEDED = 3 +ICMP6_PARAM_PROB = 4 +ICMP6_ECHO_REQUEST = 128 +ICMP6_ECHO_REPLY = 129 + +op = 0 + class icmpv6(pcs.Packet): layout = pcs.Layout() - def __init__(self, bytes = None): - type = pcs.Field("type", 8) + def __init__(self, type = 0, bytes = None): + """icmpv6 header RFC2463 and RFC2461""" + ty = pcs.Field("type", 8, default = type) code = pcs.Field("code", 8) cksum = pcs.Field("checksum", 16) - pcs.Packet.__init__(self, [type, code, cksum], bytes) + if type == ICMP6_ECHO_REQUEST or type == ICMP6_ECHO_REPLY: + id = pcs.Field("id", 16) + seq = pcs.Field("sequence", 16) + pcs.Packet.__init__(self, [ty, code, cksum, id, seq], bytes) + elif type == ICMP6_TIME_EXCEEDED or type == ICMP6_DST_UNREACH or type == ND_ROUTER_SOLICIT: + unused = pcs.Field("unused", 32) + pcs.Packet.__init__(self, [ty, code, cksum, unused], bytes) + elif type == ICMP6_PARAM_PROB: + pointer = pcs.Field("pointer", 32) + pcs.Packet.__init__(self, [ty, code, cksum, pointer], bytes) + elif type == ICMP6_PACKET_TOO_BIG: + mtu = pcs.Field("mtu", 32) + pcs.Packet.__init__(self, [ty, code, cksum, mtu], bytes) + #elif type == ICMP6_WRUREQUEST or type == ICMP6_WRUREPLY: + elif type == ND_ROUTER_ADVERT: + chp = pcs.Field("current_hop_limit", 8) + m = pcs.Field("m", 1) + o = pcs.Field("o", 1) + unused = pcs.Field("unused", 6) + rlf = pcs.Field("router_lifetime", 16) + rct = pcs.Field("reachable_time", 32) + rtt = pcs.Field("retrans_timer", 32) + pcs.Packet.__init__(self, [ty, code, cksum, chp, m, o, unused, rlt, rct, rtt], bytes) + elif type == ND_NEIGHBOR_SOLICIT: + reserved = pcs.Field("reserved", 32) + target = pcs.Field("target", 16 * 8) + pcs.Packet.__init__(self, [ty, code, cksum, reserved, target], bytes) + elif type == ND_NEIGHBOR_ADVERT: + r = pcs.Field("router", 1) + s = pcs.Field("solicited", 1) + o = pcs.Field("override", 1) + reserved = pcs.Field("reserved", 29) + target = pcs.Field("target", 16 * 8) + pcs.Packet.__init__(self, [ty, code, cksum, r, s, o, reserved, target], bytes) + else: + pcs.Packet.__init__(self, [ty, code, cksum], bytes) + + def option(self, type = 0): + """add icmp6 option header RFC2461""" + global op + op += 1 + ty = pcs.Field("type" + str(op), 8, default = type) + length = pcs.Field("length" + str(op), 8) + # Source Link-Layer Address. + if type == 1: + source = pcs.Field("source" + str(op), 48) + pcs.Packet.__add__(self, [ty, length, source]) + # Target Link-Layer Address + elif type == 2: + target = pcs.Field("target" + str(op), 48) + pcs.Packet.__add__(self, [ty, length, target]) + # Prefix Information. + elif type == 3: + plength = pcs.Field("prefix_length" + str(op), 8) + l = pcs.Field("L" + str(op), 1) + a = pcs.Field("A" + str(op), 1) + reserved1 = pcs.Field("reserved1" + str(op), 6) + vlf = pcs.Field("valid_lifetime" + str(op), 32) + plf = pcs.Field("preferred_lifetime" + str(op), 32) + reserved2 = pcs.Field("reserved2" + str(op), 32) + prefix = pcs.Field("prefix" + str(op), 48) + pcs.Packet.__add__(self, [ty, length, plength, l, a, reserved1, vlf, plf, reserved2, prefix]) + # Redirected Header. + elif type == 4: + reserved = pcs.Field("reserved" + str(op), 48) + pcs.Packet.__add__(self, [ty, length, reserved]) + # MTU + elif type == 5: + reserved = pcs.Field("reserved" + str(op), 16) + mtu = pcs.Field("mtu" + str(op), 32) + pcs.Packet.__add__(self, [ty, length, reserved, mtu]) + else: + pcs.Packet.__add__(self, [ty, length]) - + def cksum(self, ip, data = ""): + """return icmpv6 checksum if we send packet through + raw link level (i.e bpf)""" + total = 0 + p6 = pseudoipv6() + p6.src = ip.src + p6.dst = ip.dst + p6.length = len(self.getbytes()) + len (data) + p6.next_header = ip.next_header + pkt = p6.getbytes() + self.getbytes() + data + if len(pkt) % 2 == 1: + pkt += "\0" + for i in range(len(pkt)/2): + total += (struct.unpack("!H", pkt[2*i:2*i+2])[0]) + total = (total >> 16) + (total & 0xffff) + total += total >> 16 + return ~total ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/pcs/pcs.py#2 (text+ko) ==== @@ -169,6 +169,11 @@ if bytes != None: self.decode(bytes) + def __add__(self, layout = None): + for field in layout: + self.layout.append(field) + self._needencode = True + def __setattr__(self, name, value): """Setting the layout is a special case because of the ramifications this has on the packet. Only fields represented @@ -345,27 +350,44 @@ unifying mechanism so you can write packets over any of the available APIs and the connector will do the right thing.""" - def __init__(name, mode, arg): - import socket + def __init__(self, name, arg = ""): + from socket import * + import bpf + connectors = [ "IPV4", "IPV6", "ICMP6", "UDP6", "TCP6", "ICMP", "UDP", "TCP", "BPF", "PCAP" ] + self.bsd = 0 if name not in connectors: raise InvalidConnectorError - if name == "TCP": - self.sock = socket(socket.AF_INET, socket.SOCK_STREAM) - elif name == "UDP": - self.sock = socket(socket.AF_INET, socket.SOCK_DGRAM) + if name == "IPV4": + self.sock = socket(AF_INET, SOCK_RAW, arg) + self.sock.setsockopt(IPPROTO_IP, IP_HDRINCL, 1) + elif name == "ICMP6": + self.sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6) elif name == "TCP6": - self.sock = socket(socket.AF_INET6, socket.SOCK_STREAM) + self.sock = socket(AF_INET6, SOCK_RAW, IPPROTO_TCP) + elif name == "TCP": + self.sock = socket(AF_INET, SOCK_RAW, IPPROTO_TCP) elif name == "UDP6": - self.sock = socket(socket.AF_INET6, socket.SOCK_DGRAM) + self.sock = socket(AF_INET6, SOCK_RAW, IPPROTO_UDP) + elif name == "UDP": + self.sock = socket(AF_INET, SOCK_RAW, IPPROTO_UDP) + elif name == "IPV6" or name == "BPF": + if re.search("bsd|BSD", sys.platform): + self.sock = bpf.open(arg) + self.bsd = 1 + else: + self.sock = socket(PF_PACKET, SOCK_RAW) + sock.bind((arg, 0x86dd)) elif name == "PCAP": self.sock = pcap.pcap(arg) def read(): pass - def write(): - pass - - def close(): - pass - + def write(self, packet, ip = ""): + if self.bsd: + self.sock.write(packet) + else: + self.sock.sendto(packet, (ip, 0)) + + def close(self): + self.sock.close() ==== //depot/projects/soc2006/clem1_ipv6vulns/pcs/setup.py#2 (text+ko) ==== @@ -36,9 +36,11 @@ # Description: The setup script for all of the Packet Construction Set -from distutils.core import setup +from distutils.core import setup, Extension from pcs import pcs +bpf = Extension('bpf', sources = ['bpf/bpfmodule.c']) + setup(name='pcs', version = '0.1', description = 'Packet Construction Set', @@ -46,4 +48,5 @@ author_email = 'gnn@neville-neil.com', url = 'http://pcs.sf.net', packages = ['pcs', 'pcs.packets'], + ext_modules = [bpf], ) From owner-p4-projects@FreeBSD.ORG Sat Jun 17 21:07:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30BDA16A47B; Sat, 17 Jun 2006 21:07:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E960016A47A for ; Sat, 17 Jun 2006 21:07:20 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4F6D43D45 for ; Sat, 17 Jun 2006 21:07:20 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HL7KEH016294 for ; Sat, 17 Jun 2006 21:07:20 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HL7K0c016288 for perforce@freebsd.org; Sat, 17 Jun 2006 21:07:20 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 17 Jun 2006 21:07:20 GMT Message-Id: <200606172107.k5HL7K0c016288@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 99465 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, 17 Jun 2006 21:07:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=99465 Change 99465 by kmacy@kmacy_storage:sun4v_work on 2006/06/17 21:06:54 correctly handle character buffering Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hvcons.c#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hvcons.c#6 (text+ko) ==== @@ -60,11 +60,14 @@ .d_flags = D_TTY | D_NEEDGIANT, }; +#define PCBURST 16 static struct tty *hvcn_tp = NULL; static struct resource *hvcn_irq; static void *hvcn_intrhand; -static int prevchar = 0; +static int bufindex; +static int buflen; +static u_char buf[PCBURST]; static int polltime; static struct callout_handle hvcn_timeouthandle = CALLOUT_HANDLE_INITIALIZER(&hvcn_timeouthandle); @@ -266,20 +269,23 @@ static void hvcn_tty_start(struct tty *tp) { - int c; - + if (!(tp->t_state & (TS_TIMEOUT | TS_BUSY | TS_TTSTOP))) { tp->t_state |= TS_BUSY; - - if (prevchar && (hv_cnputchar(prevchar) != H_EWOULDBLOCK)) - prevchar = 0; - while (tp->t_outq.c_cc != 0) { - c = prevchar = getc(&tp->t_outq); - if (hv_cnputchar(prevchar) == H_EWOULDBLOCK) - break; - prevchar = 0; - } + do { + if (buflen == 0) { + buflen = q_to_b(&tp->t_outq, buf, PCBURST); + bufindex = 0; + } + while (buflen) { + if (hv_cnputchar(buf[bufindex]) == H_EWOULDBLOCK) + goto done; + bufindex++; + buflen--; + } + } while (tp->t_outq.c_cc != 0); + done: tp->t_state &= ~TS_BUSY; ttwwakeup(tp); } @@ -306,7 +312,7 @@ if (tp->t_state & TS_ISOPEN) ttyld_rint(tp, c); - if (tp->t_outq.c_cc != 0 || prevchar != 0) + if (tp->t_outq.c_cc != 0 || buflen != 0) hvcn_tty_start(tp); } From owner-p4-projects@FreeBSD.ORG Sat Jun 17 21:35:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F362916A47C; Sat, 17 Jun 2006 21:35:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CCEA016A479 for ; Sat, 17 Jun 2006 21:35:03 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A94F43D67 for ; Sat, 17 Jun 2006 21:34:56 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HLYuFw018450 for ; Sat, 17 Jun 2006 21:34:56 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HLYuoi018447 for perforce@freebsd.org; Sat, 17 Jun 2006 21:34:56 GMT (envelope-from als@FreeBSD.org) Date: Sat, 17 Jun 2006 21:34:56 GMT Message-Id: <200606172134.k5HLYuoi018447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 99469 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, 17 Jun 2006 21:35:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=99469 Change 99469 by als@als_head on 2006/06/17 21:33:59 import jail common control tool Affected files ... .. //depot/projects/jail2/j2_tools/jctl/Makefile#1 add .. //depot/projects/jail2/j2_tools/jctl/jctl.8#1 add .. //depot/projects/jail2/j2_tools/jctl/jctl.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 17 21:39:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6484D16A47E; Sat, 17 Jun 2006 21:39:02 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40A5C16A474 for ; Sat, 17 Jun 2006 21:39:02 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED11543D48 for ; Sat, 17 Jun 2006 21:39:01 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HLd1ob018652 for ; Sat, 17 Jun 2006 21:39:01 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HLd1Sn018649 for perforce@freebsd.org; Sat, 17 Jun 2006 21:39:01 GMT (envelope-from als@FreeBSD.org) Date: Sat, 17 Jun 2006 21:39:01 GMT Message-Id: <200606172139.k5HLd1Sn018649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 99470 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, 17 Jun 2006 21:39:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=99470 Change 99470 by als@als_head on 2006/06/17 21:38:09 import 3 tools jdisk - jail disk control tool jnetwork - jail network control tool jresource - jail resource control. Affected files ... .. //depot/projects/jail2/j2_tools/jdisk/Makefile#1 add .. //depot/projects/jail2/j2_tools/jdisk/jdisk.c#1 add .. //depot/projects/jail2/j2_tools/jnetwork/Makefile#1 add .. //depot/projects/jail2/j2_tools/jnetwork/jifconfig.c#1 add .. //depot/projects/jail2/j2_tools/jresource/Makefile#1 add .. //depot/projects/jail2/j2_tools/jresource/jresource.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 17 22:57:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69F3716A47E; Sat, 17 Jun 2006 22:57:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B70416A47B for ; Sat, 17 Jun 2006 22:57:42 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDBA543D46 for ; Sat, 17 Jun 2006 22:57:41 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HMvfD9023659 for ; Sat, 17 Jun 2006 22:57:41 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HMvf7k023656 for perforce@freebsd.org; Sat, 17 Jun 2006 22:57:41 GMT (envelope-from gabor@FreeBSD.org) Date: Sat, 17 Jun 2006 22:57:41 GMT Message-Id: <200606172257.k5HMvf7k023656@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 99475 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, 17 Jun 2006 22:57:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=99475 Change 99475 by gabor@spitfire on 2006/06/17 22:57:24 Add IA32_BINARY_PORT macro. This is an enhancement for the existing NOT_FOR_ARCHS and ONLY_FOR_ARCHS system. It should be set instead of the previous two knobs for ports that fetch and install compiled i386 binaries. On ia64 and amd64 the kernel-level compatibility and the availability of the 32-bit libraries is checked and the port can only be installed if both succeeded. Also add SYSCTL variable for /sbin/sysctl. It makes the code easier to read. PR: ports/98105 Reviewed by: erwin Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#2 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#2 (text+ko) ==== @@ -216,6 +216,10 @@ # NOT_FOR_ARCHS_REASON_${ARCH} # - Reason why it's not for ${NOT_FOR_ARCHS}s # +# IA32_BINARY_PORT - It should be set instead of ONLY_FOR_ARCHS if +# the given port fetches and installs compiled +# i386 binaries. +# # Dependency checking. Use these if your port requires another port # not in the list below. (Default: empty.) # @@ -1059,6 +1063,7 @@ SORT?= /usr/bin/sort STRIP_CMD?= /usr/bin/strip SU_CMD?= /usr/bin/su root -c +SYSCTL?= /sbin/sysctl TAIL?= /usr/bin/tail TEST?= test # Shell builtin TR?= LANG=C /usr/bin/tr @@ -1088,6 +1093,30 @@ # Kludge for pre-3.0 systems MACHINE_ARCH?= i386 +# Check the compatibility layer for amd64/ia64 + +.if ${ARCH} == "amd64" || ${ARCH} =="ia64" +.if exists(/usr/lib32) +HAVE_COMPAT_IA32_LIBS?= YES +.endif +.if !defined(HAVE_COMPAT_IA32_KERN) +HAVE_COMPAT_IA32_KERN!= if ${SYSCTL} -a compat.ia32.maxvmem >/dev/null 2>&1; then echo YES; fi +.endif +.endif + +.if defined(IA32_BINARY_PORT) && ${ARCH} != "i386" +.if ${ARCH} == "amd64" || ${ARCH} == "ia64" +.if !defined(HAVE_COMPAT_IA32_KERN) +IGNORE= you need a kernel with compiled-in IA32 compatibility to use this port. +.elif !defined(HAVE_COMPAT_IA32_LIBS) +IGNORE= you need the 32-bit libraries installed under /usr/lib32 to use this port. +.endif +.else +IGNORE= you have to use i386 (or compatible) platform to use this port. +.endif +.endif + + # Get the operating system type .if !defined(OPSYS) OPSYS!= ${UNAME} -s @@ -1100,7 +1129,7 @@ # Get __FreeBSD_version .if !defined(OSVERSION) -OSVERSION!= /sbin/sysctl -n kern.osreldate +OSVERSION!= ${SYSCTL} -n kern.osreldate .endif # Get the object format. @@ -2685,7 +2714,7 @@ .if defined(GNU_CONFIGURE) # Maximum command line length .if !defined(CONFIGURE_MAX_CMD_LEN) -CONFIGURE_MAX_CMD_LEN!= /sbin/sysctl -n kern.argmax +CONFIGURE_MAX_CMD_LEN!= ${SYSCTL} -n kern.argmax .endif CONFIGURE_ARGS+= --prefix=${PREFIX} ${CONFIGURE_TARGET} CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN} From owner-p4-projects@FreeBSD.ORG Sat Jun 17 23:20:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2A5C16A52E; Sat, 17 Jun 2006 23:20:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BEBA016A52B for ; Sat, 17 Jun 2006 23:20:11 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DB1343D45 for ; Sat, 17 Jun 2006 23:20:10 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HNKAj5029578 for ; Sat, 17 Jun 2006 23:20:10 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HNK9JV029575 for perforce@freebsd.org; Sat, 17 Jun 2006 23:20:09 GMT (envelope-from imp@freebsd.org) Date: Sat, 17 Jun 2006 23:20:09 GMT Message-Id: <200606172320.k5HNK9JV029575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99477 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, 17 Jun 2006 23:20:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=99477 Change 99477 by imp@imp_lighthouse on 2006/06/17 23:19:44 86 iic Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KB920X#31 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#31 (text+ko) ==== @@ -93,7 +93,7 @@ device mem # Memory and kernel memory devices device md -device at91_twi # TWI: Two Wire Interface +#device at91_twi # TWI: Two Wire Interface device at91_spi # SPI: device at91_ssc # iic From owner-p4-projects@FreeBSD.ORG Sat Jun 17 23:20:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACE3E16A556; Sat, 17 Jun 2006 23:20:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD17316A52C for ; Sat, 17 Jun 2006 23:20:11 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F0AF43D46 for ; Sat, 17 Jun 2006 23:20:10 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HNKA2E029584 for ; Sat, 17 Jun 2006 23:20:10 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HNKANX029581 for perforce@freebsd.org; Sat, 17 Jun 2006 23:20:10 GMT (envelope-from imp@freebsd.org) Date: Sat, 17 Jun 2006 23:20:10 GMT Message-Id: <200606172320.k5HNKANX029581@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99478 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, 17 Jun 2006 23:20:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=99478 Change 99478 by imp@imp_lighthouse on 2006/06/17 23:20:04 Expand $FreeBSD$ Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pdcreg.h#4 edit .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#10 edit .. //depot/projects/arm/src/sys/arm/at91/at91_pioreg.h#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pdcreg.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD$ */ +/* $FreeBSD: src/sys/arm/at91/at91_pdcreg.h,v 1.1 2006/05/11 14:30:28 cognet Exp $ */ #ifndef ARM_AT91_AT91_PDCREG_H #define ARM_AT91_AT91_PDCREG_H ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.1 2006/03/24 07:39:29 imp Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/at91/at91_pioreg.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD$ */ +/* $FreeBSD: src/sys/arm/at91/at91_pioreg.h,v 1.1 2006/03/24 07:39:29 imp Exp $ */ #ifndef ARM_AT91_AT91_PIOREG_H #define ARM_AT91_AT91_PIOREG_H From owner-p4-projects@FreeBSD.ORG Sat Jun 17 23:31:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2A6716A47A; Sat, 17 Jun 2006 23:31:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E80C16A479 for ; Sat, 17 Jun 2006 23:31:25 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FA6B43D46 for ; Sat, 17 Jun 2006 23:31:25 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5HNVPrp030205 for ; Sat, 17 Jun 2006 23:31:25 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HNVOpp030202 for perforce@freebsd.org; Sat, 17 Jun 2006 23:31:24 GMT (envelope-from imp@freebsd.org) Date: Sat, 17 Jun 2006 23:31:24 GMT Message-Id: <200606172331.k5HNVOpp030202@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 99480 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, 17 Jun 2006 23:31:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=99480 Change 99480 by imp@imp_lighthouse on 2006/06/17 23:30:55 Sync to -current. Basically exapnd $FreeBSD$ Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#16 edit .. //depot/projects/arm/src/sys/arm/at91/at91_pmcreg.h#5 edit .. //depot/projects/arm/src/sys/arm/at91/at91_pmcvar.h#3 edit .. //depot/projects/arm/src/sys/arm/at91/at91_rtc.c#4 edit .. //depot/projects/arm/src/sys/arm/at91/at91_rtcreg.h#4 edit .. //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#4 edit .. //depot/projects/arm/src/sys/arm/at91/at91_sscreg.h#3 edit .. //depot/projects/arm/src/sys/arm/at91/at91var.h#4 edit .. //depot/projects/arm/src/sys/arm/at91/files.kb920x#4 edit .. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#12 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#16 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.2 2006/06/17 23:22:10 imp Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/at91/at91_pmcreg.h#5 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD$ */ +/* $FreeBSD: src/sys/arm/at91/at91_pmcreg.h,v 1.1 2006/03/24 07:37:56 imp Exp $ */ #ifndef ARM_AT91_AT91_PMCREG_H #define ARM_AT91_AT91_PMCREG_H ==== //depot/projects/arm/src/sys/arm/at91/at91_pmcvar.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD$ */ +/* $FreeBSD: src/sys/arm/at91/at91_pmcvar.h,v 1.1 2006/03/24 07:37:56 imp Exp $ */ #ifndef ARM_AT91_AT91_PMCVAR_H #define ARM_AT91_AT91_PMCVAR_H ==== //depot/projects/arm/src/sys/arm/at91/at91_rtc.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.1 2006/03/24 07:35:30 imp Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/at91/at91_rtcreg.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD$ */ +/* $FreeBSD: src/sys/arm/at91/at91_rtcreg.h,v 1.1 2006/03/24 07:35:30 imp Exp $ */ #ifndef ARM_AT91_AT91_RTCREG_H #define ARM_AT91_AT91_RTCREG_H ==== //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.1 2006/03/24 07:42:33 imp Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/at91/at91_sscreg.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD$ */ +/* $FreeBSD: src/sys/arm/at91/at91_sscreg.h,v 1.1 2006/03/24 07:42:33 imp Exp $ */ #ifndef ARM_AT91_AT91_SSCREG_H #define ARM_AT91_AT91_SSCREG_H ==== //depot/projects/arm/src/sys/arm/at91/at91var.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD$ */ +/* $FreeBSD: src/sys/arm/at91/at91var.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */ #ifndef _AT91VAR_H_ #define _AT91VAR_H_ @@ -36,7 +36,6 @@ bus_space_handle_t sc_sys_sh; struct rman sc_irq_rman; struct rman sc_mem_rman; - struct rman sc_usbmem_rman; }; struct at91_ivar { ==== //depot/projects/arm/src/sys/arm/at91/files.kb920x#4 (text+ko) ==== @@ -1,2 +1,2 @@ -#$FreeBSD$ +#$FreeBSD: src/sys/arm/at91/files.kb920x,v 1.1 2006/02/04 23:32:13 imp Exp $ arm/at91/kb920x_machdep.c standard ==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/arm/at91/ohci_atmelarm.c,v 1.1 2006/03/18 01:45:29 imp Exp $"); #include #include